You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2017/11/06 19:32:48 UTC
[geode] branch develop updated: GEODE-3952: Improve and apply
spotless.
This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 96684f3 GEODE-3952: Improve and apply spotless.
96684f3 is described below
commit 96684f3f801998edea9d64ce0f66cc9f73621c97
Author: Patrick Rhomberg <Pu...@users.noreply.github.com>
AuthorDate: Mon Nov 6 11:32:43 2017 -0800
GEODE-3952: Improve and apply spotless.
* Expand whitespace handling to strip end of lines and end of files
* Remove commented-out import statements.
* Enforce style guide import ordering
* Enforce style guide modifier ordering
---
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 +-
.../protocol/serialization/codec/JSONCodec.java | 4 +-
.../registry/SerializationCodecRegistry.java | 4 +-
.../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 +-
.../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 | 1 -
.../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 +-
.../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 +-
.../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 | 15 +-
.../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 | 14 +-
.../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 | 31 +-
.../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 | 36 +-
.../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 +-
.../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 +-
4389 files changed, 25706 insertions(+), 25670 deletions(-)
diff --git a/build.gradle b/build.gradle
index e12c878..2f5446a 100755
--- a/build.gradle
+++ b/build.gradle
@@ -97,16 +97,58 @@ subprojects {
apply plugin: "com.diffplug.gradle.spotless"
spotless {
- lineEndings = 'unix';
+ lineEndings = 'unix'
java {
target project.fileTree(project.projectDir) {
include '**/*.java'
exclude '**/generated-src/**'
}
+
+ custom 'Remove commented-out import statements', {
+ it.replaceAll(/\n\/\/ import .*?;.*/, '')
+ }
+
+ custom 'End files with a single blank line', {
+ it.replaceAll(/\s+$/, '\n')
+ }
+
+ // Removes end-of-line whitespace
+ trimTrailingWhitespace()
+
+ // Enforce style import order
+ importOrderFile "${project(':geode-core').projectDir}/../etc/eclipseOrganizeImports.importorder"
+
// The formatter is relative to geode-core and not the root project as the root project would change
// if Geode and submodules are included as part of a different gradle project.
eclipseFormatFile "${project(':geode-core').projectDir}/../etc/eclipse-java-google-style.xml"
+
+ // Enforce style modifier order
+ custom 'Modifier ordering', {
+ def modifierRanking = [
+ public : 1,
+ protected : 2,
+ private : 3,
+ abstract : 4,
+ default : 5,
+ static : 6,
+ final : 7,
+ transient : 8,
+ volatile : 9,
+ synchronized: 10,
+ native : 11,
+ strictfp : 12]
+ // Find any instance of multiple modifiers. Lead with a non-word character to avoid
+ // accidental matching against for instance, "an alternative default value"
+ it.replaceAll(/\W(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
+ // Do not replace the leading non-word character. Identify the modifiers
+ it.replaceAll(/(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
+ // Sort the modifiers according to the ranking above
+ it.split().sort({ modifierRanking[it] }).join(' ') + ' '
+ }
+ )
+ }
+ )
+ }
}
}
}
-
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
index a553b72..7d65961 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
@@ -15,15 +15,16 @@
package org.apache.geode.modules.session.internal.common;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.Region;
import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics;
import org.apache.geode.modules.session.internal.filter.util.TypeAwareMap;
import org.apache.geode.modules.util.RegionConfiguration;
import org.apache.geode.modules.util.SessionCustomExpiry;
-import java.util.Map;
-import javax.servlet.http.HttpSession;
-
public abstract class AbstractSessionCache implements SessionCache {
/**
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
index 8350cad..53d1368 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
@@ -15,6 +15,14 @@
package org.apache.geode.modules.session.internal.common;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -30,13 +38,6 @@ import org.apache.geode.modules.util.RegionConfiguration;
import org.apache.geode.modules.util.RegionStatus;
import org.apache.geode.modules.util.SessionCustomExpiry;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpSession;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Class which defines a client/server cache.
*/
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
index ff47e78..d4ee064 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
@@ -15,6 +15,13 @@
package org.apache.geode.modules.session.internal.common;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
@@ -28,12 +35,6 @@ import org.apache.geode.modules.util.RegionHelper;
import org.apache.geode.modules.util.TouchPartitionedRegionEntriesFunction;
import org.apache.geode.modules.util.TouchReplicatedRegionEntriesFunction;
-import java.util.Map;
-import javax.servlet.http.HttpSession;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Class which defines a peer-to-peer cache
*/
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
index 9b03bc0..2bbd957 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
@@ -15,11 +15,11 @@
package org.apache.geode.modules.session.internal.common;
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
-import javax.servlet.http.HttpSession;
-
/**
* Interface to basic cache operations.
*/
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
index de3f307..547f562 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
@@ -15,17 +15,18 @@
package org.apache.geode.modules.session.internal.common;
-import org.apache.geode.cache.Declarable;
-import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.cache.Operation;
-import org.apache.geode.cache.util.CacheListenerAdapter;
-
import java.util.Properties;
+
import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+
public class SessionExpirationCacheListener extends CacheListenerAdapter<String, HttpSession>
implements Declarable {
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
index 70d60ca..0cb3a41 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
@@ -15,8 +15,6 @@
package org.apache.geode.modules.session.internal.filter;
-import org.apache.geode.modules.session.internal.filter.attributes.AbstractSessionAttributes;
-
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -24,6 +22,8 @@ import java.util.UUID;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
+import org.apache.geode.modules.session.internal.filter.attributes.AbstractSessionAttributes;
+
/**
* Class which fakes an in-memory basic session manager for testing purposes.
*/
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
index 44c3ec3..1c9857d 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
@@ -15,14 +15,6 @@
package org.apache.geode.modules.session.internal.filter;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.Delta;
-import org.apache.geode.Instantiator;
-import org.apache.geode.InvalidDeltaException;
-import org.apache.geode.modules.session.internal.filter.attributes.AbstractSessionAttributes;
-import org.apache.geode.modules.session.internal.filter.attributes.SessionAttributes;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -33,21 +25,30 @@ import java.io.ObjectOutputStream;
import java.util.Collections;
import java.util.Enumeration;
import java.util.concurrent.atomic.AtomicBoolean;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
-import org.apache.geode.modules.util.ClassLoaderObjectInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Delta;
+import org.apache.geode.Instantiator;
+import org.apache.geode.InvalidDeltaException;
+import org.apache.geode.modules.session.internal.filter.attributes.AbstractSessionAttributes;
+import org.apache.geode.modules.session.internal.filter.attributes.SessionAttributes;
+import org.apache.geode.modules.util.ClassLoaderObjectInputStream;
+
/**
* Class which implements a Gemfire persisted {@code HttpSession}
*/
@SuppressWarnings("deprecation")
public class GemfireHttpSession implements HttpSession, DataSerializable, Delta {
- private static transient final Logger LOG =
+ private static final transient Logger LOG =
LoggerFactory.getLogger(GemfireHttpSession.class.getName());
/**
@@ -464,4 +465,3 @@ public class GemfireHttpSession implements HttpSession, DataSerializable, Delta
return null;
}
}
-
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
index f26df07..a571c4e 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
@@ -15,6 +15,21 @@
package org.apache.geode.modules.session.internal.filter;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryNotFoundException;
@@ -35,19 +50,6 @@ import org.apache.geode.modules.session.internal.filter.attributes.DeltaSessionA
import org.apache.geode.modules.session.internal.filter.util.TypeAwareMap;
import org.apache.geode.modules.session.internal.jmx.SessionStatistics;
import org.apache.geode.modules.util.RegionHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
/**
* This class implements the session management using a Gemfire distributedCache as a persistent
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
index 42b5115..dbd41bf 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
@@ -15,10 +15,6 @@
package org.apache.geode.modules.session.internal.filter.attributes;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.Delta;
-import org.apache.geode.InvalidDeltaException;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -29,6 +25,10 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Delta;
+import org.apache.geode.InvalidDeltaException;
+
/**
* This abstract class contains the structures and methods to handle delta updates to attributes.
*/
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
index 8a3cf8b..9e94580 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
@@ -15,12 +15,6 @@
package org.apache.geode.modules.session.internal.filter.attributes;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.modules.session.internal.filter.GemfireHttpSession;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -32,6 +26,12 @@ import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.util.BlobHelper;
+import org.apache.geode.modules.session.internal.filter.GemfireHttpSession;
+
/**
* Abstract implementation for attributes. Should be sub-classed to provide differing
* implementations for synchronous or delta propagation. The backing store used is defined by the
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
index 18643ad..e2de8b5 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
@@ -15,16 +15,17 @@
package org.apache.geode.modules.session.internal.filter.attributes;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.modules.session.internal.filter.GemfireHttpSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
/**
* Capture the update to a particular name
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
index 87b9ca3..d7a2197 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
@@ -15,11 +15,12 @@
package org.apache.geode.modules.session.internal.filter.attributes;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.Instantiator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.Instantiator;
+
/**
* This class implements delayed attribute delta propagation. Updates to attributes are only
* propagated once the session goes out of scope - i.e. as the request is done being processed.
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
index 5928b71..1a8e05f 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
@@ -15,11 +15,12 @@
package org.apache.geode.modules.session.internal.filter.attributes;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.Instantiator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.Instantiator;
+
/**
* This class implements synchronous attribute delta propagation. Updates to attributes are
* immediately propagated.
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
index cefb611..f0fd2d5 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
@@ -15,11 +15,11 @@
package org.apache.geode.modules.session.internal.filter.attributes;
+import java.util.Set;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.modules.session.internal.filter.GemfireHttpSession;
-import java.util.Set;
-
/**
* Interface for session attribute storage. In reality, this interface is responsible for anything,
* in the session which needs to be propagated for caching - as such it also includes other
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
index 2a86a06..184a86d 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
@@ -15,10 +15,10 @@
package org.apache.geode.modules.session.internal.filter.util;
-import org.apache.geode.modules.session.internal.common.CacheProperty;
-
import java.util.HashMap;
+import org.apache.geode.modules.session.internal.common.CacheProperty;
+
/**
*
*/
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
index 3e0847d..f49f6ac 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
@@ -15,12 +15,13 @@
package org.apache.geode.modules.session.filter;
-import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
/**
* Listener to destroy gemfire sessions when native sessions are destroyed.
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
index aa3e0d2..20c5e24 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -16,18 +16,19 @@ package org.apache.geode.modules.session.installer;
import static org.junit.Assert.assertEquals;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class InstallerJUnitTest {
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
index c1fd5a2..528c68d 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
@@ -16,6 +16,7 @@
package org.apache.geode.modules.session.internal.filter;
import java.io.IOException;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
index 0f40c10..4ad8025 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
@@ -15,10 +15,11 @@
package org.apache.geode.modules.session.internal.filter;
+import java.io.IOException;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
/**
* Interface which, when implemented, can be put into a servlet context and executed by the servlet.
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
index d14b111..13f5042 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
@@ -16,6 +16,7 @@
package org.apache.geode.modules.session.internal.filter;
import java.io.IOException;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
index 092cf08..42e9380 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
@@ -16,6 +16,7 @@
package org.apache.geode.modules.session.internal.filter;
import java.io.Serializable;
+
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index 0577dd4..48a5662 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -20,16 +20,28 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebRequest;
import com.meterware.httpunit.WebResponse;
-import org.apache.geode.cache.Region;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.modules.session.filter.SessionCachingFilter;
-import org.apache.geode.modules.session.junit.PerTestClassLoaderRunner;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.jasper.servlet.JspServlet;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.servlet.FilterHolder;
@@ -43,22 +55,12 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import org.apache.geode.cache.Region;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.modules.session.filter.SessionCachingFilter;
+import org.apache.geode.modules.session.junit.PerTestClassLoaderRunner;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* In-container testing using Jetty. This allows us to test context listener events as well as
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
index 4db3849..21ec0bd 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
@@ -15,14 +15,15 @@
package org.apache.geode.modules.session.internal.filter;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.modules.session.filter.SessionCachingFilter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import com.mockrunner.mock.web.MockFilterConfig;
import com.mockrunner.mock.web.WebMockObjectFactory;
import org.junit.Before;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.modules.session.filter.SessionCachingFilter;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
/**
* This runs all tests with a local cache disabled
*/
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
index cb072da..c7d38db 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
@@ -15,14 +15,15 @@
package org.apache.geode.modules.session.internal.filter;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.modules.session.filter.SessionCachingFilter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import com.mockrunner.mock.web.MockFilterConfig;
import com.mockrunner.mock.web.WebMockObjectFactory;
import org.junit.Before;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.modules.session.filter.SessionCachingFilter;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
/**
* This runs all tests with a local cache enabled
*/
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
index cb0465d..ee72b04 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
@@ -30,6 +30,15 @@ package org.apache.geode.modules.session.junit;
* the License.
*/
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.logging.Logger;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -43,15 +52,6 @@ import org.junit.runners.model.InitializationError;
import org.junit.runners.model.Statement;
import org.junit.runners.model.TestClass;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
public class PerTestClassLoaderRunner extends NamedRunner {
private static final Logger LOGGER = Logger.getLogger(PerTestClassLoaderRunner.class.getName());
diff --git a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
index dd0dc41..306e02c 100644
--- a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
+++ b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.modules.session.catalina;
+import java.io.IOException;
+
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.session.StandardSession;
import org.apache.catalina.util.LifecycleSupport;
-import java.io.IOException;
-
public class Tomcat7DeltaSessionManager extends DeltaSessionManager {
/**
diff --git a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java b/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
index a5f25eb..67e505c 100644
--- a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
+++ b/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
@@ -16,9 +16,6 @@ package org.apache.geode.modules.session;
import static org.junit.Assert.assertEquals;
-import org.apache.geode.modules.session.catalina.Tomcat7DeltaSessionManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebRequest;
@@ -27,6 +24,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.modules.session.catalina.Tomcat7DeltaSessionManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class Tomcat7SessionsJUnitTest extends TestSessionsBase {
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
index 1dc1d8b..78ad23a 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.beans.PropertyChangeEvent;
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
index 473bfe0..6c728f4 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
@@ -16,6 +16,11 @@ package org.apache.geode.modules.session;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.modules.session.catalina.DeltaSessionManager;
import org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener;
@@ -23,11 +28,6 @@ import org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
@Category(DistributedTest.class)
public class Tomcat8SessionsDUnitTest extends TestSessionsTomcat8Base {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
index 7d8c844..e718f69 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.modules.gatewaydelta;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
@SuppressWarnings("serial")
public abstract class AbstractGatewayDeltaEvent implements GatewayDeltaEvent, DataSerializable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
index f26f860..801b3c4 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.modules.gatewaydelta;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
@@ -22,10 +26,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
@SuppressWarnings("serial")
public class GatewayDeltaCreateEvent extends AbstractGatewayDeltaEvent {
@@ -68,4 +68,3 @@ public class GatewayDeltaCreateEvent extends AbstractGatewayDeltaEvent {
.append(this.gatewayDelta).append("]").toString();
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
index cf713bb..3a0eddf 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.modules.gatewaydelta;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.Instantiator;
import org.apache.geode.cache.Cache;
@@ -21,10 +25,6 @@ import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.modules.session.catalina.DeltaSessionInterface;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
@SuppressWarnings("serial")
public class GatewayDeltaDestroyEvent extends AbstractGatewayDeltaEvent {
@@ -63,4 +63,3 @@ public class GatewayDeltaDestroyEvent extends AbstractGatewayDeltaEvent {
.append(this.regionName).append("; key=").append(this.key).append("]").toString();
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
index 33bbf3b..e8b05cd 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.modules.gatewaydelta;
+import java.util.Properties;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Declarable;
@@ -22,8 +24,6 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackArgument;
-import java.util.Properties;
-
public class GatewayDeltaEventApplicationCacheListener
extends CacheListenerAdapter<String, GatewayDeltaEvent> implements Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
index a276728..b500256 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.modules.gatewaydelta;
+import java.util.Properties;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -29,8 +31,6 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import java.util.Properties;
-
public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<String, GatewayDelta>
implements Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
index 483af3d..f192a89 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
@@ -14,16 +14,7 @@
*/
package org.apache.geode.modules.session.bootstrap;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.cache.control.ResourceManager;
-import org.apache.geode.distributed.internal.AbstractDistributionConfig;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.modules.util.Banner;
-import org.apache.geode.modules.util.RegionHelper;
-import org.apache.geode.modules.util.ResourceManagerValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.io.File;
import java.text.DateFormat;
@@ -34,7 +25,17 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.distributed.internal.AbstractDistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.modules.util.Banner;
+import org.apache.geode.modules.util.RegionHelper;
+import org.apache.geode.modules.util.ResourceManagerValidator;
public abstract class AbstractCache {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
index 024c27c..8bf6f42 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
@@ -15,11 +15,12 @@
package org.apache.geode.modules.session.catalina;
-import org.apache.geode.modules.session.bootstrap.AbstractCache;
-import org.apache.geode.modules.session.bootstrap.LifecycleTypeAdapter;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.geode.modules.session.bootstrap.AbstractCache;
+import org.apache.geode.modules.session.bootstrap.LifecycleTypeAdapter;
+
public abstract class AbstractCacheLifecycleListener implements LifecycleListener {
protected AbstractCache cache;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
index ff6ab42..1764190 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.modules.session.catalina;
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.Session;
+
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics;
import org.apache.geode.modules.util.RegionConfiguration;
import org.apache.geode.modules.util.SessionCustomExpiry;
-import org.apache.catalina.Session;
-
-import javax.servlet.http.HttpSession;
public abstract class AbstractSessionCache implements SessionCache {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
index 558eb61..8ceb4f1 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.modules.session.catalina;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
@@ -36,11 +42,6 @@ import org.apache.geode.modules.util.SessionCustomExpiry;
import org.apache.geode.modules.util.TouchPartitionedRegionEntriesFunction;
import org.apache.geode.modules.util.TouchReplicatedRegionEntriesFunction;
-import javax.servlet.http.HttpSession;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
public class ClientServerSessionCache extends AbstractSessionCache {
private ClientCache cache;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
index 659181a..8197cd7 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.modules.session.catalina;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
import org.apache.catalina.Manager;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -21,9 +25,6 @@ import org.apache.catalina.valves.ValveBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import javax.servlet.ServletException;
-import java.io.IOException;
-
public class CommitSessionValve extends ValveBase {
private static final Log log = LogFactory.getLog(CommitSessionValve.class);
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
index 4aa894a..7ef9807 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
@@ -70,7 +70,7 @@ public class DeltaSession extends StandardSession
private boolean enableGatewayDeltaReplication;
- private transient final Object changeLock = new Object();
+ private final transient Object changeLock = new Object();
private final List<DeltaSessionAttributeEvent> eventQueue =
new ArrayList<DeltaSessionAttributeEvent>();
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
index e6d7c65..d1db333 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.modules.session.catalina;
-import org.apache.catalina.session.StandardSessionFacade;
-
import javax.servlet.http.HttpSession;
+import org.apache.catalina.session.StandardSessionFacade;
+
public class DeltaSessionFacade extends StandardSessionFacade {
private DeltaSessionInterface session;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
index cb8ac51..30b716c 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.modules.session.catalina;
-import org.apache.geode.cache.Region;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -24,6 +22,7 @@ import java.util.List;
import org.apache.catalina.Session;
import org.apache.catalina.session.ManagerBase;
+import org.apache.geode.cache.Region;
import org.apache.geode.modules.session.catalina.internal.DeltaSessionAttributeEvent;
public interface DeltaSessionInterface extends Session {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
index edc2b7d..b4dc753 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
@@ -14,29 +14,6 @@
*/
package org.apache.geode.modules.session.catalina;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.Query;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics;
-import org.apache.geode.modules.util.ContextMapper;
-import org.apache.geode.modules.util.RegionConfiguration;
-import org.apache.geode.modules.util.RegionHelper;
-import org.apache.catalina.Container;
-import org.apache.catalina.Context;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.Loader;
-import org.apache.catalina.Pipeline;
-import org.apache.catalina.Session;
-import org.apache.catalina.Valve;
-import org.apache.catalina.session.ManagerBase;
-import org.apache.catalina.session.StandardSession;
-import org.apache.catalina.util.CustomObjectInputStream;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.BufferedInputStream;
@@ -59,7 +36,31 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-abstract public class DeltaSessionManager extends ManagerBase
+import org.apache.catalina.Container;
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.Loader;
+import org.apache.catalina.Pipeline;
+import org.apache.catalina.Session;
+import org.apache.catalina.Valve;
+import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.session.StandardSession;
+import org.apache.catalina.util.CustomObjectInputStream;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics;
+import org.apache.geode.modules.util.ContextMapper;
+import org.apache.geode.modules.util.RegionConfiguration;
+import org.apache.geode.modules.util.RegionHelper;
+
+public abstract class DeltaSessionManager extends ManagerBase
implements Lifecycle, PropertyChangeListener, SessionManager {
/**
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
index b2b28fc..0d77055 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.modules.session.catalina;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
-import javax.servlet.ServletException;
-import java.io.IOException;
-
public class JvmRouteBinderValve extends ValveBase {
protected static final String info = "org.apache.geode.modules.session.JvmRouteBinderValve/1.0";
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
index bbf8e39..7d4b941 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.modules.session.catalina;
+import java.util.Set;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
@@ -31,9 +35,6 @@ import org.apache.geode.modules.util.SessionCustomExpiry;
import org.apache.geode.modules.util.TouchPartitionedRegionEntriesFunction;
import org.apache.geode.modules.util.TouchReplicatedRegionEntriesFunction;
-import javax.servlet.http.HttpSession;
-import java.util.Set;
-
public class PeerToPeerSessionCache extends AbstractSessionCache {
private Cache cache;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
index 5c0fecd..06492ee 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
@@ -14,13 +14,15 @@
*/
package org.apache.geode.modules.session.catalina;
+import java.util.Set;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.Session;
+
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics;
-import org.apache.catalina.Session;
-
-import javax.servlet.http.HttpSession;
-import java.util.Set;
public interface SessionCache {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
index 2686b44..9f6dbce 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.modules.session.catalina.callback;
+import java.util.Properties;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.cache.Region;
-import javax.servlet.http.HttpSession;
-import java.util.Properties;
-
public class LocalSessionCacheLoader implements CacheLoader<String, HttpSession>, Declarable {
private final Region<String, HttpSession> backingRegion;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
index 238f55e..bc2d17f 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.modules.session.catalina.callback;
+import java.util.Properties;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.EntryEvent;
@@ -21,9 +25,6 @@ import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.util.CacheWriterAdapter;
-import javax.servlet.http.HttpSession;
-import java.util.Properties;
-
public class LocalSessionCacheWriter extends CacheWriterAdapter<String, HttpSession>
implements Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
index caaaa37..232f075 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.modules.session.catalina.callback;
+import java.util.Properties;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.session.ManagerBase;
+
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Operation;
@@ -21,11 +27,6 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.modules.session.catalina.DeltaSessionInterface;
import org.apache.geode.modules.util.ContextMapper;
-import javax.servlet.http.HttpSession;
-import java.util.Properties;
-
-import org.apache.catalina.session.ManagerBase;
-
public class SessionExpirationCacheListener extends CacheListenerAdapter<String, HttpSession>
implements Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
index 4558047..9d40c97 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.modules.session.catalina.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -21,12 +27,6 @@ import org.apache.geode.modules.gatewaydelta.AbstractGatewayDeltaEvent;
import org.apache.geode.modules.session.catalina.DeltaSession;
import org.apache.geode.modules.session.catalina.DeltaSessionInterface;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
@SuppressWarnings("serial")
public class DeltaSessionAttributeEventBatch extends AbstractGatewayDeltaEvent {
@@ -78,4 +78,3 @@ public class DeltaSessionAttributeEventBatch extends AbstractGatewayDeltaEvent {
.append(this.eventQueue.size()).append("]").toString();
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
index 5baf059..fcfcdfa 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.modules.session.catalina.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.modules.session.catalina.DeltaSession;
import org.apache.geode.modules.session.catalina.DeltaSessionInterface;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
@SuppressWarnings("serial")
public class DeltaSessionDestroyAttributeEvent implements DeltaSessionAttributeEvent {
@@ -57,4 +57,3 @@ public class DeltaSessionDestroyAttributeEvent implements DeltaSessionAttributeE
.append(this.attributeName).append("]").toString();
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
index 090a1a3..b2b829d 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.modules.session.catalina.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.modules.session.catalina.DeltaSession;
import org.apache.geode.modules.session.catalina.DeltaSessionInterface;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
@SuppressWarnings("serial")
public class DeltaSessionUpdateAttributeEvent implements DeltaSessionAttributeEvent {
@@ -74,4 +74,3 @@ public class DeltaSessionUpdateAttributeEvent implements DeltaSessionAttributeEv
.append("]").toString();
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
index e3dff53..598c647 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.modules.util;
-import org.apache.geode.internal.GemFireVersion;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;
+import org.apache.geode.internal.GemFireVersion;
+
public class Banner {
public static String getString() {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
index a0e3e85..d0d7e18 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.modules.util;
+import java.util.List;
+import java.util.Set;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Execution;
@@ -26,9 +29,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.MembershipListener;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import java.util.List;
-import java.util.Set;
-
public class BootstrappingFunction implements Function, MembershipListener {
private static final long serialVersionUID = 1856043174458190605L;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
index 703c785..19dc339 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.modules.util;
-import org.apache.geode.modules.session.catalina.DeltaSessionManager;
-
import java.util.HashMap;
import java.util.Map;
import org.apache.catalina.session.ManagerBase;
+import org.apache.geode.modules.session.catalina.DeltaSessionManager;
+
/**
* This basic singleton class maps context paths to manager instances.
* <p>
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
index 4e9e9fd..d30d712 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
@@ -260,4 +260,3 @@ public class CreateRegionFunction implements Function, Declarable {
return lockService;
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
index 0f2d6ef..39f9c65 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.modules.util;
+import java.util.Properties;
+
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.util.CacheListenerAdapter;
-import java.util.Properties;
-
@SuppressWarnings("unchecked")
public class DebugCacheListener extends CacheListenerAdapter implements Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
index e20421a..74ff9d2 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
@@ -14,17 +14,17 @@
*/
package org.apache.geode.modules.util;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.CustomExpiry;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-
/**
* Class <code>RegionConfiguration</code> encapsulates the configuration attributes for a
* <code>Region</code> to be created on the server.
@@ -293,4 +293,3 @@ public class RegionConfiguration implements DataSerializable {
return cacheWriterName;
}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
index e756533..f7a1d73 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.modules.util;
+import java.util.Properties;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Declarable;
@@ -23,8 +25,6 @@ import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.util.CacheListenerAdapter;
-import java.util.Properties;
-
public class RegionConfigurationCacheListener
extends CacheListenerAdapter<String, RegionConfiguration> implements Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
index 0743bea..9a21cac 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.modules.util;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheWriter;
@@ -34,12 +40,6 @@ import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.modules.gatewaydelta.GatewayDeltaForwarderCacheListener;
import org.apache.geode.modules.session.catalina.callback.SessionExpirationCacheListener;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CancellationException;
-
@SuppressWarnings({"deprecation", "unchecked"})
public class RegionHelper {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
index bedfcba..8c62163 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.modules.util;
+import java.util.Properties;
+
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.RegionFunctionContext;
-import java.util.Properties;
-
public class RegionSizeFunction implements Function, Declarable {
private static final long serialVersionUID = -2791590491585777990L;
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
index d3e5f18..c67c5ec 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.modules.util;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.cache.control.ResourceManager;
-
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.ArrayList;
@@ -24,6 +21,9 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.cache.control.ResourceManager;
+
public class ResourceManagerValidator {
private static final Pattern DIGIT_PATTERN = Pattern.compile("(\\d+|[^\\d]+)");
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
index fd1e5b2..6a7c799 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.modules.util;
+import java.io.Serializable;
+import java.util.Properties;
+
+import javax.servlet.http.HttpSession;
+
import org.apache.geode.cache.CustomExpiry;
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.Region;
-import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-import java.util.Properties;
-
@SuppressWarnings("serial")
public class SessionCustomExpiry
implements CustomExpiry<String, HttpSession>, Serializable, Declarable {
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
index 9a3f5aa..85a8fbc 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.modules.util;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Declarable;
@@ -23,9 +26,6 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.partition.PartitionRegionHelper;
-import java.util.Properties;
-import java.util.Set;
-
/**
* Touches the keys contained in the set of keys by performing a get on the partitioned region.
*
@@ -89,4 +89,3 @@ public class TouchPartitionedRegionEntriesFunction implements Function, Declarab
public void init(Properties properties) {}
}
-
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
index 3d2a037..d855627 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.modules.util;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Declarable;
@@ -21,9 +24,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
-import java.util.Properties;
-import java.util.Set;
-
/**
* Touches the keys contained in the set of keys by performing a get on the replicated region. This
* is a non-data-aware function invoked using onMembers or onServers.
@@ -86,4 +86,3 @@ public class TouchReplicatedRegionEntriesFunction implements Function, Declarabl
public void init(Properties properties) {}
}
-
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
index 46b4a25..3c54107 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.modules.session;
+import java.io.IOException;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
/**
* Interface which, when implemented, can be put into a servlet context and executed by the servlet.
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
index 8da6cec..7bdd569 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
@@ -15,6 +15,9 @@
package org.apache.geode.modules.session;
+import java.io.IOException;
+import java.io.PrintWriter;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -22,8 +25,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.io.PrintWriter;
/**
*
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
index 7f04e8b..f78c92e 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
@@ -14,7 +14,12 @@
*/
package org.apache.geode.modules.session;
-import org.apache.geode.modules.session.catalina.JvmRouteBinderValve;
+import java.io.File;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+
+import javax.servlet.ServletException;
+
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -31,10 +36,7 @@ import org.apache.catalina.valves.ValveBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import javax.servlet.ServletException;
-import java.io.File;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
+import org.apache.geode.modules.session.catalina.JvmRouteBinderValve;
/**
*
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
index a6bec6c..9abb63e 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
@@ -21,6 +21,7 @@ import java.beans.PropertyChangeEvent;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
index 4c7ca18..8ccaef6 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.modules.session;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
@Category(IntegrationTest.class)
public class Tomcat6SessionsJUnitTest extends TestSessionsBase {
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
index a6400c7..c567184 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
@@ -16,18 +16,6 @@ package org.apache.geode.modules.util;
import static org.assertj.core.api.Assertions.*;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -39,6 +27,19 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.Vector;
+import org.apache.bcel.Constants;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.generic.ClassGen;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
@SuppressWarnings("unused")
public class ClassLoaderObjectInputStreamTest {
diff --git a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/CommandServlet.java b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/CommandServlet.java
index cd44490..ba65cc6 100644
--- a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/CommandServlet.java
+++ b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/CommandServlet.java
@@ -18,6 +18,7 @@ package org.apache.geode.modules.session;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.function.Function;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
diff --git a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/SessionCountingListener.java b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/SessionCountingListener.java
index 829789f..3cc7512 100644
--- a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/SessionCountingListener.java
+++ b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/SessionCountingListener.java
@@ -15,6 +15,7 @@
package org.apache.geode.modules.session;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
diff --git a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCount.java b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCount.java
index ef6e958..fb7e866 100644
--- a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCount.java
+++ b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCount.java
@@ -15,11 +15,12 @@
package org.apache.geode.modules.session.functions;
-import org.apache.geode.modules.session.SessionCountingListener;
-
import java.util.function.Function;
+
import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.modules.session.SessionCountingListener;
+
public class GetSessionCount implements Function<HttpServletRequest, String> {
@Override
public String apply(final HttpServletRequest request) {
diff --git a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCreatedCount.java b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCreatedCount.java
index bb5a62a..33f7c3a 100644
--- a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCreatedCount.java
+++ b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionCreatedCount.java
@@ -15,11 +15,12 @@
package org.apache.geode.modules.session.functions;
-import org.apache.geode.modules.session.SessionCountingListener;
-
import java.util.function.Function;
+
import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.modules.session.SessionCountingListener;
+
public class GetSessionCreatedCount implements Function<HttpServletRequest, String> {
@Override
public String apply(final HttpServletRequest request) {
diff --git a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionDestroyedCount.java b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionDestroyedCount.java
index f8d3e66..9664510 100644
--- a/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionDestroyedCount.java
+++ b/extensions/session-testing-war/src/main/java/org/apache/geode/modules/session/functions/GetSessionDestroyedCount.java
@@ -15,11 +15,12 @@
package org.apache.geode.modules.session.functions;
-import org.apache.geode.modules.session.SessionCountingListener;
-
import java.util.function.Function;
+
import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.modules.session.SessionCountingListener;
+
public class GetSessionDestroyedCount implements Function<HttpServletRequest, String> {
@Override
public String apply(final HttpServletRequest request) {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
index fe1f777..493051f 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
@@ -16,15 +16,16 @@ package org.apache.geode.management.internal;
import static org.junit.Assert.assertNotNull;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.IOException;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
-import java.io.IOException;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class AgentUtilJUnitTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
index bd33904..9ef8839 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
@@ -25,10 +25,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AbstractConfig;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
@Category(AcceptanceTest.class)
public class GfshStartLocatorLogTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index acfd137..80067ce 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -85,14 +85,14 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.rules.RequiresGeodeHome;
/**
* The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the
* contract and functionality of the GemFire launcher lifecycle commands inside Gfsh.
- *
+ *
* @see javax.management.MBeanServerConnection
* @see javax.management.remote.JMXConnector
* @see org.apache.geode.distributed.AbstractLauncher
@@ -402,7 +402,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
/**
* Test to verify GEODE-2138
- *
+ *
* @throws IOException
*/
@Test
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
index 0d7305b..6fa05c7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
@@ -35,8 +35,8 @@ import org.mockito.Mockito;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshParserRule;
@Category(IntegrationTest.class)
public class StartLocatorCommandIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
index 61868d7..2a8807e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
@@ -35,8 +35,8 @@ import org.mockito.Mockito;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshParserRule;
@Category(IntegrationTest.class)
public class StartServerCommandIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
index a67dddc..7e7b2bd 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
@@ -18,9 +18,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
@Category(AcceptanceTest.class)
public class StatusLocatorRealGfshTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExitCodeStatusCommandsTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExitCodeStatusCommandsTest.java
index 742212a..e833b23 100755
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExitCodeStatusCommandsTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExitCodeStatusCommandsTest.java
@@ -37,10 +37,10 @@ import org.apache.geode.internal.ExitCode;
import org.apache.geode.internal.process.PidFile;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
// Originally created in response to GEODE-2971
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index 1f2ec73..b95eeb4 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -15,6 +15,19 @@
package org.apache.geode.rest.internal.web;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
@@ -37,18 +50,6 @@ import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
public class GeodeRestClient {
public static final String CONTEXT = "/geode/v1";
@@ -81,7 +82,7 @@ public class GeodeRestClient {
/**
* Retrieve the status code of the HttpResponse
- *
+ *
* @param response The HttpResponse message received from the server
* @return a numeric value
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
index b16f8fb..d0b0d93 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
@@ -335,7 +335,7 @@ public class RestInterfaceIntegrationTest {
/*
* Object result = runQueryUsingApi(getPeopleRegion().getRegionService(),
* String.format("SELECT * FROM %1$s", getPeopleRegion().getFullPath()));
- *
+ *
* System.out.printf("(OQL Query using API) Person is (%1$s)%n", result);
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 0418c7c..adf29c2 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -32,11 +32,11 @@ import org.springframework.http.MediaType;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class RestSecurityIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
index 4199171..565dd48 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
@@ -40,11 +40,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
import org.apache.geode.rest.internal.web.controllers.RedactingPostProcessor;
import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class RestSecurityPostProcessorTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
index 6f1660c..031bb07 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
@@ -34,11 +34,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class RestSecurityWithSSLTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
index cef6a21..dac3503 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
@@ -28,10 +28,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({IntegrationTest.class, RestAPITest.class})
public class RestServersIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
index 893c40c..d07c0be 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
@@ -18,14 +18,6 @@ package org.apache.geode.rest.internal.web;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.RestAPITest;
-import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.RequiresGeodeHome;
-
import org.apache.http.HttpResponse;
import org.json.JSONObject;
import org.junit.ClassRule;
@@ -33,6 +25,14 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.RequiresGeodeHome;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class SwaggerVerificationIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
index c2dacbf..49ce884 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.rest.internal.web.controllers;
+import java.io.Serializable;
+
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.geode.internal.lang.ObjectUtils;
-import java.io.Serializable;
+import org.apache.geode.internal.lang.ObjectUtils;
/**
* The Customer class models a customer entity.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@JsonInclude(Include.NON_NULL)
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
index 4c92aae..20eda96 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
@@ -17,7 +17,7 @@ package org.apache.geode.rest.internal.web.controllers;
/**
* The Gender enum is a enumeration of genders (sexes).
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
index 082f69d..d86bc99 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.execute.FunctionContext;
/**
* The GetAllEntries is function that will return a map as a result of its execution.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@@ -63,4 +63,3 @@ public class GetAllEntries implements Function {
}
}
-
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
index a09d7fe..c6c6af6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
@@ -33,7 +33,7 @@ import org.apache.geode.cache.query.TypeMismatchException;
/**
* The GetDeliveredOrders class is a gemfire function that gives details about delivered orders.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
index be3e90b..5540ecb 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
@@ -27,7 +27,7 @@ import org.apache.geode.cache.execute.FunctionContext;
/**
* The GetRegions class is an gemfire function that gives data about available regions.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
index a8c2f08..31ae5ba 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
@@ -72,4 +72,3 @@ public class GetValueForKey implements Function {
return false;
}
}
-
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
index 9a5d070..5d38efe 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
@@ -24,7 +24,7 @@ import org.apache.geode.pdx.PdxWriter;
/**
* The Item class models item entity in the real world.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java
index f15e819..236995d 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java
@@ -15,12 +15,12 @@
package org.apache.geode.rest.internal.web.controllers;
+import java.util.Set;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
-import java.util.Set;
-
public class NoArgumentFunction implements Function {
/**
* Specifies whether the function sends results while executing. The method returns false if no
@@ -33,7 +33,7 @@ public class NoArgumentFunction implements Function {
* If {@link Function#hasResult()} returns true, {@link ResultCollector#getResult()} blocks and
* waits for the result of function execution
* </p>
- *
+ *
* @return whether this function returns a Result back to the caller.
*
* @since GemFire 6.0
@@ -49,7 +49,7 @@ public class NoArgumentFunction implements Function {
* provided to this function is the one which was built using {@linkplain Execution}. The contexts
* can be data dependent or data-independent so user should check to see if the context provided
* in parameter is instance of {@link RegionFunctionContext}.
- *
+ *
* @param context as created by {@link Execution}
*
* @since GemFire 6.0
@@ -61,7 +61,7 @@ public class NoArgumentFunction implements Function {
/**
* Return a unique function identifier, used to register the function with {@link FunctionService}
- *
+ *
* @return string identifying this function
*
* @since GemFire 6.0
@@ -88,7 +88,7 @@ public class NoArgumentFunction implements Function {
* This method is only consulted when Region passed to
* FunctionService#onRegion(org.apache.geode.cache.Region) is a partitioned region
* </p>
- *
+ *
* @return false if the function is read only, otherwise returns true
*
* @see FunctionService
@@ -101,7 +101,7 @@ public class NoArgumentFunction implements Function {
/**
* Specifies whether the function is eligible for re-execution (in case of failure).
- *
+ *
* @return whether the function is eligible for re-execution.
*
* @see RegionFunctionContext#isPossibleDuplicate()
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
index 708b0b3..c9c0769 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
@@ -26,7 +26,7 @@ import org.apache.geode.pdx.PdxWriter;
/**
* The Order class is an abstraction modeling a order.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
index be465f9..a3f089d 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
@@ -14,18 +14,18 @@
*/
package org.apache.geode.rest.internal.web.controllers;
+import java.io.Serializable;
import java.util.Date;
+
import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
-import java.io.Serializable;
-
/**
* The Person class is an abstraction modeling a person.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@SuppressWarnings("unused")
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
index 0275961..eef479a 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
@@ -57,4 +57,3 @@ public class PutKeyFunction implements Function {
return true;
}
}
-
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java
index 7ec14bf..af9fe81 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.rest.internal.web.controllers;
-import org.apache.geode.security.PostProcessor;
-
import java.security.Principal;
import java.util.Properties;
+import org.apache.geode.security.PostProcessor;
+
/**
* This is example that implements PostProcessor that will redact Social Security Numbers from
* Customer objects
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 025084c..01997c1 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -55,7 +55,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
/**
* Dunit Test to validate OnRegion function execution with REST APIs
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index 4529f2c..daf0d4f 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -22,7 +22,27 @@ import static org.apache.geode.test.dunit.Assert.assertEquals;
import static org.apache.geode.test.dunit.Assert.assertNotNull;
import static org.apache.geode.test.dunit.Assert.fail;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.JSONArray;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionService;
@@ -36,25 +56,6 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.json.JSONArray;
-import org.junit.experimental.categories.Category;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
@Category(DistributedTest.class)
class RestAPITestBase extends JUnit4DistributedTestCase {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index b127884..205d880 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -24,6 +24,33 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -50,32 +77,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
/**
* Dunit Test containing inter - operations between REST Client and Gemfire cache client
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index dc87bbc..afa1050 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -163,4 +163,3 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
}
}
}
-
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 71e9fcf..90272a3 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -19,6 +19,16 @@ import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Properties;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
@@ -26,15 +36,6 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Properties;
@Category(DistributedTest.class)
@RunWith(Parameterized.class)
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 6df3663..6b79605 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -31,6 +31,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
import javax.net.ssl.SSLContext;
import org.apache.commons.lang.StringUtils;
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
index 7a70dbe..7b03748 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
@@ -18,6 +18,7 @@ import java.net.URI;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.ResourceHttpMessageConverter;
@@ -31,7 +32,7 @@ import org.springframework.web.util.UriComponentsBuilder;
/**
* The RestTestUtils class contains core functionality for Spring REST Template
* <p/>
- *
+ *
* @see org.springframework.context.ApplicationContext
* @see org.springframework.data.gemfire.GemfireTemplate
* @since GemFire 8.0
@@ -88,12 +89,12 @@ public class RestTestUtils {
/*
* protected static HttpMessageConverter<Object> createMarshallingHttpMessageConverter() { final
* Jaxb2Marshaller jaxbMarshaller = new Jaxb2Marshaller();
- *
+ *
* jaxbMarshaller.setContextPaths("org.apache.geode.web.rest.domain",
* "org.apache.geode.web.controllers.support");
* jaxbMarshaller.setMarshallerProperties(Collections.singletonMap( "jaxb.formatted.output",
* Boolean.TRUE));
- *
+ *
* return new MarshallingHttpMessageConverter(jaxbMarshaller); }
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java
index 42bf92c..2126a12 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java
@@ -19,8 +19,6 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.net.URISyntaxException;
-import org.apache.geode.modules.session.functions.GetMaxInactiveInterval;
-import org.apache.geode.modules.session.functions.GetSessionCount;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -28,6 +26,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
+import org.apache.geode.modules.session.functions.GetMaxInactiveInterval;
+import org.apache.geode.modules.session.functions.GetSessionCount;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Client.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/Client.java
index 7237b93..d9257e8 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/Client.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/Client.java
@@ -16,6 +16,9 @@ package org.apache.geode.session.tests;
import java.io.IOException;
import java.net.URISyntaxException;
+import java.util.function.Function;
+
+import javax.servlet.http.HttpServletRequest;
import org.apache.http.Header;
import org.apache.http.StatusLine;
@@ -33,10 +36,6 @@ import org.apache.http.util.EntityUtils;
import org.apache.geode.modules.session.CommandServlet;
import org.apache.geode.modules.session.QueryCommand;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.function.Function;
-import javax.servlet.http.HttpServletRequest;
/**
* A simple http client that talks to a server running the session-testing-war.
@@ -71,7 +70,7 @@ public class Client {
/**
* Change the server that the client is targeting.
- *
+ *
* @param port the port that the server is listening on
*/
public void setPort(int port) {
@@ -132,7 +131,7 @@ public class Client {
/**
* Remove the session attribute on the server
- *
+ *
* @param key - the session attribute to remove
*/
public Response remove(String key) throws IOException, URISyntaxException {
@@ -141,7 +140,7 @@ public class Client {
/**
* Remove the session attribute on the server
- *
+ *
* @param key - the session attribute to remove
* @param storeRespCookie - whether or not to store the session cookie of this request
*/
@@ -206,7 +205,7 @@ public class Client {
/**
* Sends a request to the server and returns a custom response object with the result
- *
+ *
* @param storeRespCookie if true, retain the value of a "Set-Cookie" header returned in the
* response.
*/
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
index fafb8f6..5064c22 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
@@ -122,7 +122,7 @@ public abstract class ContainerInstall {
* installations.
*
* Subclasses provide installation of specific containers.
- *
+ *
* @param connType Enum representing the connection type of this installation (either client
* server or peer to peer)
* @param moduleName The module name of the installation being setup (i.e. tomcat, appserver,
@@ -269,7 +269,7 @@ public abstract class ContainerInstall {
/**
* Generates a {@link ServerContainer} from the given {@link ContainerInstall}
- *
+ *
* @param containerDescriptors Additional descriptors used to identify a container
*/
public abstract ServerContainer generateContainer(File containerConfigHome,
@@ -311,7 +311,7 @@ public abstract class ContainerInstall {
/**
* Finds and extracts the geode module associated with the specified module.
- *
+ *
* @param moduleName The module name (i.e. tomcat, appserver, etc.) of the module that should be
* extract. Used as a search parameter to find the module archive.
* @return The path to the non-archive (extracted) version of the module files
@@ -370,7 +370,7 @@ public abstract class ContainerInstall {
/**
* Edits the specified property within the given property file
- *
+ *
* @param filePath path to the property file
* @param propertyName property name to edit
* @param propertyValue new property value
@@ -427,7 +427,7 @@ public abstract class ContainerInstall {
* {@link #rewriteNodeAttributes(Node, HashMap)},
* {@link #nodeHasExactAttributes(Node, HashMap, boolean)} to edit the required parts of the XML
* file.
- *
+ *
* @param XMLPath The path to the xml file to edit
* @param tagId The id of tag to edit. If null, then this method will add a new xml element,
* unless writeOnSimilarAttributeNames is set to true.
@@ -509,7 +509,7 @@ public abstract class ContainerInstall {
/**
* Finds the node in the given document with the given name and attribute
- *
+ *
* @param doc XML document to search for the node
* @param nodeName The name of the node to search for
* @param name The name of the attribute that the node should contain
@@ -539,7 +539,7 @@ public abstract class ContainerInstall {
/**
* Replaces the node's attributes with the attributes in the given hashmap
- *
+ *
* @param node XML node that should be edited
* @param attributes HashMap of strings representing the attributes of a node (key = value)
* @return The given node with ONLY the given attributes
@@ -563,7 +563,7 @@ public abstract class ContainerInstall {
/**
* Checks to see whether the given XML node has the exact attributes given in the attributes
* hashmap
- *
+ *
* @param checkSimilarValues If true, will also check to make sure that the given node's
* attributes also have the exact same values as the ones given in the attributes HashMap.
* @return True if the node has only the attributes the are given by the HashMap (no more and no
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java
index 413f9e3..4d8b1c7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java
@@ -14,9 +14,18 @@
*/
package org.apache.geode.session.tests;
-import org.junit.Before;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.HttpSession;
+
+import org.awaitility.Awaitility;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -26,16 +35,6 @@ import org.apache.geode.modules.util.RegionHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.awaitility.Awaitility;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpSession;
-
/**
* Extends the {@link CargoTestBase} class to support client server tests of generic app servers
*
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
index 5a2c4b0..4d7688a 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
@@ -24,8 +24,8 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.DUnitEnv;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
/**
* Setup class for Tomcat Client Server tests
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
index 7aa50c0..b659955 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
@@ -34,11 +34,11 @@ import org.junit.runners.Parameterized;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
index 164147a..e7468b5 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
@@ -31,10 +31,10 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.HttpClientRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.tools.pulse.internal.data.Cluster;
@RunWith(Parameterized.class)
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
index adea87a..ee36624 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
@@ -18,11 +18,6 @@ package org.apache.geode.tools.pulse;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.rules.HttpClientRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
import org.junit.Before;
@@ -30,6 +25,12 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.HttpClientRule;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
@Category(IntegrationTest.class)
public class PulseDataExportTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
index 42d8411..baec2b1 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
@@ -18,18 +18,19 @@ package org.apache.geode.tools.pulse;
import static org.assertj.core.api.Assertions.assertThat;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.http.HttpResponse;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.HttpClientRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.http.HttpResponse;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(IntegrationTest.class)
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
index ce57fdb..cae9e96 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
@@ -37,9 +37,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.SecurableCommunicationChannels;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.HttpClientRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
diff --git a/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java b/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
index 7255c1a..83b0fc4 100644
--- a/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
+++ b/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
@@ -19,6 +19,14 @@ import static org.junit.Assert.assertEquals;
import java.util.List;
import java.util.stream.IntStream;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -33,13 +41,6 @@ import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.index.AbstractIndex;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
@Fork(3)
public class RangeQueryWithIndexBenchmark {
diff --git a/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RegionOperationBenchmark.java b/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RegionOperationBenchmark.java
index 1dc0e64..c9d0d18 100644
--- a/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RegionOperationBenchmark.java
+++ b/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RegionOperationBenchmark.java
@@ -18,6 +18,14 @@ import static org.junit.Assert.*;
import java.util.stream.IntStream;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -29,13 +37,6 @@ import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.index.AbstractIndex;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
@Fork(10)
public class RegionOperationBenchmark {
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
index d61a2d5..ec98b0e 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
@@ -54,7 +54,7 @@ public class MessageExecutionContext {
/**
* Returns the cache associated with this execution
* <p>
- *
+ *
* @throws InvalidExecutionContextException if there is no cache available
*/
public Cache getCache() throws InvalidExecutionContextException {
@@ -68,7 +68,7 @@ public class MessageExecutionContext {
/**
* Returns the locator associated with this execution
* <p>
- *
+ *
* @throws InvalidExecutionContextException if there is no locator available
*/
public Locator getLocator() throws InvalidExecutionContextException {
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java
index def4134..841976d 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java
@@ -15,8 +15,8 @@
package org.apache.geode.internal.protocol.operations;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.Result;
import org.apache.geode.internal.protocol.serialization.SerializationService;
@@ -34,4 +34,3 @@ public interface OperationHandler<Req, Resp, ErrorResp> {
Result<Resp, ErrorResp> process(SerializationService serializationService, Req request,
MessageExecutionContext messageExecutionContext) throws InvalidExecutionContextException;
}
-
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java
index 93ec694..a27f146 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java
@@ -15,10 +15,10 @@
package org.apache.geode.internal.protocol.serialization.codec;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.pdx.JSONFormatter;
-import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.internal.protocol.serialization.SerializationType;
import org.apache.geode.internal.protocol.serialization.TypeCodec;
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
@Experimental
public class JSONCodec implements TypeCodec<PdxInstance> {
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java
index 6140beb..045cd36 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java
@@ -19,10 +19,10 @@ import java.util.ServiceLoader;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.protocol.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
-import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.internal.protocol.serialization.SerializationType;
import org.apache.geode.internal.protocol.serialization.TypeCodec;
+import org.apache.geode.internal.protocol.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
+import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException;
@Experimental
public class SerializationCodecRegistry {
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionAuthenticatingStateProcessor.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionAuthenticatingStateProcessor.java
index a57c90e..79edc90 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionAuthenticatingStateProcessor.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionAuthenticatingStateProcessor.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.internal.protocol.state;
-import org.apache.geode.internal.protocol.state.exception.ConnectionStateException;
-
import java.util.Properties;
+import org.apache.geode.internal.protocol.state.exception.ConnectionStateException;
+
public interface ConnectionAuthenticatingStateProcessor extends ConnectionStateProcessor {
@Override
default ConnectionAuthenticatingStateProcessor allowAuthentication()
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionShiroAuthorizingStateProcessor.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionShiroAuthorizingStateProcessor.java
index 0dd2bbc..cd2c6cc 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionShiroAuthorizingStateProcessor.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionShiroAuthorizingStateProcessor.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.internal.protocol.state;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadState;
+
import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.OperationContext;
import org.apache.geode.internal.protocol.ProtocolErrorCode;
import org.apache.geode.internal.protocol.state.exception.ConnectionStateException;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadState;
public class ConnectionShiroAuthorizingStateProcessor implements ConnectionStateProcessor {
private final SecurityService securityService;
diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionStateProcessor.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionStateProcessor.java
index 24d6d01..321120d 100644
--- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionStateProcessor.java
+++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/state/ConnectionStateProcessor.java
@@ -36,7 +36,7 @@ public interface ConnectionStateProcessor {
/**
* This indicates whether this specific state processor is able to handle authentication requests.
- *
+ *
* @return specialized ConnectionAuthenticatingStateProcessor interface implementation which can
* move to a new state
* @throws ConnectionStateException if unable to handle handshakes in this state.
@@ -49,7 +49,7 @@ public interface ConnectionStateProcessor {
/**
* This indicates whether this specific state processor is able to handle handshake requests.
- *
+ *
* @return specialized ConnectionHandshakingStateProcessor interface implementation which can move
* to a new state
* @throws ConnectionStateException if unable to handle handshakes in this state.
diff --git a/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java b/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
index a0e3483..420df7c 100755
--- a/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
+++ b/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
* Signifies that a public API (public class, method or field) is subject to incompatible changes,
* or even removal, in a future release. An API bearing this annotation is exempt from any
* compatibility guarantees made by its containing library.
- *
+ *
* <p>
* Note that the presence of this annotation implies nothing about the quality or performance of the
* API in question, only the fact that it is not "API-frozen."
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
* It is generally safe for <i>applications</i> to depend on beta APIs, at the cost of some extra
* work during upgrades. However, it is generally inadvisable for <i>libraries</i> (which get
* included on users' class paths, outside the library developers' control) to do so.
- *
+ *
* <p>
* Inspired by similar annotations in JGroups, Spark, DataflowJavaSDK.
*/
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
index 06bc035..32d7ad1 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
@@ -16,7 +16,7 @@ package org.apache.geode.annotations.experimentalpackage;
/**
* Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an <tt>Experimental</tt> package.
- *
+ *
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
public class ClassInExperimentalPackage {
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
index d668435..bc2bfbf 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
@@ -14,7 +14,7 @@
*/
/**
* Used by <tt>ExperimentalJUnitTest</tt>. This is an <tt>Experimental</tt> package.
- *
+ *
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
@Experimental("This is an experimental package")
diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
index 126c6fe..14c63ca 100755
--- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
+++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
@@ -16,7 +16,7 @@ package org.apache.geode.experimental.nonexperimentalpackage;
/**
* Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an <tt>Experimental</tt> package.
- *
+ *
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
public class ClassInNonExperimentalPackage {
diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
index ba13c2c..56e4e2d 100755
--- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
+++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
@@ -14,7 +14,7 @@
*/
/**
* Used by <tt>ExperimentalJUnitTest</tt>. This is a non-<tt>Experimental</tt> package.
- *
+ *
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
package org.apache.geode.experimental.nonexperimentalpackage;
diff --git a/geode-concurrency-test/src/main/java/java/net/InetAddress.java b/geode-concurrency-test/src/main/java/java/net/InetAddress.java
index 0416664..3ef0ffc 100644
--- a/geode-concurrency-test/src/main/java/java/net/InetAddress.java
+++ b/geode-concurrency-test/src/main/java/java/net/InetAddress.java
@@ -153,4 +153,3 @@ public class InetAddress implements java.io.Serializable {
return getLoopbackAddress();
}
}
-
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
index 2cba958..5e99790 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
@@ -23,13 +23,13 @@ import javax.resource.spi.ManagedConnectionFactory;
import org.apache.geode.ra.GFConnectionFactory;
/**
- *
+ *
*
*/
public class GFConnectionFactoryImpl implements GFConnectionFactory {
- final private ConnectionManager cm;
+ private final ConnectionManager cm;
- final private ManagedConnectionFactory mcf;
+ private final ManagedConnectionFactory mcf;
private Reference ref;
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
index 5ff7a71..af239b4 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.ra.spi.JCAManagedConnection;
import org.apache.geode.ra.GFConnection;
/**
- *
+ *
*
*/
public class GFConnectionImpl implements GFConnection {
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
index a4ae25e..0fb1e6f 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
@@ -24,8 +24,8 @@ import org.apache.geode.LogWriter;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.TransactionId;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.i18n.LocalizedStrings;
public class JCALocalTransaction implements LocalTransaction {
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
index 99cff78..4313070 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
@@ -27,7 +27,7 @@ import javax.security.auth.Subject;
import org.apache.geode.internal.ra.GFConnectionFactoryImpl;
/**
- *
+ *
*
*/
public class JCAManagedConnectionFactory implements ManagedConnectionFactory {
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
index e6c7e6a..46ae8f7 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
@@ -18,7 +18,7 @@ import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnectionMetaData;
/**
- *
+ *
*
*/
public class JCAManagedConnectionMetaData implements ManagedConnectionMetaData {
diff --git a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
index 704da8e..c2dd448 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
@@ -16,15 +16,15 @@ package org.apache.geode;
/**
* Abstract cancellation proxy for cancelling an operation, esp. a thread.
- *
+ *
* Creators of services or threads should implement a subclass of CancelCriterion, and implement the
* two methods - cancelInProgress, and generateCancelledException(e).
- *
+ *
* Code inside the service can check to see if the service is cancelled by calling
* {@link #checkCancelInProgress(Throwable)}. Generally the pattern is to check before performing an
* operation, check if the service is canceled before propagating an exception further up the stack,
* and check for cancellation inside a long loop. Eg.
- *
+ *
* <pre>
* while (true) {
* c.checkCancelInProgress(null);
@@ -36,7 +36,7 @@ package org.apache.geode;
* }
* }
* </pre>
- *
+ *
* @see CancelException
* @since GemFire 5.1
*/
@@ -46,7 +46,7 @@ public abstract class CancelCriterion {
* Indicate if the service is in the progress of being cancelled. The typical use of this is to
* indicate, in the case of an {@link InterruptedException}, that the current operation should be
* cancelled.
- *
+ *
* @return null if the service is not shutting down, or a message that can be used to construct an
* exception indicating the service is shut down.
*/
@@ -55,7 +55,7 @@ public abstract class CancelCriterion {
/**
* Use this utility function in your implementation of cancelInProgress() and cancelled() to
* indicate a system failure
- *
+ *
* @return failure string if system failure has occurred
*/
protected String checkFailure() {
@@ -70,7 +70,7 @@ public abstract class CancelCriterion {
/**
* See if the current operation is being cancelled. If so, it either throws a
* {@link RuntimeException} (usually a {@link CancelException}).
- *
+ *
* @param e an underlying exception or null if there is no exception that triggered this check
* @see #cancelInProgress()
*/
@@ -87,10 +87,10 @@ public abstract class CancelCriterion {
* Template factory method for generating the exception to be thrown by
* {@link #checkCancelInProgress(Throwable)}. Override this to specify different exception for
* checkCancelInProgress() to throw.
- *
+ *
* This method should wrap the exception in a service specific CancelationException (eg
* CacheClosedException). or return null if the service is not being canceled.
- *
+ *
* @param throwable an underlying exception, if any
* @return RuntimeException to be thrown by checkCancelInProgress(), null if the receiver has not
* been cancelled.
@@ -100,7 +100,7 @@ public abstract class CancelCriterion {
/**
* Checks to see if a cancellation is in progress. This is equivalent to the expression
* (cancelInProgress() != null).
- *
+ *
* @return true if a cancellation is in progress, false if not
*/
public boolean isCancelInProgress() {
diff --git a/geode-core/src/main/java/org/apache/geode/CancelException.java b/geode-core/src/main/java/org/apache/geode/CancelException.java
index 49413f2..7380081 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelException.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode;
@@ -21,7 +21,7 @@ import org.apache.geode.cache.CacheRuntimeException;
/**
* Abstract root class of all GemFire exceptions representing system cancellation
- *
+ *
* @since GemFire 6.0
*/
public abstract class CancelException extends CacheRuntimeException {
@@ -34,7 +34,7 @@ public abstract class CancelException extends CacheRuntimeException {
/**
* Create instance with given message
- *
+ *
* @param message the message
*/
public CancelException(String message) {
@@ -43,7 +43,7 @@ public abstract class CancelException extends CacheRuntimeException {
/**
* Create instance with given message and cause
- *
+ *
* @param message the message
* @param cause the cause
*/
@@ -53,7 +53,7 @@ public abstract class CancelException extends CacheRuntimeException {
/**
* Create instance with empty message and given cause
- *
+ *
* @param cause the cause
*/
public CancelException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
index af34363..8b4b32a 100644
--- a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
@@ -52,7 +52,7 @@ public abstract class CanonicalInstantiator extends Instantiator {
/**
* This method is not supported and if called will throw UnsupportedOperationException. Use
* {@link #newInstance(DataInput)} instead.
- *
+ *
* @throws UnsupportedOperationException in all cases
*/
@Override
@@ -63,7 +63,7 @@ public abstract class CanonicalInstantiator extends Instantiator {
/**
* Creates a new "empty" instance of a <Code>DataSerializable</code> class whose state will be
* filled in by invoking its {@link DataSerializable#fromData fromData} method.
- *
+ *
* @param in the data input that can be read to decide what instance to create.
* @return the new "empty" instance.
* @throws IOException if a read from <code>in</code> fails.
diff --git a/geode-core/src/main/java/org/apache/geode/CopyException.java b/geode-core/src/main/java/org/apache/geode/CopyException.java
index 00ad5da..c713ff6 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyException.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyException.java
@@ -60,4 +60,3 @@ public class CopyException extends GemFireException {
super(cause);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/CopyHelper.java b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
index 86592c0..116156e 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
@@ -37,10 +37,10 @@ import org.apache.geode.pdx.internal.PdxUnreadData;
* A static helper for optimally creating copies. Creating copies of cache values provides improved
* concurrency as well as isolation. For transactions, creating a copy is the guaranteed way to
* enforce "Read Committed" isolation on changes to cache <code>Entries</code>.
- *
+ *
* <p>
* Here is a simple example of how to use <code>CopyHelper.copy</code>
- *
+ *
* <pre>
* Object o = r.get("stringBuf");
* StringBuffer s = (StringBuffer) CopyHelper.copy(o);
@@ -79,7 +79,7 @@ public final class CopyHelper {
* <li>UUID
* <li>PdxInstance but not WritablePdxInstance
* </ul>
- *
+ *
* @param o the object to check
* @return true if o is an instance of a well known immutable class.
* @since GemFire 6.6.2
@@ -122,25 +122,25 @@ public final class CopyHelper {
* <p>
* Makes a copy of the specified object. The object returned is not guaranteed to be a deep copy
* of the original object, as explained below.
- *
+ *
* <p>
* Copies can only be made if the original is a <tt>Cloneable</tt> or serializable by GemFire. If
* o is a {@link #isWellKnownImmutableInstance(Object) well known immutable instance} then it will
* be returned without copying it.
- *
+ *
* <p>
* If the argument o is an instance of {@link java.lang.Cloneable}, a copy is made by invoking
* <tt>clone</tt> on it. Note that not all implementations of <tt>clone</tt> make deep copies
* (e.g. {@link java.util.HashMap#clone HashMap.clone}). Otherwise, if the argument is not an
* instance of <tt>Cloneable</tt>, a copy is made using serialization: if GemFire serialization is
* implemented, it is used; otherwise, java serialization is used.
- *
+ *
* <p>
* The difference between this method and {@link #deepCopy(Object) deepCopy}, is that this method
* uses <tt>clone</tt> if available, whereas <tt>deepCopy</tt> does not. As a result, for
* <tt>Cloneable</tt> objects copied using this method, how deep a copy the returned object is
* depends on its implementation of <tt>clone</tt>.
- *
+ *
* @param o the original object that a copy is needed of
* @return the new instance that is a copy of of the original
* @throws CopyException if copying fails because a class could not be found or could not be
@@ -233,16 +233,16 @@ public final class CopyHelper {
/**
* Makes a deep copy of the specified object o using serialization, so the object has to be
* serializable by GemFire.
- *
+ *
* <p>
* If o is a {@link #isWellKnownImmutableInstance(Object) well known immutable instance} then it
* will be returned without copying it.
- *
+ *
* <p>
* The passed in object is serialized in memory, and then deserialized into a new instance, which
* is returned. If GemFire serialization is implemented for the object, it is used; otherwise,
* java serialization is used.
- *
+ *
* @param o the original object to be copied
* @return the new instance that is a copy of the original
* @throws CopyException if copying fails because a class could not be found or could not be
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 2d16459..c7efb40 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -32,8 +32,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.IdentityHashMap;
-import java.util.LinkedHashSet;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
@@ -82,23 +82,23 @@ import org.apache.geode.pdx.PdxInstance;
* private String name;
* private Date birthday;
* private Company employer;
- *
+ *
* public void toData(DataOutput out) throws IOException {
* out.writeInt(this.id);
* out.writeUTF(this.name);
* DataSerializer.writeDate(this.birthday, out);
* DataSerializer.writeObject(this.employer, out);
* }
- *
+ *
* public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- *
+ *
* this.id = in.readInt();
* this.name = in.readUTF();
* this.birthday = DataSerializer.readDate(in);
* this.employer = (Company) DataSerializer.readObject(in);
* }
* }
- *
+ *
* </PRE>
*
* <P>
@@ -226,9 +226,9 @@ public abstract class DataSerializer {
/**
* Writes class name to a <code>DataOutput</code>. This method will handle a <code>null</code>
* value and not throw a <code>NullPointerException</code>.
- *
+ *
* @throws IOException A problem occurs while writing to <code>out</code>
- *
+ *
* @see #readNonPrimitiveClassName(DataInput)
*/
public static void writeNonPrimitiveClassName(String className, DataOutput out)
@@ -267,9 +267,9 @@ public abstract class DataSerializer {
/**
* Reads name of an instance of <code>Class</code> from a <code>DataInput</code>.
- *
+ *
* The return value may be <code>null</code>.
- *
+ *
* @throws IOException A problem occurs while reading from <code>in</code>
* @see #writeNonPrimitiveClassName(String, DataOutput)
*/
@@ -3098,7 +3098,7 @@ public abstract class DataSerializer {
/**
* For internal use only. Sets the unique <code>eventId</code> of this
* <code>DataSerializer</code>.
- *
+ *
* @since GemFire 6.5
*/
public void setEventId(Object/* EventID */ eventId) {
@@ -3108,7 +3108,7 @@ public abstract class DataSerializer {
/**
* For internal use only. Returns the unique <code>eventId</code> of this
* <code>DataSerializer</code>.
- *
+ *
* @since GemFire 6.5
*/
public Object/* EventID */ getEventId() {
@@ -3117,7 +3117,7 @@ public abstract class DataSerializer {
/**
* For internal use only. Sets the context of this <code>DataSerializer</code>.
- *
+ *
* @since GemFire 6.5
*/
public void setContext(Object/* ClientProxyMembershipID */ context) {
@@ -3126,7 +3126,7 @@ public abstract class DataSerializer {
/**
* For internal use only. Returns the context of this <code>DataSerializer</code>.
- *
+ *
* @since GemFire 6.5
*/
public Object/* ClientProxyMembershipID */ getContext() {
@@ -3136,12 +3136,12 @@ public abstract class DataSerializer {
/**
* maps a class to its enum constants.
*/
- private final static ConcurrentMap knownEnums = new ConcurrentHashMap();
+ private static final ConcurrentMap knownEnums = new ConcurrentHashMap();
/**
* gets the enum constants for the given class. {@link Class#getEnumConstants()} uses reflection,
* so we keep around the class to enumConstants mapping in the {@link #knownEnums} map
- *
+ *
* @param <E>
* @param clazz
* @return enum constants for the given class
@@ -3161,7 +3161,7 @@ public abstract class DataSerializer {
* serializes the ordinal byte, so for backward compatibility new enum constants should only be
* added to the end of the enum type.<br />
* Example: <code>DataSerializer.writeEnum(DAY_OF_WEEK.SUN, out);</code>
- *
+ *
* @see #readEnum(Class, DataInput)
* @since GemFire 6.5
* @throws IOException
@@ -3188,7 +3188,7 @@ public abstract class DataSerializer {
* backward compatibility new enum constants should only be added to the end of the enum
* type.<br />
* Example: <code>DAY_OF_WEEK d = DataSerializer.readEnum(DAY_OF_WEEK.class, in);</code>
- *
+ *
* @since GemFire 6.5
* @see #writeEnum(Enum, DataOutput)
* @throws IOException A problem occurs while writing to <code>out</code>
@@ -3212,4 +3212,3 @@ public abstract class DataSerializer {
return getEnumConstantsForClass(clazz)[ordinal];
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/Delta.java b/geode-core/src/main/java/org/apache/geode/Delta.java
index a474981..3ac33c7 100755
--- a/geode-core/src/main/java/org/apache/geode/Delta.java
+++ b/geode-core/src/main/java/org/apache/geode/Delta.java
@@ -25,9 +25,9 @@ import java.io.IOException;
* from an application object, and generate a new application object by applying a delta to an
* existing application object. The difference in object state is contained in the
* {@link DataOutput} and {@link DataInput} parameters.
- *
+ *
* @since GemFire 6.1
- *
+ *
*/
public interface Delta {
@@ -40,9 +40,9 @@ public interface Delta {
* This method is invoked on an application object at the delta sender, if GemFire determines the
* presence of a delta by calling {@link Delta#hasDelta()} on the object. The delta is written to
* the {@link DataOutput} object provided by GemFire.
- *
+ *
* Any delta state should be reset in this method.
- *
+ *
* @throws IOException
*/
void toDelta(DataOutput out) throws IOException;
@@ -53,7 +53,7 @@ public interface Delta {
* This method throws an {@link InvalidDeltaException} when the delta in the {@link DataInput}
* cannot be applied to the object. GemFire automatically handles an {@link InvalidDeltaException}
* by reattempting the update by sending the full application object.
- *
+ *
* @throws IOException
* @throws InvalidDeltaException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
index db87e35..04f8105 100644
--- a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode;
@@ -21,7 +21,7 @@ package org.apache.geode;
* This exception wraps any checked exception encountered during invocation of
* {@link Delta#fromDelta(java.io.DataInput)} or {@link Delta#toDelta(java.io.DataOutput)} in
* GemFire.
- *
+ *
* @since GemFire 6.5
*/
public class DeltaSerializationException extends RuntimeException {
diff --git a/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java b/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
index 0ecc750..69c3a0b 100755
--- a/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
@@ -17,7 +17,7 @@ package org.apache.geode;
/**
* An <code>ForcedDisconnectException</code> is thrown when a GemFire application is removed from
* the distributed system due to membership constraints such as network partition detection.
- *
+ *
* @since GemFire 5.7
*/
public class ForcedDisconnectException extends CancelException {
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
index c47d9e1..f4c8e8f 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
@@ -20,7 +20,7 @@ package org.apache.geode;
* <p>
* This class ought to be called <em>GemFireException</em>, but that name is reserved for an older
* class that extends {@link java.lang.RuntimeException}.
- *
+ *
* @see org.apache.geode.GemFireException
* @since GemFire 5.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java b/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
index 724f6da..862798d 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
@@ -21,7 +21,7 @@ package org.apache.geode;
* <code>Exception</code> to not accidently catch this exception.
* <p>
* Note: if user code catches this error (or its subclasses) then it <em>must</em> be rethrown.
- *
+ *
* @since GemFire 5.7
*/
public class GemFireRethrowable extends Error {
@@ -34,7 +34,7 @@ public class GemFireRethrowable extends Error {
/**
* Create a GemFireRethrowable with the specified message.
- *
+ *
* @param message
*/
public GemFireRethrowable(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java b/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
index 653cad1..48b0b9e 100644
--- a/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
+++ b/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
@@ -13,16 +13,16 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode;
/**
* Indicates that serious error has occurred within the GemFire system.
- *
+ *
* This is similar to {@link AssertionError}, but these errors are always enabled in a GemFire
* system.
- *
+ *
* @since GemFire 5.5
* @see AssertionError
*/
@@ -30,7 +30,7 @@ public class InternalGemFireError extends Error {
private static final long serialVersionUID = 6390043490679349593L;
/**
- *
+ *
*/
public InternalGemFireError() {
// TODO Auto-generated constructor stub
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
index edbf038..41e64fd 100755
--- a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
@@ -21,7 +21,7 @@ import java.io.DataInput;
* the receiving peer/client. The class implementing {@link Delta} may also choose to throw this in
* {@link Delta#fromDelta(DataInput in)}. GemFire, on encountering this exception distributes the
* full application object.
- *
+ *
* @since GemFire 6.1
*/
public class InvalidDeltaException extends GemFireException {
@@ -34,7 +34,7 @@ public class InvalidDeltaException extends GemFireException {
/**
* Creates a new <code>InvalidDeltaException</code>.
- *
+ *
* @param msg String explaining the exception
*/
public InvalidDeltaException(String msg) {
@@ -43,7 +43,7 @@ public class InvalidDeltaException extends GemFireException {
/**
* Creates a new <code>InvalidDeltaException</code>.
- *
+ *
* @param e Throwable
*/
public InvalidDeltaException(Throwable e) {
@@ -52,7 +52,7 @@ public class InvalidDeltaException extends GemFireException {
/**
* Creates a new <code>InvalidDeltaException</code>.
- *
+ *
* @param msg String explaining the exception
* @param e Throwable
*/
diff --git a/geode-core/src/main/java/org/apache/geode/LogWriter.java b/geode-core/src/main/java/org/apache/geode/LogWriter.java
index 4a2e473..135b527 100644
--- a/geode-core/src/main/java/org/apache/geode/LogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/LogWriter.java
@@ -15,11 +15,11 @@
package org.apache.geode;
+import java.util.logging.Handler;
+
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.i18n.LogWriterI18n;
-import java.util.logging.Handler;
-
/**
* Defines methods available to clients that want to write a log message to their GemFire
* distributed system log file.
@@ -229,7 +229,7 @@ public interface LogWriter {
* <p>
* The logging is done using the <code>finer</code> level. The string message will start with
* <code>"ENTRY"</code> and include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
*/
@@ -240,7 +240,7 @@ public interface LogWriter {
* <p>
* The logging is done using the <code>finer</code> level. The string message will start with
* <code>"RETURN"</code> and include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
*/
@@ -255,7 +255,7 @@ public interface LogWriter {
* This is a convenience method that could be done instead by calling
* {@link #finer(String, Throwable)}. The string message will start with <code>"THROW"</code> and
* include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
* @param thrown The Throwable that is being thrown.
@@ -292,7 +292,7 @@ public interface LogWriter {
/**
* A mechanism for accessing the abstraction layer used for internationalization.
- *
+ *
* @return LogWriterI18n
*/
public LogWriterI18n convertToLogWriterI18n();
diff --git a/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java b/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
index 323cd84..afb150f 100755
--- a/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
@@ -17,7 +17,7 @@ package org.apache.geode;
/**
* Indicates that attempts to allocate more objects in off-heap memory has failed and the Cache will
* be closed to prevent it from losing distributed consistency.
- *
+ *
*/
public class OutOfOffHeapMemoryException extends CancelException {
private static final long serialVersionUID = 4111959438738739010L;
diff --git a/geode-core/src/main/java/org/apache/geode/SerializationException.java b/geode-core/src/main/java/org/apache/geode/SerializationException.java
index 4e82b26..3c78d3f 100644
--- a/geode-core/src/main/java/org/apache/geode/SerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/SerializationException.java
@@ -18,16 +18,16 @@ import org.apache.geode.GemFireIOException;
/**
* An exception indicating that a serialization or deserialization failed.
- *
+ *
* @since GemFire 5.7
*/
public class SerializationException extends GemFireIOException {
private static final long serialVersionUID = 7783018024920098997L;
/**
- *
+ *
* Create a new instance of SerializationException with a detail message
- *
+ *
* @param message the detail message
*/
public SerializationException(String message) {
@@ -36,7 +36,7 @@ public class SerializationException extends GemFireIOException {
/**
* Create a new instance of SerializationException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java b/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
index fba2878..eb0c23f 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode;
-// import org.apache.geode.internal.Assert;
-// import org.apache.geode.internal.FieldInfo;
/**
* Describes an individual statistic whose value is updated by an application and may be archived by
diff --git a/geode-core/src/main/java/org/apache/geode/Statistics.java b/geode-core/src/main/java/org/apache/geode/Statistics.java
index cd37648..63cf288 100644
--- a/geode-core/src/main/java/org/apache/geode/Statistics.java
+++ b/geode-core/src/main/java/org/apache/geode/Statistics.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode;
-// import org.apache.geode.distributed.DistributedSystem;
import java.util.function.DoubleSupplier;
import java.util.function.IntSupplier;
@@ -118,7 +117,7 @@ public interface Statistics {
/**
* Sets the value of a statistic with the given <code>id</code> whose type is <code>int</code>.
- *
+ *
* @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
* @throws ArrayIndexOutOfBoundsException If the id is invalid.
@@ -143,7 +142,7 @@ public interface Statistics {
/**
* Sets the value of a statistic with the given <code>id</code> whose type is <code>long</code>.
- *
+ *
* @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
* @throws ArrayIndexOutOfBoundsException If the id is invalid.
@@ -168,7 +167,7 @@ public interface Statistics {
/**
* Sets the value of a statistic with the given <code>id</code> whose type is <code>double</code>.
- *
+ *
* @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
* @throws ArrayIndexOutOfBoundsException If the id is invalid.
@@ -394,7 +393,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -419,7 +418,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param name the name of the statistic to update
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -446,7 +445,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param descriptor the descriptor of the statistic to update
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -472,7 +471,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -497,7 +496,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param name the name of the statistic to update
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -523,7 +522,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param descriptor the descriptor of the statistic to update
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -549,7 +548,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -574,7 +573,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param name the name of the statistic to update
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
@@ -601,7 +600,7 @@ public interface Statistics {
* the statistic-sampling-rate.
* <p>
* Get methods are not guaranteed to recompute a new value, they may return the last sampled value
- *
+ *
* @param descriptor the descriptor of the statistic to update
* @param supplier a callback that will return the value of the stat. This replaces any previously
* registered supplier. If the passed in supplier is null, it will remove any existing
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
index 8056b73..0018158 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
@@ -14,10 +14,6 @@
*/
package org.apache.geode;
-// import org.apache.geode.distributed.DistributedSystem;
-// import org.apache.geode.internal.statistics.StatArchiveFormat;
-// import java.io.IOException;
-// import java.io.Reader;
/**
* Instances of this interface provide methods that create instances of {@link Statistics}. It can
@@ -33,11 +29,11 @@ package org.apache.geode;
* increase and decrease or a <I>counter</I> meaning that its value is strictly increasing. Marking
* a statistic as a counter allows statistic display tools to properly display a statistics whose
* value "wraps around" (that is, exceeds its maximum value).
- *
+ *
* <P>
* The following code is an example of how to create a type using the api. In this example the type
* has two stats whose values always increase:
- *
+ *
* <pre>
StatisticsFactory f = ...;
StatisticsType t = f.createType(
@@ -56,16 +52,16 @@ package org.apache.geode;
this.sampleCountId = this.samplerStats.nameToId("sampleCount");
this.sampleTimeId = this.samplerStats.nameToId("sampleTime");
* </pre>
- *
+ *
* Later on the stat ids can be used to increment the stats:
- *
+ *
* <pre>
* this.samplerStats.incInt(this.sampleCountId, 1);
* this.samplerStats.incLong(this.sampleTimeId, nanosSpentWorking / 1000000);
* </pre>
* <P>
* The following is an example of how to create the same type using XML. The XML data:
- *
+ *
* <pre>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE statistics PUBLIC
@@ -85,16 +81,16 @@ package org.apache.geode;
</type>
</statistics>
* </pre>
- *
+ *
* The code to create the type:
- *
+ *
* <pre>
StatisticsFactory f = ...;
Reader r = new InputStreamReader("fileContainingXmlData"));
StatisticsType type = f.createTypesFromXml(r)[0];
* </pre>
* <P>
- *
+ *
* @see <A href="package-summary.html#statistics">Package introduction</A>
*
*
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsType.java b/geode-core/src/main/java/org/apache/geode/StatisticsType.java
index fab47bf..88a2375 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsType.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsType.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode;
-// import org.apache.geode.internal.Assert;
-// import java.io.*;
-// import java.util.*;
/**
* Used to describe a logical collection of statistics. These descriptions are used to create an
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java b/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
index d37e2c2..34da874 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode;
-// import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.statistics.StatArchiveFormat;
import java.io.IOException;
import java.io.Reader;
+import org.apache.geode.internal.statistics.StatArchiveFormat;
+
/**
* Instances of this interface provide methods that create instances of {@link StatisticDescriptor}
* and {@link StatisticsType}. Every {@link StatisticsFactory} is also a type factory.
@@ -31,11 +31,11 @@ import java.io.Reader;
* increase and decrease or a <I>counter</I> meaning that its value is strictly increasing. Marking
* a statistic as a counter allows statistic display tools to properly display a statistics whose
* value "wraps around" (that is, exceeds its maximum value).
- *
+ *
* <P>
* The following code is an example of how to create a type using XML. In this example the type has
* two stats whose values always increase:
- *
+ *
* <pre>
StatisticsTypeFactory f = ...;
StatisticsType t = f.createType(
@@ -53,7 +53,7 @@ import java.io.Reader;
* </pre>
* <P>
* The following is an example of how to create the same type using XML. The XML data:
- *
+ *
* <pre>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE statistics PUBLIC
@@ -73,16 +73,16 @@ import java.io.Reader;
</type>
</statistics>
* </pre>
- *
+ *
* The code to create the type:
- *
+ *
* <pre>
StatisticsTypeFactory f = ...;
Reader r = new InputStreamReader("fileContainingXmlData"));
StatisticsType type = f.createTypesFromXml(r)[0];
* </pre>
* <P>
- *
+ *
* @see <A href="package-summary.html#statistics">Package introduction</A>
*
*
@@ -185,7 +185,7 @@ public interface StatisticsTypeFactory {
/**
* Creates or finds and returns a {@link StatisticsType} with the given <code>name</code>,
* <code>description</code>, and {@link StatisticDescriptor statistic descriptions}.
- *
+ *
* @throws IllegalArgumentException if a type with the given <code>name</code> already exists and
* it differs from the given parameters.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/SystemFailure.java b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
index 13c8f60..976d3d4 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemFailure.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
@@ -93,7 +93,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* {@link Error}, or {@link Throwable}, you <em>must</em>also check for {@link VirtualMachineError}
* like so:
* <p>
- *
+ *
* <pre>
catch (VirtualMachineError err) {
SystemFailure.{@link #initiateFailure(Error) initiateFailure}(err);
@@ -102,7 +102,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
throw err;
}
* </pre>
- *
+ *
* <h2>Periodically Check For Errors</h2> Check for serious system errors at appropriate points in
* your algorithms. You may elect to use the {@link #checkFailure()} utility function, but you are
* not required to (you could just see if {@link SystemFailure#getFailure()} returns a non-null
@@ -111,7 +111,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* A job processing loop is a good candidate, for instance, in
* org.apache.org.jgroups.protocols.UDP#run(), which implements {@link Thread#run}:
* <p>
- *
+ *
* <pre>
for (;;) {
SystemFailure.{@link #checkFailure() checkFailure}();
@@ -119,7 +119,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
if (Thread.currentThread().isInterrupted()) break;
...
* </pre>
- *
+ *
* <h2>Create Logging ThreadGroups</h2> If you create any Thread, a best practice is to catch severe
* errors and signal failure appropriately. One trick to do this is to create a ThreadGroup that
* handles uncaught exceptions by overriding
@@ -127,7 +127,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* of that {@link ThreadGroup}. This also has a significant side-benefit in that most uncaught
* exceptions can be detected:
* <p>
- *
+ *
* <pre>
ThreadGroup tg = new ThreadGroup("Worker Threads") {
public void uncaughtException(Thread t, Throwable e) {
@@ -149,7 +149,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* <em>anywhere</em> in your virtual machine. Whenever you catch {@link Error} or {@link Throwable},
* you should also make sure that you aren't dealing with a corrupted JVM:
* <p>
- *
+ *
* <pre>
catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
@@ -161,7 +161,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
...
}
* </pre>
- *
+ *
* @since GemFire 5.1
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DM_GC",
@@ -189,9 +189,9 @@ public final class SystemFailure {
/**
* the underlying failure
- *
+ *
* This is usually an instance of {@link VirtualMachineError}, but it is not required to be such.
- *
+ *
* @see #getFailure()
* @see #initiateFailure(Error)
*/
@@ -199,7 +199,7 @@ public final class SystemFailure {
/**
* user-defined runnable to run last
- *
+ *
* @see #setFailureAction(Runnable)
*/
private static volatile Runnable failureAction = () -> {
@@ -222,7 +222,7 @@ public final class SystemFailure {
* completed.
* <p>
* This may be dynamically modified while the system is running.
- *
+ *
* @param newVal true if it is OK to exit the process
* @return the previous value
*/
@@ -254,7 +254,7 @@ public final class SystemFailure {
/**
* Synchronizes access to state variables, used to notify the watchdog when to run
- *
+ *
* @see #notifyWatchDog()
* @see #startProctor()
* @see #startWatchDog()
@@ -263,14 +263,14 @@ public final class SystemFailure {
/**
* True if we have closed GemFire
- *
+ *
* @see #emergencyClose()
*/
private static volatile boolean gemfireCloseCompleted = false;
/**
* True if we have completed the user-defined failure action
- *
+ *
* @see #setFailureAction(Runnable)
*/
private static volatile boolean failureActionCompleted = false;
@@ -278,7 +278,7 @@ public final class SystemFailure {
/**
* This is a logging ThreadGroup, created only once.
*/
- private final static ThreadGroup tg;
+ private static final ThreadGroup tg;
static {
tg = new ThreadGroup("SystemFailure Watchdog Threads") {
@Override
@@ -300,12 +300,12 @@ public final class SystemFailure {
* This can be set with the system property <code>gemfire.WATCHDOG_WAIT</code>. The default is 15
* sec.
*/
- static public final int WATCHDOG_WAIT =
+ public static final int WATCHDOG_WAIT =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "WATCHDOG_WAIT", 15).intValue();
/**
* This is the watchdog thread
- *
+ *
* @guarded.By {@link #failureSync}
*/
private static Thread watchDog;
@@ -376,7 +376,7 @@ public final class SystemFailure {
/**
* This is the run loop for the watchdog thread.
*/
- static protected void runWatchDog() {
+ protected static void runWatchDog() {
boolean warned = false;
@@ -491,7 +491,7 @@ public final class SystemFailure {
/**
* Spies on system statistics looking for low memory threshold
- *
+ *
* @guarded.By {@link #failureSync}
* @see #minimumMemoryThreshold
*/
@@ -509,7 +509,7 @@ public final class SystemFailure {
/**
* This is the minimum amount of memory that the proctor will tolerate before declaring a system
* failure.
- *
+ *
* @see #setFailureMemoryThreshold(long)
* @guarded.By {@link #memorySync}
*/
@@ -519,44 +519,44 @@ public final class SystemFailure {
/**
* This is the interval, in seconds, that the proctor thread will awaken and poll system free
* memory.
- *
+ *
* The default is 1 sec. This can be set using the system property
* <code>gemfire.SystemFailure.MEMORY_POLL_INTERVAL</code>.
- *
+ *
* @see #setFailureMemoryThreshold(long)
*/
- static final public long MEMORY_POLL_INTERVAL =
+ public static final long MEMORY_POLL_INTERVAL =
Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_POLL_INTERVAL", 1);
/**
* This is the maximum amount of time, in seconds, that the proctor thread will tolerate seeing
* free memory stay below {@link #setFailureMemoryThreshold(long)}, after which point it will
* declare a system failure.
- *
+ *
* The default is 15 sec. This can be set using the system property
* <code>gemfire.SystemFailure.MEMORY_MAX_WAIT</code>.
- *
+ *
* @see #setFailureMemoryThreshold(long)
*/
- static final public long MEMORY_MAX_WAIT =
+ public static final long MEMORY_MAX_WAIT =
Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_MAX_WAIT", 15);
/**
* Flag that determines whether or not we monitor memory on our own. If this flag is set, we will
* check freeMemory, invoke GC if free memory gets low, and start throwing our own
* OutOfMemoryException if
- *
+ *
* The default is false, so this monitoring is turned off. This monitoring has been found to be
* unreliable in non-Sun VMs when the VM is under stress or behaves in unpredictable ways.
*
* @since GemFire 6.5
*/
- static final public boolean MONITOR_MEMORY =
+ public static final boolean MONITOR_MEMORY =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MONITOR_MEMORY");
/**
* Start the proctor thread, if it isn't already running.
- *
+ *
* @see #proctor
*/
private static void startProctor() {
@@ -592,25 +592,25 @@ public final class SystemFailure {
/**
* Symbolic representation of an invalid starve time
*/
- static private final long NEVER_STARVED = Long.MAX_VALUE;
+ private static final long NEVER_STARVED = Long.MAX_VALUE;
/**
* this is the last time we saw memory starvation
- *
+ *
* @guarded.By {@link #memorySync}}}
*/
- static private long firstStarveTime = NEVER_STARVED;
+ private static long firstStarveTime = NEVER_STARVED;
/**
* This is the previous measure of total memory. If it changes, we reset the proctor's starve
* statistic.
*/
- static private long lastTotalMemory = 0;
+ private static long lastTotalMemory = 0;
/**
* This is the run loop for the proctor thread
*/
- static protected void runProctor() {
+ protected static void runProctor() {
// Note that the javadocs say this can return Long.MAX_VALUE.
final long maxMemory = Runtime.getRuntime().maxMemory();
@@ -746,16 +746,16 @@ public final class SystemFailure {
/**
* Enables some fine logging
*/
- static private final boolean DEBUG = false;
+ private static final boolean DEBUG = false;
/**
* If true, we track the progress of emergencyClose on System.err
*/
- static public final boolean TRACE_CLOSE = false;
+ public static final boolean TRACE_CLOSE = false;
- static protected final String WATCHDOG_NAME = "SystemFailure Watchdog";
+ protected static final String WATCHDOG_NAME = "SystemFailure Watchdog";
- static protected final String PROCTOR_NAME = "SystemFailure Proctor";
+ protected static final String PROCTOR_NAME = "SystemFailure Proctor";
/**
* break any potential circularity in {@link #loadEmergencyClasses()}
@@ -785,7 +785,7 @@ public final class SystemFailure {
/**
* Attempt to close any and all GemFire resources.
- *
+ *
* The contract of this method is that it should not acquire any synchronization mutexes nor
* create any objects.
* <p>
@@ -820,7 +820,7 @@ public final class SystemFailure {
/**
* Throw the system failure.
- *
+ *
* This method does not return normally.
* <p>
* Unfortunately, attempting to create a new Throwable at this point may cause the thread to hang
@@ -829,7 +829,7 @@ public final class SystemFailure {
*
* @throws Error
*/
- static private void throwFailure() throws InternalGemFireError, Error {
+ private static void throwFailure() throws InternalGemFireError, Error {
if (failure != null)
throw failure;
}
@@ -847,7 +847,7 @@ public final class SystemFailure {
/**
* Utility function to check for failures. If a failure is detected, this methods throws an
* AssertionFailure.
- *
+ *
* @see #initiateFailure(Error)
* @throws InternalGemFireError if the system has been corrupted
* @throws Error if the system has been corrupted and a thread-specific AssertionError cannot be
@@ -863,7 +863,7 @@ public final class SystemFailure {
/**
* Signals that a system failure has occurred and then throws an AssertionError.
- *
+ *
* @param f the failure to set
* @throws IllegalArgumentException if f is null
* @throws InternalGemFireError always; this method does not return normally.
@@ -880,7 +880,7 @@ public final class SystemFailure {
* This method does not generate an error, and should only be used in circumstances where
* execution needs to continue, such as when re-implementing
* {@link ThreadGroup#uncaughtException(Thread, Throwable)}.
- *
+ *
* @param failure the system failure
* @throws IllegalArgumentException if you attempt to set the failure to null
*/
@@ -917,7 +917,7 @@ public final class SystemFailure {
* If this function returns a non-null value, keep in mind that the JVM is very limited. In
* particular, any attempt to allocate objects may fail if the original failure was an
* OutOfMemoryError.
- *
+ *
* @return the failure, if any
*/
public static Error getFailure() {
@@ -932,7 +932,7 @@ public final class SystemFailure {
* while the system is running.
* <p>
* The default action prints the failure stack trace to System.err.
- *
+ *
* @see #initiateFailure(Error)
* @param action the Runnable to use
* @return the previous action
@@ -945,11 +945,11 @@ public final class SystemFailure {
/**
* Set the memory threshold under which system failure will be notified.
- *
+ *
* This value may be dynamically modified while the system is running. The default is 1048576
* bytes. This can be set using the system property
* <code>gemfire.SystemFailure.chronic_memory_threshold</code>.
- *
+ *
* @param newVal threshold in bytes
* @return the old threshold
* @see Runtime#freeMemory()
@@ -965,7 +965,7 @@ public final class SystemFailure {
return result;
}
- static private boolean logStdErr(String kind, String name, String s, Throwable t) {
+ private static boolean logStdErr(String kind, String name, String s, Throwable t) {
try {
System.err.print(name);
System.err.print(": [");
@@ -985,32 +985,32 @@ public final class SystemFailure {
/**
* Logging can require allocation of objects, so we wrap the logger so that failures are silently
* ignored.
- *
+ *
* @param s string to print
* @param t the call stack, if any
* @return true if the warning got printed
*/
- static protected boolean logWarning(String name, String s, Throwable t) {
+ protected static boolean logWarning(String name, String s, Throwable t) {
return logStdErr("warning", name, s, t);
}
/**
* Logging can require allocation of objects, so we wrap the logger so that failures are silently
* ignored.
- *
+ *
* @param s string to print
*/
- static protected void logInfo(String name, String s) {
+ protected static void logInfo(String name, String s) {
logStdErr("info", name, s, null);
}
/**
* Logging can require allocation of objects, so we wrap the logger so that failures are silently
* ignored.
- *
+ *
* @param s string to print
*/
- static protected void logFine(String name, String s) {
+ protected static void logFine(String name, String s) {
if (DEBUG) {
logStdErr("fine", name, s, null);
}
diff --git a/geode-core/src/main/java/org/apache/geode/ToDataException.java b/geode-core/src/main/java/org/apache/geode/ToDataException.java
index a0055a5..8eae786 100644
--- a/geode-core/src/main/java/org/apache/geode/ToDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/ToDataException.java
@@ -17,7 +17,7 @@ package org.apache.geode;
/**
* A <code>ToDataException</code> is thrown during serialization if {@link DataSerializable#toData}
* throws an exception or if {@link DataSerializer#toData} is called and returns false.
- *
+ *
* @since GemFire 6.5
*/
public class ToDataException extends SerializationException {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
index 7a4bd6a..2f01787 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.admin;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@@ -25,6 +23,8 @@ import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Date;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* AdminConfig loads/stores the member information list. The list contains all of the members being
@@ -36,7 +36,7 @@ import java.util.Date;
* <li>Type=SERVER|CLIENT
* <li>Host=A valid hostname or IP Address where the instance is running
* <li>Port=The port you are using to open the monitor port for the instance
- *
+ *
* @deprecated as of 7.0 use the <code><a href=
* "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
* package instead
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
index 45c4214..6eacda0 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.admin;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.persistence.PersistentID;
-import org.apache.geode.distributed.DistributedMember;
-
import java.io.File;
import java.net.InetAddress;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.persistence.PersistentID;
+import org.apache.geode.distributed.DistributedMember;
+
/**
* Administrative interface for managing an entire GemFire distributed system. This interface should
* not be confused with {@link org.apache.geode.distributed.DistributedSystem DistributedSystem}
@@ -245,7 +245,7 @@ public interface AdminDistributedSystem {
/**
* Registers a cache event listener. Does nothing if the listener is already registered. The
* listeners are called in the order they are registered.
- *
+ *
* @param listener the listener to register.
* @since GemFire 5.0
*/
@@ -253,7 +253,7 @@ public interface AdminDistributedSystem {
/**
* Unregisters a cache listener. Does nothing if the listener is not registered.
- *
+ *
* @param listener the listener to unregister.
* @since GemFire 5.0
*/
@@ -282,7 +282,7 @@ public interface AdminDistributedSystem {
/**
* Returns all the cache server members of the distributed system which are hosting a client queue
* for the particular durable-client having the given durableClientId
- *
+ *
* @param durableClientId - durable-id of the client
* @return array of CacheServer(s) having the queue for the durable client
* @throws AdminException
@@ -323,7 +323,7 @@ public interface AdminDistributedSystem {
* from a set of persistent files, it will wait for other members that were also persisting the
* same region to start up. If the persistent files for those other members were lost, this method
* can be used to tell the remaining members to stop waiting for the lost data.
- *
+ *
* @param host The host of the member whose files were lost.
* @param directory The directory where those files resided.
* @since GemFire 6.5
@@ -336,10 +336,10 @@ public interface AdminDistributedSystem {
* from a set of persistent files, it will wait for other members that were also persisting the
* same region to start up. If the persistent files for those other members were lost, this method
* can be used to tell the remaining members to stop waiting for the lost data.
- *
+ *
* @param diskStoreID The unique id of the disk store which you are revoking. The unique id can be
* discovered from {@link #getMissingPersistentMembers()}
- *
+ *
* @since GemFire 7.0
*/
public void revokePersistentMember(UUID diskStoreID) throws AdminException;
@@ -347,12 +347,12 @@ public interface AdminDistributedSystem {
/**
* Retrieve the set of persistent files that the existing members are waiting for. See
* {@link AdminDistributedSystem#revokePersistentMember(InetAddress, String)}
- *
+ *
* @return The persistent members that were known to the existing persistent members, when the
* existing members were last online.
* @throws AdminException
* @since GemFire 6.5
- *
+ *
*/
public Set<PersistentID> getMissingPersistentMembers() throws AdminException;
@@ -361,13 +361,13 @@ public interface AdminDistributedSystem {
* connected to, excluding the stand-alone locators. Calling this method will ensure that regions
* with the {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which allows for a
* faster recovery when the members are restarted.
- *
+ *
* Killing individual members can lead to inconsistencies in the members persistent data, which
* gemfire repairs on startup. Calling shutDownAllMembers makes sure that the persistent files are
* consistent on shutdown, which makes recovery faster.
- *
+ *
* This is equivalent to calling shutDownAllMembers(0);
- *
+ *
* @return The set of members that were shutdown
* @since GemFire 6.5
*/
@@ -378,14 +378,14 @@ public interface AdminDistributedSystem {
* connected to, excluding the stand-alone locators. Calling this method will ensure that regions
* with the {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which allows for a
* faster recovery when the members are restarted.
- *
+ *
* Killing individual members can lead to inconsistencies in the members persistent data, which
* gemfire repairs on startup. Calling shutDownAllMembers makes sure that the persistent files are
* consistent on shutdown, which makes recovery faster.
- *
+ *
* @param timeout The amount of time to wait (in milliseconds) for the shutdown all to complete.
* @return The set of members that were shutdown, or null if the timeout is exceeded.
- *
+ *
* @since GemFire 6.5
*/
public Set<DistributedMember> shutDownAllMembers(long timeout) throws AdminException;
@@ -393,9 +393,9 @@ public interface AdminDistributedSystem {
/**
* Backup the persistent files for all of the members of the distributed system that the admin
* member is connected to.
- *
+ *
* @param targetDir The directory where each member's backup should be placed.
- *
+ *
* @return The status of the backup, which includes the set of members that were backed up and the
* set of members that were known to be offline at the time of backup.
* @since GemFire 6.5
@@ -407,12 +407,12 @@ public interface AdminDistributedSystem {
* the admin member is connected to. Only new operation log files since the previous backup will
* be copied during this backup. The generated restore script will reference and copy operation
* log files from the previous backup.
- *
+ *
* @param targetDir The directory where each member's backup should be placed.
* @param baselineDir The directory of a previous backup. If this parameter is null or the
* directory does not exist (on a member by member basis) a full backup will be performed
* for the member.
- *
+ *
* @return The status of the backup, which includes the set of members that were backed up and the
* set of members that were known to be offline at the time of backup.
* @since GemFire 6.5
@@ -422,12 +422,11 @@ public interface AdminDistributedSystem {
/**
* Compact the persistent files for all of the members of the distributed system that the admin
* member connected to.
- *
+ *
* This is equivalent to calling {DiskStore#forceCompaction} on all members.
- *
+ *
* @return The set of members that compacted their disk stores.
* @since GemFire 6.5
*/
public Map<DistributedMember, Set<PersistentID>> compactAllDiskStores() throws AdminException;
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
index 60a8722..3a7c29d 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.admin;
+import java.util.Properties;
+
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
import org.apache.geode.admin.internal.DistributedSystemConfigImpl;
import org.apache.geode.distributed.DistributedSystem;
@@ -24,8 +26,6 @@ import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LocalLogWriter;
-import java.util.Properties;
-
/**
* Factory for creating GemFire administration entities.
*
@@ -83,12 +83,12 @@ public class AdminDistributedSystemFactory {
* Once it has been enabled be careful to only use GemFire APIs from the
* <code>org.apache.geode.admin</code> package. In particular do not create a
* {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}.
- *
+ *
* @param adminOnly <code>true</code> if this VM should be limited to administration APIs;
* <code>false</code> if this VM should allow all GemFire APIs.
* @throws IllegalStateException if a {@link DistributedSystem} or {@link AdminDistributedSystem}
* connection already exists.
- *
+ *
* @since GemFire 5.7
*/
public static void setEnableAdministrationOnly(boolean adminOnly) {
@@ -145,4 +145,3 @@ public class AdminDistributedSystemFactory {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
index 247f4d0..834b77d 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
@@ -16,7 +16,7 @@ package org.apache.geode.admin;
/**
* A listener whose callback methods are invoked when an {@link Alert} is received.
- *
+ *
* @deprecated as of 7.0 use the <code><a href=
* "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
* package instead
diff --git a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
index b4c4079..11740d9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
@@ -17,7 +17,7 @@ package org.apache.geode.admin;
/**
* The status of a backup operation, returned by
* {@link AdminDistributedSystem#backupAllMembers(java.io.File,java.io.File)}.
- *
+ *
* @since GemFire 6.5
* @deprecated as of 7.0 use the <code><a href=
* "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
index 338061e..f381e18 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
@@ -77,4 +77,3 @@ public class CacheDoesNotExistException extends AdminException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
index 9f99309..bbb9cc2 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
@@ -35,7 +35,7 @@ package org.apache.geode.admin;
*
* <LI>The number of entries in the Cache {@link #getMaxEventQueueSize event delivery queue} is too
* large.</LI>
- *
+ *
* <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#FULL_ACCESS
* FULL_ACCESS} on role loss.</LI>
*
@@ -43,17 +43,17 @@ package org.apache.geode.admin;
*
* If any of the following criteria is true, then a cache member is considered to be in
* {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
- *
+ *
* <UL>
- *
+ *
* <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#NO_ACCESS
* NO_ACCESS} on role loss.</LI>
- *
+ *
* <LI>If one of the regions is configured with
* {@link org.apache.geode.cache.LossAction#LIMITED_ACCESS LIMITED_ACCESS} on role loss.</LI>
- *
+ *
* </UL>
- *
+ *
* <UL>
*
* </UL>
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
index a229281..e53d6e5 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
@@ -24,7 +24,7 @@ package org.apache.geode.admin;
public interface CacheServer extends SystemMember, ManagedEntity {
/**
* Returns the configuration of this cache vm
- *
+ *
* @deprecated as of 5.7 use {@link CacheVm#getVmConfig} instead.
*/
@Deprecated
@@ -32,10 +32,10 @@ public interface CacheServer extends SystemMember, ManagedEntity {
/**
* Find whether this server is primary for given client (durableClientId)
- *
+ *
* @param durableClientId - durable-id of the client
* @return true if the server is primary for given client
- *
+ *
* @since GemFire 5.6
*/
public boolean isPrimaryForDurableClient(String durableClientId);
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java b/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
index 74e1510..b943f61 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
@@ -69,4 +69,3 @@ public interface ConfigurationParameter {
*/
public void setValue(Object value) throws UnmodifiableConfigurationException;
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
index 940d306..7e93438 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.admin;
-import org.apache.geode.admin.internal.InetAddressUtil;
-import org.apache.geode.distributed.internal.DistributionConfig;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.admin.internal.InetAddressUtil;
+import org.apache.geode.distributed.internal.DistributionConfig;
/**
@@ -97,7 +97,7 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* The name of the "membership-port-range" property
- *
+ *
* @since GemFire 6.5
*/
String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE;
@@ -106,14 +106,14 @@ public interface DistributedSystemConfig extends Cloneable {
* The default membership-port-range.
* <p>
* Actual value is <code>[1024,65535]</code>.
- *
+ *
* @since GemFire 6.5
*/
int[] DEFAULT_MEMBERSHIP_PORT_RANGE = DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
/**
* settings for tcp-port
- *
+ *
* @since GemFire 6.5
*/
String TCP_PORT_NAME = TCP_PORT;
@@ -121,7 +121,7 @@ public interface DistributedSystemConfig extends Cloneable {
* The default value of the "tcpPort" property.
* <p>
* Actual value is <code>0</code>.
- *
+ *
* @since GemFire 6.5
*/
int DEFAULT_TCP_PORT = DistributionConfig.DEFAULT_TCP_PORT;
@@ -314,7 +314,7 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Returns the membership-port-range property of the Distributed System. This range is given as
* two numbers separated by a minus sign.
- *
+ *
* @since GemFire 6.5
*/
public String getMembershipPortRange();
@@ -322,7 +322,7 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Sets the membership-port-range property of the Distributed System. This range is given as two
* numbers separated by a minus sign.
- *
+ *
* @since GemFire 6.5
*/
public void setMembershipPortRange(String membershipPortRange);
@@ -330,14 +330,14 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Sets the primary communication port number for the Distributed System.
- *
+ *
* @since GemFire 6.5
*/
public void setTcpPort(int port);
/**
* Returns the primary communication port number for the Distributed System.
- *
+ *
* @since GemFire 6.5
*/
public int getTcpPort();
@@ -513,21 +513,21 @@ public interface DistributedSystemConfig extends Cloneable {
* Returns the refreshInterval in seconds used for auto-polling and updating
* AdminDistributedSystem constituents including SystemMember, CacheServer, SystemMemberCache and
* StatisticResource
- *
+ *
* @since GemFire 6.0
*/
public int getRefreshInterval();
/**
* Sets the refreshInterval in seconds
- *
+ *
* @since GemFire 6.0
*/
public void setRefreshInterval(int timeInSecs);
/**
* Returns an array of configurations for statically known <code>CacheServers</code>.
- *
+ *
* @deprecated as of 5.7 use {@link #getCacheVmConfigs} instead.
*/
@Deprecated
@@ -535,7 +535,7 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Creates the configuration for a CacheServer
- *
+ *
* @deprecated as of 5.7 use {@link #createCacheVmConfig} instead.
*/
@Deprecated
@@ -543,7 +543,7 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Removes the configuration for a CacheServer
- *
+ *
* @deprecated as of 5.7 use {@link #removeCacheVmConfig} instead.
*/
@Deprecated
@@ -551,21 +551,21 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Returns an array of configurations for statically known {@link CacheVm}s.
- *
+ *
* @since GemFire 5.7
*/
public CacheVmConfig[] getCacheVmConfigs();
/**
* Creates the configuration for a {@link CacheVm}.
- *
+ *
* @since GemFire 5.7
*/
public CacheVmConfig createCacheVmConfig();
/**
* Removes the configuration for a {@link CacheVm}
- *
+ *
* @since GemFire 5.7
*/
public void removeCacheVmConfig(CacheVmConfig existing);
@@ -623,4 +623,3 @@ public interface DistributedSystemConfig extends Cloneable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
index cb82679..d2bbdaa 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
@@ -42,4 +42,3 @@ public interface DistributionLocator extends ManagedEntity {
public DistributionLocatorConfig getConfig();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
index 6e8794d..34516d3 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
@@ -65,14 +65,14 @@ public interface DistributionLocatorConfig extends ManagedEntityConfig {
/**
* Sets the properties used to configure the locator's DistributedSystem.
- *
+ *
* @since GemFire 5.0
*/
public void setDistributedSystemProperties(Properties props);
/**
* Retrieves the properties used to configure the locator's DistributedSystem.
- *
+ *
* @since GemFire 5.0
*/
public Properties getDistributedSystemProperties();
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
index 9dda7c1..1e01b40 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.net.SocketCreator;
/**
* Class <code>GemFireMemberStatus</code> provides the status of a specific GemFire member VM. This
* VM can be a peer, a client, a server and/or a gateway.
- *
+ *
* @deprecated as of 7.0 use the <code><a href=
* "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
* package instead
@@ -110,7 +110,7 @@ public class GemFireMemberStatus implements Serializable {
protected long upTime = -1;
- protected transient final Cache cache;
+ protected final transient Cache cache;
public GemFireMemberStatus() {
this(null);
@@ -135,7 +135,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Returns whether this member is a client to a cache server
- *
+ *
* @return whether this member is a client to a cache server
*/
public boolean getIsClient() {
@@ -144,7 +144,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Sets whether this member is a client to a cache server
- *
+ *
* @param isClient Boolean defining whether this member is a client to a cache server
*/
protected void setIsClient(boolean isClient) {
@@ -153,7 +153,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Returns whether this member is a cache server
- *
+ *
* @return whether this member is a cache server
*/
public boolean getIsServer() {
@@ -162,7 +162,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Sets whether this member is a cache server
- *
+ *
* @param isServer Boolean defining whether this member is a cache server
*/
protected void setIsServer(boolean isServer) {
@@ -179,7 +179,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Returns whether this member is a hub for WAN gateways
- *
+ *
* @return whether this member is a hub for WAN gateways
*/
public boolean getIsGatewayHub() {
@@ -188,7 +188,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Sets whether this member is a cache server
- *
+ *
* @param isGatewayHub Boolean defining whether this member is a hub for WAN gateways
*/
protected void setIsGatewayHub(boolean isGatewayHub) {
@@ -213,7 +213,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* For internal use only
- *
+ *
* @return status of the gateway hub
*/
public Object/* GatewayHubStatus */ getGatewayHubStatus() {
@@ -307,7 +307,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* For internal use only
- *
+ *
* @param clientID client for health
* @return the client's health
*/
@@ -333,7 +333,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* For internal use only
- *
+ *
* @param fullRegionPath region path
* @return status for the region
*/
@@ -553,7 +553,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* returning Map of client queue size against client Id
- *
+ *
* param clientMap is a Map of client queue size against ClientProxyMembershipID
*/
private Map getClientIDMap(Map ClientProxyMembershipIDMap) {
@@ -678,4 +678,3 @@ public class GemFireMemberStatus implements Serializable {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
index 63dd605..5a805af 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
@@ -127,14 +127,14 @@ public interface MemberHealthConfig {
* <p>
* A high retransmission ratio may indicate poor network conditions requiring reduced flow-control
* settings, a udp-fragment-size setting that is too high.
- *
+ *
* @see #DEFAULT_MAX_RETRANSMISSION_RATIO
*/
public double getMaxRetransmissionRatio();
/**
* Sets the maximum ratio of multicast retransmissions / total multicast messages.
- *
+ *
* @see #getMaxRetransmissionRatio
*/
public void setMaxRetransmissionRatio(double ratio);
diff --git a/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java b/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
index 0328641..b20b0c9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
@@ -15,7 +15,6 @@
package org.apache.geode.admin;
-// import org.apache.geode.GemFireException;
/**
* Thrown when an administration operation that accesses information in a remote system member is
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java b/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
index e849a70..3cb9fee 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.admin;
-// import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheRuntimeException;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
index 69774b8..fb31076 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
@@ -30,8 +30,8 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* Class <code>RegionSubRegionSnapshot</code> provides information about <code>Region</code>s. This
* also provides the information about sub regions This class is used by the monitoring tool.
- *
- *
+ *
+ *
* @since GemFire 5.7
* @deprecated as of 7.0 use the <code><a href=
* "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
@@ -63,7 +63,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
/**
* add the snapshot of sub region
- *
+ *
* @param snap snapshot of sub region
* @return true if operation is successful
*/
@@ -137,7 +137,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
}
/**
- *
+ *
* @return full path of region
*/
public String getFullPath() {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/Statistic.java b/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
index 428281a..f5ad694 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
@@ -61,4 +61,3 @@ public interface Statistic extends java.io.Serializable {
*/
public String getDescription();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java b/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
index 1300c6a..b5efd10 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
@@ -79,4 +79,3 @@ public interface StatisticResource {
public void refresh() throws org.apache.geode.admin.AdminException;
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
index ffd3f06..558b42d 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.admin;
-import org.apache.geode.distributed.DistributedMember;
-
import java.net.InetAddress;
+import org.apache.geode.distributed.DistributedMember;
+
/**
* Administrative interface for monitoring a GemFire system member.
*
@@ -142,4 +142,3 @@ public interface SystemMember {
*/
public DistributedMember getDistributedMember();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
index 7a1fb1a..0aa198b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
@@ -65,7 +65,7 @@ public interface SystemMemberBridgeServer {
/**
* Returns a string representing the ip address or host name that this server will listen on.
- *
+ *
* @return the ip address or host name that this server is to listen on
* @since GemFire 5.7
*/
@@ -84,7 +84,7 @@ public interface SystemMemberBridgeServer {
* The default value does not override the gemfire.properties. If you wish to override the
* properties and want to have your server bind to all local addresses then use this string
* <code>"0.0.0.0"</code>.
- *
+ *
* @param address the ip address or host name that this server is to listen on
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
@@ -94,7 +94,7 @@ public interface SystemMemberBridgeServer {
/**
* Returns a string representing the ip address or host name that server locators will tell
* clients that this server is listening on.
- *
+ *
* @return the ip address or host name to give to clients so they can connect to this server
* @since GemFire 5.7
*/
@@ -109,7 +109,7 @@ public interface SystemMemberBridgeServer {
* The default value causes the bind-address to be given to clients
* <p>
* A <code>null</code> value will be treated the same as the default "".
- *
+ *
* @param name the ip address or host name that will be given to clients so they can connect to
* this server
* @throws AdminException if this bridge server is running
@@ -129,7 +129,7 @@ public interface SystemMemberBridgeServer {
* clients who have registered interest in that key. Other clients are not notified of the change.
* In addition, the actual value is pushed to the client. The client does not need to request the
* new value from the bridge server.
- *
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
@@ -137,7 +137,7 @@ public interface SystemMemberBridgeServer {
/**
* Answers whether or not this bridge server should notify clients based on key subscription.
- *
+ *
* @since GemFire 5.7
*/
public boolean getNotifyBySubscription();
@@ -155,7 +155,7 @@ public interface SystemMemberBridgeServer {
/**
* Returns the configured buffer size of the socket connection for this <code>BridgeServer</code>.
* The default is 32768 bytes.
- *
+ *
* @return the configured buffer size of the socket connection for this <code>BridgeServer</code>
* @since GemFire 5.7
*/
@@ -176,7 +176,7 @@ public interface SystemMemberBridgeServer {
* Returns the maximum amount of time between client pings. This value is used by the
* <code>ClientHealthMonitor</code> to determine the health of this <code>BridgeServer</code>'s
* clients. The default is 60000 ms.
- *
+ *
* @return the maximum amount of time between client pings.
* @since GemFire 5.7
*/
@@ -184,7 +184,7 @@ public interface SystemMemberBridgeServer {
/**
* Returns the maximum allowed client connections
- *
+ *
* @since GemFire 5.7
*/
public int getMaxConnections();
@@ -192,7 +192,7 @@ public interface SystemMemberBridgeServer {
/**
* Sets the maxium number of client connections allowed. When the maximum is reached the server
* will stop accepting connections.
- *
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
@@ -201,7 +201,7 @@ public interface SystemMemberBridgeServer {
/**
* Returns the maxium number of threads allowed in this server to service client requests. The
* default of <code>0</code> causes the server to dedicate a thread for every client connection.
- *
+ *
* @since GemFire 5.7
*/
public int getMaxThreads();
@@ -209,7 +209,7 @@ public interface SystemMemberBridgeServer {
/**
* Sets the maxium number of threads allowed in this server to service client requests. The
* default of <code>0</code> causes the server to dedicate a thread for every client connection.
- *
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
@@ -217,14 +217,14 @@ public interface SystemMemberBridgeServer {
/**
* Returns the maximum number of messages that can be enqueued in a client-queue.
- *
+ *
* @since GemFire 5.7
*/
public int getMaximumMessageCount();
/**
* Sets maximum number of messages that can be enqueued in a client-queue.
- *
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
@@ -232,14 +232,14 @@ public interface SystemMemberBridgeServer {
/**
* Returns the time (in seconds ) after which a message in the client queue will expire.
- *
+ *
* @since GemFire 5.7
*/
public int getMessageTimeToLive();
/**
* Sets the time (in seconds ) after which a message in the client queue will expire.
- *
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
@@ -248,7 +248,7 @@ public interface SystemMemberBridgeServer {
/**
* Sets the list of server groups this bridge server will belong to. By default bridge servers
* belong to the default global server group which all bridge servers always belong to.
- *
+ *
* @param groups possibly empty array of <code>String</code> where each string is a server groups
* that this bridge server will be a member of.
* @throws AdminException if this bridge server is running
@@ -258,7 +258,7 @@ public interface SystemMemberBridgeServer {
/**
* Returns the list of server groups that this bridge server belongs to.
- *
+ *
* @return a possibly empty array of <code>String</code>s where each string is a server group.
* Modifying this array will not change the server groups that this bridge server belongs
* to.
@@ -269,7 +269,7 @@ public interface SystemMemberBridgeServer {
/**
* Get a description of the load probe for this bridge server. {@link ServerLoadProbe} for details
* on the load probe.
- *
+ *
* @return the load probe used by this bridge server.
* @since GemFire 5.7
*/
@@ -278,10 +278,10 @@ public interface SystemMemberBridgeServer {
/**
* Set the load probe for this bridge server. See {@link ServerLoadProbe} for details on how to
* implement a load probe.
- *
+ *
* The load probe should implement DataSerializable if it is used with this interface, because it
* will be sent to the remote VM.
- *
+ *
* @param loadProbe the load probe to use for this bridge server.
* @throws AdminException if the bridge server is running
* @since GemFire 5.7
@@ -290,14 +290,14 @@ public interface SystemMemberBridgeServer {
/**
* Get the frequency in milliseconds to poll the load probe on this bridge server.
- *
+ *
* @return the frequency in milliseconds that we will poll the load probe.
*/
public long getLoadPollInterval();
/**
* Set the frequency in milliseconds to poll the load probe on this bridge server
- *
+ *
* @param loadPollInterval the frequency in milliseconds to poll the load probe. Must be greater
* than 0.
* @throws AdminException if the bridge server is running
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
index 8517fd0..26b5f70 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
@@ -39,7 +39,7 @@ public interface SystemMemberCache {
/**
* Indicates if this cache has been closed.
- *
+ *
* @return true, if this cache is closed; false, otherwise
*/
public boolean isClosed();
@@ -180,4 +180,3 @@ public interface SystemMemberCache {
*/
public boolean isServer() throws AdminException;
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
index 4008bdf..36d7b16 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
@@ -32,7 +32,7 @@ public interface SystemMemberCacheListener {
/**
* Invoked after a region is created in any node of distributed system.
- *
+ *
* @param event describes the region that was created.
* @see CacheFactory#create
* @see Cache#createRegion
@@ -42,12 +42,12 @@ public interface SystemMemberCacheListener {
/**
* Invoked when a region is destroyed or closed in any node of distributed system.
- *
+ *
* @param event describes the region that was lost. The operation on this event can be used to
* determine the actual operation that caused the loss. Note that {@link Cache#close()}
* invokes this callback with <code>Operation.CACHE_CLOSE</code> for each region in the
* closed cache and it invokes {@link #afterCacheClose}.
- *
+ *
* @see Cache#close()
* @see Region#close
* @see Region#localDestroyRegion()
@@ -58,7 +58,7 @@ public interface SystemMemberCacheListener {
/**
* Invoked after a cache is created in any node of a distributed system. Note that this callback
* will be done before any regions are created in the cache.
- *
+ *
* @param event describes the member that created the cache.
* @see CacheFactory#create
*/
@@ -68,7 +68,7 @@ public interface SystemMemberCacheListener {
* Invoked after a cache is closed in any node of a distributed system. This callback is done
* after those done for each region in the cache. This callback is not done if the distributed
* member that has a cache crashes.
- *
+ *
* @param event describes the member that closed its cache.
* @see Cache#close()
*/
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
index edfa356..51a3a69 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
@@ -66,7 +66,7 @@ public interface SystemMemberCacheServer {
/**
* Returns a string representing the ip address or host name that this server will listen on.
- *
+ *
* @return the ip address or host name that this server is to listen on
* @since GemFire 5.7
*/
@@ -85,7 +85,7 @@ public interface SystemMemberCacheServer {
* The default value does not override the gemfire.properties. If you wish to override the
* properties and want to have your server bind to all local addresses then use this string
* <code>"0.0.0.0"</code>.
- *
+ *
* @param address the ip address or host name that this server is to listen on
* @throws AdminException if this cache server is running
* @since GemFire 5.7
@@ -95,7 +95,7 @@ public interface SystemMemberCacheServer {
/**
* Returns a string representing the ip address or host name that server locators will tell
* clients that this server is listening on.
- *
+ *
* @return the ip address or host name to give to clients so they can connect to this server
* @since GemFire 5.7
*/
@@ -110,7 +110,7 @@ public interface SystemMemberCacheServer {
* The default value causes the bind-address to be given to clients
* <p>
* A <code>null</code> value will be treated the same as the default "".
- *
+ *
* @param name the ip address or host name that will be given to clients so they can connect to
* this server
* @throws AdminException if this cache server is running
@@ -130,7 +130,7 @@ public interface SystemMemberCacheServer {
* clients who have registered interest in that key. Other clients are not notified of the change.
* In addition, the actual value is pushed to the client. The client does not need to request the
* new value from the cache server.
- *
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
@@ -138,7 +138,7 @@ public interface SystemMemberCacheServer {
/**
* Answers whether or not this cache server should notify clients based on key subscription.
- *
+ *
* @since GemFire 5.7
*/
public boolean getNotifyBySubscription();
@@ -156,7 +156,7 @@ public interface SystemMemberCacheServer {
/**
* Returns the configured buffer size of the socket connection for this <code>CacheServer</code>.
* The default is 32768 bytes.
- *
+ *
* @return the configured buffer size of the socket connection for this <code>CacheServer</code>
* @since GemFire 5.7
*/
@@ -177,7 +177,7 @@ public interface SystemMemberCacheServer {
* Returns the maximum amount of time between client pings. This value is used by the
* <code>ClientHealthMonitor</code> to determine the health of this <code>CacheServer</code>'s
* clients. The default is 60000 ms.
- *
+ *
* @return the maximum amount of time between client pings.
* @since GemFire 5.7
*/
@@ -185,7 +185,7 @@ public interface SystemMemberCacheServer {
/**
* Returns the maximum allowed client connections
- *
+ *
* @since GemFire 5.7
*/
public int getMaxConnections();
@@ -193,7 +193,7 @@ public interface SystemMemberCacheServer {
/**
* Sets the maxium number of client connections allowed. When the maximum is reached the server
* will stop accepting connections.
- *
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
@@ -202,7 +202,7 @@ public interface SystemMemberCacheServer {
/**
* Returns the maxium number of threads allowed in this server to service client requests. The
* default of <code>0</code> causes the server to dedicate a thread for every client connection.
- *
+ *
* @since GemFire 5.7
*/
public int getMaxThreads();
@@ -210,7 +210,7 @@ public interface SystemMemberCacheServer {
/**
* Sets the maxium number of threads allowed in this server to service client requests. The
* default of <code>0</code> causes the server to dedicate a thread for every client connection.
- *
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
@@ -218,14 +218,14 @@ public interface SystemMemberCacheServer {
/**
* Returns the maximum number of messages that can be enqueued in a client-queue.
- *
+ *
* @since GemFire 5.7
*/
public int getMaximumMessageCount();
/**
* Sets maximum number of messages that can be enqueued in a client-queue.
- *
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
@@ -233,14 +233,14 @@ public interface SystemMemberCacheServer {
/**
* Returns the time (in seconds ) after which a message in the client queue will expire.
- *
+ *
* @since GemFire 5.7
*/
public int getMessageTimeToLive();
/**
* Sets the time (in seconds ) after which a message in the client queue will expire.
- *
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
@@ -249,7 +249,7 @@ public interface SystemMemberCacheServer {
/**
* Sets the list of server groups this cache server will belong to. By default cache servers
* belong to the default global server group which all cache servers always belong to.
- *
+ *
* @param groups possibly empty array of <code>String</code> where each string is a server groups
* that this cache server will be a member of.
* @throws AdminException if this cache server is running
@@ -259,7 +259,7 @@ public interface SystemMemberCacheServer {
/**
* Returns the list of server groups that this cache server belongs to.
- *
+ *
* @return a possibly empty array of <code>String</code>s where each string is a server group.
* Modifying this array will not change the server groups that this cache server belongs
* to.
@@ -270,7 +270,7 @@ public interface SystemMemberCacheServer {
/**
* Get a description of the load probe for this cache server. {@link ServerLoadProbe} for details
* on the load probe.
- *
+ *
* @return the load probe used by this cache server.
* @since GemFire 5.7
*/
@@ -279,10 +279,10 @@ public interface SystemMemberCacheServer {
/**
* Set the load probe for this cache server. See {@link ServerLoadProbe} for details on how to
* implement a load probe.
- *
+ *
* The load probe should implement DataSerializable if it is used with this interface, because it
* will be sent to the remote VM.
- *
+ *
* @param loadProbe the load probe to use for this cache server.
* @throws AdminException if the cache server is running
* @since GemFire 5.7
@@ -291,14 +291,14 @@ public interface SystemMemberCacheServer {
/**
* Get the frequency in milliseconds to poll the load probe on this cache server.
- *
+ *
* @return the frequency in milliseconds that we will poll the load probe.
*/
public long getLoadPollInterval();
/**
* Set the frequency in milliseconds to poll the load probe on this cache server
- *
+ *
* @param loadPollInterval the frequency in milliseconds to poll the load probe. Must be greater
* than 0.
* @throws AdminException if the cache server is running
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
index d26ce39..86663dc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.admin;
-import org.apache.geode.cache.*;
import java.io.File;
+import org.apache.geode.cache.*;
+
/**
* Administrative interface that represent's the {@link SystemMember}'s view of one of its cache's
* {@link org.apache.geode.cache.Region}s. If the region in the remote system member is closed or
@@ -82,7 +83,7 @@ public interface SystemMemberRegion {
* Returns a description of the CacheListener in this region's attributes. If there is more than 1
* CacheListener defined for a region this method will return the description of the 1st
* CacheListener returned from {@link #getCacheListeners}
- *
+ *
* @deprecated as of 6.0 use getCacheListeners() instead
*/
@Deprecated
@@ -92,7 +93,7 @@ public interface SystemMemberRegion {
* This method will return an empty array if there are no CacheListeners defined on the region. If
* there are one or more than 1 CacheListeners defined, this method will return an array which has
* the names of all the CacheListeners
- *
+ *
* @return String[] the region's <code>CacheListeners</code> as a String array
* @since GemFire 6.0
*/
@@ -130,7 +131,7 @@ public interface SystemMemberRegion {
/**
* string describing the CustomExpiry for entry-time-to-live
- *
+ *
* @return the CustomExpiry for entry-time-to-live
*/
public String getCustomEntryTimeToLive();
@@ -157,14 +158,14 @@ public interface SystemMemberRegion {
/**
* string describing the CustomExpiry for entry-idle-timeout
- *
+ *
* @return the CustomExpiry for entry-idle-timeout
*/
public String getCustomEntryIdleTimeout();
/**
* Returns the MirrorType in this region's attributes.
- *
+ *
* @deprecated as of 5.0, you should use getDataPolicy instead
*/
@Deprecated
@@ -176,7 +177,7 @@ public interface SystemMemberRegion {
public DataPolicy getDataPolicy();
/**
- *
+ *
* /** Returns the Scope in this region's attributes.
*/
public Scope getScope();
@@ -260,7 +261,7 @@ public interface SystemMemberRegion {
/**
* Returns whether or not acks are sent after an update is processed.
- *
+ *
* @return False if acks are sent after updates are processed; true if acks are sent before
* updates are processed.
*
@@ -291,24 +292,23 @@ public interface SystemMemberRegion {
/**
* Returns the <code>MembershipAttributes</code> that configure required roles for reliable access
* to the region.
- *
+ *
* @deprecated this API is scheduled to be removed
*/
public MembershipAttributes getMembershipAttributes();
/**
* Returns the <code>SubscriptionAttributes</code> for the region.
- *
+ *
* @since GemFire 5.0
*/
public SubscriptionAttributes getSubscriptionAttributes();
/**
* Returns the <code>PartitionAttributes</code> for the region.
- *
+ *
* @since GemFire 5.7
*/
public PartitionAttributes getPartitionAttributes();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
index c95d32e..a21ba60 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.admin;
-// import java.io.*;
/**
* Type-safe definition for system members.
@@ -39,7 +38,7 @@ public class SystemMemberType implements java.io.Serializable {
/**
* GemFire Cache Server connected to the distributed system
- *
+ *
* @deprecated as of 5.7 use {@link #CACHE_VM} instead.
*/
@Deprecated
@@ -87,7 +86,7 @@ public class SystemMemberType implements java.io.Serializable {
/**
* Return whether this is <code>CACHE_SERVER</code>.
- *
+ *
* @deprecated as of 5.7 use {@link #isCacheVm} instead.
*/
@Deprecated
@@ -147,4 +146,3 @@ public class SystemMemberType implements java.io.Serializable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
index d7850b4..cf22850 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
@@ -34,7 +34,7 @@ public interface SystemMembershipEvent {
/**
* Returns the {@link DistributedMember} that this event originated in.
- *
+ *
* @return the member that performed the operation that originated this event.
* @since GemFire 5.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java b/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
index 758dbd7..d17bca2 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
@@ -78,4 +78,3 @@ public class UnmodifiableConfigurationException extends AdminException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index f166224..303fda8 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -14,6 +14,16 @@
*/
package org.apache.geode.admin.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.*;
+import java.util.concurrent.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.*;
@@ -40,16 +50,6 @@ import org.apache.geode.internal.logging.log4j.LogWriterAppender;
import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
import org.apache.geode.internal.util.concurrent.FutureResult;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Represents a GemFire distributed system for remote administration/management.
*
@@ -126,7 +126,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
* <p>
* This is volatile to allow SystemFailure to deliver fatal poison-pill to thisAdminDS without
* waiting on synchronization.
- *
+ *
* @guarded.By CONNECTION_SYNC
*/
private static volatile AdminDistributedSystemImpl thisAdminDS;
@@ -434,9 +434,9 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
return this.controller;
}
- static private final String TIMEOUT_MS_NAME = "AdminDistributedSystemImpl.TIMEOUT_MS";
- static private final int TIMEOUT_MS_DEFAULT = 60000; // 30000 -- see bug36470
- static private final int TIMEOUT_MS =
+ private static final String TIMEOUT_MS_NAME = "AdminDistributedSystemImpl.TIMEOUT_MS";
+ private static final int TIMEOUT_MS_DEFAULT = 60000; // 30000 -- see bug36470
+ private static final int TIMEOUT_MS =
Integer.getInteger(TIMEOUT_MS_NAME, TIMEOUT_MS_DEFAULT).intValue();
@@ -569,7 +569,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Sets the distribution-related portion of the given managed entity's configuration so that the
* entity is part of this distributed system.
- *
+ *
* @throws AdminException TODO-javadocs
*/
private void setDistributionParameters(SystemMember member) throws AdminException {
@@ -1223,7 +1223,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Override createSystemMember by instantiating SystemMemberImpl
- *
+ *
* @throws AdminException TODO-javadocs
*/
protected SystemMember createSystemMember(ApplicationVM app)
@@ -1234,7 +1234,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Constructs & returns a SystemMember instance using the corresponding InternalDistributedMember
* object.
- *
+ *
* @param member InternalDistributedMember instance for which a SystemMember instance is to be
* constructed.
* @return constructed SystemMember instance
@@ -1405,8 +1405,8 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
* <code>GemFireVM</code> or <code>null</code> if no Finds and returns the
* <code>SystemMember</code> that corresponds to the given <code>GemFireVM</code> or
* <code>null</code> if no <code>SystemMember</code> corresponds.
- *
- *
+ *
+ *
* @param vm GemFireVM instance
* @param compareConfig Should the members' configurations be compared? <code>true</code> when the
* member has joined, <code>false</code> when the member has left Should the members'
@@ -1752,7 +1752,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Returns the instance of system member that is running either as a CacheVm or only ApplicationVm
* for the given string representation of the id.
- *
+ *
* @param memberId string representation of the member identifier
* @return instance of system member which could be either as a CacheVm or Application VM
*/
@@ -1900,11 +1900,11 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Returns all the cache server members of the distributed system which are hosting a client queue
* for the particular durable-client having the given durableClientId
- *
+ *
* @param durableClientId - durable-id of the client
* @return array of CacheServer(s) having the queue for the durable client
* @throws AdminException
- *
+ *
* @since GemFire 5.6
*/
public CacheServer[] getCacheServers(String durableClientId) throws AdminException {
@@ -1946,7 +1946,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override // GemStoneAddition
@@ -1960,7 +1960,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
* <p>
* TODO: remove this static method during reimplementation of
* {@link SystemMemberCacheEventProcessor}
- *
+ *
* @return AdminDistributedSystem
*/
public static AdminDistributedSystemImpl getConnectedInstance() {
@@ -2243,7 +2243,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
}
/**
- *
+ *
* @deprecated use {@link #revokePersistentMember(UUID)} instead
*/
public static void revokePersistentMember(DM dm, InetAddress host, String directory) {
@@ -2284,7 +2284,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* Shutdown all members.
- *
+ *
* @param dm
* @param timeout the amount of time (in ms) to spending trying to shutdown the members
* gracefully. After this time period, the members will be forceable shut down. If the
@@ -2334,10 +2334,10 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
/**
* This method can be used to process ClientMembership events sent for BridgeMembership by bridge
* servers to all admin members.
- *
+ *
* NOTE: Not implemented currently. JMX implementation which is a subclass of this class i.e.
* AdminDistributedSystemJmxImpl implements it.
- *
+ *
* @param senderId id of the member that sent the ClientMembership changes for processing (could
* be null)
* @param clientId id of a client for which the notification was sent
@@ -2366,4 +2366,3 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
return getAlertLevel().getName();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
index dbf860f..2b1ccd9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.admin.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
import org.apache.geode.admin.CacheServerConfig;
import org.apache.geode.admin.CacheVmConfig;
import org.apache.geode.internal.admin.GemFireVM;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* An implementation of <code>CacheVmConfig</code>
*
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
index c10c6f8..4bfa80b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.admin.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
import org.apache.geode.admin.*;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.admin.GemFireVM;
import org.apache.geode.internal.admin.remote.RemoteApplicationVM;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Implements the administrative interface to a cache server.
*
@@ -172,10 +172,10 @@ public class CacheServerImpl extends ManagedSystemMemberImpl implements CacheVm,
/**
* Find whether this server is primary for given client (durableClientId)
- *
+ *
* @param durableClientId - durable-id of the client
* @return true if the server is primary for given client
- *
+ *
* @since GemFire 5.6
*/
public boolean isPrimaryForDurableClient(String durableClientId) {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
index 8e5707d..07341b9 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
@@ -15,16 +15,15 @@
package org.apache.geode.admin.internal;
-import org.apache.geode.admin.ConfigurationParameter;
-import org.apache.geode.admin.UnmodifiableConfigurationException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.File;
-// import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.geode.admin.ConfigurationParameter;
+import org.apache.geode.admin.UnmodifiableConfigurationException;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* A single configuration parameter of a system member.
*
@@ -279,4 +278,3 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
index 8865429..1d2d4ee 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
@@ -27,4 +27,3 @@ import org.apache.geode.admin.ConfigurationParameter;
public interface ConfigurationParameterListener {
public void configurationParameterValueChanged(ConfigurationParameter parm);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index ae9f3c8..ae76b55 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -26,6 +26,20 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_ADDRESS
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.TCP_PORT;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.admin.AdminXmlException;
import org.apache.geode.admin.CacheServerConfig;
import org.apache.geode.admin.CacheVmConfig;
@@ -40,19 +54,6 @@ import org.apache.geode.internal.logging.LogConfig;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.internal.logging.log4j.LogLevel;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
/**
* An implementation of the configuration object for an <code>AdminDistributedSystem</code>. After a
@@ -211,11 +212,11 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
/**
* Creates a new <code>DistributedSystemConifgImpl</code> whose configuration is specified by the
* given <code>Properties</code> object.
- *
+ *
* @param props The configuration properties specified by the caller
* @param ignoreGemFirePropsFile whether to skip loading distributed system properties from
* gemfire.properties file
- *
+ *
* @since GemFire 6.5
*/
protected DistributedSystemConfigImpl(Properties props, boolean ignoreGemFirePropsFile) {
@@ -1128,4 +1129,3 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
return buf.toString();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
index a352616..596805c 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.admin.internal;
+import java.util.List;
+import java.util.Set;
+
import org.apache.geode.admin.DistributedSystemHealthConfig;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -22,9 +25,6 @@ import org.apache.geode.distributed.internal.MembershipListener;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.List;
-import java.util.Set;
-
/**
* Contains the logic for evaluating the health of an entire GemFire distributed system according to
* the thresholds provided in a {@link DistributedSystemHealthConfig}.
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
index bf4d4a4..3dc118d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.Config;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.admin.AdminBridgeServer;
import org.apache.geode.internal.admin.CacheInfo;
import org.apache.geode.internal.admin.DLockInfo;
@@ -47,6 +46,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.net.SocketCreator;
/**
* A thread that monitors the health of the distributed system. It is kind of like a
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index 65a29a8..1db01a7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -14,17 +14,17 @@
*/
package org.apache.geode.admin.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.net.InetAddress;
+import java.util.Properties;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.admin.DistributionLocator;
import org.apache.geode.admin.DistributionLocatorConfig;
import org.apache.geode.distributed.internal.tcpserver.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.net.InetAddress;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-
/**
* Provides an implementation of <code>DistributionLocatorConfig</code>.
*
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
index 97c5c7d..722bf9f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
@@ -15,6 +15,12 @@
package org.apache.geode.admin.internal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.DistributionLocator;
import org.apache.geode.admin.DistributionLocatorConfig;
@@ -26,11 +32,6 @@ import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
/**
* Default administrative implementation of a DistributionLocator.
@@ -326,4 +327,3 @@ public class DistributionLocatorImpl implements DistributionLocator, InternalMan
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
index 59e8386..3835cb1 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.admin.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.DistributedSystemConfig;
import org.apache.geode.admin.ManagedEntity;
@@ -24,13 +32,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
* Implements the actual administration (starting, stopping, etc.) of GemFire
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
index f39fdc3..12f5bb9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
@@ -48,7 +48,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* A request send from an admin VM to all of the peers to indicate that that should complete the
* backup operation.
- *
+ *
*
*/
public class FinishBackupRequest extends CliLegacyMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
index ab032b7..97fdb30 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.admin.remote.AdminResponse;
/**
* The reply for a {@link FinishBackupRequest}. The reply contains the persistent ids of the disk
* stores that were backed up on this member.
- *
+ *
*
*/
public class FinishBackupResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
index 5461ebb..a85a6aa 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
@@ -19,7 +19,7 @@ import org.apache.geode.internal.admin.remote.AdminResponse;
/**
* The response to the {@link FlushToDiskRequest}
- *
+ *
*
*/
public class FlushToDiskResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
index efeee66..6be2208 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.admin.internal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
import org.apache.geode.CancelException;
import org.apache.geode.admin.*;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-
/**
* Provides the implementation of the <code>GemFireHealth</code> administration API. This class is
* responsible for {@linkplain GemFireVM#addHealthListener sending} the {@link GemFireHealthConfig}s
@@ -294,9 +294,9 @@ public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, Heal
/**
* Returns the GemFireHealthConfig object for the given host name.
- *
+ *
* @param hostName host name for which the GemFire Health Config is needed
- *
+ *
* @throws IllegalArgumentException if host with given name could not be found
*/
public synchronized GemFireHealthConfig getGemFireHealthConfig(String hostName) {
@@ -324,10 +324,10 @@ public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, Heal
/**
* Sets the GemFireHealthConfig object for the given host name.
- *
+ *
* @param hostName host name for which the GemFire Health Config is needed
* @param config GemFireHealthConfig object to set
- *
+ *
* @throws IllegalArgumentException if (1) given host name & the host name in the given config do
* not match OR (2) host with given name could not be found OR (3) there are no GemFire
* components running on the given host
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java b/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
index 17d1535..bd1c42e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireIOException;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SocketCreator;
/**
@@ -188,7 +188,7 @@ public class InetAddressUtil {
/**
* Logs the stack trace for the given Throwable if logger is initialized else prints the stack
* trace using System.out. If logged the logs are logged at WARNING level.
- *
+ *
* @param throwable Throwable to log stack trace for
*/
private static void logStackTrace(Throwable throwable) {
@@ -198,4 +198,3 @@ public class InetAddressUtil {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
index 83aa440..4fbf629 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
@@ -15,11 +15,6 @@
package org.apache.geode.admin.internal;
-import org.apache.geode.internal.admin.GfManagerAgent;
-import org.apache.geode.internal.admin.GemFireVM;
-import org.apache.geode.internal.admin.ApplicationVM;
-import org.apache.geode.internal.logging.MergeLogFiles;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -27,6 +22,11 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
+import org.apache.geode.internal.admin.ApplicationVM;
+import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.admin.GfManagerAgent;
+import org.apache.geode.internal.logging.MergeLogFiles;
+
public class LogCollator {
private GfManagerAgent system;
@@ -118,4 +118,3 @@ public class LogCollator {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
index c7a8505..d33c99d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
@@ -14,17 +14,15 @@
*/
package org.apache.geode.admin.internal;
-// import org.apache.geode.admin.DistributedSystemConfig;
-// import org.apache.geode.admin.ManagedEntity;
+import java.io.File;
+import java.net.*;
+
import org.apache.geode.admin.ManagedEntityConfig;
+import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.admin.GemFireVM;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.net.SocketCreator;
-import java.io.File;
-import java.net.*;
-
/**
* The abstract superclass of objects that configure a managed entity such as a GemFire cache server
* or a distribution locator. It contains configuration state and behavior common to all managed
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
index 4e5198e..432c507 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.admin.internal;
+import java.io.InputStream;
+
+import org.xml.sax.*;
+
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.xml.sax.*;
-
-import java.io.InputStream;
/**
* The abstract superclass of classes that convert XML into a
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
index 80732cc..e210057 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
@@ -14,19 +14,19 @@
*/
package org.apache.geode.admin.internal;
-import org.apache.geode.admin.*;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import java.io.*;
+import java.util.*;
import javax.xml.transform.*;
-// import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
+
import org.xml.sax.*;
-// import org.xml.sax.ext.*;
import org.xml.sax.helpers.AttributesImpl;
-import java.io.*;
-import java.util.*;
+
+import org.apache.geode.admin.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Generates XML data that represents the managed entities in an
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
index 29b81f4..4c0482f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
@@ -14,16 +14,18 @@
*/
package org.apache.geode.admin.internal;
-import org.apache.geode.admin.*;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import java.io.*;
+import java.util.*;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+
import org.xml.sax.*;
import org.xml.sax.helpers.DefaultHandler;
-import java.io.*;
-import java.util.*;
+
+import org.apache.geode.admin.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Parses an XML file and configures a {@link DistributedSystemConfig} from it.
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
index 77a3998..e6132e4 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
@@ -20,7 +20,7 @@ import org.apache.geode.admin.ManagedEntityConfig;
/**
* Defines the actual administration (starting, stopping, etc.) of GemFire {@link ManagedEntity}s.
- *
+ *
*/
interface ManagedEntityController {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
index faa67c5..005a300 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* Creates ManagedEntityController for administration (starting, stopping, etc.) of GemFire
* {@link ManagedEntity}s.
- *
+ *
*/
public class ManagedEntityControllerFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
index 02e7ae4..ee88d64 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.admin.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.ConfigurationParameter;
import org.apache.geode.admin.ManagedEntityConfig;
import org.apache.geode.internal.admin.GemFireVM;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-
/**
* A <code>SystemMember</code> that is also managed (or manageable) by the admin API.
*
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
index febd52d..869f774 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
@@ -35,9 +35,9 @@ import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.admin.remote.AdminMultipleReplyProcessor;
import org.apache.geode.internal.admin.remote.AdminResponse;
import org.apache.geode.internal.admin.remote.CliLegacyMessage;
+import org.apache.geode.internal.cache.BackupManager;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.BackupManager;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* A request to from an admin VM to all non admin members to start a backup. In the prepare phase of
* the backup, the members will suspend bucket destroys to make sure buckets aren't missed during
* the backup.
- *
+ *
*
*/
public class PrepareBackupRequest extends CliLegacyMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
index 2ba6817..745e3ed 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.admin.remote.AdminResponse;
/**
* The response to the {@link PrepareBackupRequest}
- *
+ *
*
*/
public class PrepareBackupResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
index 517f0a0..6fd71c1 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
@@ -80,7 +80,7 @@ public class StatisticImpl implements org.apache.geode.admin.Statistic {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -89,4 +89,3 @@ public class StatisticImpl implements org.apache.geode.admin.Statistic {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
index c6f60cb..5b3fbe1 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
@@ -14,18 +14,16 @@
*/
package org.apache.geode.admin.internal;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.geode.admin.AdminException;
-import org.apache.geode.admin.SystemMember;
import org.apache.geode.admin.Statistic;
+import org.apache.geode.admin.SystemMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.admin.Stat;
import org.apache.geode.internal.admin.StatResource;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.admin.SystemMember;
-
-import java.util.ArrayList;
-// import java.util.Date;
-import java.util.List;
/**
* Provides monitoring of a statistic resource.
@@ -165,7 +163,7 @@ public class StatisticResourceImpl implements org.apache.geode.admin.StatisticRe
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -174,4 +172,3 @@ public class StatisticResourceImpl implements org.apache.geode.admin.StatisticRe
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
index b6b386e..2735578 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
@@ -15,8 +15,8 @@
package org.apache.geode.admin.internal;
import org.apache.geode.admin.*;
-import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.DistributedMember;
/**
* An event that describes an operation on a cache. Instances of this are delivered to a
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
index 012388b..f17ef14 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
@@ -38,7 +38,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* This class processes the message to be delivered to admin node. [This needs to be redesigned and
* reimplemented... see 32887]
- *
+ *
* @since GemFire 5.0
*/
public class SystemMemberCacheEventProcessor {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
index 62076f0..4da9d2a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.admin.internal;
+import java.util.*;
+
import org.apache.geode.admin.*;
import org.apache.geode.cache.*;
import org.apache.geode.internal.Assert;
@@ -21,8 +23,6 @@ import org.apache.geode.internal.ObjIdMap;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.*;
-
/**
* View of a GemFire system member's cache.
*
@@ -292,7 +292,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -300,4 +300,3 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
return getName();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
index da09903..c064954 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.admin.internal;
+import java.net.InetAddress;
+import java.util.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.*;
@@ -28,10 +33,6 @@ import org.apache.geode.internal.admin.GemFireVM;
import org.apache.geode.internal.admin.StatResource;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
-import java.net.InetAddress;
-import java.util.*;
/**
* Member of a GemFire system.
@@ -105,12 +106,12 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
/**
* Constructs the instance of SystemMember using the corresponding InternalDistributedMember
* instance of a DS member for the given AdminDistributedSystem.
- *
+ *
* @param system Current AdminDistributedSystem instance
* @param member InternalDistributedMember instance for which a SystemMember instance is to be
* constructed.
* @throws AdminException if construction of SystemMember fails
- *
+ *
* @since GemFire 6.5
*/
protected SystemMemberImpl(AdminDistributedSystem system, InternalDistributedMember member)
@@ -402,9 +403,9 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
/**
* Updates this SystemMember instance using the corresponding InternalDistributedMember
- *
+ *
* @param member InternalDistributedMember instance to update this SystemMember
- *
+ *
* @since GemFire 6.5
*/
private void updateByInternalDistributedMember(InternalDistributedMember member) {
@@ -484,4 +485,3 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
return this.internalId;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
index 74115bb..e714745 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
@@ -15,8 +15,8 @@
package org.apache.geode.admin.internal;
import org.apache.geode.admin.*;
-import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.DistributedMember;
/**
* An event that describes an operation on a region. Instances of this are delivered to a
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
index fbf0839..3aeb8ea 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
@@ -14,15 +14,13 @@
*/
package org.apache.geode.admin.internal;
+import java.io.File;
+import java.util.*;
+
import org.apache.geode.admin.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.Assert;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.admin.remote.*;
-import java.io.File;
-import java.util.*;
-
/**
* View of a region in a GemFire system member's cache.
*
@@ -210,7 +208,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
* If there are more than 1 CacheListeners defined, this method will return the description of the
* 1st CacheListener in the list returned by the getCacheListeners method. If there is only one
* CacheListener defined this method will return it's description
- *
+ *
* @return String the region's <code>CacheListener</code> description
* @deprecated as of 6.0, use {@link #getCacheListeners} instead
*/
@@ -228,7 +226,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
* This method will return an empty array if there are no CacheListeners defined on the region. If
* there are one or more than 1 CacheListeners defined, this method will return an array which has
* the description of all the CacheListeners
- *
+ *
* @return String[] the region's <code>CacheListeners</code> descriptions as a String array
* @since GemFire 6.0
*/
@@ -333,7 +331,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -368,4 +366,3 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
index 8e16dca..b7b8a7d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
@@ -14,15 +14,14 @@
*/
package org.apache.geode.admin.jmx;
-import org.apache.geode.LogWriter;
-import org.apache.geode.admin.AdminException;
-import org.apache.geode.admin.AdminDistributedSystem;
-
-// import javax.management.MBeanException;
-import javax.management.MalformedObjectNameException;
import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.apache.geode.LogWriter;
+import org.apache.geode.admin.AdminDistributedSystem;
+import org.apache.geode.admin.AdminException;
+
/**
* A server component that provides administration-related information about a GemFire distributed
* system via the Java Management Extension JMX API. When a JMX <code>Agent</code> is created, it
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
index 29f0751..0224995 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
@@ -16,7 +16,6 @@ package org.apache.geode.admin.jmx;
import org.apache.geode.admin.DistributedSystemConfig;
import org.apache.geode.distributed.internal.DistributionConfig;
-// import org.apache.geode.admin.internal.InetAddressUtil;
/**
* A configuration object for a JMX administration {@linkplain Agent agent} that is hosted by a
@@ -66,7 +65,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* <dd><U>Description</U>: whether or not connections to the JMX agent require SSL</dd>
* <dd><U>{@linkplain #DEFAULT_AGENT_SSL_ENABLED Default}</U>: false</dd>
* </dl>
- *
+ *
* <dl>
* <a name="agent-ssl-protocols">
* <dt>{@linkplain #AGENT_SSL_PROTOCOLS_NAME agent-ssl-protocols}</dt></a>
@@ -105,7 +104,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* <dd><U>Description</U>: whether or not the HTTP adapter is enabled in the JMX agent.</dd>
* <dd><U>{@linkplain #DEFAULT_HTTP_ENABLED Default}</U>: true</dd>
* </dl>
- *
+ *
* <dl>
* <a name="http-port">
* <dt>{@linkplain #HTTP_PORT_NAME http-port}</dt></a>
@@ -170,7 +169,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* objects.</dd>
* <dd><U>{@linkplain #DEFAULT_RMI_PORT Default}</U>: 1099</dd>
* </dl>
- *
+ *
* <dl>
* <a name="rmi-server-port">
* <dt>{@linkplain #RMI_PORT_NAME rmi-server-port}</dt></a>
@@ -193,7 +192,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* <dd><U>Description</U>: whether or not the SNMP JMX adapter is enabled</dd>
* <dd><U>{@linkplain #DEFAULT_SNMP_ENABLED Default}</U>: false</dd>
* </dl>
- *
+ *
* <dl>
* <a name="snmp-bind-address">
* <dt>{@linkplain #SNMP_BIND_ADDRESS_NAME snmp-bind-address}</dt></a>
@@ -209,9 +208,9 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* <dd><U>Description</U>: the deployment directory for AdventNet SNMP Adaptor</dd>
* <dd><U>{@linkplain #DEFAULT_SNMP_DIRECTORY Default}</U>: ""</dd>
* </dl>
- *
+ *
* <B>JMX Agent Email Notification Properties (for statistics alerts)</B>
- *
+ *
* <dl>
* <a name="email-notification-enabled">
* <dt>{@linkplain #EMAIL_NOTIFICATIONS_ENABLED_NAME email-notification-enabled}</dt></a>
@@ -219,28 +218,28 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* </dd>
* <dd><U>{@linkplain #DEFAULT_EMAIL_NOTIFICATIONS_ENABLED Default}</U>: false</dd>
* </dl>
- *
+ *
* <dl>
* <a name="email-notification-from">
* <dt>{@linkplain #EMAIL_NOTIFICATIONS_FROM_NAME email-notification-from}</dt></a>
* <dd><U>Description</U>: Email address to be used to send email notifications.</dd>
* <dd><U>{@linkplain #DEFAULT_EMAIL_FROM Default}</U>: ""</dd>
* </dl>
- *
+ *
* <dl>
* <a name="email-notification-host">
* <dt>{@linkplain #EMAIL_NOTIFICATIONS_HOST_NAME email-notification-host}</dt></a>
* <dd><U>Description</U>: The host name of the mail server to be used for email communication.</dd>
* <dd><U>{@linkplain #DEFAULT_EMAIL_HOST Default}</U>: ""</dd>
* </dl>
- *
+ *
* <dl>
* <a name="email-notification-to">
* <dt>{@linkplain #EMAIL_NOTIFICATIONS_TO_LIST_NAME email-notification-to}</dt></a>
* <dd><U>Description</U>: Email address where the email notifications should be sent.</dd>
* <dd><U>{@linkplain #DEFAULT_EMAIL_TO_LIST Default}</U>: ""</dd>
* </dl>
- *
+ *
* <dl>
* <a name="state-save-file">
* <dt>{@linkplain #STATE_SAVE_FILE_NAME state-save-file}</dt></a>
@@ -248,7 +247,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* stored in the same directory in which the agent.properties file is located</dd>
* <dd><U>{@linkplain #DEFAULT_STATE_SAVE_FILE Default}</U>: ""</dd>
* </dl>
- *
+ *
*
* @since GemFire 4.0
* @deprecated as of 7.0 use the <code><a href=
@@ -389,14 +388,14 @@ public interface AgentConfig extends DistributedSystemConfig {
/**
* The name of the "rmi-server-port" property
- *
+ *
* @since GemFire 6.5
*/
public static final String RMI_SERVER_PORT_NAME = "rmi-server-port";
/**
* The default value of the {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port} property (0)
- *
+ *
* @since GemFire 6.5
*/
public static final int DEFAULT_RMI_SERVER_PORT = 0;
@@ -623,7 +622,7 @@ public interface AgentConfig extends DistributedSystemConfig {
* Returns the port of the RMI Connector Server.
*
* See <a href="#rmi-server-port">description</a> above.
- *
+ *
* @return the value set for rmi-server-port
* @since GemFire 6.5
*/
@@ -633,7 +632,7 @@ public interface AgentConfig extends DistributedSystemConfig {
* Sets the port of the RMI Connector Server.
*
* See <a href="#rmi-server-port">description</a> above.
- *
+ *
* @param port rmi-server-port to set.
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
index 5228c6b..b4c8fc7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.admin.jmx;
-// import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.jmx.internal.AgentConfigImpl;
import org.apache.geode.admin.jmx.internal.AgentImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
index 1bfddf2..b829502 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
@@ -14,6 +14,18 @@
*/
package org.apache.geode.admin.jmx.internal;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.management.*;
+import javax.management.modelmbean.ModelMBean;
+import javax.management.openmbean.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.*;
@@ -26,23 +38,13 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.admin.Alert;
import org.apache.geode.internal.admin.*;
+import org.apache.geode.internal.admin.Alert;
import org.apache.geode.internal.admin.remote.UpdateAlertDefinitionMessage;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import javax.management.*;
-import javax.management.modelmbean.ModelMBean;
-import javax.management.openmbean.*;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Provides MBean support for managing a GemFire distributed system.
@@ -88,7 +90,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Constructs new DistributedSystemJmxImpl and registers an MBean to represent it.
- *
+ *
* @param config configuration defining the JMX agent.
*/
public AdminDistributedSystemJmxImpl(AgentConfigImpl config)
@@ -220,7 +222,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Constructs & returns a SystemMember instance using the corresponding InternalDistributedMember
* object.
- *
+ *
* @param member InternalDistributedMember instance for which a SystemMember instance is to be
* constructed.
* @return constructed SystemMember instance
@@ -612,7 +614,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
private String mbeanName;
/** The remotable ObjectName that the MBean is registered under */
- final private ObjectName objectName;
+ private final ObjectName objectName;
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
@@ -1406,7 +1408,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Convenience method to retrieve admin stat alert definition.
- *
+ *
* @param alertDefinitionId id of a stat alert definition
* @return StatAlertDefinition reference to an instance of StatAlertDefinition
* @since GemFire 5.7
@@ -1424,7 +1426,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* This method can be used to get an alert definition.
- *
+ *
* @param alertDefinition StatAlertDefinition to retrieve
* @return StatAlertDefinition
* @since GemFire 5.7
@@ -1557,7 +1559,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Checks if the given file is writable.
- *
+ *
* @param file file to check write permissions for
* @return true if file is writable, false otherwise
*/
@@ -1601,7 +1603,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
* This method can be used to update alert definition for the Stat mentioned. This method should
* update the collection maintained at the aggregator and should notify members for the newly
* added alert definitions. A new alert definition will be created if matching one not found.
- *
+ *
* @param alertDefinition alertDefinition to be updated
* @since GemFire 5.7
*/
@@ -1636,7 +1638,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
* This method can be used to remove alert definition for the Stat mentioned. This method should
* update the collection maintained at the aggregator and should notify members for the newly
* added alert definitions.
- *
+ *
* @param defId id of the alert definition to be removed
* @since GemFire 5.7
*/
@@ -1665,7 +1667,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Convenience method to check whether an alert definition is created.
- *
+ *
* @param alertDefinition alert definition to check whether already created
* @return true if the alert definition is already created, false otherwise
* @since GemFire 5.7
@@ -1674,7 +1676,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/*
* Need to maintain a map of stat against the StatAlertDefinitions. check in that map whether
* the alert definition is there for the given alert
- *
+ *
* TODO: optimize to use Map.containsKey - DONE
*/
synchronized (ALERT_DEFINITIONS) {
@@ -1684,7 +1686,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Returns the refresh interval for the Stats in seconds.
- *
+ *
* @return refresh interval for the Stats(in seconds)
* @since GemFire 5.7
*/
@@ -1697,7 +1699,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* This method is used to set the refresh interval for the Stats in seconds
- *
+ *
* @param refreshIntervalForStatAlerts refresh interval for the Stats(in seconds)
* @since GemFire 5.7
*/
@@ -1711,7 +1713,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Returns whether Statistics Alert definitions could be persisted across runs/sessions
- *
+ *
* @return value of canPersistStatAlertDefs.
* @since GemFire 6.5
*/
@@ -1721,7 +1723,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* An intermediate method to notify all members for change in refresh interval.
- *
+ *
* @param newInterval refresh interval to be set for members(in milliseconds)
*/
private void notifyMembersForRefreshIntervalChange(long newInterval) {
@@ -1736,7 +1738,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* An intermediate method to notify all members for change in stat alert definition.
- *
+ *
* @param alertDef stat alert definition that got changed
*/
private void notifyMembersForAlertDefinitionChange(StatAlertDefinition alertDef) {
@@ -1762,7 +1764,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* An intermediate method to notify all members for removal of stat alert definition.
- *
+ *
* @param alertDef stat alert definition to be removed
*/
private void notifyMembersForAlertDefinitionRemoval(StatAlertDefinition alertDef) {
@@ -1778,7 +1780,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* This method can be used to set the AlertsManager for the newly joined member VM.
- *
+ *
* @param memberVM Member VM to set AlertsManager for
* @since GemFire 5.7
*/
@@ -1818,7 +1820,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* This method can be used to retrieve all available stat alert definitions. Returns empty array
* if there are no stat alert definitions defined.
- *
+ *
* @return An array of all available StatAlertDefinition objects
* @since GemFire 5.7
*/
@@ -1853,7 +1855,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
* This method can be used to process the notifications sent by the member(s). Actual aggregation
* of stats can occur here. The array contains alert objects with alert def. ID & value.
* AlertHelper class can be used to retrieve the corresponding alert definition.
- *
+ *
* @param alerts array of Alert class(contains alert def. ID & value)
* @param remoteVM Remote Member VM that sent Stat Alerts for processing the notifications to the
* clients
@@ -1904,7 +1906,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
* 1. check if it's system-wide. 2. if system-wide keep, it in a collection (that should get
* cleared on timeout). Process all alerts when notifications from all members are received.
* Need to check if the member leaves meanwhile.
- *
+ *
* 1. Check if function evaluation is required? 2. If it's not required, the notification
* should directly be sent to clients.
*/
@@ -1913,7 +1915,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/*
* StatAlert with alert definitions having functions assigned will get evaluated at manager
* side only.
- *
+ *
* Is combination of systemwide alerts with function valid? It should be & hence such
* evaluation should be skipped on manager side. Or is it to be evaluated at manager as well
* as aggragator?
@@ -1926,14 +1928,14 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/*
* variable isSystemWide is created only for convienience, there should be an indication for
* the same in the alert definition. Currently there is no systemWide definition
- *
+ *
* Evaluating system wide alerts: 1. It'll take time for aggregator to gather alerts from all
* members. Member might keep joining & leaving in between. The member for whom the stat-alert
* value was taken might have left & new ones might have joined leave until all the
* calculations are complete. A disclaimer to be put that these are not exact values. 2. How
* would the aggregator know that it has received alerts from all the managers? Is the concept
* of system-wide alerts valid? System-wide stats might be!
- *
+ *
*/
if (!isSystemWide) {
notificationObjects.add(alertNotification);
@@ -1990,7 +1992,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* An intermediate method to send notifications to the clients.
- *
+ *
* @param notificationObjects list of StatAlertNotification objects
*/
private void sendNotifications(ArrayList notificationObjects, ObjectName objName) {
@@ -2050,7 +2052,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
* Sends an email to the configured recipients using configured email server. The given message
* will be the email body. NOTE: the check whether email notfication is enabled or not should done
* using {@link #isEmailNotificationEnabled} before calling this method.
- *
+ *
* @param subject subject of the email
* @param message message body of the email
*/
@@ -2071,7 +2073,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* This method is used to process ClientMembership events sent for BridgeMembership by bridge
* servers to all admin members.
- *
+ *
* @param senderId id of the member that sent the ClientMembership changes for processing (could
* be null)
* @param clientId id of a client for which the notification was sent
@@ -2139,7 +2141,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Finds the member as per details in the given event object and passes on this event for handling
* the cache creation.
- *
+ *
* @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreateEvent(SystemMemberCacheEvent event) {
@@ -2155,7 +2157,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Finds the member as per details in the given event object and passes on this event for handling
* the cache closure.
- *
+ *
* @param event event object corresponding to the closure of the cache
*/
public void handleCacheCloseEvent(SystemMemberCacheEvent event) {
@@ -2171,7 +2173,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Finds the member as per details in the given event object and passes on this event for handling
* the region creation.
- *
+ *
* @param event event object corresponding to the creation of a region
*/
public void handleRegionCreateEvent(SystemMemberRegionEvent event) {
@@ -2186,7 +2188,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
/**
* Finds the member as per details in the given event object and passes on this event for handling
* the region loss.
- *
+ *
* @param event event object corresponding to the loss of a region
*/
public void handleRegionLossEvent(SystemMemberRegionEvent event) {
@@ -2234,14 +2236,14 @@ class ProcessSystemwideStatAlertsNotification extends TimerTask {
* <li>Region Created</li>
* <li>Region Loss</li>
* </ol>
- *
+ *
*/
class CacheAndRegionListenerImpl implements SystemMemberCacheListener {
private AdminDistributedSystemJmxImpl adminDS;
/**
* Csontructor to create CacheAndRegionListenerImpl
- *
+ *
* @param adminDSResource instance of AdminDistributedSystemJmxImpl
*/
CacheAndRegionListenerImpl(AdminDistributedSystemJmxImpl adminDSResource) {
@@ -2276,4 +2278,3 @@ class CacheAndRegionListenerImpl implements SystemMemberCacheListener {
adminDS.handleRegionLossEvent(event);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
index 4e53b07..dab7dd6 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.util.IOUtils;
* properties for further information.
* <p>
* Extends and implements DistributedSystemConfig.
- *
+ *
* @since GemFire 3.5 (in which it was named AgentConfig)
*/
public class AgentConfigImpl extends DistributedSystemConfigImpl implements AgentConfig {
@@ -184,7 +184,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Returns default values for all valid agent properties as a Properties object.
- *
+ *
* @return default values for all valid agent properties
*/
static Properties getDefaultValuesForAllProperties() {
@@ -441,7 +441,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Constructs new instance of AgentConfig. Supplied command-line arguments are used to create a
* set of non-default properties for initializing this AgentConfig.
- *
+ *
* @param args array of non-default configuration arguments
*/
public AgentConfigImpl(String[] args) {
@@ -451,7 +451,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Creates a new <code>AgentConfig</code> with the given non-default configuration properties.
- *
+ *
* @param props overriding non-default configuration properties
*/
public AgentConfigImpl(Properties props) {
@@ -467,7 +467,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Constructs new instance of AgentConfig using the specified property file.
- *
+ *
* @param propFile the file to load configuration properties from
*/
public AgentConfigImpl(File propFile) {
@@ -505,7 +505,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Checks to see if this config object is "read only". If it is, then an
* {@link IllegalStateException} is thrown.
- *
+ *
* @since GemFire 4.0
*/
@Override
@@ -560,7 +560,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Converts the contents of this config to a property instance and Stringifies it
- *
+ *
* @return contents of this config as String
*/
public String toPropertiesAsString() {
@@ -582,7 +582,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Converts the contents of this config to a property instance.
- *
+ *
* @return contents of this config as java.util.Properties
*/
public Properties toProperties() {
@@ -591,7 +591,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Converts the contents of this config to a property instance.
- *
+ *
* @param includeDSProperties Should distributed system properties be included in the
* <code>Properties</code> object? See bug 32682.
*
@@ -877,7 +877,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
* Returns the port of the RMI Connector Server.
* <p>
* See <a href="#rmi-server-port">description</a> above.
- *
+ *
* @return the value set for rmi-server-port
*
* @since GemFire 6.5
@@ -888,7 +888,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Sets the port of the RMI Connector Server.
- *
+ *
* @param port rmi-server-port to set.
*
* @since GemFire 6.5
@@ -951,7 +951,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Initialize the values of this AgentConfig.
- *
+ *
* @param props the configuration values to use
*/
private void initialize(Properties props) {
@@ -1067,7 +1067,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Filter all agent configuration attributes out of the given <code>Properties</code> object.
* <p/>
- *
+ *
* @param props the <code>Properties</code> object of filter agent configuration attributes out
* of.
*
@@ -1094,7 +1094,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
* Appends the log-file property to the Properties object if set of properties does not already
* define the log-file property or the gemfire.agent.log-file property.
* <p/>
- *
+ *
* @param props the <code>Properties</code> to append the log-file property to if the property
* does not exist.
*/
@@ -1109,7 +1109,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
* Appends any additional property-file specified properties to the supplied Properties. If the
* supplied property overrides the property in the property-file, then property-file value is
* ignored. System Properties always override the supplied properties
- *
+ *
* @return appendedProps Properties appened to from the property-file if any
*/
private static Properties appendOptionalPropertyFileProperties(final Properties props) {
@@ -1160,7 +1160,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Returns a description of the given agent config property
- *
+ *
* @throws IllegalArgumentException If <code>prop</code> is not a recognized agent configuration
* property
*/
@@ -1377,7 +1377,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Parses the array of command-line arguments (format: key=value) into an instance of Properties.
- *
+ *
* @param args the command-line arguments to convert into a Properties
*/
private static Properties toProperties(String[] args) {
@@ -1422,7 +1422,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Makes sure that the mcast port and locators are correct and consistent.
- *
+ *
* @throws IllegalArgumentException If configuration is not valid
*/
@Override
@@ -1686,7 +1686,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
* <li>the class path
* </ol>
* Only the first file found will be used.
- *
+ *
* @return a <code>URL</code> that names the property file; otherwise Null if no property file was
* found.
*/
@@ -1745,7 +1745,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Returns string representation of the specified object with special handling for InetAddress.
- *
+ *
* @param obj the object to convert to string
*
* @return string representation of the specified object
@@ -1912,4 +1912,3 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
return super.clone();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
index 9eb741f..7d21ff7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
@@ -530,7 +530,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
/**
* Gets the agent's property file. This is the file it will use when saving its configuration. It
* was also used when the agent started to initialize its configuration.
- *
+ *
* @return the agent's property file
*/
public String getPropertyFile() {
@@ -1540,7 +1540,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
/**
* Process the String form of a hostname to make it comply with Jmx URL restrictions. Namely wrap
* IPv6 literal address with "[", "]"
- *
+ *
* @param hostname the name to safeguard.
* @return a string representation suitable for use in a Jmx connection URL
*/
@@ -1621,4 +1621,3 @@ class ConnectionNotificationFilterImpl implements NotificationFilter {
return isThisNotificationEnabled;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
index 80c3a17..e28c7a8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
@@ -57,7 +57,7 @@ import org.apache.geode.internal.util.JavaCommandBuilder;
* A command line utility inspired by the <code>CacheServerLauncher</code> that is responsible for
* administering a stand-along GemFire JMX {@link Agent}.
* <p/>
- *
+ *
* @since GemFire 3.5
*/
public class AgentLauncher {
@@ -114,7 +114,7 @@ public class AgentLauncher {
* constructor is package private to prevent direct instantiation or subclassing by classes
* outside this package, but does allow the class to be tested as needed.
* <p/>
- *
+ *
* @param basename base name for the application to be launched
*/
AgentLauncher(final String basename) {
@@ -573,7 +573,7 @@ public class AgentLauncher {
* Note, the status of the Agent, as indicated in the .agent.ser status file, should never have a
* written value of UNKNOWN.
* <p/>
- *
+ *
* @param states an array of possible acceptable states satisfying the condition of the Agent's
* status.
* @return a boolean value indicating whether the Agent's status satisfies one of the specified
@@ -603,7 +603,7 @@ public class AgentLauncher {
* Reads the GemFire JMX Agent's status from the status file (.agent.ser) in it's working
* directory.
* <p/>
- *
+ *
* @return a Status object containing the state persisted to the .agent.ser file in the working
* directory and representing the status of the Agent
* @throws IOException if the status file was unable to be read.
@@ -634,7 +634,7 @@ public class AgentLauncher {
/**
* A wrapper method for the readStatus method to make one last check for the GemFire JMX Agent
* process if running with the native libraries.
- *
+ *
* @return the Status object as returned from readStatus unless running in native mode and a
* determination is made such that the Agent process is not running.
* @throws IOException if the state of the Agent process could not be read from the .agent.ser
@@ -656,7 +656,7 @@ public class AgentLauncher {
* Reads the JMX Agent's status from the .agent.ser status file. If the status file cannot be read
* due to I/O problems, the method will keep attempting to read the file for up to 20 seconds.
* <p/>
- *
+ *
* @return the Status of the GemFire JMX Agent as determined by the .agent.ser status file, or
* natively based on the presence/absence of the Agent process.
*/
@@ -689,7 +689,7 @@ public class AgentLauncher {
* Sets the status of the GemFire JMX Agent by serializing a <code>Status</code> object to a
* status file in the Agent's working directory.
* <p/>
- *
+ *
* @param status the Status object representing the state of the Agent process to persist to disk.
* @return the written Status object.
* @throws IOException if the Status could not be successfully persisted to disk.
@@ -766,7 +766,7 @@ public class AgentLauncher {
/**
* Prints usage information for the AgentLauncher to the command line.
* <p/>
- *
+ *
* @param message a String to output to the command line indicating the user error.
*/
private static void usage(final String message) {
@@ -856,7 +856,7 @@ public class AgentLauncher {
* class are serialized to a {@linkplain #statusFileName file} on disk in the specified working
* directory {@linkplain #workingDirectory}.
* <p/>
- *
+ *
* @see #SHUTDOWN
* @see #STARTING
* @see #RUNNING
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
index 5e6202d..a67acc8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
@@ -146,7 +146,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* Un-registers all the statistics & cache managed resource created for this member. After
* un-registering the resource MBean instances, clears managedStatisticsResourcesMap collection &
* sets managedSystemMemberCache to null.
- *
+ *
* Creates ConfigurationParameterJmxImpl, StatisticResourceJmxImpl and SystemMemberCacheJmxImpl.
* But cleans up only StatisticResourceJmxImpl and SystemMemberCacheJmxImpl which are of type
* ManagedResource.
@@ -274,7 +274,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* Attempt to set refreshInterval on CacheServerJmx MBean would result in an
* OperationNotSupportedException Auto-refresh is enabled on demand when a call to refreshConfig
* is made
- *
+ *
* @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@@ -301,7 +301,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
/**
* Initializes Cache & Statistics managed resources.
- *
+ *
* @throws AdminException if initialization of managed resources fails
*/
// private void initializeManagedResources() throws AdminException {
@@ -368,7 +368,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* Handles notification to refresh. Reacts by refreshing the values of this GemFireManager's
* ConfigurationParamaters. Any other notification is ignored. Given notification is handled only
* if there is any JMX client connected to the system.
- *
+ *
* @param notification the JMX notification being received
* @param hb handback object is unused
*/
@@ -399,7 +399,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
/**
* Override createStatisticResource by instantiating StatisticResourceJmxImpl if it was not
* created earlier otherwise returns the same instance.
- *
+ *
* @param stat StatResource reference for which this JMX resource is to be created
* @return StatisticResourceJmxImpl - JMX Implementation of StatisticResource
* @throws AdminException if constructing StatisticResourceJmxImpl instance fails
@@ -428,7 +428,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
/**
* Override createSystemMemberCache by instantiating SystemMemberCacheJmxImpl if it was not
* created earlier.
- *
+ *
* @param vm GemFireVM reference for which this JMX resource is to be created
* @return SystemMemberCacheJmxImpl - JMX Implementation of SystemMemberCache
* @throws AdminException if constructing SystemMemberCacheJmxImpl instance fails
@@ -461,7 +461,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
/**
* Cleans up Managed Resources created for the client that was connected to the server represented
* by this class.
- *
+ *
* @param clientId id of the client to be removed
* @return List of ManagedResources associated with the client of given client id
*/
@@ -492,7 +492,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
/**
* Implementation handles client membership changes.
- *
+ *
* @param clientId id of the client for whom membership change happened
* @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
* {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
@@ -525,7 +525,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* Implementation handles creation of cache by extracting the details from the given event object
* and sending the {@link SystemMemberJmx#NOTIF_CACHE_CREATED} notification to the connected JMX
* Clients.
- *
+ *
* @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreate(SystemMemberCacheEvent event) {
@@ -537,7 +537,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* Implementation handles closure of cache by extracting the details from the given event object
* and sending the {@link SystemMemberJmx#NOTIF_CACHE_CLOSED} notification to the connected JMX
* Clients.
- *
+ *
* @param event event object corresponding to the closure of the cache
*/
public void handleCacheClose(SystemMemberCacheEvent event) {
@@ -549,7 +549,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* Implementation handles creation of region by extracting the details from the given event object
* and sending the {@link SystemMemberJmx#NOTIF_REGION_CREATED} notification to the connected JMX
* Clients. Region Path is set as User Data in Notification.
- *
+ *
* @param event event object corresponding to the creation of a region
*/
public void handleRegionCreate(SystemMemberRegionEvent event) {
@@ -566,7 +566,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
* object and sending the {@link SystemMemberJmx#NOTIF_REGION_LOST} notification to the connected
* JMX Clients. Region Path is set as User Data in Notification. Additionally, it also clears the
* ManagedResources created for the region that is lost.
- *
+ *
* @param event event object corresponding to the loss of a region
*/
public void handleRegionLoss(SystemMemberRegionEvent event) {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
index 3273ccc..ec8d314 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
@@ -14,13 +14,12 @@
*/
package org.apache.geode.admin.jmx.internal;
-// import org.apache.geode.admin.ConfigurationParameter;
-import org.apache.geode.internal.Assert;
-
import javax.management.Descriptor;
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
+import org.apache.geode.internal.Assert;
+
/**
* Subclass of AttributeInfo with {@link org.apache.geode.admin.ConfigurationParameter} added for
* use as the {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's
@@ -63,4 +62,3 @@ class ConfigAttributeInfo extends org.apache.commons.modeler.AttributeInfo {
return info;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index f9add13..0acd73e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -160,4 +160,3 @@ public class ConfigurationParameterJmxImpl
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
index 54d3072..828d731 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
@@ -14,12 +14,11 @@
*/
package org.apache.geode.admin.jmx.internal;
-import org.apache.geode.admin.*;
-import org.apache.geode.admin.internal.*;
-// import org.apache.geode.internal.admin.*;
import javax.management.*;
import javax.management.modelmbean.*;
-// import org.apache.commons.modeler.ManagedBean;
+
+import org.apache.geode.admin.*;
+import org.apache.geode.admin.internal.*;
/**
* The JMX "managed resource" that represents the configuration for the health of a distributed
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
index 65c2477..55852ca 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
@@ -14,31 +14,12 @@
*/
package org.apache.geode.admin.jmx.internal;
-// import org.apache.geode.admin.AdminException;
-// import org.apache.geode.admin.DistributionLocator;
+import javax.management.ObjectName;
+import javax.management.modelmbean.ModelMBean;
+
import org.apache.geode.admin.DistributionLocatorConfig;
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.Assert;
-
-// import org.apache.commons.modeler.ManagedBean;
-// import org.apache.commons.modeler.AttributeInfo;
-
-// import java.util.Date;
-// import java.util.Set;
-
-// import javax.management.Attribute;
-// import javax.management.AttributeList;
-// import javax.management.Descriptor;
-// import javax.management.JMException;
-// import javax.management.MBeanServer;
-// import javax.management.MalformedObjectNameException;
-// import javax.management.Notification;
-// import javax.management.NotificationListener;
-import javax.management.ObjectName;
-// import javax.management.modelmbean.DescriptorSupport;
-import javax.management.modelmbean.ModelMBean;
-// import javax.management.modelmbean.ModelMBeanAttributeInfo;
/**
* Provides MBean support for managing a distribution locator.
@@ -180,4 +161,3 @@ public class DistributionLocatorJmxImpl
public void cleanupResource() {}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
index 32ee5b4..85b2b38 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
@@ -15,18 +15,18 @@
package org.apache.geode.admin.jmx.internal;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.commons.modeler.AttributeInfo;
-import org.apache.commons.modeler.OperationInfo;
import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.OperationInfo;
/**
* Extends ManagedBean to allow for dynamically creating new instances of ManagedBean based on an
* existing instance of ManagedBean.
- *
+ *
* @since GemFire 5.0.1
*/
public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
@@ -140,4 +140,3 @@ public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
return (sb.toString());
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
index a47ff27..aa01ca7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
@@ -29,7 +29,6 @@ import org.apache.geode.admin.internal.GemFireHealthImpl;
import org.apache.geode.internal.admin.GfManagerAgent;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-// import org.apache.commons.modeler.ManagedBean;
/**
* The JMX "managed resource" that represents the health of GemFire. Basically, it provides the
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
index 2c33215..2d74623 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
@@ -35,7 +35,6 @@ import org.xml.sax.helpers.DefaultHandler;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.ExitCode;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import java.util.*;
/**
* A tool that reads the XML description of MBeans used with the Jakarta Commons Modeler and
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
index b2c5883..2b425cf 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
@@ -90,7 +90,7 @@ public class MBeanUtil {
new HashMap<NotificationListener, Map<RefreshNotificationType, Integer>>();
/** key=ObjectName, value=ManagedResource */
- private final static Map<ObjectName, ManagedResource> managedResources =
+ private static final Map<ObjectName, ManagedResource> managedResources =
new HashMap<ObjectName, ManagedResource>();
static {
@@ -103,7 +103,7 @@ public class MBeanUtil {
/**
* Initializes Mbean Server, Registry, Refresh Timer & registers Server Notification Listener.
- *
+ *
* @return reference to the mbeanServer
*/
static MBeanServer start() {
@@ -572,7 +572,7 @@ public class MBeanUtil {
/**
* Returns true if a MBean with given ObjectName is registered.
- *
+ *
* @param objectName ObjectName to use for checking if MBean is registered
* @return true if MBeanServer is not null & MBean with given ObjectName is registered with the
* MBeanServer
@@ -732,7 +732,7 @@ public class MBeanUtil {
/**
* Logs the stack trace for the given Throwable if logger is initialized else prints the stack
* trace using System.out.
- *
+ *
* @param level severity level to log at
* @param throwable Throwable to log stack trace for
*/
@@ -743,7 +743,7 @@ public class MBeanUtil {
/**
* Logs the stack trace for the given Throwable if logger is initialized else prints the stack
* trace using System.out.
- *
+ *
* @param level severity level to log at
* @param throwable Throwable to log stack trace for
* @param message user friendly error message to show
@@ -754,7 +754,7 @@ public class MBeanUtil {
/**
* Raises RuntimeAdminException with given 'message' if given 'condition' is false.
- *
+ *
* @param condition condition to evaluate
* @param message failure message
*/
@@ -764,4 +764,3 @@ public class MBeanUtil {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
index e799279..50444f6 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -14,19 +14,19 @@
*/
package org.apache.geode.admin.jmx.internal;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.Properties;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.admin.DistributedSystemConfig;
import org.apache.geode.admin.internal.InetAddressUtil;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.Properties;
-
/**
* Creates <code>ServerSockets</code> for JMX adaptors.
* <p>
@@ -57,7 +57,7 @@ public class MX4JServerSocketFactory implements mx4j.tools.adaptor.AdaptorServer
/**
* Constructs new instance of MX4JServerSocketFactory.
- *
+ *
* @param useSSL true if ssl is to be enabled
* @param needClientAuth true if client authentication is required
* @param protocols space-delimited list of ssl protocols to use
@@ -78,7 +78,7 @@ public class MX4JServerSocketFactory implements mx4j.tools.adaptor.AdaptorServer
/**
* Constructs new instance of MX4JServerSocketFactory.
- *
+ *
* @param useSSL true if ssl is to be enabled
* @param needClientAuth true if client authentication is required
* @param protocols space-delimited list of ssl protocols to use
@@ -133,4 +133,3 @@ public class MX4JServerSocketFactory implements mx4j.tools.adaptor.AdaptorServer
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
index a86d082..393fc1b 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* Provides the ways to send emails to all the registered email id It also provides the way to
* add/remove email ids. Can be used to send email in case of any alerts raised / warning / failure
* in gemfire.
- *
+ *
* @since GemFire 5.1
*/
public class MailManager {
@@ -75,7 +75,7 @@ public class MailManager {
/**
* Send Emails to all the registered email id
- *
+ *
* @param emailData Instance of EmailData
*/
// Why a separate method & class EmailData needed???
@@ -173,7 +173,7 @@ public class MailManager {
}
/**
- *
+ *
* @return Properties consisting mailHost and mailFrom property
*/
private Properties getMailHostConfiguration() {
@@ -190,7 +190,7 @@ public class MailManager {
}
/**
- *
+ *
* @param host mail host server name
*/
public void setMailHost(String host) {
@@ -198,7 +198,7 @@ public class MailManager {
}
/**
- *
+ *
* @return mail host server name
*/
public String getMailHost() {
@@ -206,7 +206,7 @@ public class MailManager {
}
/**
- *
+ *
* @param fromAddress mailFrom email id
*/
public void setMailFromAddress(String fromAddress) {
@@ -214,7 +214,7 @@ public class MailManager {
}
/**
- *
+ *
* @return mailFrom email id
*/
public String getMailFromAddress() {
@@ -298,18 +298,18 @@ public class MailManager {
protected String mailFrom;
- public final static String PROPERTY_MAIL_HOST = "mail.host";
+ public static final String PROPERTY_MAIL_HOST = "mail.host";
- public final static String PROPERTY_MAIL_FROM = "mail.from";
+ public static final String PROPERTY_MAIL_FROM = "mail.from";
- public final static String PROPERTY_MAIL_TO_LIST = "mail.toList";
+ public static final String PROPERTY_MAIL_TO_LIST = "mail.toList";
/**
* Incorporating subject and message of email
- *
- *
+ *
+ *
*/
- static private class EmailData {
+ private static class EmailData {
String subject;
String message;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
index 5c2a81f..03ad017 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
@@ -71,4 +71,3 @@ public interface ManagedResource {
public void cleanupResource();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
index 3b5747f..a135fb9 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
@@ -201,4 +201,3 @@ public class ManagedResourceType implements java.io.Serializable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
index 40a514a..d5b6c74 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -16,6 +16,16 @@ package org.apache.geode.admin.jmx.internal;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import java.net.InetAddress;
+import java.text.MessageFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.management.*;
+
+import mx4j.AbstractDynamicMBean;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.admin.*;
import org.apache.geode.admin.jmx.Agent;
import org.apache.geode.cache.InterestPolicy;
@@ -26,24 +36,16 @@ import org.apache.geode.internal.admin.remote.ClientHealthStats;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import mx4j.AbstractDynamicMBean;
-import org.apache.logging.log4j.Logger;
-
-import javax.management.*;
-import java.net.InetAddress;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicLong;
/**
* This class uses the JMX Attributes/Operations that use (return/throw) GemFire types. This is the
* single MBean accessible with ObjectName string {@link MemberInfoWithStatsMBean#MBEAN_NAME}}. This
* MBean can be used to retrieve the all member details as plain java types.
- *
+ *
* This MBean also acts as a Notification Hub for all the Notifications that are defined for Admin
* Distributed System.
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements NotificationEmitter {
@@ -87,7 +89,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Default Constructor
- *
+ *
* @param agent Admin Agent instance
* @throws OperationsException if ObjectName can't be formed for this MBean
* @throws MBeanRegistrationException
@@ -105,7 +107,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns attributes defined for this MBean as an array of MBeanAttributeInfo objects.
- *
+ *
* @return attributes defined as an array of MBeanAttributeInfo objects.
*/
@Override
@@ -139,7 +141,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns operations defined for this MBean as an array of MBeanOperationInfo objects.
- *
+ *
* @return operations defined as an array of MBeanOperationInfo objects.
*/
@Override
@@ -174,7 +176,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns notifications defined for this MBean as an array of MBeanNotificationInfo objects.
- *
+ *
* @return notification definitions as an array of MBeanNotificationInfo objects.
*/
@Override
@@ -234,7 +236,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
}
/**
- *
+ *
* @return ObjectName of this MBean
*/
/* default */ ObjectName getObjectName() {
@@ -243,7 +245,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns the version of the GemFire Enterprise instance as a string.
- *
+ *
* @return GemFire Enterprise version string derived from {@link GemFireVersion}
*/
/* getter for attribute - Version */
@@ -267,7 +269,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Connects the Admin Agent in the DS
- *
+ *
* @return AdminDistributedSystem MBean ObjectName
* @throws OperationsException if connection to the DS fails
* @throws AdminException if connection to the DS fails
@@ -288,7 +290,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
}
/**
- *
+ *
* @param memberId
* @return SystemMemberJmx instance for given memberId
* @throws AdminException
@@ -321,7 +323,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Return ObjectNames for all the Member MBeans in the DS.
- *
+ *
* @return Array of ObjectNames of all Member MBeans
* @throws OperationsException if (1)agent could not connect in the DS OR (2)Notification Listener
* could not be registered for the Admin DS MBean OR (3)fails to retrieve information from
@@ -372,7 +374,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns information including ObjectNames for all regions on a member with given member id.
- *
+ *
* @param memberId member identifier as a String
* @return Map of details of all regions on a member with given id
* @throws OperationsException if fails to retrieve the regions information
@@ -415,7 +417,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/* **************************************************************************/
/**
* Initializes all the possible MBeans for all the members.
- *
+ *
*/
private void initializeAll() throws OperationsException {
try {
@@ -458,7 +460,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Initializes Cache, Regions & Statistics Types MBeans for the given Member.
- *
+ *
* @param memberJmx Member Mbean instance
* @throws OperationsException if fails to initialize required MBeans
* @throws AdminException if fails to initialize required MBeans
@@ -477,7 +479,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Initializes statistics for a member with the given mbean.
- *
+ *
* @param memberJmx Member Mbean instance
* @throws AdminException if fails to initialize required statistic MBeans
*/
@@ -491,7 +493,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Initializes all regions & its subregions using the Cache MBean and the RegionSubRegionSnapshot
* for this cache MBean.
- *
+ *
* @param cache Cache MBean resource
* @param regionSnapshot RegionSubRegionSnapshot instance for the cache
* @throws MalformedObjectNameException if fails to initialize the region MBean
@@ -624,7 +626,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
DistributionConfig.GEMFIRE_PREFIX + "client.stats.threads.int";
/**
- *
+ *
* @param memberId
* @return All the required details for a member with given memberId
* @throws OperationsException
@@ -727,7 +729,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
}
/**
- *
+ *
* @param snapshot
* @return Map of client details
*/
@@ -777,7 +779,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns a Map containing information about regions.
- *
+ *
* @param cache Reference to an MBean representing a Cache on a member
* @param existingRegionMbeans Map of Path against Region MBean ObjectNames
* @return Map of all region details
@@ -809,7 +811,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
* Collects all the region details from the RegionSubRegionSnapshot instance passed and the Cache
* MBean. Checks in the set of existingRegionMbeans before initializing Region Mbeans if there are
* not initialized yet.
- *
+ *
* @param cache Cache MBean instance
* @param regionSnapshot RegionSubRegionSnapshot instance
* @param regionsInfo Map of regions information that gets populated recursively
@@ -875,7 +877,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Checks if the given host name string contains ':' as in IPv6 host address.
- *
+ *
* @param host host name string
* @return true if the host string contains ':', false otherwise
*/
@@ -885,7 +887,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Checks if the given host name is actually a String representation of an IPv4 address.
- *
+ *
* @param host host name string
* @return true if given host name is a String representation of an IPv4 address, false otherwise
*/
@@ -899,10 +901,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
* Excludes the host name from the client id and returns the String. If the host name can not be
* detected, returns an empty string. Typically, the client id looks like:
* HOST(VM_PID:VM_KIND):PORT:RANDOM_STRING:CLIENT_NAME
- *
+ *
* Extracts the client name from the client id. If the client id is not in the expected format,
* returns 'N/A'
- *
+ *
* @param clientId string identifier for a client
* @param host host name (FQDN) the client is running on
* @return name extracted from given client id
@@ -910,9 +912,9 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/*
* Some examples of Client Id format: (1) Java Client:
* nase(21716:loner):51789:42e9a0bf:client_nase_21716 nase(2560:loner):2:7a84729a:Feeder
- *
+ *
* (2) Native Client: nase(21045:loner):2:GFNative_OnNnEpyRWL:ExampleDistributedSystem
- *
+ *
* (3) IPv6 Host whose name can not be resolved:
* fdf0:76cf:a0ed:9449:0:0:0:1001(21716:loner):51789:42e9a0b:client_nase_21716
* fdf0:76cf:a0ed:9449:0:0:0:1001:51789:42e9a0b:client_nase_21716
@@ -951,7 +953,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns a Map of all the statistics required for Hyperic currently. It relies on the attribute
* of the StatisticsResource Mbeans.
- *
+ *
* @param member instance for which the stats are needed
* @return Map of all the statistics required for Hyperic currently.
* @throws OperationsException exceptions thrown while retrieving the attributes
@@ -1080,8 +1082,8 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns attribute with given attribute name on MBean with given ObjectName.
- *
- *
+ *
+ *
* @param objectName ObjectName for the MBean
* @param attribute attribute name
* @param unavailableValue return this value if the attribute value is null
@@ -1106,7 +1108,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Return Map of region full against the ObjectName of existing region MBeans.
- *
+ *
* @param memberId string identifier of a member
* @return Map of region path vs ObjectName for existing region MBeans
* @throws MalformedObjectNameException If the query expression used is not valid
@@ -1128,7 +1130,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Returns an array of ObjectNames existing statistics types MBeans
- *
+ *
* @param memberId string identifier of a member
* @param name text id of the stats which appears in the stats ObjectName as name keyProperty
* @return Array of Stats MBean ObjectNames
@@ -1151,7 +1153,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
/**
* Queries the MBean server with the string formed using placing the params in the parameterized
* string passed as queryStr.
- *
+ *
* @param queryStr parameterized string
* @param params params to put in the string
* @return results of an ObjectName query
@@ -1214,8 +1216,8 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
* MBeans. This acts as a listener for these notifications and broadcasts them as notifications from
* the {@link MemberInfoWithStatsMBean} MBean. This class extends
* {@link NotificationBroadcasterSupport} only to have the functionality to send notifications.
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
class NotificationForwarder extends NotificationBroadcasterSupport implements NotificationListener {
@@ -1230,7 +1232,7 @@ class NotificationForwarder extends NotificationBroadcasterSupport implements No
/**
* Default Constructor
- *
+ *
* @param mBeanServer reference to the MBeanServer instance
*/
/* default */ NotificationForwarder(MBeanServer mBeanServer) {
@@ -1243,13 +1245,13 @@ class NotificationForwarder extends NotificationBroadcasterSupport implements No
* NotificationForwarder as a notification listener for Cache/Region Notifications. 3.
* AdminDistributedSystem Disconnected: Unregisters this NotificationForwarder as a notification
* listener for member Notifications.
- *
+ *
* Forwards the notifications to the JMX Clients that have registered for notifications on this
* MBean
- *
+ *
* @param notification notification to be handled
* @param handback handback object used while NotificationForwarder was registered
- *
+ *
* @see NotificationListener#handleNotification(Notification, Object)
*/
public void handleNotification(Notification notification, Object handback) {
@@ -1321,7 +1323,7 @@ class NotificationForwarder extends NotificationBroadcasterSupport implements No
/**
* Registers itself as a NotificationListener for Notifications sent from MBean with the
* ObjectName given as source.
- *
+ *
* @param source source of notifications
* @throws InstanceNotFoundException The MBean name provided does not match any of the registered
* MBeans.
@@ -1334,7 +1336,7 @@ class NotificationForwarder extends NotificationBroadcasterSupport implements No
/**
* Unregisters itself as a NotificationListener for Notifications sent from MBean with the
* ObjectName given as source.
- *
+ *
* @param source source of notifications
* @throws InstanceNotFoundException The MBean name provided does not match any of the registered
* MBeans.
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
index 1ba6b84..87452e2 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
@@ -28,7 +28,7 @@ import java.rmi.server.UnicastRemoteObject;
/**
* This MBean is an implementation of {@link RMIRegistryServiceMBean}.
- *
+ *
*/
public class RMIRegistryService implements RMIRegistryServiceMBean {
/* RMI Registry host */
@@ -52,7 +52,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Constructor to configure RMI Registry to start using given RMI Registry port.
- *
+ *
* @param port to run RMI Registry on
*/
public RMIRegistryService(int port) {
@@ -62,10 +62,10 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Constructor to configure RMI Registry to start using given RMI Registry port & host bind
* address.
- *
+ *
* @param host to bind RMI Registry to
* @param port to run RMI Registry on
- *
+ *
* @throws UnknownHostException if IP Address can not be resolved for the given host string while
* creating the RMIServerSocketFactory
*/
@@ -88,7 +88,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Sets the host on which rmiregistry listens for incoming connections
- *
+ *
* @param host the host on which rmiregistry listens for incoming connections
*/
protected void setHost(String host) {
@@ -100,7 +100,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Returns the port on which rmiregistry listens for incoming connections
- *
+ *
* @return the port on which rmiregistry listens for incoming connections
*/
public int getPort() {
@@ -109,7 +109,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Sets the port on which rmiregistry listens for incoming connections
- *
+ *
* @param port the port on which rmiregistry listens for incoming connections
*/
protected void setPort(int port) {
@@ -121,7 +121,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Starts this MBean: rmiregistry can now accept incoming calls
- *
+ *
* @see #stop
* @see #isRunning
*/
@@ -140,7 +140,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Returns whether this MBean has been started and not yet stopped.
- *
+ *
* @return whether this MBean has been started and not yet stopped.
* @see #start
*/
@@ -150,7 +150,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Stops this MBean: rmiregistry cannot accept anymore incoming calls
- *
+ *
* @see #start
*/
public synchronized void stop() throws NoSuchObjectException {
@@ -161,7 +161,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Returns an array of the names bound in the rmiregistry
- *
+ *
* @return an array of the names bound in the rmiregistry
* @see java.rmi.registry.Registry#list()
*/
@@ -174,7 +174,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Removes the binding for the specified <code>name</code> in the rmiregistry
- *
+ *
* @see java.rmi.registry.Registry#unbind(String)
*/
public void unbind(String name) throws RemoteException, NotBoundException {
@@ -188,7 +188,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Custom implementation of the {@link RMIServerSocketFactory}
- *
+ *
*/
class RMIServerSocketFactoryImpl implements RMIServerSocketFactory {
/* IP address to use for creating ServerSocket */
@@ -197,9 +197,9 @@ class RMIServerSocketFactoryImpl implements RMIServerSocketFactory {
/**
* Constructs a RMIServerSocketFactory. The given rmiBindAddress is used to bind the ServerSockets
* created from this factory.
- *
+ *
* @param rmiBindAddress String representation of the address to bind the ServerSockets to
- *
+ *
* @throws UnknownHostException if IP Address can not be resolved for the given host string
*/
/* default */ RMIServerSocketFactoryImpl(String rmiBindAddress) throws UnknownHostException {
@@ -208,7 +208,7 @@ class RMIServerSocketFactoryImpl implements RMIServerSocketFactory {
/**
* Create a server socket on the specified port (port 0 indicates an anonymous port).
- *
+ *
* @param port the port number
* @return the server socket on the specified port
* @exception IOException if an I/O error occurs during server socket creation
@@ -218,4 +218,3 @@ class RMIServerSocketFactoryImpl implements RMIServerSocketFactory {
bindAddress);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
index 9d9bfb4..556c45a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
@@ -22,7 +22,7 @@ import java.rmi.RemoteException;
* This interface is similar to mx4j.tools.naming.NamingServiceMBean. Features that differ are: 1.
* This MBean interface additionally provides a way to specify the host that the RMI Registry should
* get bound to. 2. Port property can not be changed once set.
- *
+ *
*/
public interface RMIRegistryServiceMBean {
@@ -35,14 +35,14 @@ public interface RMIRegistryServiceMBean {
/**
* Returns the port on which rmiregistry listens for incoming connections
- *
+ *
* @return the port on which rmiregistry listens for incoming connections
*/
public int getPort();
/**
* Returns whether this MBean has been started and not yet stopped.
- *
+ *
* @return whether this MBean has been started and not yet stopped.
* @see #start
*/
@@ -50,7 +50,7 @@ public interface RMIRegistryServiceMBean {
/**
* Starts this MBean: rmiregistry can now accept incoming calls
- *
+ *
* @see #stop
* @see #isRunning
*/
@@ -58,14 +58,14 @@ public interface RMIRegistryServiceMBean {
/**
* Stops this MBean: rmiregistry cannot accept anymore incoming calls
- *
+ *
* @see #start
*/
public void stop() throws NoSuchObjectException;
/**
* Returns an array of the names bound in the rmiregistry
- *
+ *
* @return an array of the names bound in the rmiregistry
* @see java.rmi.registry.Registry#list()
*/
@@ -73,7 +73,7 @@ public interface RMIRegistryServiceMBean {
/**
* Removes the binding for the specified <code>name</code> in the rmiregistry
- *
+ *
* @see java.rmi.registry.Registry#unbind(String)
*/
public void unbind(String name) throws RemoteException, NotBoundException;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
index 14be6cb..a7c0786 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
@@ -123,4 +123,3 @@ public class RefreshNotificationType implements java.io.Serializable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
index 40ca11b..9ae9825 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
@@ -16,11 +16,11 @@ package org.apache.geode.admin.jmx.internal;
import java.io.DataInput;
import java.io.DataOutput;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
-import org.apache.geode.DataSerializer;
import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.StatAlert;
@@ -28,10 +28,10 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Notification to be sent to clients (e.g GFMon2.0 ). It incorporates
- *
+ *
* @see StatAlert raised and also Gemfire member id which raised the alert
- *
- *
+ *
+ *
* @since GemFire 5.7
*/
public class StatAlertNotification extends StatAlert
@@ -60,7 +60,7 @@ public class StatAlertNotification extends StatAlert
}
/**
- *
+ *
* @param id of gemfire member which raised the alert
*/
public void setMemberId(String id) {
@@ -83,7 +83,7 @@ public class StatAlertNotification extends StatAlert
/**
* The notification is something like this "For Member ID: <ID> [ <StatName> = <Value> .. ]"
- *
+ *
* @param defn {@link StatAlertDefinition}
* @return String representation of this object based on {@link StatAlertDefinition}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
index 106fa35..4507377 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
@@ -28,13 +28,13 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* <li>process notification from members
* <li>Aggregate stats & make available for clients thro' JMXAgent
* </ol>
- *
+ *
*/
public interface StatAlertsAggregator {
/**
* This method can be used to get an alert definition.
- *
+ *
* @param alertDefinition StatAlertDefinition to retrieve
* @return StatAlertDefinition
*/
@@ -42,7 +42,7 @@ public interface StatAlertsAggregator {
/**
* This method can be used to retrieve all available stat alert definitions.
- *
+ *
* @return An array of all available StatAlertDefinition objects
*/
public StatAlertDefinition[] getAllStatAlertDefinitions();
@@ -53,7 +53,7 @@ public interface StatAlertsAggregator {
* added alert definitions.
* <p>
* A new alert definition will be created if matching one not found.
- *
+ *
* @param alertDefinition alertDefinition to be updated
*/
public void updateAlertDefinition(StatAlertDefinition alertDefinition);
@@ -63,14 +63,14 @@ public interface StatAlertsAggregator {
* <p>
* This method should update the collection maintained at the aggregator and should notify members
* for the newly added alert definitions.
- *
+ *
* @param defId id of the alert definition to be removed
*/
public void removeAlertDefinition(Integer defId);
/**
* Convenience method to check whether an alert definition is created.
- *
+ *
* @param alert alert definition to check whether already created
* @return true if the alert definition is already created, false otherwise
*/
@@ -78,21 +78,21 @@ public interface StatAlertsAggregator {
/**
* This method can be used to set the AlertManager for the newly joined member VM.
- *
+ *
* @param memberVM Member VM to set AlertsManager for
*/
public void setAlertsManager(GemFireVM memberVM);
/**
* Returns the refresh interval for the Stats in seconds.
- *
+ *
* @return refresh interval for the Stats(in seconds)
*/
public int getRefreshIntervalForStatAlerts();
/**
* This method is used to set the refresh interval for the Stats Alerts in seconds
- *
+ *
* @param refreshInterval refresh interval for the Stats(in seconds)
*/
public void setRefreshIntervalForStatAlerts(int refreshInterval);
@@ -101,7 +101,7 @@ public interface StatAlertsAggregator {
* This method can be used to process the notifications sent by the member(s). Actual aggregation
* of stats can occur here. The array contains alert objects with alert def. ID & value.
* AlertHelper class can be used to retrieve the corresponding alert definition.
- *
+ *
* @param alerts array of Alert class(contains alert def. ID & value)
* @param remoteVM
*/
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
index c257ad5..57c21c4 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.admin.jmx.internal;
-import org.apache.geode.admin.Statistic;
-import org.apache.geode.internal.Assert;
-
import javax.management.Descriptor;
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
+import org.apache.geode.admin.Statistic;
+import org.apache.geode.internal.Assert;
+
/**
* Subclass of AttributeInfo with {@link org.apache.geode.admin.Statistic} added for use as the
* {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's <i>targetObject</i>
@@ -68,4 +68,3 @@ class StatisticAttributeInfo extends org.apache.commons.modeler.AttributeInfo {
return info;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
index 4f46d5a..61ee780 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
@@ -148,7 +148,7 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
* Attempt to set refreshInterval on StatisticResourceJmx MBean would result in an
* OperationNotSupportedException Auto-refresh is enabled on demand when a call to getStatistics
* is made
- *
+ *
* @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@@ -169,7 +169,7 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
* if there is any JMX client connected to the system.
* <p>
* TODO: investigate use of NotificationFilter instead of explicit check...
- *
+ *
* @param notification the JMX notification being received
* @param hb handback object is unused
*/
@@ -315,7 +315,7 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
/**
* Checks equality of the given object with <code>this</code> based on the type (Class) and the
* MBean Name returned by <code>getMBeanName()</code> methods.
- *
+ *
* @param obj object to check equality with
* @return true if the given object is if the same type and its MBean Name is same as
* <code>this</code> object's MBean Name, false otherwise
@@ -333,7 +333,7 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
/**
* Returns hash code for <code>this</code> object which is based on the MBean Name generated.
- *
+ *
* @return hash code for <code>this</code> object
*/
@Override
@@ -341,4 +341,3 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
return this.getMBeanName().hashCode();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
index 6206340..adbcf19 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.admin.jmx.internal;
+import javax.management.ObjectName;
+import javax.management.modelmbean.ModelMBean;
+
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.internal.SystemMemberBridgeServerImpl;
import org.apache.geode.admin.internal.SystemMemberCacheImpl;
import org.apache.geode.internal.admin.AdminBridgeServer;
import org.apache.geode.internal.admin.GemFireVM;
-import javax.management.ObjectName;
-import javax.management.modelmbean.ModelMBean;
-
/**
* MBean representation of a {@link org.apache.geode.admin.SystemMemberBridgeServer}.
*
@@ -95,7 +95,7 @@ public class SystemMemberBridgeServerJmxImpl extends SystemMemberBridgeServerImp
/**
* Checks equality of the given object with <code>this</code> based on the type (Class) and the
* MBean Name returned by <code>getMBeanName()</code> methods.
- *
+ *
* @param obj object to check equality with
* @return true if the given object is if the same type and its MBean Name is same as
* <code>this</code> object's MBean Name, false otherwise
@@ -113,7 +113,7 @@ public class SystemMemberBridgeServerJmxImpl extends SystemMemberBridgeServerImp
/**
* Returns hash code for <code>this</code> object which is based on the MBean Name generated.
- *
+ *
* @return hash code for <code>this</code> object
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index ebce869..8c8ed37 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -88,7 +88,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
/**
* Override createSystemMemberRegion by instantiating SystemMemberRegionJmxImpl. This instance is
* also added to the managedResources collection.
- *
+ *
* @param r reference to Region instance for which this JMX resource is to be created
* @return SystemMemberRegionJmxImpl - JMX Implementation of SystemMemberRegion
* @throws AdminException if constructing SystemMemberRegionJmxImpl instance fails
@@ -120,7 +120,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
/**
* Creates a SystemMemberBridgeServerJmxImpl instance. This instance is also added to the
* managedResources collection.
- *
+ *
* @param bridge reference to AdminBridgeServer for which this JMX resource is to be created
* @return SystemMemberBridgeServerJmxImpl - JMX Implementation of SystemMemberBridgeServerImpl
* @throws AdminException if constructing SystemMemberBridgeServerJmxImpl instance fails
@@ -355,7 +355,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
/**
* Un-registers all the statistics & cache managed resource created for this member. After
* un-registering the resource MBean instances, clears this.memberResources collection.
- *
+ *
* Creates ConfigurationParameterJmxImpl, StatisticResourceJmxImpl and SystemMemberCacheJmxImpl.
* But cleans up only StatisticResourceJmxImpl and SystemMemberCacheJmxImpl which are of type
* ManagedResource.
@@ -385,7 +385,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
/**
* Cleans up managed resources created for the region that was (created and) destroyed in a cache
* represented by this Managed Resource.
- *
+ *
* @param regionPath path of the region that got destroyed
* @return a managed resource related to this region path
*/
@@ -416,7 +416,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
/**
* Checks equality of the given object with <code>this</code> based on the type (Class) and the
* MBean Name returned by <code>getMBeanName()</code> methods.
- *
+ *
* @param obj object to check equality with
* @return true if the given object is if the same type and its MBean Name is same as
* <code>this</code> object's MBean Name, false otherwise
@@ -434,7 +434,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
/**
* Returns hash code for <code>this</code> object which is based on the MBean Name generated.
- *
+ *
* @return hash code for <code>this</code> object
*/
@Override
@@ -442,4 +442,3 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
return this.getMBeanName().hashCode();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
index 06b0be9..f76d66a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.admin.jmx.internal;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.management.*;
+import javax.naming.OperationNotSupportedException;
+
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.*;
import org.apache.geode.cache.Operation;
@@ -22,12 +30,6 @@ import org.apache.geode.internal.admin.ClientMembershipMessage;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.logging.log4j.Logger;
-
-import javax.management.*;
-import javax.naming.OperationNotSupportedException;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Defines methods that all <code>SystemMember</code> MBeans should implement.
@@ -142,7 +144,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Implementation should handle creation of cache by extracting the details from the given event
* object.
- *
+ *
* @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreate(SystemMemberCacheEvent event);
@@ -150,7 +152,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Implementation should handle closure of cache by extracting the details from the given event
* object.
- *
+ *
* @param event event object corresponding to the closure of the cache
*/
public void handleCacheClose(SystemMemberCacheEvent event);
@@ -158,7 +160,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Implementation should handle creation of region by extracting the details from the given event
* object.
- *
+ *
* @param event event object corresponding to the creation of a region
*/
public void handleRegionCreate(SystemMemberRegionEvent event);
@@ -166,14 +168,14 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Implementation should handle loss of region by extracting the details from the given event
* object.
- *
+ *
* @param event event object corresponding to the loss of a region
*/
public void handleRegionLoss(SystemMemberRegionEvent event);
/**
* Implementation should handle client membership changes.
- *
+ *
* @param clientId id of the client for whom membership change happened
* @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
* {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
@@ -390,7 +392,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Returns the next notification sequence number.
- *
+ *
* @return the notificationSequenceNumber
*/
/* default */static int getNextNotificationSequenceNumber() {
@@ -399,7 +401,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Returns the cache event details extracted from the given SystemMemberCacheEvent
- *
+ *
* @param event SystemMemberCacheEvent instance
* @return the cache event details extracted from the given SystemMemberCacheEvent
*/
@@ -412,7 +414,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Returns the region event details extracted from the given SystemMemberRegionEvent
- *
+ *
* @param event SystemMemberRegionEvent instance
* @return the cache event details extracted from the given SystemMemberRegionEvent
*/
@@ -426,9 +428,9 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
/**
* Sends the given notification.
- *
+ *
* @param notif notification to send
- *
+ *
* @throws NullPointerException if resource or ModelMBean for resource is null
*/
/* default */static void sendNotification(ManagedResource resource, Notification notif) {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
index 0241302..f34538c 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
@@ -98,12 +98,12 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Constructs the instance of SystemMember using the corresponding InternalDistributedMember
* instance of a DS member for the given AdminDistributedSystem.
- *
+ *
* @param system Current AdminDistributedSystem instance
* @param member InternalDistributedMember instance for which a SystemMember instance is to be
* constructed.
* @throws AdminException if construction of SystemMember fails
- *
+ *
* @since GemFire 6.5
*/
protected SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system,
@@ -148,7 +148,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
* Attempt to set refreshInterval on SystemMemberJmx MBean would result in an
* OperationNotSupportedException Auto-refresh is enabled on demand when a call to refreshConfig
* is made
- *
+ *
* @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@@ -162,7 +162,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Sets interval in seconds between member config refreshes; zero or less turns off auto
* refreshing. Manual refreshing has no effect on when the next scheduled refresh will occur.
- *
+ *
* @param refreshInterval the new refresh interval in seconds
*/
public void _setRefreshInterval(int refreshInterval) {
@@ -191,7 +191,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Initializes Cache & Statistics managed resources.
- *
+ *
* @throws AdminException if initialization of managed resources fails
*/
// private void initializeManagedResources() throws AdminException {
@@ -262,7 +262,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
* Handles notification to refresh. Reacts by refreshing the values of this SystemMember's
* ConfigurationParamaters. Any other notification is ignored. Given notification is handled only
* if there is any JMX client connected to the system.
- *
+ *
* @param notification the JMX notification being received
* @param hb handback object is unused
*/
@@ -291,7 +291,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Override createStatisticResource by instantiating StatisticResourceJmxImpl if it was not
* created earlier otherwise returns the same instance.
- *
+ *
* @param stat StatResource reference for which this JMX resource is to be created
* @return StatisticResourceJmxImpl - JMX Implementation of StatisticResource
* @throws AdminException if constructing StatisticResourceJmxImpl instance fails
@@ -320,7 +320,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Override createSystemMemberCache by instantiating SystemMemberCacheJmxImpl if it was not
* created earlier.
- *
+ *
* @param vm GemFireVM reference for which this JMX resource is to be created
* @return SystemMemberCacheJmxImpl - JMX Implementation of SystemMemberCache
* @throws AdminException if constructing SystemMemberCacheJmxImpl instance fails
@@ -411,7 +411,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Cleans up Managed Resources created for the client that was connected to the server represented
* by this class.
- *
+ *
* @param clientId id of the client to be removed
* @return List of ManagedResources associated with the client of given client id
*/
@@ -442,7 +442,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
/**
* Implementation handles client membership changes.
- *
+ *
* @param clientId id of the client for whom membership change happened
* @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
* {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
@@ -475,7 +475,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
* Implementation handles creation of cache by extracting the details from the given event object
* and sending the {@link SystemMemberJmx#NOTIF_CACHE_CREATED} notification to the connected JMX
* Clients.
- *
+ *
* @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreate(SystemMemberCacheEvent event) {
@@ -487,7 +487,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
* Implementation handles closure of cache by extracting the details from the given event object
* and sending the {@link SystemMemberJmx#NOTIF_CACHE_CLOSED} notification to the connected JMX
* Clients.
- *
+ *
* @param event event object corresponding to the closure of the cache
*/
public void handleCacheClose(SystemMemberCacheEvent event) {
@@ -499,7 +499,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
* Implementation handles creation of region by extracting the details from the given event object
* and sending the {@link SystemMemberJmx#NOTIF_REGION_CREATED} notification to the connected JMX
* Clients. Region Path is set as User Data in Notification.
- *
+ *
* @param event event object corresponding to the creation of a region
*/
public void handleRegionCreate(SystemMemberRegionEvent event) {
@@ -516,7 +516,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
* object and sending the {@link SystemMemberJmx#NOTIF_REGION_LOST} notification to the connected
* JMX Clients. Region Path is set as User Data in Notification. Additionally, it also clears the
* ManagedResources created for the region that is lost.
- *
+ *
* @param event event object corresponding to the loss of a region
*/
public void handleRegionLoss(SystemMemberRegionEvent event) {
@@ -538,4 +538,3 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
Helper.sendNotification(this, notification);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
index cc5621e..b98ec31 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.admin.jmx.internal;
+import javax.management.ObjectName;
+import javax.management.modelmbean.ModelMBean;
+
import org.apache.geode.admin.internal.SystemMemberCacheImpl;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.admin.GemFireVM;
-import javax.management.ObjectName;
-import javax.management.modelmbean.ModelMBean;
-
/**
* MBean representation of {@link org.apache.geode.admin.SystemMemberRegion}.
*
@@ -99,7 +99,7 @@ public class SystemMemberRegionJmxImpl
/**
* Checks equality of the given object with <code>this</code> based on the type (Class) and the
* MBean Name returned by <code>getMBeanName()</code> methods.
- *
+ *
* @param obj object to check equality with
* @return true if the given object is if the same type and its MBean Name is same as
* <code>this</code> object's MBean Name, false otherwise
@@ -117,7 +117,7 @@ public class SystemMemberRegionJmxImpl
/**
* Returns hash code for <code>this</code> object which is based on the MBean Name generated.
- *
+ *
* @return hash code for <code>this</code> object
*/
@Override
@@ -125,4 +125,3 @@ public class SystemMemberRegionJmxImpl
return this.getMBeanName().hashCode();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index 09add5e..c1f36fc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -111,7 +111,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* cache that is initiating an operation; it does not matter what it is set to on the cache that
* receives the operation.<br>
* {@link #setEarlyAck} {@link RegionAttributes#getEarlyAck}</dd>
- *
+ *
* <dt>{@link SubscriptionAttributes} [<em>default:</em> {@link InterestPolicy#DEFAULT}]</dt>
* <dd>How will the region in this cache subscribe to other distributed instances of this region.
* <br>
@@ -128,7 +128,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* <dd>Whether or not this region is a client that is to use connections from the named pool to
* communicate with servers. If {@code null}, then it is not a client. If {@code non-null}, then the
* named pool will be used. {@link #setPoolName} {@link RegionAttributes#getPoolName}</dd>
- *
+ *
*
* <dt>EnableSubscriptionConflation [<em>default:</em> {@code false}]</dt>
* <dd>Whether or not conflation is enabled for sending messages from a cache server to its clients.
@@ -191,7 +191,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* impact. A value of one is appropriate when it is known that only one thread will modify and all
* others will only read. <br>
* {@link #setConcurrencyLevel} {@link RegionAttributes#getConcurrencyLevel}</dd>
- *
+ *
* <dt>ConcurrencyChecksEnabled [<em>default:</em> {@code false}]</dt>
* <dd>Enables a distributed versioning algorithm that detects concurrency conflicts in regions and
* ensures that changes to an entry are not applied in a different order in other members. This can
@@ -221,7 +221,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* conflated if the same entry is written while a previous operation for the same entry is still in
* the queue.<br>
* {@link #setDiskSynchronous} {@link RegionAttributes#isDiskSynchronous}</dd>
- *
+ *
* <dt>PersistBackup [<em>default:</em> {@code false}]</dt>
* <dd>Whether or not a persistent backup should be made of the region.<br>
* {@link #setPersistBackup} {@link RegionAttributes#getPersistBackup}</dd>
@@ -325,7 +325,7 @@ public class AttributesFactory<K, V> {
* The default disk synchronous write setting
* <p>
* Current value: {@code true} each.
- *
+ *
* @since GemFire 6.5
*/
public static final boolean DEFAULT_DISK_SYNCHRONOUS = true;
@@ -469,7 +469,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the CacheListener for the next {@code RegionAttributes} created. Any existing cache
* listeners on this factory are removed.
- *
+ *
* @param aListener a user defined CacheListener, null if no listener
* @deprecated as of GemFire 5.0, use {@link #addCacheListener} instead.
*/
@@ -490,7 +490,7 @@ public class AttributesFactory<K, V> {
/**
* Adds a cache listener to the end of the list of cache listeners on this factory.
- *
+ *
* @param aListener the cache listener to add to the factory.
* @throws IllegalArgumentException if {@code aListener} is null
* @since GemFire 5.0
@@ -508,7 +508,7 @@ public class AttributesFactory<K, V> {
/**
* Removes all cache listeners and then adds each listener in the specified array.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this factory.
* @throws IllegalArgumentException if the {@code newListeners} array has a null element
* @since GemFire 5.0
@@ -552,7 +552,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the idleTimeout CustomExpiry for the next {@code RegionAttributes} created.
- *
+ *
* @param custom the CustomExpiry to use; null means none will be used.
*/
public void setCustomEntryIdleTimeout(CustomExpiry<K, V> custom) {
@@ -579,7 +579,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the custom timeToLive for the next {@code RegionAttributes} created.
- *
+ *
* @param custom the CustomExpiry to use, none if the default for the region is to be used.
*/
public void setCustomEntryTimeToLive(CustomExpiry<K, V> custom) {
@@ -628,7 +628,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the scope for the next {@code RegionAttributes} created. Default scope is
* DISTRIBUTED_NO_ACK. Refer gemfire documentation for more details on this.
- *
+ *
* @param scopeType the type of Scope to use for the region
* @throws IllegalArgumentException if scopeType is null
*/
@@ -661,7 +661,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the mirror type for the next {@code RegionAttributes} created.
- *
+ *
* @param mirrorType The type of mirroring to use for the region
* @throws IllegalArgumentException if mirrorType is null
* @deprecated use {@link #setDataPolicy} instead.
@@ -691,7 +691,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the data policy for the next {@code RegionAttributes} created. Default data policy is
* 'Normal'. Please refer gemfire documentation for more details on this.
- *
+ *
* @param dataPolicy The data policy to use for the region
* @throws IllegalArgumentException if dataPolicy is null
*/
@@ -716,7 +716,7 @@ public class AttributesFactory<K, V> {
* Sets the key constraint for the next {@code RegionAttributes} created. Keys in the region will
* be constrained to this class (or subclass). Any attempt to store a key of an incompatible type
* in the region will cause a {@code ClassCastException} to be thrown.
- *
+ *
* @param keyConstraint The Class to constrain the keys to, or null if no constraint
* @throws IllegalArgumentException if {@code keyConstraint} is a class denoting a primitive type
*/
@@ -733,7 +733,7 @@ public class AttributesFactory<K, V> {
* Sets the value constraint for the next {@code RegionAttributes} created. Values in the region
* will be constrained to this class (or subclass). Any attempt to store a value of an
* incompatible type in the region will cause a {@code ClassCastException} to be thrown.
- *
+ *
* @param valueConstraint The Class to constrain the values to, or null if no constraint
* @throws IllegalArgumentException if {@code valueConstraint} is a class denoting a primitive
* type
@@ -753,7 +753,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the entry initial capacity for the next {@code RegionAttributes} created. This value is
* used in initializing the map that holds the entries. Default is 16.
- *
+ *
* @param initialCapacity the initial capacity of the entry map
* @throws IllegalArgumentException if initialCapacity is negative.
* @see java.util.HashMap
@@ -769,7 +769,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the entry load factor for the next {@code RegionAttributes} created. This value is used in
* initializing the map that holds the entries. Default is 0.75.
- *
+ *
* @param loadFactor the load factor of the entry map
* @throws IllegalArgumentException if loadFactor is nonpositive
* @see java.util.HashMap
@@ -786,7 +786,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the concurrency level of the next {@code RegionAttributes} created. This value is used in
* initializing the map that holds the entries. Default is 16.
- *
+ *
* @param concurrencyLevel the concurrency level of the entry map
* @throws IllegalArgumentException if concurrencyLevel is nonpositive
*/
@@ -800,7 +800,7 @@ public class AttributesFactory<K, V> {
/**
* Enables or disabled concurrent modification checks. Concurrency checks are enabled by default.
- *
+ *
* @since GemFire 7.0
* @param concurrencyChecksEnabled whether to perform concurrency checks on operations
*/
@@ -886,7 +886,7 @@ public class AttributesFactory<K, V> {
/**
* adds a gateway sender to the end of list of gateway senders on this factory
- *
+ *
* @param gatewaySenderId
* @throws IllegalArgumentException if {@code gatewaySender} is null
* @since GemFire 7.0
@@ -903,7 +903,7 @@ public class AttributesFactory<K, V> {
/**
* Adds a AsyncEventQueue to the end of list of async event queues on this factory
- *
+ *
* @param asyncEventQueueId
* @throws IllegalArgumentException if {@code gatewaySender} is null
* @since GemFire 7.0
@@ -996,7 +996,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the DiskStore name attribute. This causes the region to use the {@link DiskStore}.
- *
+ *
* @param name the name of the diskstore
* @since GemFire 6.5
*/
@@ -1012,7 +1012,7 @@ public class AttributesFactory<K, V> {
/**
* Sets whether or not the writing to the disk is synchronous. Default is true.
- *
+ *
* @param isSynchronous boolean if true indicates synchronous writes
* @since GemFire 6.5
*/
@@ -1151,7 +1151,7 @@ public class AttributesFactory<K, V> {
// STATISTICS
/**
* Sets whether statistics are enabled for this region and its entries. Default is false.
- *
+ *
* @param statisticsEnabled whether statistics are enabled
*/
public void setStatisticsEnabled(boolean statisticsEnabled) {
@@ -1161,7 +1161,7 @@ public class AttributesFactory<K, V> {
/**
* Sets the flag telling a region to ignore JTA transactions. Default is false.
- *
+ *
* @since GemFire 5.0
*/
public void setIgnoreJTA(boolean flag) {
@@ -1171,7 +1171,7 @@ public class AttributesFactory<K, V> {
/**
* Sets whether this region should become lock grantor. Default value is false.
- *
+ *
* @param isLockGrantor whether this region should become lock grantor
*/
public void setLockGrantor(boolean isLockGrantor) {
@@ -1183,7 +1183,7 @@ public class AttributesFactory<K, V> {
* Sets whether distributed operations on this region should attempt to use multicast. Multicast
* must also be enabled in the cache's DistributedSystem (see <a
* href=../distributed/DistributedSystem.html#mcast-port">"mcast-port"</a>). Default is false.
- *
+ *
* @since GemFire 5.0
* @see RegionAttributes#getMulticastEnabled
*/
@@ -1195,7 +1195,7 @@ public class AttributesFactory<K, V> {
/**
* Sets cloning on region. Default is false. Note: off-heap regions always behave as if cloning is
* enabled.
- *
+ *
* @since GemFire 6.1
* @see RegionAttributes#getCloningEnabled()
*/
@@ -1214,7 +1214,7 @@ public class AttributesFactory<K, V> {
* <p>
* The named connection pool must exist on the cache at the time these attributes are used to
* create a region. See {@link PoolManager#createFactory} for how to create a connection pool.
- *
+ *
* @param name the name of the connection pool to use; if {@code null} or {@code ""} then the
* connection pool is disabled for regions using these attributes.
* @since GemFire 5.7
@@ -1231,7 +1231,7 @@ public class AttributesFactory<K, V> {
/**
* Sets this region's compressor for compressing entry values.
- *
+ *
* @since GemFire 8.0
* @param compressor a compressor.
*/
@@ -1247,7 +1247,7 @@ public class AttributesFactory<K, V> {
/**
* Enables this region's usage of off-heap memory if true.
- *
+ *
* @since Geode 1.0
* @param offHeap boolean flag to enable off-heap memory
*/
@@ -1264,7 +1264,7 @@ public class AttributesFactory<K, V> {
/**
* Creates a {@code RegionAttributes} with the current settings.
- *
+ *
* @return the newly created {@code RegionAttributes}
* @throws IllegalStateException if the current settings violate the
* <a href="#compatibility">compatibility rules</a>
@@ -1277,7 +1277,7 @@ public class AttributesFactory<K, V> {
/**
* Creates a {@code RegionAttributes} with the current settings.
- *
+ *
* @return the newly created {@code RegionAttributes}
* @throws IllegalStateException if the current settings violate the
* <a href="#compatibility">compatibility rules</a>
@@ -1350,7 +1350,7 @@ public class AttributesFactory<K, V> {
* <li>{@link EvictionAttributes Eviction} is incompatible with the {@link DataPolicy#EMPTY} data
* policy</li>
* </ul>
- *
+ *
* @param attrs the attributes to validate
* @throws IllegalStateException if the attributes are not consistent with each other.
* @since GemFire 3.5
@@ -1593,7 +1593,7 @@ public class AttributesFactory<K, V> {
/**
* Constructs an instance of {@code RegionAttributes} with default settings.
- *
+ *
* @see AttributesFactory
*/
public RegionAttributesImpl() {}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
index 579a4e8..21d6919 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
@@ -35,7 +35,7 @@ public interface AttributesMutator<K, V> {
/**
* Returns the Region whose attributes this mutator affects.
- *
+ *
* @return the Region this mutator affects
*/
public Region<K, V> getRegion();
@@ -78,7 +78,7 @@ public interface AttributesMutator<K, V> {
/**
* Changes the custom timeToLive for values in this region
- *
+ *
* @param custom the new CustomExpiry
* @return the old CustomExpiry
*/
@@ -100,7 +100,7 @@ public interface AttributesMutator<K, V> {
/**
* Changes the CustomExpiry for idleTimeout for values in the region
- *
+ *
* @param custom the new CustomExpiry
* @return the old CustomExpiry
*/
@@ -108,7 +108,7 @@ public interface AttributesMutator<K, V> {
/**
* Adds a cache listener to the end of the list of cache listeners on this region.
- *
+ *
* @param aListener the user defined cache listener to add to the region.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
@@ -119,7 +119,7 @@ public interface AttributesMutator<K, V> {
* Removes a cache listener from the list of cache listeners on this region. Does nothing if the
* specified listener has not been added. If the specified listener has been added then
* {@link CacheCallback#close} will be called on it; otherwise does nothing.
- *
+ *
* @param aListener the cache listener to remove from the region.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
@@ -129,7 +129,7 @@ public interface AttributesMutator<K, V> {
/**
* Removes all cache listeners, calling {@link CacheCallback#close} on each of them, and then adds
* each listener in the specified array.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this region.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
* @since GemFire 5.0
@@ -138,7 +138,7 @@ public interface AttributesMutator<K, V> {
/**
* Changes the cache writer for the region.
- *
+ *
* @param cacheWriter the cache writer
* @return the previous CacheWriter
*/
@@ -146,11 +146,11 @@ public interface AttributesMutator<K, V> {
/**
* Changes the cache loader for the region.
- *
+ *
* Changing the cache loader for partitioned regions is not recommended due to the fact that it
* can result in an inconsistent cache loader configuration. This feature may be removed in future
* releases.
- *
+ *
* @param cacheLoader the cache loader
* @return the previous CacheLoader
*/
@@ -159,14 +159,14 @@ public interface AttributesMutator<K, V> {
/**
* Allows changing the eviction controller attributes for the region.
- *
+ *
* @return the {@link EvictionAttributesMutator} used to change the EvictionAttributes
*/
public EvictionAttributesMutator getEvictionAttributesMutator();
/**
* Sets cloning on region Note: off-heap regions always behave as if cloning is enabled.
- *
+ *
* @param cloningEnable
* @since GemFire 6.1
*/
@@ -184,28 +184,28 @@ public interface AttributesMutator<K, V> {
/**
* Adds GatewaySenderId to the list of GatewaySenderIds of the region. If the GatewaySenderId is
* not present on this VM then it will try to send it to other VM's
- *
+ *
* @param gatewaySenderId
*/
public void addGatewaySenderId(String gatewaySenderId);
/**
* Removes GatewaySenderId from the list of GatewaySenderIds of the region.
- *
+ *
* @param gatewaySenderId
*/
public void removeGatewaySenderId(String gatewaySenderId);
/**
* Adds AsyncEventQueueId to the list of AsyncEventQueueId of the region.
- *
+ *
* @param asyncEventQueueId
*/
public void addAsyncEventQueueId(String asyncEventQueueId);
/**
* Removes AsyncEventQueueId from the list of AsyncEventQueuesId of the region.
- *
+ *
* @param asyncEventQueueId
*/
public void removeAsyncEventQueueId(String asyncEventQueueId);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Cache.java b/geode-core/src/main/java/org/apache/geode/cache/Cache.java
index 66a3cd8..c67bdf7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Cache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Cache.java
@@ -58,7 +58,7 @@ public interface Cache extends GemFireCache {
* Terminates this object cache and releases all the resources. Calls {@link Region#close} on each
* region in the cache. After this cache is closed, any further method call on this cache or any
* region object will throw {@link CacheClosedException}, unless otherwise noted.
- *
+ *
* @param keepAlive whether the server should keep the durable client's queues alive for the
* timeout period
* @throws CacheClosedException if the cache is already closed.
@@ -111,7 +111,7 @@ public interface Cache extends GemFireCache {
/**
* Creates a {@link RegionFactory} which can be used to specify additional attributes for
* {@link Region} creation.
- *
+ *
* @see #createRegionFactory(RegionShortcut)
* @since GemFire 6.5
*/
@@ -120,7 +120,7 @@ public interface Cache extends GemFireCache {
/**
* Creates a {@link RegionFactory} for the most commonly used {@link Region} types defined by
* {@link RegionShortcut}
- *
+ *
* @since GemFire 6.5
*/
<K, V> RegionFactory<K, V> createRegionFactory(RegionShortcut shortcut);
@@ -128,7 +128,7 @@ public interface Cache extends GemFireCache {
/**
* Creates a {@link RegionFactory} for creating a {@link Region} from {@link RegionAttributes}
* mapped to this regionAttributesId
- *
+ *
* @param regionAttributesId the Id of RegionAttributes to be used
* @see #setRegionAttributes(String, RegionAttributes)
* @since GemFire 6.5
@@ -137,7 +137,7 @@ public interface Cache extends GemFireCache {
/**
* Creates a {@link RegionFactory} for creating a {@link Region} from the given regionAttributes
- *
+ *
* @param regionAttributes regionAttributes for the new region
* @see #createRegionFactory(RegionShortcut)
* @since GemFire 6.5
@@ -148,7 +148,7 @@ public interface Cache extends GemFireCache {
* Internal GemStone method for accessing the internationalized logging object for GemFire, use
* {@link #getLogger()} instead. This method does not throw {@code CacheClosedException} if the
* cache is closed.
- *
+ *
* @return the logging object
* @deprecated as of 6.5 use getLogger().convertToLogWriterI18n() instead
*/
@@ -159,7 +159,7 @@ public interface Cache extends GemFireCache {
* Internal GemStone method for accessing the internationalized logging object for GemFire, use
* {@link #getSecurityLogger()} instead. This method does not throw {@code CacheClosedException}
* if the cache is closed.
- *
+ *
* @return the security logging object
* @deprecated as of 6.5 use getSecurityLogger().convertToLogWriterI18n() instead
*/
@@ -184,7 +184,7 @@ public interface Cache extends GemFireCache {
* Gets the frequency (in seconds) at which a message will be sent by the primary cache-server to
* all the secondary cache-server nodes to remove the events which have already been dispatched
* from the queue.
- *
+ *
* @return The time interval in seconds
*/
int getMessageSyncInterval();
@@ -193,7 +193,7 @@ public interface Cache extends GemFireCache {
* Sets the frequency (in seconds) at which a message will be sent by the primary cache-server
* node to all the secondary cache-server nodes to remove the events which have already been
* dispatched from the queue.
- *
+ *
* @param seconds the time interval in seconds
* @throws IllegalArgumentException if {@code seconds} is less than zero
*/
@@ -233,7 +233,7 @@ public interface Cache extends GemFireCache {
* <p>
* For the default configuration see the constants in
* {@link org.apache.geode.cache.server.CacheServer}.
- *
+ *
* @see org.apache.geode.cache.server.CacheServer
*
* @since GemFire 5.7
@@ -257,7 +257,7 @@ public interface Cache extends GemFireCache {
* the cache if its timestamp is newer than what is in the cache or if it is the same and the
* event's distributed system ID is larger than that of the last event to modify the affected
* entry.
- *
+ *
* @param resolver gateway event conflict resolution resolver
* @since GemFire 7.0
*/
@@ -265,7 +265,7 @@ public interface Cache extends GemFireCache {
/**
* Returns the current gateway event conflict resolver
- *
+ *
* @since GemFire 7.0
*/
GatewayConflictResolver getGatewayConflictResolver();
@@ -309,7 +309,7 @@ public interface Cache extends GemFireCache {
/**
* Creates {@link GatewaySenderFactory} for creating a SerialGatewaySender
- *
+ *
* @return SerialGatewaySenderFactory
* @since GemFire 7.0
*/
@@ -318,7 +318,7 @@ public interface Cache extends GemFireCache {
/**
* Creates {@link AsyncEventQueueFactory} for creating a AsyncEventQueue
- *
+ *
* @return AsyncEventQueueFactory
* @since GemFire 7.0
*/
@@ -326,7 +326,7 @@ public interface Cache extends GemFireCache {
/**
* Creates {@link GatewayReceiverFactory} for creating a GatewayReceiver
- *
+ *
* @return GatewayReceiverFactory
* @since GemFire 7.0
*/
@@ -334,7 +334,7 @@ public interface Cache extends GemFireCache {
/**
* Returns all {@link GatewaySender}s for this Cache.
- *
+ *
* @return Set of GatewaySenders
* @since GemFire 7.0
*/
@@ -342,7 +342,7 @@ public interface Cache extends GemFireCache {
/**
* Returns the {@link GatewaySender} with the given id added to this Cache.
- *
+ *
* @return GatewaySender with id
* @since GemFire 7.0
*/
@@ -350,7 +350,7 @@ public interface Cache extends GemFireCache {
/**
* Returns all {@link GatewayReceiver}s for this Cache
- *
+ *
* @return Set of GatewaySenders
* @since GemFire 7.0
*/
@@ -358,7 +358,7 @@ public interface Cache extends GemFireCache {
/**
* Returns all {@link AsyncEventQueue}s for this Cache
- *
+ *
* @return Set of AsyncEventQueue
* @since GemFire 7.0
*/
@@ -366,7 +366,7 @@ public interface Cache extends GemFireCache {
/**
* Returns the {@link AsyncEventQueue} with the given id added to this Cache.
- *
+ *
* @return AsyncEventQueue with id
* @since GemFire 7.0
*/
@@ -374,14 +374,14 @@ public interface Cache extends GemFireCache {
/**
* Returns a set of the other non-administrative members in the distributed system.
- *
+ *
* @since GemFire 6.6
*/
Set<DistributedMember> getMembers();
/**
* Returns a set of the administrative members in the distributed system.
- *
+ *
* @since GemFire 6.6
*/
Set<DistributedMember> getAdminMembers();
@@ -389,7 +389,7 @@ public interface Cache extends GemFireCache {
/**
* Returns a set of the members in the distributed system that have the given region. For regions
* with local scope an empty set is returned.
- *
+ *
* @param region a Region in the cache
* @since GemFire 6.6
*/
@@ -397,7 +397,7 @@ public interface Cache extends GemFireCache {
/**
* Obtains the snapshot service to allow the cache data to be imported or exported.
- *
+ *
* @return the snapshot service
*/
CacheSnapshotService getSnapshotService();
@@ -409,14 +409,14 @@ public interface Cache extends GemFireCache {
* <p>
* This will also return true if the Cache has finished reconnecting. When reconnect has completed
* you can use {@link Cache#getReconnectedCache} to retrieve the new cache instance.
- *
+ *
* @return true if the Cache is attempting to reconnect or has finished reconnecting
*/
boolean isReconnecting();
/**
* Wait for the Cache to finish reconnecting to the distributed system and recreate a new Cache.
- *
+ *
* @see #getReconnectedCache
* @param time amount of time to wait, or -1 to wait forever
* @param units time unit
@@ -428,7 +428,7 @@ public interface Cache extends GemFireCache {
/**
* Force the Cache to stop reconnecting. If the Cache is currently connected this will disconnect
* and close it.
- *
+ *
*/
void stopReconnecting();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
index dffde6a..931faa6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
@@ -38,14 +38,14 @@ public interface CacheEvent<K, V> {
/**
* Returns the region to which this cached object belongs or the region that raised this event for
* <code>RegionEvent</code>s.
- *
+ *
* @return the region associated with this object or the region that raised this event.
*/
public Region<K, V> getRegion();
/**
* Return a description of the operation that triggered this event.
- *
+ *
* @return the operation that triggered this event.
* @since GemFire 5.0
*/
@@ -55,7 +55,7 @@ public interface CacheEvent<K, V> {
* Returns the callbackArgument passed to the method that generated this event. Provided primarily
* in case this object or region has already been destroyed. See the {@link Region} interface
* methods that take a callbackArgument parameter.
- *
+ *
* @return the callbackArgument associated with this event. <code>null</code> is returned if the
* callback argument is not propagated to the event. This happens for events given to
* {@link TransactionListener} and to {@link CacheListener} on the remote side of a
@@ -68,7 +68,7 @@ public interface CacheEvent<K, V> {
* callback argument may have existed but it could not be obtained. Note that
* {@link #getCallbackArgument} will return <code>null</code> when this method returns
* <code>false</code>.
- *
+ *
* @since GemFire 6.0
*/
public boolean isCallbackArgumentAvailable();
@@ -76,7 +76,7 @@ public interface CacheEvent<K, V> {
/**
* Answer true if this event originated in a cache other than this one. Answer false if this event
* originated in this cache.
- *
+ *
* @return true if this event originated remotely
*
*/
@@ -84,7 +84,7 @@ public interface CacheEvent<K, V> {
/**
* Returns the {@link DistributedMember} that this event originated in.
- *
+ *
* @return the member that performed the operation that originated this event.
* @since GemFire 5.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
index ec79aa3..e4907d9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
@@ -33,7 +33,7 @@ public class CacheExistsException extends CacheException {
/**
* Constructs an instance of <code>CacheExistsException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public CacheExistsException(Cache cache, String msg) {
@@ -44,7 +44,7 @@ public class CacheExistsException extends CacheException {
/**
* Constructs an instance of <code>CacheExistsException</code> with the specified detail message
* and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 9b23f6c..1eb649a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.cache;
+import java.util.Properties;
+
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -32,8 +34,6 @@ import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import java.util.Properties;
-
/**
* Factory class used to create the singleton {@link Cache cache} and connect to the GemFire
* singleton {@link DistributedSystem distributed system}. If the application wants to connect to
@@ -51,39 +51,39 @@ import java.util.Properties;
* The following examples illustrate bootstrapping the cache using region shortcuts:
* <p>
* Example 1: Create a cache and a replicate region named customers.
- *
+ *
* <PRE>
* Cache c = new CacheFactory().create();
* Region r = c.createRegionFactory(REPLICATE).create("customers");
* </PRE>
- *
+ *
* Example 2: Create a cache and a partition region with redundancy
- *
+ *
* <PRE>
* Cache c = new CacheFactory().create();
* Region r = c.createRegionFactory(PARTITION_REDUNDANT).create("customers");
* </PRE>
- *
+ *
* Example 3: Construct the cache region declaratively in cache.xml
- *
+ *
* <PRE>
<!DOCTYPE cache PUBLIC
"-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
- <cache>
+ <cache>
<region name="myRegion" refid="REPLICATE"/>
<!-- you can override or add to the REPLICATE attributes by adding
a region-attributes sub element here -->
</cache>
* </PRE>
- *
+ *
* Now, create the cache telling it to read your cache.xml file:
- *
+ *
* <PRE>
* Cache c = new CacheFactory().set("cache-xml-file", "myCache.xml").create();
* Region r = c.getRegion("myRegion");
* </PRE>
- *
+ *
* <p>
* For a complete list of all region shortcuts see {@link RegionShortcut}. Applications that need to
* explicitly control the individual region attributes can do this declaratively in XML or using
@@ -99,7 +99,7 @@ public class CacheFactory {
/**
* Creates a default cache factory.
- *
+ *
* @since GemFire 6.5
*/
public CacheFactory() {
@@ -109,7 +109,7 @@ public class CacheFactory {
/**
* Create a CacheFactory initialized with the given gemfire properties. For a list of valid
* GemFire properties and their meanings see {@linkplain ConfigurationProperties}.
- *
+ *
* @param props the gemfire properties to initialize the factory with.
* @since GemFire 6.5
*/
@@ -123,7 +123,7 @@ public class CacheFactory {
/**
* Sets a gemfire property that will be used when creating the Cache. For a list of valid GemFire
* properties and their meanings see {@link ConfigurationProperties}.
- *
+ *
* @param name the name of the gemfire property
* @param value the value of the gemfire property
* @return a reference to this CacheFactory object
@@ -247,7 +247,7 @@ public class CacheFactory {
/**
* Gets the instance of {@link Cache} produced by an earlier call to {@link #create()}.
- *
+ *
* @param system the {@code DistributedSystem} the cache was created with.
* @return the {@link Cache} associated with the specified system.
* @throws CacheClosedException if a cache has not been created or the created one is
@@ -260,7 +260,7 @@ public class CacheFactory {
/**
* Gets the instance of {@link Cache} produced by an earlier call to {@link #create()} even if it
* has been closed.
- *
+ *
* @param system the {@code DistributedSystem} the cache was created with.
* @return the {@link Cache} associated with the specified system.
* @throws CacheClosedException if a cache has not been created
@@ -306,7 +306,7 @@ public class CacheFactory {
/**
* Gets an arbitrary open instance of {@link Cache} produced by an earlier call to
* {@link #create()}.
- *
+ *
* @throws CacheClosedException if a cache has not been created or the only created one is
* {@link Cache#isClosed closed}
*/
@@ -323,7 +323,7 @@ public class CacheFactory {
/**
* Returns the version of the cache implementation.
- *
+ *
* @return the version of the cache implementation as a {@code String}
*/
public static String getVersion() {
@@ -341,7 +341,7 @@ public class CacheFactory {
* Note that a PdxInstance is only returned if a serialized PDX is found in the cache. If the
* cache contains a deserialized PDX, then a domain class instance is returned instead of a
* PdxInstance.
- *
+ *
* @param readSerialized true to prefer PdxInstance
* @return this CacheFactory
* @since GemFire 6.6
@@ -374,7 +374,7 @@ public class CacheFactory {
* This is provided mostly for container to inject an already initialized post processor. An
* object provided this way is expected to be initialized already. We are not calling the init
* method on this object
- *
+ *
* @return this CacheFactory
*/
public CacheFactory setPostProcessor(PostProcessor postProcessor) {
@@ -386,7 +386,7 @@ public class CacheFactory {
* Set the PDX serializer for the cache. If this serializer is set, it will be consulted to see if
* it can serialize any domain classes which are added to the cache in portable data exchange
* format.
- *
+ *
* @param serializer the serializer to use
* @return this CacheFactory
* @since GemFire 6.6
@@ -401,9 +401,9 @@ public class CacheFactory {
* Set the disk store that is used for PDX meta data. When serializing objects in the PDX format,
* the type definitions are persisted to disk. This setting controls which disk store is used for
* that persistence.
- *
+ *
* If not set, the metadata will go in the default disk store.
- *
+ *
* @param diskStoreName the name of the disk store to use for the PDX metadata.
* @return this CacheFactory
* @since GemFire 6.6
@@ -418,7 +418,7 @@ public class CacheFactory {
* setting is false. If you are using persistent regions with PDX then you must set this to true.
* If you are using a {@code GatewaySender} or {@code AsyncEventQueue} with PDX then you should
* set this to true.
- *
+ *
* @param isPersistent true if the metadata should be persistent
* @return this CacheFactory
* @since GemFire 6.6
@@ -436,7 +436,7 @@ public class CacheFactory {
* You should only set this attribute to {@code true} if you know this member will only be reading
* cache data. In this use case you do not need to pay the cost of preserving the unread fields
* since you will never be reserializing pdx data.
- *
+ *
* @param ignore {@code true} if fields not read during pdx deserialization should be ignored;
* {@code false}, the default, if they should be preserved.
* @return this CacheFactory
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java b/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
index 8f23238..cb7f2ef 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
@@ -18,12 +18,12 @@ package org.apache.geode.cache;
* <p>
* A listener to handle region or entry related events.
* </p>
- *
+ *
* <p>
* Instead of implementing this interface it is recommended that you extend the
* {@link org.apache.geode.cache.util.CacheListenerAdapter} class.
* </p>
- *
+ *
* <h4>Avoiding the risk of deadlock</h4>
* <p>
* The methods on a <code>CacheListener</code> are invoked while holding a lock on the entry
@@ -39,20 +39,20 @@ package org.apache.geode.cache;
* configuration. To be assured of no deadlocks, listener code should cause some other thread to
* access the region and must not wait for that thread to complete the task.
* </p>
- *
+ *
* <h4>Concurrency</h4>
* <p>
* Multiple events, on different entries, can cause concurrent invocation of
* <code>CacheListener</code> methods. Any exceptions thrown by the listener are caught by GemFire
* and logged.
* </p>
- *
+ *
* <h4>Declaring instances in Cache XML files</h4>
* <p>
* To declare a CacheListener in a Cache XML file, it must also implement {@link Declarable}
* </p>
- *
- *
+ *
+ *
* @see AttributesFactory#addCacheListener
* @see AttributesFactory#initCacheListeners
* @see RegionAttributes#getCacheListeners
@@ -66,7 +66,7 @@ public interface CacheListener<K, V> extends CacheCallback {
/**
* Handles the event of new key being added to a region. The entry did not previously exist in
* this region in the local cache (even with a null value).
- *
+ *
* @param event the EntryEvent
* @see Region#create(Object, Object)
* @see Region#put(Object, Object)
@@ -77,7 +77,7 @@ public interface CacheListener<K, V> extends CacheCallback {
/**
* Handles the event of an entry's value being modified in a region. This entry previously existed
* in this region in the local cache, but its previous value may have been null.
- *
+ *
* @param event the EntryEvent
* @see Region#put(Object, Object)
*/
@@ -85,7 +85,7 @@ public interface CacheListener<K, V> extends CacheCallback {
/**
* Handles the event of an entry's value being invalidated.
- *
+ *
* @param event the EntryEvent
* @see Region#invalidate(Object)
*/
@@ -93,7 +93,7 @@ public interface CacheListener<K, V> extends CacheCallback {
/**
* Handles the event of an entry being destroyed.
- *
+ *
* @param event the EntryEvent
* @see Region#destroy(Object)
*/
@@ -103,7 +103,7 @@ public interface CacheListener<K, V> extends CacheCallback {
* Handles the event of a region being invalidated. Events are not invoked for each individual
* value that is invalidated as a result of the region being invalidated. Each subregion, however,
* gets its own <code>regionInvalidated</code> event invoked on its listener.
- *
+ *
* @param event the RegionEvent
* @see Region#invalidateRegion()
* @see Region#localInvalidateRegion()
@@ -114,7 +114,7 @@ public interface CacheListener<K, V> extends CacheCallback {
* Handles the event of a region being destroyed. Events are not invoked for each individual entry
* that is destroyed as a result of the region being destroyed. Each subregion, however, gets its
* own <code>afterRegionDestroyed</code> event invoked on its listener.
- *
+ *
* @param event the RegionEvent
* @see Region#destroyRegion()
* @see Region#localDestroyRegion()
@@ -126,7 +126,7 @@ public interface CacheListener<K, V> extends CacheCallback {
/**
* Handles the event of a region being cleared. Events are not invoked for each individual entry
* that is removed as a result of the region being cleared.
- *
+ *
* @param event the RegionEvent
*
* @see Region#clear
@@ -140,7 +140,7 @@ public interface CacheListener<K, V> extends CacheCallback {
* <p>
* Note that this method is only called for creates done in the local vm. To be notified of
* creates done in remote vms use {@link RegionMembershipListener#afterRemoteRegionCreate}.
- *
+ *
* @param event the RegionEvent
*
* @see Cache#createRegion
@@ -153,7 +153,7 @@ public interface CacheListener<K, V> extends CacheCallback {
* Handles the event of a region being live after receiving the marker from the server.
*
* @param event the RegionEvent
- *
+ *
* @see Cache#readyForEvents
* @since GemFire 5.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
index 65d147a..9a19f82 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
@@ -37,7 +37,7 @@ public class CacheLoaderException extends OperationAbortedException {
/**
* Constructs an instance of <code>CacheLoaderException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public CacheLoaderException(String msg) {
@@ -47,7 +47,7 @@ public class CacheLoaderException extends OperationAbortedException {
/**
* Constructs an instance of <code>CacheLoaderException</code> with the specified detail message
* and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -57,7 +57,7 @@ public class CacheLoaderException extends OperationAbortedException {
/**
* Constructs an instance of <code>CacheLoaderException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public CacheLoaderException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
index 7732e96..f5340bd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
@@ -33,7 +33,7 @@ public abstract class CacheRuntimeException extends GemFireException {
/**
* Constructs an instance of {@code CacheRuntimeException} with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public CacheRuntimeException(String msg) {
@@ -43,7 +43,7 @@ public abstract class CacheRuntimeException extends GemFireException {
/**
* Constructs an instance of {@code CacheRuntimeException} with the specified detail message and
* cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -53,7 +53,7 @@ public abstract class CacheRuntimeException extends GemFireException {
/**
* Constructs an instance of {@code CacheRuntimeException} with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public CacheRuntimeException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
index 05839cc..fdccf9c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
@@ -40,7 +40,7 @@ public interface CacheStatistics {
* Entry and subregion creation will update the modification time on a region, but
* <code>destroy</code>, <code>destroyRegion</code>, <code>invalidate</code>, and
* <code>invalidateRegion</code> do not update the modification time.
- *
+ *
* @return the last modification time of the region or the entry; returns 0 if entry is invalid or
* modification time is uninitialized.
* @see Region#put(Object, Object)
@@ -97,7 +97,7 @@ public interface CacheStatistics {
* <code>Region.get</code>, then zero is returned.
* <p>
* The hit ratio is equivalent to:
- *
+ *
* <pre>
* long hitCount = getHitCount();
* long total = hitCount + getMissCount();
@@ -112,7 +112,7 @@ public interface CacheStatistics {
/**
* Reset the missCount and hitCount to zero for this entry.
- *
+ *
* @throws StatisticsDisabledException if statistics are not available
*/
public void resetCounts() throws StatisticsDisabledException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java b/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
index 8d9c694..672d695 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
@@ -22,22 +22,22 @@ import java.util.concurrent.TimeUnit;
* <p>
* The CacheTransactionManager interface allows applications to manage transactions on a per
* {@link Cache} basis.
- *
+ *
* <p>
* The life cycle of a GemFire transaction starts with a begin operation. The life cycle ends with
* either a commit or rollback operation. Between the begin and the commit/rollback are typically
* {@link Region} operations. In general, those that either create, destroy, invalidate or update
* {@link Region.Entry} are considered transactional, that is they modify transactional state.
- *
+ *
* <p>
* A GemFire transaction may involve operations on multiple regions, each of which may have
* different attributes.
- *
+ *
* <p>
* While a GemFire transaction and its operations are invoked in the local VM, the resulting
* transaction state is distributed to other VM's at commit time as per the attributes of each
* participant Region.
- *
+ *
* <p>
* A transaction can have no more than one thread associated with it and conversely a thread can
* only operate on one transaction at any given time. Child threads will not inherit the existing
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
* <p>
* Each of the following methods operate on the current thread. All methods throw
* {@link CacheClosedException} if the Cache is closed.
- *
+ *
* <p>
* GemFire Transactions currently only support Read Committed isolation. In addition, they are
* optimistic transactions in that write locking and conflict checks are performed as part of the
@@ -64,12 +64,12 @@ import java.util.concurrent.TimeUnit;
* r.put("stringBuf", s);
* txMgr.commit();
* </pre>
- *
+ *
* <p>
* To aid in creating copies, the "copy on read" <code>Cache</code> attribute and the
* {@link org.apache.geode.CopyHelper#copy} method are provided. The following is a Read Committed
* safe example using the <code>CopyHelper.copy</code> method.
- *
+ *
* <pre>
* CacheTransactionManager txMgr = cache.getCacheTransactionManager();
* txMgr.begin();
@@ -88,21 +88,21 @@ import java.util.concurrent.TimeUnit;
* Partitioned Regions, Distributed No Ack and Distributed Ack Regions are supported (see
* {@link AttributesFactory} for Scope). For both scopes, a consistent configuration (per VM) is
* enforced.
- *
+ *
* <p>
* Global Regions, client Regions (see org.apache.geode.cache.client package) and persistent Regions
* (see {@link DiskWriteAttributes}) do not support transactions.
- *
+ *
* <p>
* When PartitionedRegions are involved in a transaction, all data in the transaction must be
* colocated together on one data node. See the GemFire Developer Guide for details on using
* transactions with Partitioned Regions.
- *
- *
+ *
+ *
* @since GemFire 4.0
- *
+ *
* @see Cache
- *
+ *
*/
public interface CacheTransactionManager {
/**
@@ -122,16 +122,16 @@ public interface CacheTransactionManager {
* transaction.
*
* @throws IllegalStateException if the thread is not associated with a transaction
- *
+ *
* @throws CommitConflictException if the commit operation fails due to a write conflict.
- *
+ *
* @throws TransactionDataNodeHasDepartedException if the node hosting the transaction data has
* departed. This is only relevant for transaction that involve PartitionedRegions.
- *
+ *
* @throws TransactionDataNotColocatedException if at commit time, the data involved in the
* transaction has moved away from the transaction hosting node. This can only happen if
* rebalancing/recovery happens during a transaction that involves a PartitionedRegion.
- *
+ *
* @throws TransactionInDoubtException when GemFire cannot tell which nodes have applied the
* transaction and which have not. This only occurs if nodes fail mid-commit, and only
* then in very rare circumstances.
@@ -143,7 +143,7 @@ public interface CacheTransactionManager {
* thread is no longer associated with a transaction and the transaction context is destroyed.
*
* @since GemFire 4.0
- *
+ *
* @throws IllegalStateException if the thread is not associated with a transaction
*/
public void rollback();
@@ -152,7 +152,7 @@ public interface CacheTransactionManager {
* Suspends the transaction on the current thread. All subsequent operations performed by this
* thread will be non-transactional. The suspended transaction can be resumed by calling
* {@link #resume(TransactionId)}
- *
+ *
* @return the transaction identifier of the suspended transaction or null if the thread was not
* associated with a transaction
* @since GemFire 6.6.2
@@ -162,7 +162,7 @@ public interface CacheTransactionManager {
/**
* On the current thread, resumes a transaction that was previously suspended using
* {@link #suspend()}
- *
+ *
* @param transactionId the transaction to resume
* @throws IllegalStateException if the thread is associated with a transaction or if
* {@link #isSuspended(TransactionId)} would return false for the given transactionId
@@ -174,7 +174,7 @@ public interface CacheTransactionManager {
/**
* This method can be used to determine if a transaction with the given transaction identifier is
* currently suspended locally. This method does not check other members for transaction status.
- *
+ *
* @param transactionId
* @return true if the transaction is in suspended state, false otherwise
* @since GemFire 6.6.2
@@ -185,17 +185,17 @@ public interface CacheTransactionManager {
/**
* On the current thread, resumes a transaction that was previously suspended using
* {@link #suspend()}.
- *
+ *
* This method is equivalent to
- *
+ *
* <pre>
* if (isSuspended(txId)) {
* resume(txId);
* }
* </pre>
- *
+ *
* except that this action is performed atomically
- *
+ *
* @param transactionId the transaction to resume
* @return true if the transaction was resumed, false otherwise
* @since GemFire 6.6.2
@@ -211,9 +211,9 @@ public interface CacheTransactionManager {
* <li>Another thread calls commit/rollback on the transaction</li>
* <li>This thread has waited for the specified timeout</li>
* </ul>
- *
+ *
* This method returns immediately if {@link #exists(TransactionId)} returns false.
- *
+ *
* @param transactionId the transaction to resume
* @param time the maximum time to wait
* @param unit the time unit of the <code>time</code> argument
@@ -227,7 +227,7 @@ public interface CacheTransactionManager {
* Reports the existence of a transaction for the given transactionId. This method can be used to
* determine if a transaction with the given transaction identifier is currently in progress
* locally.
- *
+ *
* @param transactionId the given transaction identifier
* @return true if the transaction is in progress, false otherwise.
* @since GemFire 6.6.2
@@ -266,7 +266,7 @@ public interface CacheTransactionManager {
/**
* Returns an array of all the transaction listeners on this cache. Modifications to the returned
* array will not effect what listeners are on this cache.
- *
+ *
* @return the cache's <code>TransactionListener</code>s; an empty array if no listeners
* @since GemFire 5.0
*/
@@ -286,7 +286,7 @@ public interface CacheTransactionManager {
/**
* Adds a transaction listener to the end of the list of transaction listeners on this cache.
- *
+ *
* @param aListener the user defined transaction listener to add to the cache.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
@@ -297,7 +297,7 @@ public interface CacheTransactionManager {
* Removes a transaction listener from the list of transaction listeners on this cache. Does
* nothing if the specified listener has not been added. If the specified listener has been added
* then {@link CacheCallback#close} will be called on it; otherwise does nothing.
- *
+ *
* @param aListener the transaction listener to remove from the cache.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
@@ -307,7 +307,7 @@ public interface CacheTransactionManager {
/**
* Removes all transaction listeners, calling {@link CacheCallback#close} on each of them, and
* then adds each listener in the specified array.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this cache.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
* @since GemFire 5.0
@@ -316,7 +316,7 @@ public interface CacheTransactionManager {
/**
* Set the TransactionWriter for the cache
- *
+ *
* @param writer
* @see TransactionWriter
* @since GemFire 6.5
@@ -325,7 +325,7 @@ public interface CacheTransactionManager {
/**
* Returns the current {@link TransactionWriter}
- *
+ *
* @see CacheTransactionManager#setWriter(TransactionWriter)
* @return the current {@link TransactionWriter}
* @since GemFire 6.5
@@ -335,7 +335,7 @@ public interface CacheTransactionManager {
/**
* Sets whether transactions should be executed in distributed or non-distributed mode. Once set
* this mode should not be changed during the course of transactions.
- *
+ *
* @throws IllegalStateException if a transaction is already in progress and this method sets the
* distributed mode to a different value.
* @since Geode 1.0
@@ -344,7 +344,7 @@ public interface CacheTransactionManager {
/**
* Returns the execution mode of transactions
- *
+ *
* @return true if distributed, false otherwise.
* @since Geode 1.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
index ae4dcb5..a3f33be 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
@@ -67,7 +67,7 @@ public interface CacheWriter<K, V> extends CacheCallback {
* {@link CacheEvent#getOperation() Operation}'s {@link Operation#isLoad()} method. The entry
* being created may already exist in the local cache where this <code>CacheWriter</code> is
* installed, but it does not yet exist in the cache where the operation was initiated.
- *
+ *
* @param event an EntryEvent that provides information about the operation in progress
* @throws CacheWriterException if thrown will abort the operation in progress, and the exception
* will be propagated back to caller that initiated the operation
@@ -114,10 +114,10 @@ public interface CacheWriter<K, V> extends CacheCallback {
/**
* Called before a region is cleared. The <code>CacheWriter</code> will not additionally be called
* for each entry that is cleared in the region as a result of a region clear.
- *
+ *
* <p>
* WARNING: This method should not clear/destroy any regions
- *
+ *
*
* @param event a RegionEvent that provides information about the operation
*
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
index 59bdab1..2cc6e8b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
@@ -40,7 +40,7 @@ public class CacheWriterException extends OperationAbortedException {
/**
* Constructs an instance of <code>CacheWriterException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public CacheWriterException(String msg) {
@@ -50,7 +50,7 @@ public class CacheWriterException extends OperationAbortedException {
/**
* Constructs an instance of <code>CacheWriterException</code> with the specified detail message
* and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -60,7 +60,7 @@ public class CacheWriterException extends OperationAbortedException {
/**
* Constructs an instance of <code>CacheWriterException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public CacheWriterException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java b/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
index 648882e..d0c7fcf 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
@@ -20,11 +20,11 @@ package org.apache.geode.cache;
* <code>ClientSessions</code> can be used from the cache server to perform interest registrations
* and unregistrations on behalf of clients. <code>ClientSessions</code> are only available on the
* cache server.
- *
+ *
* <p>
* The ClientSession is often used in conjunction with a callback <code>EntryEvent</code> as shown
* below.
- *
+ *
* <pre>
* String durableClientId = ...; // Some part of the event's key or value would contain this id
* Cache cache = CacheFactory.getAnyInstance();
@@ -32,7 +32,7 @@ package org.apache.geode.cache;
* ClientSession clientSession = cacheServer.getClientSession(durableClientId);
* clientSession.registerInterest(event.getRegion().getFullPath(), event.getKey(), InterestResultPolicy.KEYS_VALUES, true);
* </pre>
- *
+ *
* @since GemFire 6.0
* @see org.apache.geode.cache.server.CacheServer#getClientSession(String) getClientSession
* @see org.apache.geode.cache.server.CacheServer#getClientSession(org.apache.geode.distributed.DistributedMember)
@@ -43,7 +43,7 @@ public interface ClientSession {
/**
* Registers interest in a particular region and key
- *
+ *
* @param regionName The name of the region in which to register interest
* @param keyOfInterest The key on which to register interest
* @param policy The {@link org.apache.geode.cache.InterestResultPolicy}. Note: For the special
@@ -82,7 +82,7 @@ public interface ClientSession {
/**
* Registers interest in a particular region and regular expression
- *
+ *
* @param regionName The name of the region in which to register interest
* @param regex The regular expression to on which to register interest
* @param isDurable Whether the interest is durable
@@ -96,7 +96,7 @@ public interface ClientSession {
/**
* Unregisters interest in a particular region and key
- *
+ *
* @param regionName The name of the region in which to unregister interest
* @param keyOfInterest The key on which to unregister interest
* @param isDurable Whether the interest is durable
@@ -106,7 +106,7 @@ public interface ClientSession {
/**
* Unregisters interest in a particular region and key
- *
+ *
* @param regionName The name of the region in which to unregister interest
* @param keyOfInterest The key on which to unregister interest
* @param isDurable Whether the interest is durable
@@ -120,7 +120,7 @@ public interface ClientSession {
/**
* Unregisters interest in a particular region and regular expression
- *
+ *
* @param regionName The name of the region in which to unregister interest
* @param regex The regular expression on which to unregister interest
* @param isDurable Whether the interest is durable
@@ -130,7 +130,7 @@ public interface ClientSession {
/**
* Unregisters interest in a particular region and regular expression
- *
+ *
* @param regionName The name of the region in which to unregister interest
* @param regex The regular expression on which to unregister interest
* @param isDurable Whether the interest is durable
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java b/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java
index 282c9c5..36c2032 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java
@@ -28,7 +28,7 @@ public class CommitConflictException extends TransactionException {
/**
* Constructs an instance of <code>CommitConflictException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public CommitConflictException(String msg) {
@@ -38,7 +38,7 @@ public class CommitConflictException extends TransactionException {
/**
* Constructs an instance of <code>CommitConflictException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -48,7 +48,7 @@ public class CommitConflictException extends TransactionException {
/**
* Constructs an instance of <code>CommitConflictException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java b/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
index 84e4953..9f4ee97 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
@@ -72,4 +72,3 @@ public class CommitDistributionException extends TransactionException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java b/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
index d1e3bea..fd2cc4b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
@@ -16,7 +16,7 @@ package org.apache.geode.cache;
/**
* Thrown when a commit fails to complete due to errors
- *
+ *
* @since GemFire 5.7
*/
public class CommitIncompleteException extends TransactionException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java b/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
index a387044..fd7d445 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
@@ -21,7 +21,7 @@ package org.apache.geode.cache;
* <p>
* Note that if you wish to refer to an implementation of this interface in XML, the implementation
* must also implement the Declarable interface.
- *
+ *
*
*/
public interface CustomExpiry<K, V> extends CacheCallback {
@@ -31,7 +31,7 @@ public interface CustomExpiry<K, V> extends CacheCallback {
* region should be used.
* <p>
* The entry parameter should not be used after this method invocation completes.
- *
+ *
* @param entry the entry to calculate the expiration for
* @return the expiration to be used, null if the region's defaults should be used.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
index e761eb2..d16ce15 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
@@ -16,10 +16,10 @@
package org.apache.geode.cache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Enumerated type for region data policy. The data policy specifies how this local cache will
* handle the data for a region.
@@ -101,7 +101,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* In addition to <code>PARTITION</code> also causes data to be stored to disk. The region
* initialization may use the data stored on disk.
- *
+ *
* @since GemFire 6.5
*/
public static final DataPolicy PERSISTENT_PARTITION = new DataPolicy(6, "PERSISTENT_PARTITION");
@@ -152,7 +152,7 @@ public class DataPolicy implements java.io.Serializable {
* Although DataPolicy {@link #PARTITION} will return true to this query, it is possible to turn
* off local storage with {@link PartitionAttributesFactory#setLocalMaxMemory(int)} by setting
* localMaxMemory to zero.
- *
+ *
* @return true if regions with this policy store data locally.
* @see #NORMAL
* @see #PRELOADED
@@ -167,7 +167,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return whether this policy does replication.
- *
+ *
* @return true if this policy does replication.
* @see #REPLICATE
* @see #PERSISTENT_REPLICATE
@@ -178,7 +178,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return whether this policy does persistence.
- *
+ *
* @return true if this policy does persistence.
* @see #PERSISTENT_PARTITION
* @see #PERSISTENT_REPLICATE
@@ -190,7 +190,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return whether this policy does partitioning.
- *
+ *
* @return true if this policy does partitioning
* @see #PARTITION
* @see #PERSISTENT_PARTITION
@@ -202,7 +202,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return whether this policy does preloaded.
- *
+ *
* @return true if this policy does preloaded.
* @see #PRELOADED
* @since GemFire 6.5
@@ -213,7 +213,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #EMPTY}.
- *
+ *
* @return true if this policy is {@link #EMPTY}.
* @deprecated from version 6.5 forward please use withStorage()
*/
@@ -223,7 +223,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #NORMAL}.
- *
+ *
* @return true if this policy is {@link #NORMAL}.
* @deprecated from version 6.5 forward please use an identity comparison instead of this method
*/
@@ -233,7 +233,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #PRELOADED}.
- *
+ *
* @return true if this policy is {@link #PRELOADED}
* @deprecated from version 6.5 forward please use withPreloaded()
*/
@@ -243,7 +243,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is the default.
- *
+ *
* @return true if this policy is the default.
* @deprecated from version 6.5 forward please use an identity comparison instead of this method
*/
@@ -253,7 +253,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #REPLICATE}.
- *
+ *
* @return true if this policy is {@link #REPLICATE}.
* @deprecated from version 6.5 forward please use withReplication()
*/
@@ -263,7 +263,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #PERSISTENT_REPLICATE}.
- *
+ *
* @return true if this policy is {@link #PERSISTENT_REPLICATE}.
* @deprecated from version 6.5 forward please use withPersistence() and withReplication()
*/
@@ -273,7 +273,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #PARTITION}.
- *
+ *
* @return true if this policy is {@link #PARTITION}
* @deprecated from version 6.5 forward please use withPartitioning()
*/
@@ -283,7 +283,7 @@ public class DataPolicy implements java.io.Serializable {
/**
* Returns a string representation for this data policy.
- *
+ *
* @return the name of this data policy.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
index 51018a5..1aee0ae 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
@@ -138,4 +138,3 @@ public class DiskAccessException extends CacheRuntimeException {
this.isRemote = true;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java b/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
index 96f186e..0289e62 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
@@ -24,7 +24,7 @@ import java.util.UUID;
* <p>
* Instances of this interface are created using {@link DiskStoreFactory#create}. So to create a
* <code>DiskStore</code> named <code>myDiskStore</code> do this:
- *
+ *
* <PRE>
* new DiskStoreFactory().create("myDiskStore");
* </PRE>
@@ -55,7 +55,7 @@ public interface DiskStore {
/**
* Returns the threshold at which an oplog will become compactable. Until it reaches this
* threshold the oplog will not be compacted. The threshold is a percentage in the range 0..100.
- *
+ *
* @return the threshold, as a percentage, at which an oplog is considered compactable.
*/
public int getCompactionThreshold();
@@ -110,7 +110,7 @@ public interface DiskStore {
* Returns the universally unique identifier for the Disk Store across the GemFire distributed
* system.
* </p>
- *
+ *
* @return a UUID uniquely identifying this Disk Store in the GemFire distributed system.
* @see java.util.UUID
*/
@@ -155,7 +155,7 @@ public interface DiskStore {
* active oplog can be compacted.
* <P>
* This method will block until the compaction completes.
- *
+ *
* @return <code>true</code> if one or more oplogs were compacted; <code>false</code> indicates
* that no oplogs were ready to be compacted or that a compaction was already in progress.
* @see #getAllowForceCompaction
@@ -165,14 +165,14 @@ public interface DiskStore {
/**
* Destroys this disk store. Removes the disk store from the cache, and removes all files related
* to the disk store from disk.
- *
+ *
* If there are any currently open regions in the disk store this method will throw an exception.
* If there are any closed regions that are persisted in this disk store, the data for those
* regions will be destroyed.
*
* @throws IllegalStateException if the disk store is currently in use by any regions, gateway
* senders, or a PDX type registry.
- *
+ *
* @since GemFire 8.0
*/
public void destroy();
@@ -180,7 +180,7 @@ public interface DiskStore {
/**
* Returns the warning threshold for disk usage as a percentage of the total disk volume.
- *
+ *
* @return the warning percent
* @since GemFire 8.0
*/
@@ -188,7 +188,7 @@ public interface DiskStore {
/**
* Returns the critical threshold for disk usage as a percentage of the total disk volume.
- *
+ *
* @return the critical percent
* @since GemFire 8.0
*/
@@ -196,14 +196,14 @@ public interface DiskStore {
/**
* Sets the value of the disk usage warning percentage.
- *
+ *
* @param warningPercent the warning percent
*/
public void setDiskUsageWarningPercentage(float warningPercent);
/**
* Sets the value of the disk usage critical percentage.
- *
+ *
* @param criticalPercent the critical percent
*/
public void setDiskUsageCriticalPercentage(float criticalPercent);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
index a21dd8a..0187fab 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.io.File;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
* Factory for creating instances of {@link DiskStore}. To get an instance of this factory call
* {@link Cache#createDiskStoreFactory}. If all you want to do is find an existing disk store see
@@ -25,7 +25,7 @@ import java.io.File;
* <P>
* To use this factory configure it with the <code>set</code> methods and then call {@link #create}
* to produce a disk store instance.
- *
+ *
* @since GemFire 6.5
*/
public interface DiskStoreFactory {
@@ -133,7 +133,7 @@ public interface DiskStoreFactory {
/**
* Set to <code>true</code> to cause the disk files to be automatically compacted. Set to
* <code>false</code> if no compaction is needed or manual compaction will be used.
- *
+ *
* @param isAutoCompact if true then use auto compaction
* @return a reference to <code>this</code>
*/
@@ -145,7 +145,7 @@ public interface DiskStoreFactory {
* amount of live data in an oplog becomes less than this percentage then when a compaction is
* done this garbage will be cleaned up freeing up disk space. Garbage is created by entry
* destroys, entry updates, and region destroys.
- *
+ *
* @param compactionThreshold percentage of remaining live data in the oplog at which an oplog is
* compactable
* @return a reference to <code>this</code>
@@ -164,7 +164,7 @@ public interface DiskStoreFactory {
/**
* Sets the maximum size in megabytes a single oplog (operation log) is allowed to be. When an
* oplog is created this amount of file space will be immediately reserved.
- *
+ *
* @param maxOplogSize maximum size in megabytes for one single oplog file.
* @return a reference to <code>this</code>
*/
@@ -176,7 +176,7 @@ public interface DiskStoreFactory {
* <p>
* For how to configure a region to be asynchronous see:
* {@link AttributesFactory#setDiskSynchronous}.
- *
+ *
* @param timeInterval number of milliseconds that can elapse before async data is flushed to
* disk.
* @return a reference to <code>this</code>
@@ -185,7 +185,7 @@ public interface DiskStoreFactory {
/**
* Sets the write buffer size in bytes.
- *
+ *
* @param writeBufferSize write buffer size in bytes.
* @return a reference to <code>this</code>
*/
@@ -198,7 +198,7 @@ public interface DiskStoreFactory {
* <p>
* For how to configure a region to be asynchronous see:
* {@link AttributesFactory#setDiskSynchronous}.
- *
+ *
* @param queueSize number of operations that can be asynchronously queued. If 0, the queue will
* be unlimited.
* @return a reference to <code>this</code>
@@ -209,7 +209,7 @@ public interface DiskStoreFactory {
* Sets the directories to which this disk store's data is written. If multiple directories are
* used, GemFire will attempt to distribute the data evenly amongst them. The size of each
* directory will be set to the default of {@link #DEFAULT_DISK_DIR_SIZE}.
- *
+ *
* @param diskDirs directories to put the oplog files.
* @return a reference to <code>this</code>
*/
@@ -218,11 +218,11 @@ public interface DiskStoreFactory {
/**
* Sets the directories to which this disk store's data is written and also set the sizes in
* megabytes of each directory.
- *
+ *
* @param diskDirs directories to put the oplog files.
* @param diskDirSizes sizes of disk directories in megabytes
* @return a reference to <code>this</code>
- *
+ *
* @throws IllegalArgumentException if length of the size array does not match to the length of
* the dir array
*/
@@ -230,7 +230,7 @@ public interface DiskStoreFactory {
/**
* Sets the warning threshold for disk usage as a percentage of the total disk volume.
- *
+ *
* @param warningPercent warning percent of disk usage
* @return a reference to <code>this</code>
* @since GemFire 8.0
@@ -239,7 +239,7 @@ public interface DiskStoreFactory {
/**
* Sets the critical threshold for disk usage as a percentage of the total disk volume.
- *
+ *
* @param criticalPercent critical percent of disk usage
* @return a reference to <code>this</code>
* @since GemFire 8.0
@@ -249,7 +249,7 @@ public interface DiskStoreFactory {
/**
* Create a new disk store or find an existing one. In either case the returned disk store's
* configuration will be the same as this factory's configuration.
- *
+ *
* @param name the name of the DiskStore
* @return the newly created DiskStore.
* @throws IllegalStateException if a disk store with the given name already exists and its
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
index 1040475..b0b5a87 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
@@ -38,7 +38,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
/**
* Returns true if this <code>DiskWriteAttributes</code> object configures synchronous writes.
- *
+ *
* @return Returns true if writes to disk are synchronous and false otherwise
* @deprecated as of 6.5 use {@link RegionAttributes#isDiskSynchronous} instead.
*/
@@ -48,14 +48,14 @@ public interface DiskWriteAttributes extends java.io.Serializable {
/**
* Returns true if the oplogs is to be rolled to a more condensed format (on disk)
- *
+ *
* @return Returns true if the oplogs is to be rolled or false otherwise
*/
public boolean isRollOplogs();
/**
* Get the maximum size in megabytes a single oplog (operation log) file should be
- *
+ *
* @return the maximum size the operations log file can be
* @deprecated as of 6.5 use {@link DiskStore#getMaxOplogSize()} instead.
*/
@@ -66,7 +66,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
* Returns the number of milliseconds that can elapse before unwritten data is written to disk. If
* this <code>DiskWriteAttributes</code> configures synchronous writing, then
* <code>timeInterval</code> has no meaning.
- *
+ *
* @return Returns the time interval in milliseconds that can elapse between two writes to disk
* @deprecated as of 6.5 use {@link DiskStore#getTimeInterval()} instead.
*/
@@ -77,7 +77,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
* Returns the number of unwritten bytes of data that can be enqueued before being written to
* disk. If this <code>DiskWriteAttributes</code> configures synchronous writing, then
* <code>bytesThreshold</code> has no meaning.
- *
+ *
* @return Returns the number of bytes that can be buffered before being written to disk
* @deprecated as of 6.5 use {@link DiskStore#getQueueSize()} instead.
*/
@@ -88,7 +88,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
* Two <code>DiskWriteAttributes</code> are equal if the both specify the synchronous writes, or
* they both specify asynchronous writes with the same time interval, bytes threshold,
* maxOplogSize and compaction values
- *
+ *
* @return true if o is equal else false
*/
public boolean equals(Object o);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
index 0411e0a..d5c5445 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import java.util.Properties;
import org.apache.geode.internal.cache.DiskWriteAttributesImpl;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Factory for getting DiskWriteAttribute objects
- *
+ *
* @since GemFire 5.1
* @deprecated as of 6.5 use {@link DiskStoreFactory} instead
*/
@@ -35,7 +35,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
//////////// *** Methods to get instances of DWA *** //////////////
/**
- *
+ *
* Creates a new instance of DiskWriteAttributesFactory ready to create a
* <code>DiskWriteAttributes</code> with default settings. The default
* <code>DiskWriteAttributes</code> thus created will have following behaviour.
@@ -46,7 +46,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
* <li>max-oplog-size = 1024 MB
* <li>time-interval = 1 sec
* <li>byte-threshold = 0 bytes
- *
+ *
* </ul>
*/
public DiskWriteAttributesFactory() {
@@ -57,7 +57,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
* Creates a new instance of DiskWriteAttributesFactory Factory ready to create a
* <code>DiskWriteAttributes</code> with the same settings as those in the specified
* <code>DiskWriteAttributes</code>.
- *
+ *
* @param dwa the <code>DiskWriteAttributes</code> used to initialize this
* DiskWriteAttributesFactory
*/
@@ -77,7 +77,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
/**
* Sets whether or not the writing to the disk is synchronous.
- *
+ *
* @param isSynchronous boolean if true indicates synchronous writes
* @deprecated as of 6.5 use {@link AttributesFactory#setDiskSynchronous} instead
*/
@@ -89,7 +89,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
/**
* Sets whether or not the rolling of Oplog is enabled .
- *
+ *
* @param rollingEnabled true if oplogs are to be compacted automatically; false if no compaction.
* @deprecated as of 6.5 use {@link DiskStoreFactory#setAutoCompact} instead
*/
@@ -109,7 +109,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
* compactable. A threshold of 0 causes only oplogs that have no live records to be compactable in
* which case the compact can simply remove the oplog file. A threshold of 50 causes an oplog to
* become compactable when half of its live records become dead.
- *
+ *
* @deprecated as of 6.5 use {@link DiskStoreFactory#setCompactionThreshold} instead
*/
@Deprecated
@@ -134,7 +134,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
* <P>
* Note that this method sets the same attribute as {@link #setMaxOplogSize}. The last set of the
* attribute determines its value.
- *
+ *
* @param maxOplogSize the maximum size of the oplog in bytes.
* @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setMaxOplogSize} instead
@@ -156,7 +156,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
* <P>
* Note that this method sets the same attribute as {@link #setMaxOplogSizeInBytes}. The last set
* of the attribute determines its value.
- *
+ *
* @param maxOplogSize the maximum size of the oplog in megabytes.
* @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setMaxOplogSize} instead
@@ -176,7 +176,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
/**
* Takes an int which is supposed to be in megabytes and converts it to a long. This conversion
* takes into account that multiplication can lead to Integer.MAX_VALUE being exceeded
- *
+ *
* @param megaBytes
* @return the converted value
*/
@@ -189,7 +189,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
/**
* Sets the number of milliseconds that can elapse before unwritten data is written to disk. It
* has significance only in case of asynchronous mode of writing.
- *
+ *
* @param timeInterval Time interval in milliseconds
* @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setTimeInterval} instead
@@ -208,7 +208,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
/**
* Sets the number of unwritten bytes of data that can be enqueued before being written to disk.
* It has significance only in case of asynchronous mode of writing.
- *
+ *
* @param bytesThreshold the maximum number of bytes to enqueue before async data is flushed.
* @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setQueueSize} instead
@@ -226,7 +226,7 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
/**
* Creates a <code>DiskWriteAttributes</code> with the current settings.
- *
+ *
* @return the newly created <code>DiskWriteAttributes</code>
* @throws IllegalStateException if the current settings has compaction enabled with maximum Oplog
* Size specified as infinite ( represented by 0 ) *
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java b/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
index 9da6b04..6a1813f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
@@ -18,7 +18,7 @@ import org.apache.geode.GemFireException;
/**
* This exception is thrown when two nodes are defined with same primary partitions
- *
+ *
* @since GemFire 6.6
*/
public class DuplicatePrimaryPartitionException extends GemFireException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index e9e64e7..bdc3e0f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -61,20 +61,20 @@ import org.apache.geode.security.GemFireSecurityException;
* specify it in a dynamic-region-factory element in your cache.xml.
*
* <li>Before you've created a GemFire Cache in your application, add a line of code as follows:<br>
- *
+ *
* <pre>
* {
* DynamicRegionFactory factory = DynamicRegionFactory.get();
* factory.open(config);
* }
* </pre>
- *
+ *
* <pre>
* {
* DynamicRegionFactory myFactoryHandle = DynamicRegionFactory.get().open(config);
* }
* </pre>
- *
+ *
* or just use a dynamic-region-factory element in the cache.xml.
*
* <li>Create the GemFire Cache. During cache creation, the list of dynamic Regions will either be
@@ -90,14 +90,14 @@ import org.apache.geode.security.GemFireSecurityException;
* <p>
* All other instances of GemFire across the distributed system that instantiate and open a
* DynamicRegionFactory will also get the dynamic distributed Regions.
- *
+ *
* <li>Non-dynamic parent Regions should be declared in cache.xml so that they can be created before
* the dynamic Region factory goes active and starts creating Regions. You will have cache creation
* problems if this isn't done.
- *
+ *
* <li>A DynamicRegionListener can be registered before open is called and before cache creation so
* that the listener will be called if dynamic Regions are created during cache creation.
- *
+ *
* </ul>
* <p>
* Saving the factory on disk: If {@link DynamicRegionFactory.Config#persistBackup} is configured
@@ -117,18 +117,18 @@ import org.apache.geode.security.GemFireSecurityException;
* <li>DynamicRegionFactories in non-client VMs must not be configured with a pool.
* <li>If {@link #open()} is called before cache creation and the cache.xml has a
* dynamic-region-factory element then the cache.xml will override the open call's configuration.
- *
+ *
* <li>Since the RegionAttributes of a dynamically created Region are copied from the parent Region,
* any callbacks, ({@link CacheListener}, {@link CacheWriter}, and {@link CacheLoader} are shared by
* the parent and all its dynamic children so make sure the callback is thread-safe and that its
* {@link CacheCallback#close} implementation does not stop it from functioning. However the
* products LRUAlgorithm instances will be cloned so that each dynamic Region has its own callback.
- *
+ *
* <li>The root Region name "DynamicRegions" is reserved. The factory creates a root Region of that
* name and uses it to keep track of what dynamic Regions exist. Applications should not directly
* access this Region; instead use the methods on this factory.
* </ul>
- *
+ *
* @since GemFire 4.3
* @deprecated This class is deprecated. Use {@link FunctionService} to create regions on other
* members instead.
@@ -170,7 +170,7 @@ public abstract class DynamicRegionFactory {
* Opens the factory with the given settings. This should be sent to the factory before creating a
* cache. The cache will otherwise open a factory with default settings. This does not need to be
* sent if the cache.xml declares the use of dynamic regions.
- *
+ *
* @param conf the configuration for this factory.
*/
public void open(Config conf) {
@@ -228,7 +228,7 @@ public abstract class DynamicRegionFactory {
* This method is called internally during cache initialization at the correct time. Initialize
* the factory with a GemFire Cache. We create the metadata Region which holds all our dynamically
* created regions.
- *
+ *
* @param theCache The GemFire {@code Cache}
*/
protected void doInternalInit(InternalCache theCache) throws CacheException {
@@ -348,7 +348,7 @@ public abstract class DynamicRegionFactory {
/**
* Returns the {@code DynamicRegionFactory} singleton instance.
- *
+ *
* @return the {@code DynamicRegionFactory} singleton instance
*/
public static DynamicRegionFactory get() {
@@ -357,7 +357,7 @@ public abstract class DynamicRegionFactory {
/**
* Registers a {@code DynamicRegionListener} for callbacks.
- *
+ *
* @param listener The {@code DynamicRegionListener} to be registered
*/
public void registerDynamicRegionListener(DynamicRegionListener listener) {
@@ -373,7 +373,7 @@ public abstract class DynamicRegionFactory {
/**
* Unregisters a {@code DynamicRegionListener} for callbacks.
- *
+ *
* @param listener The {@code DynamicRegionListener} to be unregistered
*/
public void unregisterDynamicRegionListener(DynamicRegionListener listener) {
@@ -514,7 +514,7 @@ public abstract class DynamicRegionFactory {
/**
* Creates the dynamic Region in the local cache and distributes the creation to other caches.
- *
+ *
* @param parentRegionName the new region is created as a subregion of the region having this path
* @param regionName the name of the new subregion
* @return the {@code Region} created
@@ -532,7 +532,7 @@ public abstract class DynamicRegionFactory {
/**
* Destroys the dynamic Region in the local cache and distributes the destruction to other caches.
- *
+ *
* @param fullRegionName The full path of the {@code Region} to be dynamically destroyed
* @throws RegionDestroyedException if the dynamic region was never created or has already been
* destroyed
@@ -679,7 +679,7 @@ public abstract class DynamicRegionFactory {
* <li>persistBackup: {@code true}
* <li>registerInterest: {@code true}
* </ul>
- *
+ *
* @since GemFire 4.3
*/
public static class Config {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
index 5448013..e26e679 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache;
/**
* <code>DynamicRegionListener</code> is an interface that can be implemented to handle dynamic
* region-related events.
- *
+ *
* The methods on a <code>DynamicRegionListener</code> are invoked synchronously. If the listener
* method takes a long time to execute then it will cause the operation that caused it to be invoked
* to take a long time.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java b/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
index fd622e0..cf45ffc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache;
* Indicates that a method was invoked on an entry that has been destroyed.
*
*
- *
+ *
* @see Region.Entry
* @since GemFire 3.0
*/
@@ -32,7 +32,7 @@ public class EntryDestroyedException extends CacheRuntimeException {
/**
* Constructs a new <code>EntryDestroyedException</code> with the message.
- *
+ *
* @param s the detailed message for this exception
*/
public EntryDestroyedException(String s) {
@@ -42,7 +42,7 @@ public class EntryDestroyedException extends CacheRuntimeException {
/**
* Constructs a new <code>EntryDestroyedException</code> with a detailed message and a causal
* exception.
- *
+ *
* @param s the message
* @param ex a causal Throwable
*/
@@ -52,7 +52,7 @@ public class EntryDestroyedException extends CacheRuntimeException {
/**
* Construct a <code>EntryDestroyedException</code> with a cause.
- *
+ *
* @param ex the causal Throwable
*/
public EntryDestroyedException(Throwable ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
index 88c292d..a0f19a9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache;
-// import java.io.*;
/**
* Contains information about an event affecting an entry, including its identity and the the
@@ -39,7 +38,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
/**
* Returns the key.
- *
+ *
* @return the key
*/
public K getKey();
@@ -65,7 +64,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
* @return the serialized form of the value in the cache before this event
* @throws IllegalStateException if off-heap and called after the method that was passed this
* EntryEvent returns.
- *
+ *
* @since GemFire 5.5
*/
public SerializedCacheValue<V> getSerializedOldValue();
@@ -85,14 +84,14 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
* @return the serialized form of the value in the cache after this event
* @throws IllegalStateException if off-heap and called after the method that was passed this
* EntryEvent returns.
- *
+ *
* @since GemFire 5.5
*/
public SerializedCacheValue<V> getSerializedNewValue();
/**
* Gets the TransactionId for this EntryEvent.
- *
+ *
* @return the ID of the transaction that performed the operation that generated this event; null
* if no transaction involved.
* @since GemFire 4.0
@@ -101,7 +100,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
/**
* Returns true if this event originated on a client.
- *
+ *
* @since GemFire 5.7
* @return true if this event originated on a client.
*/
@@ -111,7 +110,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
* Returns <code>true</code> if the old value is "available". Not available means that an old
* value existed but it could not be obtained or it was deemed too expensive to obtain. Note that
* {@link #getOldValue} will return <code>null</code> when this method returns <code>false</code>.
- *
+ *
* @since GemFire 6.0
*/
public boolean isOldValueAvailable();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
index a6abbf4..49496c5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
@@ -31,7 +31,7 @@ public class EntryExistsException extends CacheException {
/**
* Constructs an instance of <code>EntryExistsException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
index 498049b..36e4d59 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
@@ -33,7 +33,7 @@ public class EntryNotFoundException extends CacheException {
/**
* Constructs an instance of <code>EntryNotFoundException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public EntryNotFoundException(String msg) {
@@ -43,7 +43,7 @@ public class EntryNotFoundException extends CacheException {
/**
* Constructs an instance of <code>EntryNotFoundException</code> with the specified detail message
* and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java b/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
index 197c9ca..d9aed95 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
@@ -17,8 +17,8 @@ package org.apache.geode.cache;
/**
* Gemfire Context passed to <code>PartitionResolver</code> to compute the data location
- *
- *
+ *
+ *
* @see PartitionResolver
* @since GemFire 6.0
*/
@@ -27,7 +27,7 @@ public interface EntryOperation<K, V> {
/**
* Returns the region to which this cached object belongs or the region that raised this event for
* <code>RegionEvent</code>s.
- *
+ *
* @return the region associated with this object or the region that raised this event.
*/
public Region<K, V> getRegion();
@@ -36,7 +36,7 @@ public interface EntryOperation<K, V> {
* Return a description of the operation that triggered this event. It may return null and should
* not be used to generate routing object in
* {@link PartitionResolver#getRoutingObject(EntryOperation)}
- *
+ *
* @return the operation that triggered this event.
* @since GemFire 6.0
* @deprecated
@@ -45,7 +45,7 @@ public interface EntryOperation<K, V> {
/**
* Returns the key.
- *
+ *
* @return the key
*/
public K getKey();
@@ -55,7 +55,7 @@ public interface EntryOperation<K, V> {
* in case this object or region has already been destroyed. See the {@link Region} interface
* methods that take a callbackArgument parameter. Only fields on the key should be used when
* creating the routing object.
- *
+ *
* @return the callbackArgument associated with this event. <code>null</code> is returned if the
* callback argument is not propagated to the event. This happens for events given to
* {@link TransactionListener} and to {@link CacheListener} on the remote side of a
@@ -68,7 +68,7 @@ public interface EntryOperation<K, V> {
* callback argument may have existed but it could not be obtained. Note that
* {@link #getCallbackArgument} will return <code>null</code> when this method returns
* <code>false</code>.
- *
+ *
* @since GemFire 6.0
*/
public boolean isCallbackArgumentAvailable();
@@ -77,7 +77,7 @@ public interface EntryOperation<K, V> {
* Returns the value but may return null and should not be used to generate routing object in
* {@link PartitionResolver#getRoutingObject(EntryOperation)}. Only fields on the key should be
* used when creating the routing object.
- *
+ *
* @return the value.
* @deprecated
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
index 0fd1b27..1f05c31 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
@@ -18,7 +18,7 @@ import javax.print.attribute.EnumSyntax;
/**
* The action that an {@link org.apache.geode.cache.EvictionAlgorithm} takes.
- *
+ *
* @since GemFire 5.0
* @see org.apache.geode.cache.EvictionAlgorithm
* @see org.apache.geode.internal.cache.EvictionAttributesImpl
@@ -83,7 +83,7 @@ public final class EvictionAction extends EnumSyntax {
/**
* Returns the eviction action the corresponds to the given parameter. Returns <code>null</code>
* if no action corresponds.
- *
+ *
* @since GemFire 6.5
*/
public static EvictionAction parseValue(int v) {
@@ -95,7 +95,7 @@ public final class EvictionAction extends EnumSyntax {
}
/**
- *
+ *
* @param s
* @return the action parsed from the provided string. If there are problems with parsing NONE is
* returned.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
index f57f257..48b7ad9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
@@ -18,7 +18,7 @@ import javax.print.attribute.EnumSyntax;
/**
* The algorithm used to determine when to perform an {@link org.apache.geode.cache.EvictionAction}
- *
+ *
* @since GemFire 5.0
* @see org.apache.geode.cache.EvictionAction
* @see org.apache.geode.internal.cache.EvictionAttributesImpl
@@ -51,7 +51,7 @@ public final class EvictionAlgorithm extends EnumSyntax {
/**
* An algorithm that considers the number of Entries in the Region before invoking its
* {@link EvictionAction}
- *
+ *
* @deprecated
*/
public static final EvictionAlgorithm LIFO_ENTRY = new EvictionAlgorithm(4);
@@ -59,7 +59,7 @@ public final class EvictionAlgorithm extends EnumSyntax {
/**
* An algorithm that considers the amount of bytes consumed by the Region before invoking its
* {@link EvictionAction}
- *
+ *
* @deprecated
*/
public static final EvictionAlgorithm LIFO_MEMORY = new EvictionAlgorithm(5);
@@ -87,7 +87,7 @@ public final class EvictionAlgorithm extends EnumSyntax {
/**
* Returns the eviction action the corresponds to the given parameter. Returns <code>null</code>
* if no action corresponds.
- *
+ *
* @since GemFire 6.5
*/
public static EvictionAlgorithm parseValue(int v) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
index cdd8aeb..ea5d720 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
@@ -69,7 +69,7 @@ public abstract class EvictionAttributes implements DataSerializable {
* If you are using a <code>cache.xml</code> file to create a Cache Region declaratively, you can
* include the following to configure a region for eviction
* <p/>
- *
+ *
* <pre>
* <region-attributes>
* <eviction-attributes>
@@ -179,7 +179,7 @@ public abstract class EvictionAttributes implements DataSerializable {
* If you are using a <code>cache.xml</code> file to create a Cache Region declaratively, you can
* include the following to create an LRU heap eviction controller:
* <p/>
- *
+ *
* <pre>
* <region-attributes>
* <eviction-attributes>
@@ -254,7 +254,7 @@ public abstract class EvictionAttributes implements DataSerializable {
* If you are using a <code>cache.xml</code> file to create a Cache Region declaratively, you can
* include the following to create an LRU memory eviction controller:
* <p/>
- *
+ *
* <pre>
* <region-attributes>
* <eviction-attributes>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
index 79afa5a..d5808ec 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.cache.EvictionAttributesImpl;
* The EvictionAttributesMutator allows changes to be made to a
* {@link org.apache.geode.cache.EvictionAttributes}. It is returned by
* {@link org.apache.geode.cache.AttributesMutator#getEvictionAttributesMutator()}
- *
+ *
* @since GemFire 5.0
*/
public interface EvictionAttributesMutator {
@@ -28,7 +28,7 @@ public interface EvictionAttributesMutator {
* Sets the maximum value on the {@link EvictionAttributesImpl} that the given
* {@link EvictionAlgorithm} uses to determine when to perform its {@link EvictionAction}. The
* unit of the maximum value is determined by the {@link EvictionAlgorithm}
- *
+ *
* @param maximum value used by the {@link EvictionAlgorithm}
*/
public void setMaximum(int maximum);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ExpirationAction.java b/geode-core/src/main/java/org/apache/geode/cache/ExpirationAction.java
index a03ced4..ef187bf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/ExpirationAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ExpirationAction.java
@@ -30,24 +30,24 @@ public class ExpirationAction implements Serializable {
private static final long serialVersionUID = 658925707882047900L;
/** When the region or cached object expires, it is invalidated. */
- public final static ExpirationAction INVALIDATE = new ExpirationAction("INVALIDATE");
+ public static final ExpirationAction INVALIDATE = new ExpirationAction("INVALIDATE");
/** When expired, invalidated locally only. Not supported for partitioned regions. */
- public final static ExpirationAction LOCAL_INVALIDATE = new ExpirationAction("LOCAL_INVALIDATE");
+ public static final ExpirationAction LOCAL_INVALIDATE = new ExpirationAction("LOCAL_INVALIDATE");
/** When the region or cached object expires, it is destroyed. */
- public final static ExpirationAction DESTROY = new ExpirationAction("DESTROY");
+ public static final ExpirationAction DESTROY = new ExpirationAction("DESTROY");
/**
* When expired, destroyed locally only. Not supported for partitioned regions. Use DESTROY
* instead.
*/
- public final static ExpirationAction LOCAL_DESTROY = new ExpirationAction("LOCAL_DESTROY");
+ public static final ExpirationAction LOCAL_DESTROY = new ExpirationAction("LOCAL_DESTROY");
/** The name of this action */
private final transient String name;
/**
* Creates a new instance of ExpirationAction.
- *
+ *
* @param name the name of the expiration action
* @see #toString
*/
@@ -57,7 +57,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns whether this is the action for distributed invalidate.
- *
+ *
* @return true if this in INVALIDATE
*/
public boolean isInvalidate() {
@@ -66,7 +66,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns whether this is the action for local invalidate.
- *
+ *
* @return true if this is LOCAL_INVALIDATE
*/
public boolean isLocalInvalidate() {
@@ -75,7 +75,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns whether this is the action for distributed destroy.
- *
+ *
* @return true if this is DESTROY
*/
public boolean isDestroy() {
@@ -84,7 +84,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns whether this is the action for local destroy.
- *
+ *
* @return true if thisis LOCAL_DESTROY
*/
public boolean isLocalDestroy() {
@@ -93,7 +93,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns whether this action is local.
- *
+ *
* @return true if this is LOCAL_INVALIDATE or LOCAL_DESTROY
*/
public boolean isLocal() {
@@ -102,7 +102,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns whether this action is distributed.
- *
+ *
* @return true if this is INVALIDATE or DESTROY
*/
public boolean isDistributed() {
@@ -111,7 +111,7 @@ public class ExpirationAction implements Serializable {
/**
* Returns a string representation for this action
- *
+ *
* @return the name of this action
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ExpirationAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/ExpirationAttributes.java
index cdd1447..8cf2fb0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/ExpirationAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ExpirationAttributes.java
@@ -61,7 +61,7 @@ public class ExpirationAttributes implements DataSerializable {
/**
* Constructs an <code>ExpirationAttributes</code> with the specified expiration time and the
* default expiration action <code>ExpirationAction.INVALIDATE</code>.
- *
+ *
* @param expirationTime The number of seconds before expiration
* @throws IllegalArgumentException if expirationTime is nonpositive
*/
@@ -104,7 +104,7 @@ public class ExpirationAttributes implements DataSerializable {
/**
* Returns the action that should take place when this value or region expires.
- *
+ *
* @return the action to take when expiring
*/
public ExpirationAction getAction() {
@@ -128,7 +128,7 @@ public class ExpirationAttributes implements DataSerializable {
/**
* Returns a string representation of this <code>ExpirationAttributes</code>. If the timeout is
* zero, returns <code>"NO EXPIRATION"</code>.
- *
+ *
* @return the String representation of this expiration attribute
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/FailedSynchronizationException.java b/geode-core/src/main/java/org/apache/geode/cache/FailedSynchronizationException.java
index 9424719..00508d8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/FailedSynchronizationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/FailedSynchronizationException.java
@@ -36,7 +36,7 @@ public class FailedSynchronizationException extends CacheRuntimeException {
/**
* Constructs an instance of <code>FailedSynchronizationException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public FailedSynchronizationException(String msg) {
@@ -46,7 +46,7 @@ public class FailedSynchronizationException extends CacheRuntimeException {
/**
* Constructs an instance of <code>FailedSynchronizationException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
index b257bfa..663e2bc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
@@ -19,28 +19,28 @@ import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
/**
* Composite date type used to distribute the attributes for a fixed partition.
* </p>
- *
+ *
* {@link org.apache.geode.cache.PartitionAttributes#getFixedPartitionAttributes()} returns all
* fixed partitions in Partitioned Region attributes.
* </p>
* {@link org.apache.geode.cache.PartitionAttributesFactory#addFixedPartitionAttributes(FixedPartitionAttributes)}
* configures <code>FixedPartitionAttributes</Code> in <code>PartitionedRegionAttributes</code>
* </p>
- *
+ *
* @see org.apache.geode.cache.PartitionAttributes
* @see org.apache.geode.cache.PartitionAttributesFactory
- *
+ *
* @since GemFire 6.6
*/
public abstract class FixedPartitionAttributes {
- private final static boolean DEFAULT_PRIMARY_STATUS = false;
+ private static final boolean DEFAULT_PRIMARY_STATUS = false;
- private final static int DEFAULT_NUM_BUCKETS = 1;
+ private static final int DEFAULT_NUM_BUCKETS = 1;
/**
* Creates an instance of <code>FixedPartitionAttributes</code>.
- *
+ *
* @param name Name of the fixed partition.
*/
public static FixedPartitionAttributes createFixedPartition(String name) {
@@ -50,7 +50,7 @@ public abstract class FixedPartitionAttributes {
/**
* Creates an instance of <code>FixedPartitionAttributes</code>.
- *
+ *
* @param name Name of the fixed partition.
* @param isPrimary True if this member is the primary for the partition.
*/
@@ -61,7 +61,7 @@ public abstract class FixedPartitionAttributes {
/**
* Creates an instance of <code>FixedPartitionAttributes</code>.
- *
+ *
* @param name Name of the fixed partition.
* @param isPrimary True if this member is the primary for the partition.
* @param numBuckets Number of buckets allowed for the partition.
@@ -74,7 +74,7 @@ public abstract class FixedPartitionAttributes {
/**
* Creates an instance of <code>FixedPartitionAttributes</code>.
- *
+ *
* @param name Name of the fixed partition.
* @param numBuckets Number of buckets allowed for the partition.
*/
@@ -90,7 +90,7 @@ public abstract class FixedPartitionAttributes {
/**
* Returns whether this member is the primary for the partition.
- *
+ *
* @return True if this member is the primary, false otherwise.
*/
public abstract boolean isPrimary();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
index 62c7985..a7b1d1c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
@@ -26,7 +26,7 @@ import java.util.Set;
* quarters. You can implement FixedPartitionResolver to get the name of the quarter based on the
* date given as part of {@link org.apache.geode.cache.EntryOperation}.
* </p>
- *
+ *
* public class QuarterPartitionResolver implements FixedPartitionResolver{<br>
*     public String getPartitionName(EntryOperation opDetails, Set allAvailablePartitions)
* {<br>
@@ -54,18 +54,18 @@ import java.util.Set;
* @see PartitionResolver
* @since GemFire 6.6
*
- *
+ *
*/
public interface FixedPartitionResolver<K, V> extends PartitionResolver<K, V> {
/**
* This method is used to get the name of the partition for the given entry operation.
- *
+ *
* @param opDetails the details of the entry operation e.g. {@link Region#get(Object)}
* @param targetPartitions Avoid using this parameter.This set is deprecated from 8.0 and same
* will be removed in future release. Represents all the available primary partitions on
* the nodes.
- *
+ *
* @return partition-name associated with node which allows mapping of given data to user defined
* partition
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java b/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
index 2d20afe..58ae1d5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache;
/**
* An exception indicating that a gateway configuration will not work with the remote side of the
* gateway's configuration.
- *
+ *
* @since GemFire 6.6
*/
public class GatewayConfigurationException extends GatewayException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/GatewayException.java b/geode-core/src/main/java/org/apache/geode/cache/GatewayException.java
index 8ca3b9a..b5cf066 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/GatewayException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/GatewayException.java
@@ -32,7 +32,7 @@ public class GatewayException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewayException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public GatewayException(String msg) {
@@ -42,7 +42,7 @@ public class GatewayException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewayException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -52,7 +52,7 @@ public class GatewayException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewayException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public GatewayException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java b/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
index f2a75db..80d30e4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
@@ -45,7 +45,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns the name of this cache. This method does not throw {@code CacheClosedException} if the
* cache is closed.
- *
+ *
* @return the String name of this cache
*/
public String getName();
@@ -58,7 +58,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns the {@code ResourceManager} for managing this cache's resources.
- *
+ *
* @return {@code ResourceManager} for managing this cache's resources
* @since GemFire 6.0
*/
@@ -73,7 +73,7 @@ public interface GemFireCache extends RegionService {
/**
* Indicates whether the "copy on read" is enabled for this cache.
- *
+ *
* @return true if "copy on read" is enabled, false otherwise.
*
* @since GemFire 4.0
@@ -136,7 +136,7 @@ public interface GemFireCache extends RegionService {
/**
* Gets the logging object for GemFire. This method does not throw {@code CacheClosedException} if
* the cache is closed.
- *
+ *
* @return the logging object
*/
public LogWriter getLogger();
@@ -144,14 +144,14 @@ public interface GemFireCache extends RegionService {
/**
* Gets the security logging object for GemFire. This method does not throw
* {@code CacheClosedException} if the cache is closed.
- *
+ *
* @return the security logging object
*/
public LogWriter getSecurityLogger();
/**
* Returns the DiskStore by name or {@code null} if no disk store is found.
- *
+ *
* @param name the name of the disk store to find. If {@code null} then the default disk store, if
* it exists, is returned.
* @since GemFire 6.5
@@ -160,7 +160,7 @@ public interface GemFireCache extends RegionService {
/**
* create diskstore factory
- *
+ *
* @since GemFire 6.5
*/
public DiskStoreFactory createDiskStoreFactory();
@@ -169,17 +169,17 @@ public interface GemFireCache extends RegionService {
/**
* Returns whether { @link PdxInstance} is preferred for PDX types instead of Java object.
- *
+ *
* @see org.apache.geode.cache.CacheFactory#setPdxReadSerialized(boolean)
* @see org.apache.geode.cache.client.ClientCacheFactory#setPdxReadSerialized(boolean)
- *
+ *
* @since GemFire 6.6
*/
public boolean getPdxReadSerialized();
/**
* Returns the PdxSerializer used by this cache, or null if no PDX serializer is defined.
- *
+ *
* @since GemFire 6.6
* @see CacheFactory#setPdxSerializer(PdxSerializer)
* @see ClientCacheFactory#setPdxSerializer(PdxSerializer)
@@ -188,7 +188,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns the disk store used for PDX meta data
- *
+ *
* @since GemFire 6.6
* @see CacheFactory#setPdxDiskStore(String)
* @see ClientCacheFactory#setPdxDiskStore(String)
@@ -197,7 +197,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns true if the PDX metadata for this cache is persistent
- *
+ *
* @since GemFire 6.6
* @see CacheFactory#setPdxPersistent(boolean)
* @see ClientCacheFactory#setPdxPersistent(boolean)
@@ -207,7 +207,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns true if fields that are not read during PDX deserialization should be ignored during
* the PDX serialization.
- *
+ *
* @since GemFire 6.6
* @see CacheFactory#setPdxIgnoreUnreadFields(boolean)
* @see ClientCacheFactory#setPdxIgnoreUnreadFields(boolean)
@@ -227,7 +227,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns the JNDI context associated with the Cache.
- *
+ *
* @return javax.naming.Context Added as part of providing JTA implementation in Gemfire.
*
* @since GemFire 4.0
@@ -237,7 +237,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns the Declarable used to initialize this cache or {@code null} if it does not have an
* initializer.
- *
+ *
* @since GemFire 6.6
*/
public Declarable getInitializer();
@@ -245,7 +245,7 @@ public interface GemFireCache extends RegionService {
/**
* Returns the Properties used to initialize the cache initializer or {@code null} if no
* initializer properties exist.
- *
+ *
* @since GemFire 6.6
*/
public Properties getInitializerProps();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
index b5d739e..3fd2071 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
@@ -109,7 +109,7 @@ public class InterestPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #ALL}.
- *
+ *
* @return true if this policy is {@link #ALL}.
*/
public boolean isAll() {
@@ -118,7 +118,7 @@ public class InterestPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #CACHE_CONTENT}.
- *
+ *
* @return true if this policy is {@link #CACHE_CONTENT}.
*/
public boolean isCacheContent() {
@@ -127,7 +127,7 @@ public class InterestPolicy implements java.io.Serializable {
/**
* Return true if this policy is the default.
- *
+ *
* @return true if this policy is the default.
*/
public boolean isDefault() {
@@ -136,7 +136,7 @@ public class InterestPolicy implements java.io.Serializable {
/**
* Returns a string representation for this interest policy.
- *
+ *
* @return the name of this interest policy.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
index cf80ec7..7a7ff48 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
@@ -36,14 +36,14 @@ public interface InterestRegistrationEvent {
/**
* Returns the region to which this interest belongs.
- *
+ *
* @return the region to which this interest belongs
*/
public Region<?, ?> getRegion();
/**
* Returns a <code>Set</code> of keys of interest.
- *
+ *
* @return a <code>Set</code> of keys of interest
*/
public Set<?> getKeysOfInterest();
@@ -78,7 +78,7 @@ public interface InterestRegistrationEvent {
/**
* Returns the {@link ClientSession} that initiated this event
- *
+ *
* @return the {@link ClientSession} that initiated this event
*/
public ClientSession getClientSession();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
index cbe55a3..83a1c39 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
@@ -37,7 +37,7 @@ package org.apache.geode.cache;
* System.out.println(
* "afterRegisterInterest: " + event.getRegionName() + " -> " + event.getKeysOfInterest());
* }
- *
+ *
* public void afterUnregisterInterest(InterestRegistrationEvent event) {
* System.out.println("afterUnregisterInterest: " + event.getRegionName() + " -> "
* + event.getKeysOfInterest());
@@ -60,7 +60,7 @@ package org.apache.geode.cache;
*
*
* @since GemFire 6.0
- *
+ *
* @see org.apache.geode.cache.server.CacheServer#registerInterestRegistrationListener
* registerInterestRegistrationListener
* @see org.apache.geode.cache.server.CacheServer#unregisterInterestRegistrationListener
diff --git a/geode-core/src/main/java/org/apache/geode/cache/InterestResultPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/InterestResultPolicy.java
index 5d28f2e..e3b35c6 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestResultPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestResultPolicy.java
@@ -16,10 +16,11 @@
package org.apache.geode.cache;
-import org.apache.geode.internal.cache.tier.sockets.InterestResultPolicyImpl;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import org.apache.geode.internal.cache.tier.sockets.InterestResultPolicyImpl;
+
/**
* Class <code>InterestResultPolicy</code> is an enumerated type for a register interest result. The
* result of a call to Region.registerInterest can be the keys and current values, just the keys or
@@ -74,7 +75,7 @@ public class InterestResultPolicy implements Serializable {
/**
* Returns the ordinal value.
- *
+ *
* @since GemFire 5.0
*/
public byte getOrdinal() {
@@ -83,7 +84,7 @@ public class InterestResultPolicy implements Serializable {
/**
* Returns true if this <code>InterestResultPolicy</code> is {@link #NONE}.
- *
+ *
* @return true if this <code>InterestResultPolicy</code> is {@link #NONE}.
*/
public boolean isNone() {
@@ -92,7 +93,7 @@ public class InterestResultPolicy implements Serializable {
/**
* Returns true if this <code>InterestResultPolicy</code> is {@link #KEYS}.
- *
+ *
* @return true if this <code>InterestResultPolicy</code> is {@link #KEYS}.
*/
public boolean isKeys() {
@@ -101,7 +102,7 @@ public class InterestResultPolicy implements Serializable {
/**
* Returns true if this <code>InterestResultPolicy</code> is {@link #KEYS_VALUES}.
- *
+ *
* @return true if this <code>InterestResultPolicy</code> is {@link #KEYS_VALUES}.
*/
public boolean isKeysValues() {
@@ -110,7 +111,7 @@ public class InterestResultPolicy implements Serializable {
/**
* Returns true if this <code>InterestResultPolicy</code> is the default.
- *
+ *
* @return true if this <code>InterestResultPolicy</code> is the default.
*/
public boolean isDefault() {
@@ -119,7 +120,7 @@ public class InterestResultPolicy implements Serializable {
/**
* Returns a string representation for this <code>InterestResultPolicy</code>.
- *
+ *
* @return the name of this data policy.
*/
@Override // GemStoneAddition
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java b/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
index 84678b9..473e30c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
@@ -65,7 +65,7 @@ public interface LoaderHelper<K, V> {
/**
* Return the argument object for the load method that was passed in from application code. This
* object is passed in as <i>aLoaderArgument</i> in {@link Region#get(Object, Object) get}.
- *
+ *
* @return the argument or null if one was not supplied
*/
public Object getArgument();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LossAction.java b/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
index e069004..2cd18e5 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
@@ -14,17 +14,17 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
import java.util.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Specifies how access to the region is affected when one or more required roles are lost. A role
* is lost when it is are offline and no longer present in the system membership. The
* <code>LossAction</code> is specified when configuring a region's
* {@link org.apache.geode.cache.MembershipAttributes}.
- *
+ *
* @deprecated this feature is scheduled to be removed
*/
public class LossAction implements Serializable {
@@ -128,7 +128,7 @@ public class LossAction implements Serializable {
/**
* Returns a string representation for this loss action.
- *
+ *
* @return the name of this loss action
*/
@Override
@@ -137,4 +137,3 @@ public class LossAction implements Serializable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java b/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java
index b223211..50ce6a2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java
@@ -26,10 +26,10 @@ import org.apache.geode.distributed.DistributedMember;
* Indicates a low memory condition either on the local or a remote {@link Cache}. The
* {@link ResourceManager} monitors local tenured memory consumption and determines when operations
* are rejected.
- *
+ *
* @see ResourceManager#setCriticalHeapPercentage(float)
* @see Region#put(Object, Object)
- *
+ *
* @since GemFire 6.0
*/
public class LowMemoryException extends ResourceException {
@@ -46,7 +46,7 @@ public class LowMemoryException extends ResourceException {
/**
* Constructs an instance of <code>LowMemoryException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
* @param criticalMembers the member(s) which are/were in a critical state
*/
@@ -57,7 +57,7 @@ public class LowMemoryException extends ResourceException {
/**
* Get a read-only set of members in a critical state at the time this exception was constructed.
- *
+ *
* @return the critical members
*/
public Set<DistributedMember> getCriticalMembers() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
index 4479899..2135c58 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
@@ -14,12 +14,6 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.Role;
-import org.apache.geode.distributed.internal.membership.InternalRole;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.Externalizable;
@@ -31,10 +25,16 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.Role;
+import org.apache.geode.distributed.internal.membership.InternalRole;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Configuration attributes for defining reliability requirements and behavior for a
* <code>Region</code>.
- *
+ *
* <p>
* <code>MembershipAttributes</code> provides options for configuring a <code>Region</code> to
* require one or more membership roles to be present in the system for reliable access to the
@@ -45,16 +45,16 @@ import java.util.Set;
* <p>
* The {@link LossAction} defines the behavior when one or more required roles are missing.
* </p>
- *
+ *
* <p>
* The {@link ResumptionAction} specifies the action to be taken when reliability resumes.
* </p>
- *
+ *
* <p>
* <code>MembershipAttributes</code> have no effect unless one or more required roles are specified.
* These attributes are immutable after the <code>Region</code> has been created.
* </p>
- *
+ *
* @deprecated this feature is scheduled to be removed
*/
public class MembershipAttributes implements DataSerializable, Externalizable {
@@ -210,7 +210,7 @@ public class MembershipAttributes implements DataSerializable, Externalizable {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -263,4 +263,3 @@ public class MembershipAttributes implements DataSerializable, Externalizable {
fromData(in);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java b/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
index 571b36c..e08f724 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
@@ -37,7 +37,7 @@ public class MirrorType implements java.io.Serializable {
/**
* New entries created in other caches for this region are not automatically propagated to this
* region in this cache.
- *
+ *
* @deprecated as of GemFire 5.0, use {@link DataPolicy#NORMAL} instead.
*/
@Deprecated
@@ -46,7 +46,7 @@ public class MirrorType implements java.io.Serializable {
/**
* New entries created in other caches for this region are propagated to this region in this
* cache, but the value is not necessarily copied to this cache with the key.
- *
+ *
* @deprecated as of GemFire 5.0, use {@link DataPolicy#REPLICATE} instead.
*/
@Deprecated
@@ -55,7 +55,7 @@ public class MirrorType implements java.io.Serializable {
/**
* New entries created in other caches for this region are propagated to this region in this cache
* and the value is also copied to this cache.
- *
+ *
* @deprecated as of GemFire 5.0, use {@link DataPolicy#REPLICATE} instead.
*/
@Deprecated
@@ -97,7 +97,7 @@ public class MirrorType implements java.io.Serializable {
/**
* Returns the {@link DataPolicy} that corresponds to this mirror type.
- *
+ *
* @since GemFire 5.0
*/
public DataPolicy getDataPolicy() {
@@ -121,7 +121,7 @@ public class MirrorType implements java.io.Serializable {
/**
* Return whether this indicates a mirrored type.
- *
+ *
* @return true if <code>KEYS</code> or <code>KEYS_VALUES</code>
*/
public boolean isMirrored() {
@@ -130,7 +130,7 @@ public class MirrorType implements java.io.Serializable {
/**
* Returns a string representation for this mirror type.
- *
+ *
* @return the name of this mirror type
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/NoQueueServersAvailableException.java b/geode-core/src/main/java/org/apache/geode/cache/NoQueueServersAvailableException.java
index 4c99fef..5f54c3d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/NoQueueServersAvailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/NoQueueServersAvailableException.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.client.ServerConnectivityException;
/**
* Indicates that this client cannot contact any queue servers and therefore cannot perform
* operations that require a queue, such as registering interest.
- *
+ *
* @since GemFire 5.7
*/
public class NoQueueServersAvailableException extends ServerConnectivityException {
@@ -32,9 +32,9 @@ public class NoQueueServersAvailableException extends ServerConnectivityExceptio
public NoQueueServersAvailableException() {}
/**
- *
+ *
* Create a new instance of NoPrimaryAvailableException with a detail message
- *
+ *
* @param message the detail message
*/
public NoQueueServersAvailableException(String message) {
@@ -43,7 +43,7 @@ public class NoQueueServersAvailableException extends ServerConnectivityExceptio
/**
* Create a new instance of NoPrimaryAvailableException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -53,7 +53,7 @@ public class NoQueueServersAvailableException extends ServerConnectivityExceptio
/**
* Create a new instance of NoPrimaryAvailableException with a cause
- *
+ *
* @param cause the cause
*/
public NoQueueServersAvailableException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/NoSubscriptionServersAvailableException.java b/geode-core/src/main/java/org/apache/geode/cache/NoSubscriptionServersAvailableException.java
index 7fc57cf..9053164 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/NoSubscriptionServersAvailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/NoSubscriptionServersAvailableException.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.client.ServerConnectivityException;
/**
* Indicates that this client cannot contact any servers and therefore cannot perform operations
* that require subscriptions, such as registering interest.
- *
+ *
* @since GemFire 5.7
*/
public class NoSubscriptionServersAvailableException extends ServerConnectivityException {
@@ -33,9 +33,9 @@ public class NoSubscriptionServersAvailableException extends ServerConnectivityE
public NoSubscriptionServersAvailableException() {}
/**
- *
+ *
* Create a new instance of NoSubscriptionServersAvailableException with a detail message
- *
+ *
* @param message the detail message
*/
public NoSubscriptionServersAvailableException(String message) {
@@ -45,7 +45,7 @@ public class NoSubscriptionServersAvailableException extends ServerConnectivityE
/**
* Create a new instance of NoSubscriptionServersAvailableException with a detail message and
* cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -55,7 +55,7 @@ public class NoSubscriptionServersAvailableException extends ServerConnectivityE
/**
* Create a new instance of NoSubscriptionServersAvailableException with a cause
- *
+ *
* @param cause the cause
*/
public NoSubscriptionServersAvailableException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Operation.java b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
index d835b6c..4ce16aa 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Operation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
@@ -17,8 +17,9 @@
package org.apache.geode.cache;
import java.io.*;
-import org.apache.geode.internal.cache.OpType;
+
import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.internal.cache.OpType;
/**
* Enumerated type for an event operation. This class describes the operation that generated the
@@ -75,7 +76,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry creation.
- *
+ *
* @see Region#create(Object, Object)
*/
public static final Operation CREATE = new Operation("CREATE", false, // isLocal
@@ -84,7 +85,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry creation caused by a putAll invocation
- *
+ *
* @see Region#putAll
*/
public static final Operation PUTALL_CREATE = new Operation("PUTALL_CREATE", false, // isLocal
@@ -93,7 +94,7 @@ public final class Operation implements java.io.Serializable {
/**
* A 'value for key' operation.
- *
+ *
* @see Region#get(Object)
*/
public static final Operation GET = new Operation("GET", false, // isLocal
@@ -102,7 +103,7 @@ public final class Operation implements java.io.Serializable {
/**
* A 'entry for key' operation.
- *
+ *
* @see Region#getEntry(Object)
*/
public static final Operation GET_ENTRY = new Operation("GET_ENTRY", false, // isLocal
@@ -111,7 +112,7 @@ public final class Operation implements java.io.Serializable {
/**
* A 'check for existence of key' operation.
- *
+ *
* @see Region#containsKey(Object)
*/
public static final Operation CONTAINS_KEY = new Operation("CONTAINS_KEY", false, // isLocal
@@ -119,7 +120,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_CONTAINS_KEY, OP_DETAILS_NONE);
/**
* A 'check for existence of value' operation.
- *
+ *
* @see Region#containsValueForKey(Object)
*/
public static final Operation CONTAINS_VALUE = new Operation("CONTAINS_VALUE", false, // isLocal
@@ -128,7 +129,7 @@ public final class Operation implements java.io.Serializable {
/**
* A 'check for existence of value for given key' operation.
- *
+ *
* @see Region#containsValueForKey(Object)
*/
public static final Operation CONTAINS_VALUE_FOR_KEY =
@@ -138,7 +139,7 @@ public final class Operation implements java.io.Serializable {
/**
* A 'function execution' operation.
- *
+ *
* @see FunctionService
*/
public static final Operation FUNCTION_EXECUTION = new Operation("FUNCTION_EXECUTION", false, // isLocal
@@ -147,7 +148,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry creation caused by a netsearch
- *
+ *
* @see Region#get(Object)
*/
public static final Operation SEARCH_CREATE = new Operation("SEARCH_CREATE", false, // isLocal
@@ -156,7 +157,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry creation caused by a local loader
- *
+ *
* @see Region#get(Object)
* @see CacheLoader
*/
@@ -165,7 +166,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_CREATE, OP_DETAILS_LOCAL_LOAD);
/**
* An entry creation caused by a net loader
- *
+ *
* @see Region#get(Object)
* @see CacheLoader
*/
@@ -175,7 +176,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry update.
- *
+ *
* @see Region#put(Object, Object)
*/
public static final Operation UPDATE = new Operation("UPDATE", false, // isLocal
@@ -184,7 +185,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry update caused by a putAll invocation.
- *
+ *
* @see Region#putAll
*/
public static final Operation PUTALL_UPDATE = new Operation("PUTALL_UPDATE", false, // isLocal
@@ -193,7 +194,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry update caused by a net search.
- *
+ *
* @see Region#get(Object)
*/
public static final Operation SEARCH_UPDATE = new Operation("SEARCH_UPDATE", false, // isLocal
@@ -202,7 +203,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry update caused by a local load.
- *
+ *
* @see Region#get(Object)
* @see CacheLoader
*/
@@ -212,7 +213,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry update caused by a net load.
- *
+ *
* @see Region#get(Object)
* @see CacheLoader
*/
@@ -222,7 +223,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry distributed invalidate.
- *
+ *
* @see Region#invalidate(Object)
*/
public static final Operation INVALIDATE = new Operation("INVALIDATE", false, // isLocal
@@ -231,7 +232,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry local invalidate.
- *
+ *
* @see Region#localInvalidate(Object)
*/
public static final Operation LOCAL_INVALIDATE = new Operation("LOCAL_INVALIDATE", true, // isLocal
@@ -240,7 +241,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry distributed destroy.
- *
+ *
* @see Region#destroy(Object)
*/
public static final Operation DESTROY = new Operation("DESTROY", false, // isLocal
@@ -248,7 +249,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_DESTROY, OP_DETAILS_NONE);
/**
* An entry local destroy.
- *
+ *
* @see Region#localDestroy(Object)
*/
public static final Operation LOCAL_DESTROY = new Operation("LOCAL_DESTROY", true, // isLocal
@@ -257,7 +258,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry local destroy caused by an eviction.
- *
+ *
* @see Region#localDestroy(Object)
*/
public static final Operation EVICT_DESTROY = new Operation("EVICT_DESTROY", true, // isLocal
@@ -267,7 +268,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region load snapshot.
- *
+ *
* @see Region#loadSnapshot
*/
public static final Operation REGION_LOAD_SNAPSHOT = new Operation("REGION_LOAD_SNAPSHOT", false, // isLocal
@@ -276,7 +277,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region local destroy.
- *
+ *
* @see Region#localDestroyRegion()
*/
public static final Operation REGION_LOCAL_DESTROY = new Operation("REGION_LOCAL_DESTROY", true, // isLocal
@@ -285,7 +286,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region create.
- *
+ *
* @see Region#createSubregion
* @see Cache#createRegion
*/
@@ -295,7 +296,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region close
- *
+ *
* @see Region#close
*/
public static final Operation REGION_CLOSE = new Operation("REGION_CLOSE", true, // isLocal
@@ -305,7 +306,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region distributed destroy.
- *
+ *
* @see Region#destroyRegion()
*/
public static final Operation REGION_DESTROY = new Operation("REGION_DESTROY", false, // isLocal
@@ -314,7 +315,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry distributed destroy triggered by expiration
- *
+ *
* @see RegionAttributes#getEntryTimeToLive
* @see RegionAttributes#getEntryIdleTimeout
* @see ExpirationAction#DESTROY
@@ -324,7 +325,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_DESTROY, OP_DETAILS_EXPIRE);
/**
* An entry local destroy triggered by expiration
- *
+ *
* @see RegionAttributes#getEntryTimeToLive
* @see RegionAttributes#getEntryIdleTimeout
* @see ExpirationAction#LOCAL_DESTROY
@@ -334,7 +335,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_DESTROY, OP_DETAILS_EXPIRE);
/**
* An entry distributed invalidate triggered by expiration
- *
+ *
* @see RegionAttributes#getEntryTimeToLive
* @see RegionAttributes#getEntryIdleTimeout
* @see ExpirationAction#INVALIDATE
@@ -345,7 +346,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry local invalidate triggered by expiration
- *
+ *
* @see RegionAttributes#getEntryTimeToLive
* @see RegionAttributes#getEntryIdleTimeout
* @see ExpirationAction#LOCAL_INVALIDATE
@@ -357,7 +358,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region distributed destroy triggered by expiration
- *
+ *
* @see RegionAttributes#getRegionTimeToLive
* @see RegionAttributes#getRegionIdleTimeout
* @see ExpirationAction#DESTROY
@@ -368,7 +369,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_DESTROY, OP_DETAILS_EXPIRE);
/**
* A region local destroy triggered by expiration
- *
+ *
* @see RegionAttributes#getRegionTimeToLive
* @see RegionAttributes#getRegionIdleTimeout
* @see ExpirationAction#LOCAL_DESTROY
@@ -379,7 +380,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_DESTROY, OP_DETAILS_EXPIRE);
/**
* A region distributed invalidate triggered by expiration
- *
+ *
* @see RegionAttributes#getRegionTimeToLive
* @see RegionAttributes#getRegionIdleTimeout
* @see ExpirationAction#INVALIDATE
@@ -390,7 +391,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_INVALIDATE, OP_DETAILS_EXPIRE);
/**
* A region local invalidate triggered by expiration
- *
+ *
* @see RegionAttributes#getRegionTimeToLive
* @see RegionAttributes#getRegionIdleTimeout
* @see ExpirationAction#LOCAL_INVALIDATE
@@ -401,7 +402,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_INVALIDATE, OP_DETAILS_EXPIRE);
/**
* A region local invalidate.
- *
+ *
* @see Region#localInvalidateRegion()
*/
public static final Operation REGION_LOCAL_INVALIDATE =
@@ -411,7 +412,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region distributed invalidate.
- *
+ *
* @see Region#invalidateRegion()
*/
public static final Operation REGION_INVALIDATE = new Operation("REGION_INVALIDATE", false, // isLocal
@@ -420,7 +421,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region clear.
- *
+ *
* @see Region#clear
*/
public static final Operation REGION_CLEAR = new Operation("REGION_CLEAR", false, // isLocal
@@ -428,7 +429,7 @@ public final class Operation implements java.io.Serializable {
OP_TYPE_CLEAR, OP_DETAILS_NONE);
/**
* A region local clear.
- *
+ *
* @see Region#localClear
*/
public static final Operation REGION_LOCAL_CLEAR = new Operation("REGION_LOCAL_CLEAR", true, // isLocal
@@ -437,7 +438,7 @@ public final class Operation implements java.io.Serializable {
/**
* A cache create. Note that this is marked as a region operation.
- *
+ *
* @see CacheFactory#create
*/
public static final Operation CACHE_CREATE = new Operation("CACHE_CREATE", true, // isLocal
@@ -446,7 +447,7 @@ public final class Operation implements java.io.Serializable {
/**
* A cache close. Note that this is marked as a region operation.
- *
+ *
* @see Cache#close()
*/
public static final Operation CACHE_CLOSE = new Operation("CACHE_CLOSE", true, // isLocal
@@ -467,7 +468,7 @@ public final class Operation implements java.io.Serializable {
/**
* A region destroy triggered by {@link ResumptionAction#REINITIALIZE}.
- *
+ *
* @see ResumptionAction#REINITIALIZE
*/
public static final Operation REGION_REINITIALIZE = new Operation("REGION_REINITIALIZE", true, // isLocal
@@ -476,7 +477,7 @@ public final class Operation implements java.io.Serializable {
/**
* A cache close triggered by {@link LossAction#RECONNECT}.
- *
+ *
* @see LossAction#RECONNECT
*/
public static final Operation CACHE_RECONNECT = new Operation("CACHE_RECONNECT", true, // isLocal
@@ -485,7 +486,7 @@ public final class Operation implements java.io.Serializable {
/**
* An atomic entry creation operation
- *
+ *
* @see java.util.concurrent.ConcurrentMap#putIfAbsent(Object, Object)
* @since GemFire 6.5
*/
@@ -495,7 +496,7 @@ public final class Operation implements java.io.Serializable {
/**
* An atomic update operation
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(Object, Object, Object)
* @since GemFire 6.5
*/
@@ -505,7 +506,7 @@ public final class Operation implements java.io.Serializable {
/**
* An atomic destroy destroy operation
- *
+ *
* @see java.util.concurrent.ConcurrentMap#remove(Object, Object)
* @since GemFire 6.5
*/
@@ -524,7 +525,7 @@ public final class Operation implements java.io.Serializable {
/**
* An entry distributed destroy caused by a removeAll.
- *
+ *
* @see Region#removeAll(java.util.Collection)
* @since GemFire 8.1
*/
@@ -689,7 +690,7 @@ public final class Operation implements java.io.Serializable {
/**
* Returns true if this operation was initiated by a removeAll.
- *
+ *
* @see Region#removeAll(java.util.Collection)
* @since GemFire 8.1
*/
@@ -741,7 +742,7 @@ public final class Operation implements java.io.Serializable {
/**
* Answer true if this operation resulted from expiration.
- *
+ *
* @return true if this operation resulted from expiration
*
*/
@@ -751,7 +752,7 @@ public final class Operation implements java.io.Serializable {
/**
* Answer true if this operation resulted from eviction
- *
+ *
* @return true if this operatino resulted from eviction
*/
public boolean isEviction() {
@@ -766,7 +767,7 @@ public final class Operation implements java.io.Serializable {
* the same VM as where the data is hosted. If true is returned, and
* {@link CacheEvent#isOriginRemote} is true, it means the data is not hosted locally, but the
* loader was run local to the data.
- *
+ *
* @return true if this operation included a local loader execution
*/
public boolean isLocalLoad() {
@@ -777,7 +778,7 @@ public final class Operation implements java.io.Serializable {
* Returns true if this operation included a loader running that was remote from the cache that
* requested it, i.e., a netLoad. Note that the cache that requested the netLoad may not be this
* cache.
- *
+ *
* @return true if this operation included a netLoad
*/
public boolean isNetLoad() {
@@ -786,7 +787,7 @@ public final class Operation implements java.io.Serializable {
/**
* Returns true if this operation included running a loader.
- *
+ *
* @return true if isLocalLoad or isNetLoad
*/
public boolean isLoad() {
@@ -806,7 +807,7 @@ public final class Operation implements java.io.Serializable {
/**
* Returns true if this operation was a {@link #isNetSearch net search} or a {@link #isLoad load}.
- *
+ *
* @return true if this operation include a netSearch or any type of load.
*/
public boolean isSearchOrLoad() {
@@ -817,7 +818,7 @@ public final class Operation implements java.io.Serializable {
/**
* Returns true if this operation is a ConcurrentMap operation that guarantees the old value to be
* returned no matter what expense may be incurred in doing so.
- *
+ *
* @return true if this operation has this guarantee
* @since GemFire 6.5
*/
@@ -873,7 +874,7 @@ public final class Operation implements java.io.Serializable {
/**
* Returns a string representation for this operation.
- *
+ *
* @return the name of this operation.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/OperationAbortedException.java b/geode-core/src/main/java/org/apache/geode/cache/OperationAbortedException.java
index 8720408..7af8d6d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/OperationAbortedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/OperationAbortedException.java
@@ -35,7 +35,7 @@ public abstract class OperationAbortedException extends CacheRuntimeException {
/**
* Constructs an instance of <code>OperationAbortedException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public OperationAbortedException(String msg) {
@@ -45,7 +45,7 @@ public abstract class OperationAbortedException extends CacheRuntimeException {
/**
* Constructs an instance of <code>OperationAbortedException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -55,7 +55,7 @@ public abstract class OperationAbortedException extends CacheRuntimeException {
/**
* Constructs an instance of <code>OperationAbortedException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public OperationAbortedException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
index 82964fd..5feb705 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
@@ -22,37 +22,37 @@ import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.cache.partition.PartitionListener;
/**
- *
+ *
* Attributes that define the partitioned character of a Partitioned Region. This interface allows
* for the discovery of Partitioned Region attributes using
* {@link org.apache.geode.cache.RegionAttributes#getPartitionAttributes()} as well as the
* configuration of a Partitioned Region using
* {@link org.apache.geode.cache.AttributesFactory#setPartitionAttributes(PartitionAttributes)}.
- *
+ *
* PartitionAttributes are created using the
* {@link org.apache.geode.cache.PartitionAttributesFactory}
- *
+ *
* The default PartitionAttributes can be determined using
* {@link org.apache.geode.cache.PartitionAttributesFactory#create()} with out calling any of its
* mutator methods e.g.
* {@link org.apache.geode.cache.PartitionAttributesFactory#setLocalMaxMemory(int)}
*
* Also see {@link org.apache.geode.cache.DataPolicy#PARTITION}.
- *
+ *
* @since GemFire 5.0
- *
+ *
*/
public interface PartitionAttributes<K, V> {
/**
* returns entryTimeToLive in ExpirationAttributes.
- *
+ *
* @return expirationAttributes
*/
// public ExpirationAttributes getEntryTimeToLive();
/**
* returns entryIdleTimeout in ExpirationAttributes.
- *
+ *
* @return expirationAttributes
*/
// public ExpirationAttributes getEntryIdleTimeout();
@@ -60,14 +60,14 @@ public interface PartitionAttributes<K, V> {
/**
* The number of Backups for an entry in PartitionedRegion. This value should be between 0 and 3
* (for a total of 1 to 4 instances of the data). The default value is 0.
- *
+ *
* @return redundantCopies.
*/
public int getRedundantCopies();
/**
* This method returns the maximum total size of the region in megabytes.
- *
+ *
* @deprecated use getTotalMaxMemory() instead
* @return total size in megabytes.
*/
@@ -77,7 +77,7 @@ public interface PartitionAttributes<K, V> {
/**
* This method returns the maximum total size of the region, in megabytes. Default value is
* Integer.MAX_VALUE.
- *
+ *
* @return maximum size of the partitioned region, in megabytes
*
* @deprecated since Geode 1.3.0
@@ -88,7 +88,7 @@ public interface PartitionAttributes<K, V> {
/**
* This method returns total number of buckets for a PartitionedRegion. Default number of buckets
* for a PartitionedRegion is 113.
- *
+ *
* @return total number of buckets for a PartitionedRegion.
*/
public int getTotalNumBuckets();
@@ -101,7 +101,7 @@ public interface PartitionAttributes<K, V> {
/**
* Returns name of the colocated PartitionedRegion's name
- *
+ *
* @since GemFire 6.0
*/
public String getColocatedWith();
@@ -109,7 +109,7 @@ public interface PartitionAttributes<K, V> {
/**
* This method returns local properties. There are currently no local properties defined that are
* not also deprecated.
- *
+ *
* @deprecated use {@link #getLocalMaxMemory()} in GemFire 5.1 and later releases
* @return localProperties
*/
@@ -119,7 +119,7 @@ public interface PartitionAttributes<K, V> {
/**
* This method returns global properties. There are currently no global properties defined that
* are not also deprecated.
- *
+ *
* @deprecated use {@link #getTotalMaxMemory()} and {@link #getTotalNumBuckets()} in GemFire 5.1
* and later releases
* @return globalProperties
@@ -129,7 +129,7 @@ public interface PartitionAttributes<K, V> {
/**
* Returns the PartitionResolver set for custom partitioning
- *
+ *
* @return <code>PartitionResolver</code> for the PartitionedRegion
* @since GemFire 6.0
*/
@@ -139,7 +139,7 @@ public interface PartitionAttributes<K, V> {
* Returns the delay in milliseconds that existing members will wait before satisfying redundancy
* after another member crashes. Default value of recoveryDelay is -1 which indicates that
* redundancy won't be recovered if a member crashes.
- *
+ *
* @since GemFire 6.0
*/
public long getRecoveryDelay();
@@ -148,14 +148,14 @@ public interface PartitionAttributes<K, V> {
* Returns the delay in milliseconds that a new member will wait before trying to satisfy
* redundancy of data hosted on other members. Default value is 0 which is to recover redundancy
* immediately when a new member is added.
- *
+ *
* @since GemFire 6.0
*/
public long getStartupRecoveryDelay();
/**
* Returns array of PartitionListener{s} configured on this partitioned region
- *
+ *
* @see PartitionListener
* @return PartitionListener configured on this partitioned region
* @since GemFire 6.5
@@ -165,7 +165,7 @@ public interface PartitionAttributes<K, V> {
/**
* Returns <code>FixedPartitionAttributes</code>'s list of local partitions defined on this
* Partitioned Region
- *
+ *
* @since GemFire 6.6
*/
public List<FixedPartitionAttributes> getFixedPartitionAttributes();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java
index 972e1f8..bc71e31 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java
@@ -27,17 +27,17 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* partitioned {@link Region}. The setter methods follow the self-return idiom so that they can be
* "chained" together with the {@link #create} method to create {@link PartitionAttributes}. For
* example:<br>
- *
+ *
* <pre>
* PartitionAttributes pa =
* new PartitionAttributesFactory().setRedundantCopies(1).setLocalMaxMemory(1240).create();
- *
+ *
* final Region myRegion = new RegionFactory().setPartitionAttributes(pa)
* .setKeyConstraint(String.class).setValueConstraint(ArrayList.class).create("myRegion");
* </pre>
- *
+ *
* </p>
- *
+ *
* <p>
* {@link PartitionAttributes} can also be defined in a declarative fashion using a
* <a href="package-summary.html#declarative">cache.xml</a> file. Here is an example of how to
@@ -47,7 +47,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* {@link org.apache.geode.cache.CacheLoader} implementation, and sets
* {@link #setGlobalProperties(Properties) global properties} as well as
* {@link #setLocalMaxMemory(int) local max memory to use}.
- *
+ *
* <pre>
* <root-region name="pRoot">
* <region-attributes scope="distributed-ack" >
@@ -56,7 +56,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* </root-region>
* </pre>
* </p>
- *
+ *
* @see org.apache.geode.cache.PartitionAttributes
* @see org.apache.geode.cache.AttributesFactory#setPartitionAttributes(PartitionAttributes)
* @since GemFire 5.0
@@ -95,7 +95,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* The default maximum amount of memory to be used by this region in this process, in megabytes.
- *
+ *
* @deprecated Use {@link PartitionAttributesImpl#getLocalMaxMemoryDefault()} instead.
*/
@Deprecated
@@ -142,7 +142,7 @@ public class PartitionAttributesFactory<K, V> {
* Creates a new instance of PartitionAttributesFactory ready to create a
* {@link PartitionAttributes} with the same settings as those in the specified
* {@link PartitionAttributes}
- *
+ *
* @param pa the <code>PartitionAttributes</code> used to initialize this
* PartitionAttributesFactory
*/
@@ -160,9 +160,9 @@ public class PartitionAttributesFactory<K, V> {
* <p>
* <em>This setting must be the same in all processes using the Region.</em> Default number of
* redundant copies is 0.
- *
+ *
* @param redundantCopies the number of redundant bucket copies, limited to values 0, 1, 2 and 3.
- *
+ *
* @return this
*/
public PartitionAttributesFactory<K, V> setRedundantCopies(int redundantCopies) {
@@ -173,7 +173,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* Sets the cache writer for the next <code>PartitionAttributes</code> created. <i>Currently
* unsupported for the early access release.</i>
- *
+ *
* @param cacheWriter the cache writer or null if no cache writer
* @return this public PartitionAttributesFactory<K,V> setCacheWriter(CacheWriter cacheWriter) {
* this.partitionAttributes.setCacheWriter(cacheWriter); return this; }
@@ -246,7 +246,7 @@ public class PartitionAttributesFactory<K, V> {
* Sets the delay in milliseconds that existing members will wait before satisfying redundancy
* after another member crashes. Default value is set to -1 which indicates that redundancy will
* not be recovered after a failure.
- *
+ *
* @since GemFire 6.0
*/
public PartitionAttributesFactory<K, V> setRecoveryDelay(long recoveryDelay) {
@@ -258,7 +258,7 @@ public class PartitionAttributesFactory<K, V> {
* Sets the delay in milliseconds that new members will wait before satisfying redundancy. -1
* indicates that adding new members will not trigger redundancy recovery. The default (set to 0)
* is to recover redundancy immediately when a new member is added.
- *
+ *
* @since GemFire 6.0
*/
public PartitionAttributesFactory<K, V> setStartupRecoveryDelay(long startupRecoveryDelay) {
@@ -268,7 +268,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* adds a PartitionListener for the partitioned region.
- *
+ *
* @param listener
* @return PartitionAttributeFactory
* @since GemFire 6.5
@@ -289,11 +289,11 @@ public class PartitionAttributesFactory<K, V> {
* Sets the <code>Properties</code> for the local instance the partitioned Region. Local
* properties define how the local instance of the partitioned region and any storage it may
* provide, behaves. There are currently no non-deprecated local properties.
- *
+ *
* @deprecated use {@link #setLocalMaxMemory(int)} in GemFire 5.1 and later releases
* @param localProps
* @return PartitionAttributeFactory.
- *
+ *
*/
@Deprecated
public PartitionAttributesFactory<K, V> setLocalProperties(Properties localProps) {
@@ -310,12 +310,12 @@ public class PartitionAttributesFactory<K, V> {
* Global properties define how the entire partitioned Region behaves.
* <p>
* Note that global settings must be the same in all processes using the Region.
- *
+ *
* @deprecated use {@link #setTotalMaxMemory(long)} and {@link #setTotalNumBuckets(int)} in
* GemFire 5.1 and later releases
* @param globalProps
* @return PartitionAttributeFactory.
- *
+ *
* @see #GLOBAL_MAX_MEMORY_PROPERTY
*/
@Deprecated
@@ -326,7 +326,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* FixedPartitionAttributes defined for this partitioned region is added to PR attributes.
- *
+ *
* @since GemFire 6.6
*/
public PartitionAttributesFactory<K, V> addFixedPartitionAttributes(
@@ -342,7 +342,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* Sets the idleTimeout expiration attributes for region entries for the next
* <code>PartitionAttributes</code> created.
- *
+ *
* @param idleTimeout the idleTimeout ExpirationAttributes for entries in this region
* @throws IllegalArgumentException if idleTimeout is null
* @return PartitionAttributeFactory
@@ -357,7 +357,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* Sets the timeToLive expiration attributes for region entries for the next
* <code>PartitionAttributes</code> created.
- *
+ *
* @param timeToLive the timeToLive ExpirationAttributes for entries in this region
* @throws IllegalArgumentException if timeToLive is null
*/
@@ -371,7 +371,7 @@ public class PartitionAttributesFactory<K, V> {
/**
* Enables/Disables local Caching for this node for region entries for the next
* <code>PartitionAttributes</code> created. Default is true.
- *
+ *
* @param isLocalCache
* @return PartitionAttributesFactory
*/
@@ -386,7 +386,7 @@ public class PartitionAttributesFactory<K, V> {
// FACTORY METHOD
/**
* Creates a <code>PartitionAttributes</code> with the current settings.
- *
+ *
* @return the newly created <code>PartitionAttributes</code>
* @throws IllegalStateException if the current settings violate the
* <a href="#compatibility">compatibility rules </a>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
index eebc662..2f8fc00 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
@@ -42,7 +42,7 @@ package org.apache.geode.cache;
*     private String tradeID;<br>
*     private Month month ;<br>
*     private Year year ;<br>
- *
+ *
*     public TradingKey(){ } <br>
*     public TradingKey(Month month, Year year){<br>
*         this.month = month;<br>
@@ -52,12 +52,12 @@ package org.apache.geode.cache;
*         return this.month + this.year;<br>
*     }<br>
* }<br>
- *
+ *
* In the example above, all trade entries with the same month and year are guaranteed to be
* colocated.
* </p>
- *
- *
+ *
+ *
* @since GemFire 6.0
*/
public interface PartitionResolver<K, V> extends CacheCallback {
@@ -73,7 +73,7 @@ public interface PartitionResolver<K, V> extends CacheCallback {
/**
* Returns the name of the PartitionResolver
- *
+ *
* @return String name
*/
public String getName();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionedRegionStorageException.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionedRegionStorageException.java
index da028ce..854d6d3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionedRegionStorageException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionedRegionStorageException.java
@@ -15,25 +15,25 @@
package org.apache.geode.cache;
/**
- *
+ *
* <h3>Description of the conditions under which this exception is thrown</h3>
* <p>
* When a <code>PartitionedRegionStorageException</code> message contains the string:
- *
+ *
* <pre>
* There are not enough data store members to create a bucket.
* </pre>
- *
+ *
* A new data store must be added to the partitioned region for future bucket creation.
* </p>
- *
+ *
* <p>
* When a <code>PartitionedRegionStorageException</code> message contains the string:
- *
+ *
* <pre>
* Too many data store members have refused the request to create a bucket.
* </pre>
- *
+ *
* There are enough data stores, however some have refused possibly due to these conditions:
* <ol>
* <li>The amount of storage allocated to the partitioned region on that distributed member exceeds
@@ -43,21 +43,21 @@ package org.apache.geode.cache;
* <li>The distributed system on that member has been disconnected.</li>
* </ol>
* </p>
- *
+ *
* <p>
* When a <code>PartitionedRegionStorageException</code> message contains the string:
- *
+ *
* <pre>
* Creation of a bucket for partitioned region failed in N attempts.
* </pre>
- *
+ *
* If the number of attempts is lesser than the number of available data store members, contact
* GemFire support providing all logs and statistics files from all members containing the
* partitioned region. Otherwise, shutdown and then restart one or more of the data stores, given
* that it is safe to do so, for example when redundantCopies is greater than 0.
* </p>
- *
- *
+ *
+ *
* @see org.apache.geode.cache.PartitionAttributesFactory
* @since GemFire 5.0
*/
@@ -70,7 +70,7 @@ public class PartitionedRegionStorageException extends CacheRuntimeException {
/**
* Creates a new {@link PartitionedRegionStorageException} with a message.
- *
+ *
* @param msg The string message for the PartitionedRegionStorageException.
*/
@@ -80,7 +80,7 @@ public class PartitionedRegionStorageException extends CacheRuntimeException {
/**
* Creates a new {@link PartitionedRegionStorageException} with a message and Throwable cause.
- *
+ *
* @param message The string message for the PartitionedRegionStorageException.
* @param cause Throwable cause for this {@link PartitionedRegionStorageException}.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java b/geode-core/src/main/java/org/apache/geode/cache/Region.java
index 61f2c81..1e06d5b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Region.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java
@@ -67,16 +67,16 @@ import org.apache.geode.cache.snapshot.RegionSnapshotService;
* in turn has parent region <i>1st_level_region</i>; and region <i>1st_level_region</i> is a child
* of the root region. Then,the user can get the region <i>3rd_level_region</i> from the root region
* by issuing:
- *
+ *
* <pre>
* <code>
* region3 = root.getSubregion("1st_level_region/2nd_level_region/3rd_level_region");
* </code>
* </pre>
- *
+ *
* or the user can get the region <i>3rd_level_region</i> from region <i>1st_level_region</i> by
* issuing
- *
+ *
* <pre>
* <code>
* region3 = region1.getSubregion("2nd_level_region/3rd_level_region");
@@ -132,7 +132,7 @@ import org.apache.geode.cache.snapshot.RegionSnapshotService;
* CacheListener called on the client. Any local state on the client will be updated to be
* consistent with the state change made on the server.
* <p>
- *
+ *
* @see RegionAttributes
* @see AttributesFactory
* @see AttributesMutator
@@ -235,7 +235,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* <code>Scope.LOCAL</code>.
* <p>
* Does not update any <code>CacheStatistics</code>.
- *
+ *
* @param aCallbackArgument a user-defined parameter to pass to callback events triggered by this
* method. Can be null. Should be serializable.
* @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock
@@ -269,7 +269,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* In order to remove all the entries and the region, destroyRegion should be used.
*
* Does not update any <code>CacheStatistics</code>.
- *
+ *
* @param aCallbackArgument a user-defined parameter to pass to callback events triggered by this
* method. Can be null.
* @throws IllegalStateException if the region is distributed and
@@ -343,7 +343,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* object will get {@link RegionDestroyedException} exception.
* <p>
* Does not update any <code>CacheStatistics</code>.
- *
+ *
* @param aCallbackArgument a user-defined parameter to pass to callback events triggered by this
* call. Can be null.
* @see CacheListener#afterRegionDestroy
@@ -365,7 +365,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Obtains the snapshot service to allow the cache data to be imported or exported.
- *
+ *
* @return the snapshot service for the region
*/
public RegionSnapshotService<K, V> getSnapshotService();
@@ -381,7 +381,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* @throws IOException if encountered while writing the file
* @throws UnsupportedOperationException If the region is a partitioned region
* @see #loadSnapshot
- *
+ *
* @deprecated as of 7.0 use {@link #getSnapshotService()}
*/
public void saveSnapshot(OutputStream outputStream) throws IOException;
@@ -429,7 +429,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* @throws UnsupportedOperationException If the region is a partitioned region
*
* @see RegionReinitializedException
- *
+ *
* @deprecated as of 7.0 use {@link #getSnapshotService()}
*/
public void loadSnapshot(InputStream inputStream)
@@ -991,7 +991,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
*
* <p>
* Null values are not included in the result collection.
- *
+ *
* @return a Collection of all the objects cached in this region
*/
public Collection<V> values();
@@ -1022,7 +1022,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* Returns the <code>Cache</code> associated with this region.
* <p>
* Does not throw a <code>CacheClosedException</code> if the Cache is closed.
- *
+ *
* @return the Cache
* @deprecated as of 6.5 use {@link #getRegionService()} instead.
*/
@@ -1033,7 +1033,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* Returns the <code>cache</code> associated with this region.
* <p>
* Does not throw a <code>CacheClosedException</code> if the cache is closed.
- *
+ *
* @return the cache
* @since GemFire 6.5
*/
@@ -1050,7 +1050,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Sets the application-defined object associated with this region. GemFire does not use this
* object for any purpose.
- *
+ *
* @param value the application-defined object
*/
public void setUserAttribute(Object value);
@@ -1060,7 +1060,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
*
* <p>
* Does not throw a <code>RegionDestroyedException</code> if this region has been destroyed.
- *
+ *
* @return true if this region has been destroyed
*/
public boolean isDestroyed();
@@ -1068,7 +1068,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Returns whether there is a valid (non-null) value present for the specified key. This method is
* equivalent to:
- *
+ *
* <pre>
* Entry e = getEntry(key);
* return e != null && e.getValue() != null;
@@ -1124,7 +1124,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* global scope. For example, if an application needs to get two values out of a region with
* global scope and guarantee that the first value is not modified before the second value is
* retrieved, it can use this lock in the following manner:
- *
+ *
* <pre>
* Lock entry1Lock = myRegion.getDistributedLock(key1);
* Lock entry2Lock = myRegion.getDistributedLock(key2);
@@ -1147,7 +1147,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* When a region has global scope, the following operations automatically acquire a distributed
* lock on an entry: <code>create</code>, <code>put</code>, <code>destroy</code>,
* <code>invalidate</code>, and <code>get</code> that causes a loader to be invoked.
- *
+ *
* @return a <code>Lock</code> used for acquiring a distributed lock on an entry
* @throws IllegalStateException if the scope of this region is not global
* @throws NullPointerException if key is null
@@ -1294,7 +1294,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* Removes all entries from this region. Clear will be distributed to other caches if the scope is
* not <code>Scope.LOCAL</code>.
* <p>
- *
+ *
* @since GemFire 5.0
* @see java.util.Map#clear()
* @see CacheListener#afterRegionClear
@@ -1339,7 +1339,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Returns true if this region contains no entries.
- *
+ *
* @since GemFire 5.0
* @see java.util.Map#isEmpty()
* @return true if this region contains no entries.
@@ -1351,7 +1351,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* equivalent to that of calling {@link #put(Object, Object)} on this region once for each entry
* in the specified map. This operation will be distributed to other caches if the scope is not
* <code>Scope.LOCAL</code>.
- *
+ *
* @param map the key/value pairs to put in this region.
* @since GemFire 5.0
* @see java.util.Map#putAll(Map map)
@@ -1364,7 +1364,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* equivalent to that of calling {@link #put(Object, Object, Object)} on this region once for each
* entry in the specified map. This operation will be distributed to other caches if the scope is
* not <code>Scope.LOCAL</code>.
- *
+ *
* @param map the key/value pairs to put in this region.
* @param aCallbackArgument a user-defined parameter to pass to callback events triggered by this
* method. May be null. Must be serializable if this operation is distributed.
@@ -1380,7 +1380,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* specified collection. If an entry does not exist that key is skipped; EntryNotFoundException is
* not thrown. This operation will be distributed to other caches if the scope is not
* <code>Scope.LOCAL</code>.
- *
+ *
* @param keys the keys to remove from this region.
* @since GemFire 8.1
* @see Region#destroy(Object)
@@ -1393,7 +1393,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* in the specified collection. If an entry does not exist that key is skipped;
* EntryNotFoundException is not thrown. This operation will be distributed to other caches if the
* scope is not <code>Scope.LOCAL</code>.
- *
+ *
* @param keys the keys to remove from this region.
* @param aCallbackArgument a user-defined parameter to pass to callback events triggered by this
* method. May be null. Must be serializable if this operation is distributed.
@@ -1409,7 +1409,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* Note that the keys collection should extend K since a load may be done and the key in that case
* will be stored in the region. The keys parameter was not changed to extend K for backwards
* compatibility.
- *
+ *
* @param keys A Collection of keys
* @return A Map of values for the input keys
*
@@ -1420,7 +1420,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Gets and returns values for all the keys in the input Collection. If a given key does not exist
* in the region then that key's value in the returned map will be <code>null</code>.
- *
+ *
* @param <T> the type of the keys passed to getAll
* @param keys A Collection of keys
* @param aCallbackArgument an argument passed into the CacheLoader if a loader is used. This same
@@ -1471,13 +1471,13 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Returns the number of entries present in this region.
- *
+ *
* For {@link DataPolicy#PARTITION}, this is a distributed operation that returns the number of
* entries present in entire region.
- *
+ *
* For all other types of regions, it returns the number of entries present locally, and it is not
* a distributed operation.
- *
+ *
* @since GemFire 5.0
* @see java.util.Map#size()
* @return the number of entries present in this region
@@ -1500,7 +1500,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Returns the hash code value for this region. The hash code of a region is based on identity and
* uses {@link Object#hashCode}.
- *
+ *
* @return the hash code value for this region.
* @see Object#hashCode()
*/
@@ -1528,14 +1528,14 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* ".*" as the argument. This means that all keys any type are pushed to the client and
* inserted into the local cache.</i>
* </p>
- *
+ *
* <p>
* If you locally-destroy a key and your region has concurrency-checks-enabled turned off
* you will not receive invalidation events from your interest subscription for that key.
* When concurrency-checks-enabled is turned on GemFire will accept invalidation and
* deliver these events to your client cache.
* </p>
- *
+ *
* @see InterestResultPolicy
*
* @since GemFire 4.2
@@ -1553,7 +1553,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* currently supported only on clients in a client server topology. This key is first locally
* cleared from the client and current value for this key is inserted into the local cache before
* this call returns. (if requested).
- *
+ *
* <p>
* If you locally-destroy a key and your region has concurrency-checks-enabled turned off you will
* not receive invalidation events from your interest subscription for that key. When
@@ -1610,7 +1610,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* <p>
* The regular expression string is compiled using the {@link java.util.regex.Pattern} class.
* </p>
- *
+ *
* <p>
* If you locally-destroy a key and your region has concurrency-checks-enabled turned off you will
* not receive invalidation events from your interest subscription for that key. When
@@ -1783,7 +1783,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* </p>
*
* @param isDurable true if the register interest is durable
- *
+ *
* @param receiveValues defaults to true. set to false to receive create or update events as
* invalidates similar to notify-by-subscription false.
*
@@ -2117,14 +2117,14 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* If the specified key is not already associated with a value, associate it with the given value.
* This is equivalent to
- *
+ *
* <pre>
* if (!map.containsKey(key))
* return map.put(key, value);
* else
* return map.get(key);
* </pre>
- *
+ *
* except that the action is performed atomically.
*
* <p>
@@ -2137,7 +2137,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* <p>
* Region allows the value parameter to be null, which will create an invalid entry.
* </p>
- *
+ *
* @param key key with which the specified value is to be associated
* @param value value to be associated with the specified key
* @return the previous value associated with the specified key, or <tt>null</tt> if there was no
@@ -2165,7 +2165,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Removes the entry for a key only if currently mapped to a given value. This is equivalent to
- *
+ *
* <pre>
* if (map.containsKey(key) && map.get(key).equals(value)) {
* map.remove(key);
@@ -2173,7 +2173,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* } else
* return false;
* </pre>
- *
+ *
* except that the action is performed atomically.
* <p>
* As of 8.5, if value is an Array then Arrays.equals or Arrays.deepEquals is used instead of
@@ -2188,7 +2188,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* <p>
* Region allows the value parameter to be null, which will match an invalid entry.
* </p>
- *
+ *
* @param key key with which the specified value is associated
* @param value value expected to be associated with the specified key
* @return <tt>true</tt> if the value was removed
@@ -2211,7 +2211,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Replaces the entry for a key only if currently mapped to a given value. This is equivalent to
- *
+ *
* <pre>
* if (map.containsKey(key) && map.get(key).equals(oldValue)) {
* map.put(key, newValue);
@@ -2219,7 +2219,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* } else
* return false;
* </pre>
- *
+ *
* except that the action is performed atomically.
* <p>
* As of 8.5, if value is an Array then Arrays.equals or Arrays.deepEquals is used instead of
@@ -2234,7 +2234,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
* <p>
* Region allows the oldValue parameter to be null, which will match an invalid entry.
* </p>
- *
+ *
* @param key key with which the specified value is associated
* @param oldValue value expected to be associated with the specified key
* @param newValue value to be associated with the specified key
@@ -2259,14 +2259,14 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Replaces the entry for a key only if currently mapped to some value. This is equivalent to
- *
+ *
* <pre>
* if (map.containsKey(key)) {
* return map.put(key, value);
* } else
* return null;
* </pre>
- *
+ *
* except that the action is performed atomically.
* <p>
* ConcurrentMap operations are supported on partitioned and replicated regions and in client
@@ -2378,7 +2378,7 @@ public interface Region<K, V> extends ConcurrentMap<K, V> {
/**
* Sets the value of this entry. It has similar to calling a put on the key of this Entry
- *
+ *
* @param value Object the value to be set
* @return the previous value object stored locally for this entry. If the entry did not exist
* then <code>null</code> is returned. If the entry was "invalid" then <code>null</code>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
index 125b73c..fc832fd 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
@@ -16,6 +16,7 @@ package org.apache.geode.cache;
import java.io.*;
import java.util.*;
+
import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.membership.InternalRole;
@@ -39,7 +40,7 @@ public class RegionAccessException extends RegionRoleException {
/**
* Constructs a <code>RegionAccessException</code> with a message.
- *
+ *
* @param s the String message
* @param regionFullPath full path of region for which access was attempted
* @param missingRoles the missing required roles that caused this exception
@@ -54,7 +55,7 @@ public class RegionAccessException extends RegionRoleException {
/**
* Constructs a <code>RegionAccessException</code> with a message and a cause.
- *
+ *
* @param s the String message
* @param regionFullPath full path of region for which access was attempted
* @param missingRoles the missing required roles that caused this exception
@@ -70,7 +71,7 @@ public class RegionAccessException extends RegionRoleException {
/**
* Returns the missing required roles that caused this exception.
- *
+ *
* @return the missing required roles that caused this exception
*/
public Set getMissingRoles() {
@@ -109,4 +110,3 @@ public class RegionAccessException extends RegionRoleException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/RegionAttributes.java
index 06695b3..aa0b548 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionAttributes.java
@@ -44,14 +44,14 @@ public interface RegionAttributes<K, V> {
/**
* Returns the cache loader associated with this region.
- *
+ *
* @return the cache loader
*/
public CacheLoader<K, V> getCacheLoader();
/**
* Returns the cache writer associated with this region.
- *
+ *
* @return the cache writer
*/
public CacheWriter<K, V> getCacheWriter();
@@ -75,7 +75,7 @@ public interface RegionAttributes<K, V> {
/**
* Gets the <code>timeToLive</code> expiration attributes for the region as a whole. Default is 0
* which indicates that no expiration of this type will happen.
- *
+ *
* @return the timeToLive expiration attributes for this region
*/
public ExpirationAttributes getRegionTimeToLive();
@@ -92,7 +92,7 @@ public interface RegionAttributes<K, V> {
/**
* Gets the <code>timeToLive</code> expiration attributes for entries in this region. Default is 0
* which indicates that no expiration of this type is set.
- *
+ *
* @return the timeToLive expiration attributes for entries in this region
*/
public ExpirationAttributes getEntryTimeToLive();
@@ -101,7 +101,7 @@ public interface RegionAttributes<K, V> {
* Gets the <code>idleTimeout</code> expiration attributes for entries in this region. Default is
* 0 which indicates that no expiration of this type is set. Note that the XML element that
* corresponds to this method "entry-idle-time", does not include "out" in its name.
- *
+ *
* @return the idleTimeout expiration attributes for entries in this region
*/
public ExpirationAttributes getEntryIdleTimeout();
@@ -109,21 +109,21 @@ public interface RegionAttributes<K, V> {
/**
* Gets the <code>entryTimeToLive</code> <code>CustomExpiry</code>, if any for entries in this
* region
- *
+ *
* @return the entryTimeToLive CustomExpiry for entries in this region
*/
public CustomExpiry<K, V> getCustomEntryTimeToLive();
/**
* Gets the <code>idleTimeout</code> <code>CustomExpiry</code>, if any for entries in this region
- *
+ *
* @return the idleTimeout CustomExpiry for entries in this region
*/
public CustomExpiry<K, V> getCustomEntryIdleTimeout();
/**
* Gets the flag telling a region to ignore JTA transactions. Default value is set to false.
- *
+ *
* @since GemFire 5.0
*/
public boolean getIgnoreJTA();
@@ -150,7 +150,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the scope of the region. Default scope is DISTRIBUTED_NO_ACK. Please refer the gemfire
* documentation for more details on this.
- *
+ *
* @return the region's <code>Scope</code>
*/
public Scope getScope();
@@ -159,14 +159,14 @@ public interface RegionAttributes<K, V> {
/**
* Attributes that control the size of the <code>Region</code> using an {@link EvictionAlgorithm}
* and a {@link EvictionAction}.
- *
+ *
* @return the region's EvictionAttributes
*/
public EvictionAttributes getEvictionAttributes();
/**
* Returns the cache listener for the region.
- *
+ *
* @throws IllegalStateException if more than one cache listener exists on this attributes
* @return the region's <code>CacheListener</code>
* @deprecated as of GemFire 5.0, use {@link #getCacheListeners} instead
@@ -177,7 +177,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns an array of all the cache listeners on this attributes. Modifications to the returned
* array will not effect the attributes.
- *
+ *
* @return the region's <code>CacheListener</code>s; an empty array if no listeners
* @since GemFire 5.0
*/
@@ -188,7 +188,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the initial capacity of the entries map. Default is 16.
- *
+ *
* @return the initial capacity of the entries map
* @see java.util.HashMap
*/
@@ -196,7 +196,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the load factor of the entries map. Default is 0.75.
- *
+ *
* @return the load factor of the entries map
* @see java.util.HashMap
*/
@@ -228,7 +228,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the concurrencyLevel of the entries map. Default is 16.
- *
+ *
* @return the concurrencyLevel
* @see AttributesFactory
*/
@@ -299,14 +299,14 @@ public interface RegionAttributes<K, V> {
// STATISTICS
/**
* Returns whether the statistics are enabled for this region and its entries. Default is false.
- *
+ *
* @return true if statistics are enabled
*/
public boolean getStatisticsEnabled();
/**
* Returns whether or not acks are sent after an update is processed.
- *
+ *
* @return True if acks are sent after updates are processed; false if acks are sent before
* updates are processed.
*
@@ -319,7 +319,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns whether or not this region is a publisher. Publishers are regions on which distributed
* write operations are done.
- *
+ *
* @return True if a publisher; false if not (default).
*
* @since GemFire 4.2.3
@@ -363,7 +363,7 @@ public interface RegionAttributes<K, V> {
*
* Note: This parameter is only valid for cache server to client communication. It has no effect
* in peer to peer communication.
- *
+ *
* Default is false.
*
* @return True if conflation is enabled; false conflation is not enabled (default).
@@ -374,7 +374,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns whether or not async conflation is enabled for sending messages to async peers.
- *
+ *
* Default is false.
*
* @return True if async conflation is enabled; false async conflation is not enabled (default).
@@ -385,7 +385,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the sizes of the disk directories in megabytes
- *
+ *
* @return int[] sizes of the disk directories
* @deprecated as of 6.5 use {@link DiskStore#getDiskDirSizes} instead.
*/
@@ -395,7 +395,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the name of the {@link Pool} that this region will use to communicate with servers, if
* any. Returns <code>null</code> if this region communicates with peers.
- *
+ *
* @return the name of the client-server {@link Pool} this region will use for server
* communication; <code>null</code> is returned if the region communicates with peers.
* @since GemFire 5.7
@@ -414,7 +414,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the name of the {@link DiskStore} that this region belongs to, if any. Returns
* <code>null</code> if this region belongs to default {@link DiskStore}.
- *
+ *
* @return the name of the {@link DiskStore} of this region; <code>null</code> is returned if this
* region belongs to default {@link DiskStore}.
* @since GemFire 6.5
@@ -423,7 +423,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns true if configured synchronous disk writes. Default is set to true.
- *
+ *
* @return Returns true if writes to disk are synchronous and false otherwise
* @since GemFire 6.5
*/
@@ -445,9 +445,9 @@ public interface RegionAttributes<K, V> {
* When this is enabled, concurrent updates will be conflated if they are applied out of order.
* <p>
* All members must set this attribute the same.
- *
+ *
* Default is set to true.
- *
+ *
* @since GemFire 7.0
* @return true if concurrent update checks are turned on
*/
@@ -455,7 +455,7 @@ public interface RegionAttributes<K, V> {
/**
* Returns the compressor used by this region's entry values.
- *
+ *
* @since GemFire 8.0
* @return null if the region does not have compression enabled.
*/
@@ -463,12 +463,10 @@ public interface RegionAttributes<K, V> {
/**
* Returns whether or not this region uses off-heap memory.
- *
+ *
* @return True if a usage of off-heap memory is enabled; false if usage of off-heap memory is
* disabled (default).
* @since Geode 1.0
*/
public boolean getOffHeap();
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionDestroyedException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionDestroyedException.java
index 01b4052..66abcf8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionDestroyedException.java
@@ -27,7 +27,7 @@ public class RegionDestroyedException extends CacheRuntimeException {
/**
* Constructs a <code>RegionDestroyedException</code> with a message.
- *
+ *
* @param msg the String message
*/
public RegionDestroyedException(String msg, String regionFullPath) {
@@ -37,7 +37,7 @@ public class RegionDestroyedException extends CacheRuntimeException {
/**
* Constructs a <code>RegionDestroyedException</code> with a message and a cause.
- *
+ *
* @param s the String message
* @param ex the Throwable cause
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
index e384237..db3ea9e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
@@ -16,6 +16,7 @@ package org.apache.geode.cache;
import java.io.*;
import java.util.*;
+
import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.membership.InternalRole;
@@ -41,7 +42,7 @@ public class RegionDistributionException extends RegionRoleException {
/**
* Constructs a <code>RegionDistributionException</code> with a message.
- *
+ *
* @param s the String message
* @param regionFullPath full path of region for which access was attempted
* @param failedRoles the required roles that caused this exception
@@ -56,7 +57,7 @@ public class RegionDistributionException extends RegionRoleException {
/**
* Constructs a <code>RegionDistributionException</code> with a message and a cause.
- *
+ *
* @param s the String message
* @param regionFullPath full path of region for which access was attempted
* @param failedRoles the required roles that caused this exception
@@ -74,7 +75,7 @@ public class RegionDistributionException extends RegionRoleException {
/**
* Returns the required roles that caused this exception. One or more roles failed to receive a
* cache distribution message or acknowledge receipt of that message.
- *
+ *
* @return the required roles that caused this exception
*/
public Set getFailedRoles() {
@@ -113,4 +114,3 @@ public class RegionDistributionException extends RegionRoleException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionExistsException.java
index db57e6b..7454275 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionExistsException.java
@@ -19,7 +19,7 @@ package org.apache.geode.cache;
* Indicates that the requested region already exists when a region is being created.
*
*
- *
+ *
* @see Region#createSubregion
* @see Cache#createRegion
* @since GemFire 2.0
@@ -30,7 +30,7 @@ public class RegionExistsException extends CacheException {
/**
* Constructs an instance of <code>RegionExistsException</code> with the specified Region.
- *
+ *
* @param rgn the Region that exists
*/
public RegionExistsException(Region rgn) {
@@ -41,7 +41,7 @@ public class RegionExistsException extends CacheException {
/**
* Constructs an instance of <code>RegionExistsException</code> with the specified detail message
* and cause.
- *
+ *
* @param rgn the Region that exists
* @param cause the causal Throwable
*/
@@ -52,7 +52,7 @@ public class RegionExistsException extends CacheException {
/**
* Return the Region that already exists which prevented region creation.
- *
+ *
* @return the Region that already exists, or null if this exception has been serialized, in which
* {@link Throwable#getMessage } will return the pathFromRoot for the region that exists.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java
index 90e182f..c1739ee 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java
@@ -44,7 +44,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* The final step is to produce a {@link Region} by calling {@link #create(String)}.
* <p>
* Example: Create a replicate region with a CacheListener
- *
+ *
* <PRE>
* Cache c = new CacheFactory().create();
* // Create replicate region.
@@ -53,7 +53,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* </PRE>
* <p>
* Example: Create a partition region that has redundancy
- *
+ *
* <PRE>
* Cache c = new CacheFactory().create();
* // Create replicate region.
@@ -69,7 +69,7 @@ public class RegionFactory<K, V> {
/**
* For internal use only.
- *
+ *
* @since GemFire 6.5
*/
protected RegionFactory(InternalCache cache) {
@@ -79,7 +79,7 @@ public class RegionFactory<K, V> {
/**
* For internal use only.
- *
+ *
* @since GemFire 6.5
*/
protected RegionFactory(InternalCache cache, RegionShortcut pra) {
@@ -93,7 +93,7 @@ public class RegionFactory<K, V> {
/**
* For internal use only.
- *
+ *
* @since GemFire 6.5
*/
protected RegionFactory(InternalCache cache, RegionAttributes ra) {
@@ -103,7 +103,7 @@ public class RegionFactory<K, V> {
/**
* For internal use only.
- *
+ *
* @since GemFire 6.5
*/
protected RegionFactory(InternalCache cache, String regionAttributesId) {
@@ -258,7 +258,7 @@ public class RegionFactory<K, V> {
/**
* Adds a cache listener to the end of the list of cache listeners on this factory.
- *
+ *
* @param aListener the cache listener to add
* @return a reference to this RegionFactory object
* @throws IllegalArgumentException if {@code aListener} is null
@@ -272,7 +272,7 @@ public class RegionFactory<K, V> {
/**
* Removes all cache listeners and then adds each listener in the specified array. for the next
* {@code RegionAttributes} created.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this factory.
* @return a reference to this RegionFactory object
* @throws IllegalArgumentException if the {@code newListeners} array has a null element
@@ -311,7 +311,7 @@ public class RegionFactory<K, V> {
/**
* Sets the custom idleTimeout for the next {@code RegionAttributes} created.
- *
+ *
* @param custom the custom method
* @return the receiver
* @see AttributesFactory#setCustomEntryIdleTimeout(CustomExpiry)
@@ -337,7 +337,7 @@ public class RegionFactory<K, V> {
/**
* Sets the custom timeToLive expiration method for the next {@code RegionAttributes} created.
- *
+ *
* @param custom the custom method
* @return the receiver
* @see AttributesFactory#setCustomEntryTimeToLive(CustomExpiry)
@@ -438,7 +438,7 @@ public class RegionFactory<K, V> {
* <p>
* The named connection pool must exist on the cache at the time these attributes are used to
* create a region. See {@link PoolManager#createFactory} for how to create a connection pool.
- *
+ *
* @param poolName the name of the connection pool to use; if {@code null} or {@code ""} then the
* connection pool attribute is disabled for regions using these attributes.
* @return a reference to this RegionFactory object
@@ -452,7 +452,7 @@ public class RegionFactory<K, V> {
/**
* Sets whether or not this region should be considered a publisher.
- *
+ *
* @since GemFire 5.0
* @deprecated as of 6.5
*/
@@ -463,7 +463,7 @@ public class RegionFactory<K, V> {
/**
* Sets whether or not conflation is enabled for sending messages to async peers.
- *
+ *
* @param value true to enable async conflation
* @return a reference to this RegionFactory object
* @see AttributesFactory#setEnableAsyncConflation(boolean)
@@ -476,7 +476,7 @@ public class RegionFactory<K, V> {
/**
* Sets whether or not conflation is enabled for sending messages from a cache server to its
* clients.
- *
+ *
* @param value true to enable subscription conflation
* @return a reference to this RegionFactory object
* @see AttributesFactory#setEnableSubscriptionConflation(boolean)
@@ -592,11 +592,11 @@ public class RegionFactory<K, V> {
/**
* Sets the DiskStore name attribute. This causes the region to belong to the DiskStore.
- *
+ *
* @param name the name of the diskstore
* @return a reference to this RegionFactory object
* @since GemFire 6.5
- *
+ *
* @see AttributesFactory#setDiskStoreName
*/
public RegionFactory<K, V> setDiskStoreName(String name) {
@@ -606,7 +606,7 @@ public class RegionFactory<K, V> {
/**
* Sets whether or not the writing to the disk is synchronous.
- *
+ *
* @param isSynchronous boolean if true indicates synchronous writes
* @return a reference to this RegionFactory object
* @since GemFire 6.5
@@ -634,11 +634,11 @@ public class RegionFactory<K, V> {
/**
* Sets the directories to which the region's data are written and also set their sizes in
* megabytes
- *
+ *
* @return a reference to this RegionFactory object
* @throws IllegalArgumentException if length of the size array does not match to the length of
* the dir array
- *
+ *
* @since GemFire 5.1
* @see AttributesFactory#setDiskDirsAndSizes
* @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirsAndSizes} instead
@@ -701,7 +701,7 @@ public class RegionFactory<K, V> {
/**
* Sets whether operations on this region should be controlled by JTA transactions or not
- *
+ *
* @since GemFire 5.0
*/
public RegionFactory<K, V> setIgnoreJTA(boolean flag) {
@@ -724,7 +724,7 @@ public class RegionFactory<K, V> {
/**
* Sets the kind of interest this region has in events occuring in other caches that define the
* region by the same name.
- *
+ *
* @param sa the attributes decribing the interest
* @return a reference to this RegionFactory object
* @see AttributesFactory#setSubscriptionAttributes(SubscriptionAttributes)
@@ -782,7 +782,7 @@ public class RegionFactory<K, V> {
/**
* Sets cloning on region Note: off-heap regions always behave as if cloning is enabled.
- *
+ *
* @return a reference to this RegionFactory object
* @since GemFire 6.1
* @see AttributesFactory#setCloningEnabled
@@ -794,7 +794,7 @@ public class RegionFactory<K, V> {
/**
* Adds a gatewaySenderId to the RegionAttributes
- *
+ *
* @return a reference to this RegionFactory object
* @since GemFire 7.0
* @see AttributesFactory#addGatewaySenderId(String)
@@ -806,7 +806,7 @@ public class RegionFactory<K, V> {
/**
* Adds a asyncEventQueueId to the RegionAttributes
- *
+ *
* @param asyncEventQueueId id of AsyncEventQueue
* @return a reference to this RegionFactory instance
* @since GemFire 7.0
@@ -818,7 +818,7 @@ public class RegionFactory<K, V> {
/**
* Set the compressor to be used by this region for compressing region entry values.
- *
+ *
* @param compressor a compressor
* @return a reference to this RegionFactory instance
* @since GemFire 8.0
@@ -830,7 +830,7 @@ public class RegionFactory<K, V> {
/**
* Enables this region's usage of off-heap memory if true.
- *
+ *
* @param offHeap boolean flag to enable off-heap memory
* @since Geode 1.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionMembershipListener.java b/geode-core/src/main/java/org/apache/geode/cache/RegionMembershipListener.java
index 8c31b31..3bd5f3f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionMembershipListener.java
@@ -18,13 +18,13 @@ import org.apache.geode.distributed.DistributedMember;
/**
* A listener that can be implemented to handle region membership events.
- *
+ *
* <p>
* Instead of implementing this interface it is recommended that you extend the
* {@link org.apache.geode.cache.util.RegionMembershipListenerAdapter} class.
- *
- *
- *
+ *
+ *
+ *
* @see AttributesFactory#addCacheListener
* @see AttributesFactory#initCacheListeners
* @see RegionAttributes#getCacheListeners
@@ -41,7 +41,7 @@ public interface RegionMembershipListener<K, V> extends CacheListener<K, V> {
* <li>the region is created with an already added listener
* <li>a listener is added using the {@link AttributesMutator}.
* </ul>
- *
+ *
* @param region the {@link Region} the listener is registered on
* @param initialMembers an array of the other members that have this region at the time this
* listener is added.
@@ -50,7 +50,7 @@ public interface RegionMembershipListener<K, V> extends CacheListener<K, V> {
/**
* Invoked when another member has created the distributed region this listener is on.
- *
+ *
* @param event the event from the member whose region was created.
*/
public void afterRemoteRegionCreate(RegionEvent<K, V> event);
@@ -65,7 +65,7 @@ public interface RegionMembershipListener<K, V> extends CacheListener<K, V> {
* </ul>
* This differs from afterRemoteRegionCrash notification in that the departed member performed an
* action either to remove its region or to close its region or cache.
- *
+ *
* @param event the event from the member whose region is no longer available.
*/
public void afterRemoteRegionDeparture(RegionEvent<K, V> event);
@@ -74,7 +74,7 @@ public interface RegionMembershipListener<K, V> extends CacheListener<K, V> {
* Invoked when another member's distributed region is no longer available to this cache because
* the member has crashed or is no longer reachable on the network.
* <p>
- *
+ *
* @param event the event from the member whose region is no longer available.
*/
public void afterRemoteRegionCrash(RegionEvent<K, V> event);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionReinitializedException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionReinitializedException.java
index a0cffe7..76ecada 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionReinitializedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionReinitializedException.java
@@ -28,7 +28,7 @@ public class RegionReinitializedException extends RegionDestroyedException {
/**
* Constructs a <code>RegionReinitializedException</code> with a message.
- *
+ *
* @param msg the String message
*/
public RegionReinitializedException(String msg, String regionFullPath) {
@@ -37,7 +37,7 @@ public class RegionReinitializedException extends RegionDestroyedException {
/**
* Constructs a <code>RegionDestroyedException</code> with a message and a cause.
- *
+ *
* @param s the String message
* @param ex the Throwable cause
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
index adf4685..430201b 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
@@ -28,7 +28,7 @@ public abstract class RegionRoleException extends RoleException {
/**
* Constructs a <code>RegionRoleException</code> with a message.
- *
+ *
* @param s the String message
* @param regionFullPath full path of region for which access was attempted
*/
@@ -39,7 +39,7 @@ public abstract class RegionRoleException extends RoleException {
/**
* Constructs a <code>RegionRoleException</code> with a message and a cause.
- *
+ *
* @param s the String message
* @param regionFullPath full path of region for which access was attempted
* @param ex the Throwable cause
@@ -51,7 +51,7 @@ public abstract class RegionRoleException extends RoleException {
/**
* Returns the full path of the region for which access was attempted.
- *
+ *
* @return the full path of the region for which access was attempted
*/
public String getRegionFullPath() {
@@ -59,4 +59,3 @@ public abstract class RegionRoleException extends RoleException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleListener.java b/geode-core/src/main/java/org/apache/geode/cache/RegionRoleListener.java
index 1dff76a..f0b0c62 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionRoleListener.java
@@ -21,8 +21,8 @@ package org.apache.geode.cache;
* <p>
* Instead of implementing this interface it is recommended that you extend the
* {@link org.apache.geode.cache.util.RegionRoleListenerAdapter} class.
- *
- *
+ *
+ *
* @see AttributesFactory#setCacheListener
* @see RegionAttributes#getCacheListener
* @see AttributesMutator#addCacheListener
@@ -45,4 +45,3 @@ public interface RegionRoleListener<K, V> extends CacheListener<K, V> {
public void afterRoleLoss(RoleEvent<K, V> event);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionService.java b/geode-core/src/main/java/org/apache/geode/cache/RegionService.java
index 5583260..5731569 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionService.java
@@ -19,8 +19,8 @@ import java.util.Properties;
import java.util.Set;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
@@ -46,7 +46,7 @@ import org.apache.geode.pdx.PdxInstanceFactory;
public interface RegionService extends AutoCloseable {
/**
* the cancellation criterion for this service
- *
+ *
* @return the service's cancellation object
*/
public CancelCriterion getCancelCriterion();
@@ -90,7 +90,7 @@ public interface RegionService extends AutoCloseable {
/**
* Returns a factory that can create a {@link PdxInstance}.
- *
+ *
* @param className the fully qualified class name that the PdxInstance will become when it is
* fully deserialized.
* @return the factory
@@ -100,7 +100,7 @@ public interface RegionService extends AutoCloseable {
/**
* Creates and returns a PdxInstance that represents an enum value.
- *
+ *
* @param className the name of the enum class
* @param enumName the name of the enum constant
* @param enumOrdinal the ordinal value of the enum constant
@@ -122,7 +122,7 @@ public interface RegionService extends AutoCloseable {
* each region in the service. After this service is closed, any further method calls on this
* service or any region object obtained from the service will throw {@link CacheClosedException},
* unless otherwise noted.
- *
+ *
* @throws CacheClosedException if the service is already closed.
*/
public void close();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionShortcut.java b/geode-core/src/main/java/org/apache/geode/cache/RegionShortcut.java
index 98cb981..6e77941 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionShortcut.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionShortcut.java
@@ -22,7 +22,7 @@ package org.apache.geode.cache;
* <p>
* Another way to use predefined region attributes is in cache.xml by setting the refid attribute on
* a region element or region-attributes element to the string of each value.
- *
+ *
* @since GemFire 6.5
*/
public enum RegionShortcut {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java b/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java
index ea38cb5..dc53b00 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache;
+import java.util.*;
+
import org.apache.geode.distributed.Role;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.*;
-
/**
* Provides information on presence or absence of a <code>Region</code>'s required roles.
* Configuration of required roles is accomplished using the <code>Region</code>'s
@@ -108,4 +108,3 @@ public class RequiredRoles {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java b/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
index 0b4593b..0ce6ea4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache;
/**
* A Generic exception to indicate that a resource exception has occurred. This class is abstract so
* that only subclasses can be instantiated.
- *
+ *
* @since GemFire 6.0
*/
public abstract class ResourceException extends CacheRuntimeException {
@@ -32,7 +32,7 @@ public abstract class ResourceException extends CacheRuntimeException {
/**
* Constructs an instance of <code>ResourceException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public ResourceException(String msg) {
@@ -42,7 +42,7 @@ public abstract class ResourceException extends CacheRuntimeException {
/**
* Constructs an instance of <code>ResourceException</code> with the specified detail message and
* cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -52,7 +52,7 @@ public abstract class ResourceException extends CacheRuntimeException {
/**
* Constructs an instance of <code>ResourceException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public ResourceException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java b/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
index dcabf61..c8d4ad5 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
import java.util.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Specifies how the region is affected by resumption of reliability when one or more missing
* required roles return to the distributed membership. The <code>ResumptionAction</code> is
* specified when configuring a region's {@link org.apache.geode.cache.MembershipAttributes}.
- *
+ *
* @deprecated this API is scheduled to be removed
*/
public class ResumptionAction implements java.io.Serializable {
@@ -97,7 +97,7 @@ public class ResumptionAction implements java.io.Serializable {
/**
* Returns a string representation for this resumption action.
- *
+ *
* @return the name of this resumption action
*/
@Override
@@ -106,4 +106,3 @@ public class ResumptionAction implements java.io.Serializable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RoleException.java b/geode-core/src/main/java/org/apache/geode/cache/RoleException.java
index 47e5f2a..e28805b 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RoleException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RoleException.java
@@ -32,7 +32,7 @@ public abstract class RoleException extends CacheRuntimeException {
/**
* Constructs an instance of <code>RoleException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public RoleException(String msg) {
@@ -42,7 +42,7 @@ public abstract class RoleException extends CacheRuntimeException {
/**
* Constructs an instance of <code>RoleException</code> with the specified detail message and
* cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -52,7 +52,7 @@ public abstract class RoleException extends CacheRuntimeException {
/**
* Constructs an instance of <code>RoleException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public RoleException(Throwable cause) {
@@ -60,4 +60,3 @@ public abstract class RoleException extends CacheRuntimeException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Scope.java b/geode-core/src/main/java/org/apache/geode/cache/Scope.java
index 0ca5ab3..e736e5a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Scope.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Scope.java
@@ -16,10 +16,10 @@
package org.apache.geode.cache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Enumerated type for region distribution scope.
*
@@ -72,10 +72,10 @@ public class Scope implements Serializable {
* The following 4 definitions are included for use by the C interface. Any changes to the order
* of the scopes in VALUES must be reflected here and changed in gemfire.h.
*/
- final static int SCOPE_LOCAL = 0;
- final static int SCOPE_DISTRIBUTED_NO_ACK = 1;
- final static int SCOPE_DISTRIBUTED_ACK = 2;
- final static int SCOPE_GLOBAL = 3;
+ static final int SCOPE_LOCAL = 0;
+ static final int SCOPE_DISTRIBUTED_NO_ACK = 1;
+ static final int SCOPE_DISTRIBUTED_ACK = 2;
+ static final int SCOPE_GLOBAL = 3;
private Object readResolve() throws ObjectStreamException {
return fromOrdinal(ordinal); // Canonicalize
@@ -94,7 +94,7 @@ public class Scope implements Serializable {
/**
* Returns whether this is local scope.
- *
+ *
* @return true if this is LOCAL
*/
public boolean isLocal() {
@@ -103,7 +103,7 @@ public class Scope implements Serializable {
/**
* Returns whether this is one of the distributed scopes.
- *
+ *
* @return true if this is any scope other than LOCAL
*/
public boolean isDistributed() {
@@ -112,7 +112,7 @@ public class Scope implements Serializable {
/**
* Returns whether this is distributed no ack scope.
- *
+ *
* @return true if this is DISTRIBUTED_NO_ACK
*/
public boolean isDistributedNoAck() {
@@ -121,7 +121,7 @@ public class Scope implements Serializable {
/**
* Returns whether this is distributed ack scope.
- *
+ *
* @return true if this is DISTRIBUTED_ACK
*/
public boolean isDistributedAck() {
@@ -130,7 +130,7 @@ public class Scope implements Serializable {
/**
* Returns whether this is global scope.
- *
+ *
* @return true if this is GLOBAL
*/
public boolean isGlobal() {
@@ -139,7 +139,7 @@ public class Scope implements Serializable {
/**
* Returns whether acknowledgements are required for this scope.
- *
+ *
* @return true if this is DISTRIBUTED_ACK or GLOBAL, false otherwise
*/
public boolean isAck() {
@@ -149,7 +149,7 @@ public class Scope implements Serializable {
/**
* Returns a string representation for this scope.
- *
+ *
* @return String the name of this scope
*/
@Override
@@ -159,7 +159,7 @@ public class Scope implements Serializable {
/**
* Parse the given string into a Scope
- *
+ *
* @param scope the provided String form of Scope
* @return the canonical Scope associated with the string
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/SerializedCacheValue.java b/geode-core/src/main/java/org/apache/geode/cache/SerializedCacheValue.java
index a05dfac..cb41d0a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/SerializedCacheValue.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/SerializedCacheValue.java
@@ -34,7 +34,7 @@ public interface SerializedCacheValue<V> {
/**
* Returns the raw byte[] that represents this cache value.
- *
+ *
* @return the raw byte[] that represents this cache value
* @throws IllegalStateException if off-heap and called after the method that was passed the
* EntryEvent that this serialize value was obtained from returns and this value does not
@@ -44,7 +44,7 @@ public interface SerializedCacheValue<V> {
/**
* Returns the deserialized object for this cache value.
- *
+ *
* @return the deserialized object for this cache value
* @throws IllegalStateException if off-heap and called after the method that was passed the
* EntryEvent that this serialize value was obtained from returns.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/StatisticsDisabledException.java b/geode-core/src/main/java/org/apache/geode/cache/StatisticsDisabledException.java
index b903820..38f0063 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/StatisticsDisabledException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/StatisticsDisabledException.java
@@ -38,7 +38,7 @@ public class StatisticsDisabledException extends CacheRuntimeException {
/**
* Constructs an instance of <code>StatisticsDisabledException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public StatisticsDisabledException(String msg) {
@@ -48,7 +48,7 @@ public class StatisticsDisabledException extends CacheRuntimeException {
/**
* Constructs an instance of <code>StatisticsDisabledException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -58,7 +58,7 @@ public class StatisticsDisabledException extends CacheRuntimeException {
/**
* Constructs an instance of <code>StatisticsDisabledException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public StatisticsDisabledException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
index 3896cd9..662650c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.DataSerializable;
import java.io.*;
+import org.apache.geode.DataSerializable;
+
/**
* Configuration attributes for defining subscriber requirements and behavior for a
* <code>Region</code>.
- *
+ *
* <p>
* The {@link InterestPolicy} defines what remote operation's data/event are of interest to this
* cache's region.
* </p>
- *
+ *
* @since GemFire 5.0
*/
public class SubscriptionAttributes implements DataSerializable, Externalizable {
@@ -44,7 +45,7 @@ public class SubscriptionAttributes implements DataSerializable, Externalizable
/**
* Creates a new <code>SubscriptionAttributes</code> with the given interest policy.
- *
+ *
* @param interestPolicy the interest policy this subscriber will use
*/
public SubscriptionAttributes(InterestPolicy interestPolicy) {
@@ -87,7 +88,7 @@ public class SubscriptionAttributes implements DataSerializable, Externalizable
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/SynchronizationCommitConflictException.java b/geode-core/src/main/java/org/apache/geode/cache/SynchronizationCommitConflictException.java
index 833af0c..a736a3d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/SynchronizationCommitConflictException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/SynchronizationCommitConflictException.java
@@ -28,7 +28,7 @@ public class SynchronizationCommitConflictException extends CacheRuntimeExceptio
/**
* Constructs an instance of <code>SynchronizationCommitConflictException</code> with the
* specified detail message.
- *
+ *
* @param msg the detail message
*/
public SynchronizationCommitConflictException(String msg) {
@@ -38,7 +38,7 @@ public class SynchronizationCommitConflictException extends CacheRuntimeExceptio
/**
* Constructs an instance of <code>SynchronizationCommitConflictException</code> with the
* specified detail message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TimeoutException.java b/geode-core/src/main/java/org/apache/geode/cache/TimeoutException.java
index b625a6d..1721537 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TimeoutException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TimeoutException.java
@@ -44,7 +44,7 @@ public class TimeoutException extends OperationAbortedException {
/**
* Constructs an instance of <code>TimeoutException</code> with the specified detail message.
- *
+ *
* @param msg the detail message
*/
public TimeoutException(String msg) {
@@ -54,7 +54,7 @@ public class TimeoutException extends OperationAbortedException {
/**
* Constructs an instance of <code>TimeoutException</code> with the specified detail message and
* cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -64,7 +64,7 @@ public class TimeoutException extends OperationAbortedException {
/**
* Constructs an instance of <code>TimeoutException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public TimeoutException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionDataRebalancedException.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionDataRebalancedException.java
index 5119628..4c85a33 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionDataRebalancedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionDataRebalancedException.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.control.RebalanceOperation;
*
* <p>
* This exception only occurs when a transaction involves partitioned regions.
- *
+ *
* @since GemFire 6.6
*/
public class TransactionDataRebalancedException extends TransactionException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
index b589611..1725d2d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
@@ -22,13 +22,13 @@ import java.util.*;
* An event that describes the culmination of an entire transaction. It either describes the work
* done by a committed transaction or the work abandoned by an explicit rollback or failed commit.
* The actual work is represented by an ordered list of {@link EntryEvent} instances.
- *
+ *
* <p>
* A <code>TransactionListener</code> receives an instance of this class allowing exploration of the
* resultant operations. The resultant operation is the final result of, potentially, a sequence of
* operations on a key such that earlier operations might be masked. For example, multiple put
* operations using the same key will result in only one {@link EntryEvent} for that key.
- *
+ *
* <p>
* An instance of TransactionEvent for the same transaction on the originating VM may differ from a
* recipient VM. The amount of variation will depend on the variation of the state of Entries on
@@ -51,14 +51,14 @@ public interface TransactionEvent {
/**
* Gets the <code>TransactionId</code> associated this TransactionEvent.
- *
+ *
*/
public TransactionId getTransactionId();
/**
* Returns an ordered list of every {@link CacheEvent} for this transaction. The event order is
* consistent with the order in which the operations were performed during the transaction.
- *
+ *
* @return an unmodifiable <code>List</code> of all the {@link CacheEvent} instances; one for each
* operation performed by this transaction.
* @since GemFire 5.0
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionException.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionException.java
index 6af958e..429340a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionException.java
@@ -16,7 +16,7 @@ package org.apache.geode.cache;
/**
* This is the superclass for all Exceptions that may be thrown by a GemFire transaction.
- *
+ *
* @since GemFire 6.5
*/
public class TransactionException extends CacheException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionId.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionId.java
index 34391e9..6f55137 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionId.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionId.java
@@ -20,9 +20,9 @@ import java.io.Externalizable;
/**
* The TransactionId interface is a "marker" interface that represents a unique GemFire transaction.
*
- *
+ *
* @since GemFire 4.0
- *
+ *
* @see Cache#getCacheTransactionManager
* @see CacheTransactionManager#getTransactionId
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionInDoubtException.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionInDoubtException.java
index d5da453..b9aef56 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionInDoubtException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionInDoubtException.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache;
/**
* This Exception is thrown in presence of node failures, when GemFire cannot know with certainty
* about the outcome of the transaction.
- *
+ *
* @since GemFire 6.5
*/
public class TransactionInDoubtException extends TransactionException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java
index 34f66e4..4beb167 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java
@@ -41,7 +41,7 @@ public interface TransactionListener extends CacheCallback {
/**
* Called after a successful commit of a transaction.
- *
+ *
* @param event the TransactionEvent
* @see CacheTransactionManager#commit
*/
@@ -49,7 +49,7 @@ public interface TransactionListener extends CacheCallback {
/**
* Called after an unsuccessful commit operation.
- *
+ *
* @param event the TransactionEvent
* @see CacheTransactionManager#commit
*/
@@ -57,7 +57,7 @@ public interface TransactionListener extends CacheCallback {
/**
* Called after an explicit rollback of a transaction.
- *
+ *
* @param event the TransactionEvent
* @see CacheTransactionManager#rollback
* @see CacheTransactionManager#commit
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionWriter.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionWriter.java
index 9e486ae..06c939b 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionWriter.java
@@ -24,7 +24,7 @@ package org.apache.geode.cache;
* This writer can be used to update a backend data source before the GemFire cache is updated
* during commit. If the backend update fails, the implementer can throw a
* {@link TransactionWriterException} to veto the transaction.
- *
+ *
* @see CacheTransactionManager#setWriter
* @since GemFire 6.5
*/
@@ -35,7 +35,7 @@ public interface TransactionWriter extends CacheCallback {
* Called before the transaction has finished committing, but after conflict checking. Provides an
* opportunity for implementors to cause transaction abort by throwing a
* TransactionWriterException
- *
+ *
* @param event the TransactionEvent
* @see CacheTransactionManager#commit
* @throws TransactionWriterException in the event that the transaction should be rolled back
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionWriterException.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionWriterException.java
index 7dd24e8..e727df1 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionWriterException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionWriterException.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache;
/**
* Exception thrown by implementors of {@link TransactionWriter#beforeCommit} to signal that the
* current transaction should be aborted.
- *
+ *
* @see TransactionWriter#beforeCommit
* @since GemFire 6.5
*
@@ -28,7 +28,7 @@ package org.apache.geode.cache;
public class TransactionWriterException extends Exception {
/**
- *
+ *
*/
private static final long serialVersionUID = -5557392877576634835L;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/UnsupportedVersionException.java b/geode-core/src/main/java/org/apache/geode/cache/UnsupportedVersionException.java
index fa8fe1b..095880d 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/UnsupportedVersionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/UnsupportedVersionException.java
@@ -24,7 +24,7 @@ public class UnsupportedVersionException extends VersionException {
/**
* Constructs a new <code>UnsupportedVersionException</code>.
- *
+ *
* @param versionOrdinal The ordinal of the requested <code>Version</code>
*/
public UnsupportedVersionException(short versionOrdinal) {
@@ -33,7 +33,7 @@ public class UnsupportedVersionException extends VersionException {
/**
* Constructs a new <code>UnsupportedVersionException</code>.
- *
+ *
* @param message The exception message
*/
public UnsupportedVersionException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEvent.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEvent.java
index 78309ff..7ee8a14 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEvent.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.wan.GatewayQueueEvent;
/**
* Represents <code>Cache</code> events delivered to <code>AsyncEventListener</code>.
- *
+ *
* @since GemFire 7.0
*/
public interface AsyncEvent<K, V> extends GatewayQueueEvent<K, V> {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventListener.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventListener.java
index dadee04..e859fc8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventListener.java
@@ -24,23 +24,23 @@ import org.apache.geode.cache.CacheCallback;
* attached. Implementers of interface <code>AsyncEventListener</code> process batches of
* <code>AsyncEvent</code> delivered by the corresponding <code>AsyncEventQueue</code>. <br>
* A sample implementation of this interface is as follows: <br>
- *
+ *
* <pre>
* public class MyEventListener implements AsyncEventListener {
*
* public boolean processEvents(List<AsyncEvent> events) {
* for (Iterator i = events.iterator(); i.hasNext();) {
* AsyncEvent event = (AsyncEvent) i.next();
- *
+ *
* String originalRegionName = event.getRegion().getName();
* // For illustration purpose, use the event to update the duplicate of above region.
* final Region duplicateRegion =
* CacheHelper.getCache().getRegion(originalRegionName + "_DUP");
- *
+ *
* final Object key = event.getKey();
* final Object value = event.getDeserializedValue();
* final Operation op = event.getOperation();
- *
+ *
* if (op.isCreate()) {
* duplicateRegion.create(key, value);
* } else if (op.isUpdate()) {
@@ -48,13 +48,13 @@ import org.apache.geode.cache.CacheCallback;
* } else if (op.isDestroy()) {
* duplicateRegion.destroy(key);
* }
- *
+ *
* }
* return true;
* }
* }
* </pre>
- *
+ *
* @since GemFire 7.0
*/
public interface AsyncEventListener extends CacheCallback {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueue.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueue.java
index 574a912..0388c18 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueue.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
/**
* Interface of AsyncEventQueue. This represents the channel over which the events are delivered to
* the <code>AsyncEventListener</code>.
- *
+ *
* @since GemFire 7.0
*/
public interface AsyncEventQueue {
@@ -35,14 +35,14 @@ public interface AsyncEventQueue {
/**
* The Disk store that is required for overflow and persistence
- *
+ *
* @return String
*/
public String getDiskStoreName();// for overflow and persistence
/**
* The maximum memory after which the data needs to be overflowed to disk. Default is 100 MB.
- *
+ *
* @return int
*/
public int getMaximumQueueMemory();// for overflow
@@ -50,7 +50,7 @@ public interface AsyncEventQueue {
/**
* Represents the size of a batch that gets delivered over the AsyncEventQueue. Default batchSize
* is 100.
- *
+ *
* @return int
*/
public int getBatchSize();
@@ -58,7 +58,7 @@ public interface AsyncEventQueue {
/**
* Represents the maximum time interval that can elapse before a batch is sent from
* <code>AsyncEventQueue</code>. Default batchTimeInterval is 5 ms.
- *
+ *
* @return int
*/
public int getBatchTimeInterval();
@@ -66,7 +66,7 @@ public interface AsyncEventQueue {
/**
* Represents whether batch conflation is enabled for batches sent from
* <code>AsyncEventQueue</code>. Default is false.
- *
+ *
* @return boolean
*/
public boolean isBatchConflationEnabled();
@@ -74,14 +74,14 @@ public interface AsyncEventQueue {
/**
* Represents whether the AsyncEventQueue is configured to be persistent or non-persistent.
* Default is false.
- *
+ *
* @return boolean
*/
public boolean isPersistent();
/**
* Represents whether writing to disk is synchronous or not. Default is true.
- *
+ *
* @return boolean
*/
public boolean isDiskSynchronous();
@@ -90,7 +90,7 @@ public interface AsyncEventQueue {
* Represents whether the queue is primary or secondary. Events get delivered only by the primary
* queue. If the primary queue goes down then the secondary queue first becomes primary and then
* starts delivering the events.
- *
+ *
* @return boolean
*/
public boolean isPrimary();
@@ -98,14 +98,14 @@ public interface AsyncEventQueue {
/**
* The <code>AsyncEventListener</code> that is attached to the queue. All the event passing over
* the queue are delivered to attached listener.
- *
+ *
* @return AsyncEventListener Implementation of AsyncEventListener
*/
public AsyncEventListener getAsyncEventListener();
/**
* Represents whether this queue is parallel (higher throughput) or serial.
- *
+ *
* @return boolean True if the queue is parallel, false otherwise.
*/
public boolean isParallel();
@@ -113,7 +113,7 @@ public interface AsyncEventQueue {
/**
* Returns the number of dispatcher threads working for this <code>AsyncEventQueue</code>. Default
* number of dispatcher threads is 5.
- *
+ *
* @return the number of dispatcher threads working for this <code>AsyncEventQueue</code>
*/
public int getDispatcherThreads();
@@ -121,28 +121,28 @@ public interface AsyncEventQueue {
/**
* Returns the order policy followed while dispatching the events to AsyncEventListener. Order
* policy is set only when dispatcher threads are > 1. Default order policy is KEY.
- *
+ *
* @return the order policy followed while dispatching the events to AsyncEventListener.
*/
public OrderPolicy getOrderPolicy();
/**
* Returns the number of entries in this <code>AsyncEventQueue</code>.
- *
+ *
* @return the number of entries in this <code>AsyncEventQueue</code>.
*/
public int size();
/**
* Returns the <code>GatewayEventFilters</code> for this <code>AsyncEventQueue</code>
- *
+ *
* @return the <code>GatewayEventFilters</code> for this <code>AsyncEventQueue</code>
*/
public List<GatewayEventFilter> getGatewayEventFilters();
/**
* Returns the <code>GatewayEventSubstitutionFilter</code> for this <code>AsyncEventQueue</code>
- *
+ *
* @return the <code>GatewayEventSubstitutionFilter</code> for this <code>AsyncEventQueue</code>
*/
public GatewayEventSubstitutionFilter getGatewayEventSubstitutionFilter();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueFactory.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueFactory.java
index 8a09ca6..2ca0d16 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueFactory.java
@@ -24,12 +24,12 @@ import org.apache.geode.cache.wan.GatewaySenderFactory;
/**
* Factory to create the <code>AsyncEventQueue</code>. Below example illustrates how to get the
* instance of factory and create the <code>AsyncEventQueue</code>.
- *
+ *
* <PRE>
Cache c = new CacheFactory().create();
// get AsyncEventQueueFactory from cache
AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
-
+
// set the attributes on factory
factory.setBatchSize(batchSize);
factory.setBatchConflationEnabled(isConflation);
@@ -37,19 +37,19 @@ import org.apache.geode.cache.wan.GatewaySenderFactory;
factory.setParallel(isParallel);
.
.
- // create instance of AsyncEventListener
+ // create instance of AsyncEventListener
AsyncEventListener asyncEventListener = new <AsyncEventListener class>;
// create AsyncEventQueue by providing the id and instance of AsyncEventListener
AsyncEventQueue asyncQueue = factory.create(asyncQueueId, asyncEventListener);
* </PRE>
- *
+ *
* @since GemFire 7.0
*/
public interface AsyncEventQueueFactory {
/**
* Sets the disk store name for overflow or persistence.
- *
+ *
* @param name
*/
public AsyncEventQueueFactory setDiskStoreName(String name);
@@ -57,22 +57,22 @@ public interface AsyncEventQueueFactory {
/**
* Sets the maximum amount of memory (in MB) for an <code>AsyncEventQueue</code>'s queue. Default
* is 100 MB.
- *
+ *
* @param memory The maximum amount of memory (in MB) for an <code>AsyncEventQueue</code>'s queue
*/
public AsyncEventQueueFactory setMaximumQueueMemory(int memory);
/**
* Sets whether or not the writing to the disk is synchronous. Default is true.
- *
+ *
* @param isSynchronous boolean if true indicates synchronous writes
- *
+ *
*/
public AsyncEventQueueFactory setDiskSynchronous(boolean isSynchronous);
/**
* Sets the batch size for an <code>AsyncEventQueue</code>'s queue. Default is 100.
- *
+ *
* @param size The size of batches sent to its <code>AsyncEventListener</code>
*/
public AsyncEventQueueFactory setBatchSize(int size);
@@ -80,7 +80,7 @@ public interface AsyncEventQueueFactory {
/**
* Sets the batch time interval (in milliseconds) for a <code>AsyncEventQueue</code>. Default is 5
* ms.
- *
+ *
* @param interval The maximum time interval that can elapse before a partial batch is sent from a
* <code>AsyncEventQueue</code>.
*/
@@ -88,7 +88,7 @@ public interface AsyncEventQueueFactory {
/**
* Sets whether the <code>AsyncEventQueue</code> is persistent or not. Default is false.
- *
+ *
* @param isPersistent Whether to enable persistence for an <code>AsyncEventQueue</code>.
*/
public AsyncEventQueueFactory setPersistent(boolean isPersistent);
@@ -96,7 +96,7 @@ public interface AsyncEventQueueFactory {
/**
* Indicates whether all VMs need to distribute events to remote site. In this case only the
* events originating in a particular VM will be in dispatched in order. Default is false.
- *
+ *
* @param isParallel boolean to indicate whether distribution policy is parallel
*/
@@ -104,7 +104,7 @@ public interface AsyncEventQueueFactory {
/**
* Sets whether to enable batch conflation for <code>AsyncEventQueue</code>. Default is false.
- *
+ *
* @param isConflation Whether or not to enable batch conflation for batches sent from a
* <code>AsyncEventQueue</code>
*/
@@ -112,7 +112,7 @@ public interface AsyncEventQueueFactory {
/**
* Sets the number of dispatcher thread. Default is 5.
- *
+ *
* @param numThreads
*/
public AsyncEventQueueFactory setDispatcherThreads(int numThreads);
@@ -120,7 +120,7 @@ public interface AsyncEventQueueFactory {
/**
* Adds a <code>GatewayEventFilter</code> to the attributes of AsyncEventQueue being created by
* factory.
- *
+ *
* @param filter GatewayEventFilter
*/
public AsyncEventQueueFactory addGatewayEventFilter(GatewayEventFilter filter);
@@ -128,21 +128,21 @@ public interface AsyncEventQueueFactory {
/**
* Removes the provided <code>GatewayEventFilter</code> from the attributes of AsyncEventQueue
* being created by factory.
- *
+ *
* @param filter
*/
public AsyncEventQueueFactory removeGatewayEventFilter(GatewayEventFilter filter);
/**
* Sets the order policy for multiple dispatchers. Default is KEY.
- *
+ *
* @param policy
*/
public AsyncEventQueueFactory setOrderPolicy(OrderPolicy policy);
/**
* Sets the <code>GatewayEventSubstitutionFilter</code>.
- *
+ *
* @param filter The <code>GatewayEventSubstitutionFilter</code>
*/
public AsyncEventQueueFactory setGatewayEventSubstitutionListener(
@@ -163,8 +163,8 @@ public interface AsyncEventQueueFactory {
* instance of <code>AsyncEventListener</code> should be thread safe in that case. The
* <code>AsyncEventListener</code> will start receiving events when the
* <code>AsyncEventQueue</code> is created.
- *
- *
+ *
+ *
* @param id Id of AsyncEventQueue
* @param listener <code>AsyncEventListener</code> to be added to the regions that are configured
* to use this queue.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
index 4eb9d0d..dee2c92 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
@@ -18,8 +18,8 @@ import org.apache.geode.StatisticDescriptor;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
public class AsyncEventQueueStats extends GatewaySenderStats {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
index e6bc84c..9e0239d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
@@ -219,7 +219,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(org.apache.geode.
* internal.cache.EntryEventImpl)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/AllConnectionsInUseException.java b/geode-core/src/main/java/org/apache/geode/cache/client/AllConnectionsInUseException.java
index 3d3621a..39a62f7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/AllConnectionsInUseException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/AllConnectionsInUseException.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.client;
/**
* Indicates that the connection pool is at its maximum size and all connections are in use.
- *
+ *
* @since GemFire 5.7
*/
public class AllConnectionsInUseException extends ServerConnectivityException {
@@ -31,7 +31,7 @@ public class AllConnectionsInUseException extends ServerConnectivityException {
/**
* Create a new instance of AllConnectionsInUseException with a detail message
- *
+ *
* @param message the detail message
*/
public AllConnectionsInUseException(String message) {
@@ -40,7 +40,7 @@ public class AllConnectionsInUseException extends ServerConnectivityException {
/**
* Create a new instance of AllConnectionsInUseException with a cause
- *
+ *
* @param cause the cause
*/
public AllConnectionsInUseException(Throwable cause) {
@@ -49,7 +49,7 @@ public class AllConnectionsInUseException extends ServerConnectivityException {
/**
* Create a new instance of AllConnectionsInUseException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCache.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCache.java
index 14655e6..1a743ff 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCache.java
@@ -50,7 +50,7 @@ import org.apache.geode.cache.query.QueryService;
* {@link ClientRegionFactory}) to talk to regions on the server.
* <p>
* More pools can be created using {@link PoolManager} or by declaring them in cache.xml.
- *
+ *
* @since GemFire 6.5
*/
public interface ClientCache extends GemFireCache {
@@ -70,7 +70,7 @@ public interface ClientCache extends GemFireCache {
* Terminates this object cache and releases all the resources. Calls {@link Region#close} on each
* region in the cache. After this cache is closed, any further method call on this cache or any
* region object will throw {@link CacheClosedException}, unless otherwise noted.
- *
+ *
* @param keepalive whether the server should keep the durable client's queues alive for the
* timeout period
* @throws CacheClosedException if the cache is already closed.
@@ -80,7 +80,7 @@ public interface ClientCache extends GemFireCache {
/**
* Create and return a client region factory that is initialized to create a region using the
* given predefined region attributes.
- *
+ *
* @param shortcut the predefined region attributes to initialize the factory with.
* @return a factory that will produce a client region.
*/
@@ -92,7 +92,7 @@ public interface ClientCache extends GemFireCache {
* <p>
* Named region attributes are defined in cache.xml by setting the name as the value of the
* <code>id</code> attribute on a <code>region-attributes</code> element.
- *
+ *
* @param regionAttributesId the named region attributes to initialize the factory with.
* @throws IllegalStateException if named region attributes has not been defined.
* @return a factory that will produce a client region.
@@ -118,10 +118,10 @@ public interface ClientCache extends GemFireCache {
* Creates an authenticated cache view using the given user security properties on the client
* cache's default pool. Multiple views with different user properties can be created on a single
* client cache.
- *
+ *
* Requires that {@link ClientCacheFactory#setPoolMultiuserAuthentication(boolean)
* multiuser-authentication} to be set to true on the default pool.
- *
+ *
* Applications must use this instance to do operations, when multiuser-authentication is set to
* true.
*
@@ -144,7 +144,7 @@ public interface ClientCache extends GemFireCache {
* <p>
* See {@link #createAuthenticatedView(Properties)} for more information on the returned cache
* view.
- *
+ *
* @param userSecurityProperties the security properties of a user.
* @param poolName - the pool that the users should be authenticated against.
* @return the {@link RegionService} instance associated with a user and the given properties.
@@ -153,7 +153,7 @@ public interface ClientCache extends GemFireCache {
/**
* Returns a set of the servers to which this client is currently connected.
- *
+ *
* @since GemFire 6.6
*/
public Set<InetSocketAddress> getCurrentServers();
@@ -161,7 +161,7 @@ public interface ClientCache extends GemFireCache {
/**
* Returns the default server pool. If one or more non-default pools were configured, this may
* return null.
- *
+ *
* @since GemFire 7.0
* @see org.apache.geode.cache.client.Pool
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
index 8f48862..f6edc3e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
@@ -64,31 +64,31 @@ import org.apache.geode.security.AuthenticationRequiredException;
* The following examples illustrate bootstrapping the client cache using region shortcuts:
* <p>
* Example 1: Connect to a CacheServer on the default host and port and access a region "customers"
- *
+ *
* <PRE>
* ClientCache c = new ClientCacheFactory().create();
* Region r = c.createClientRegionFactory(PROXY).create("customers");
* // The PROXY shortcut tells GemFire to route all requests to the servers
* // . i.e. there is no local caching
* </PRE>
- *
+ *
* Example 2: Connect using the GemFire locator and create a local LRU cache
- *
+ *
* <PRE>
* ClientCache c = new ClientCacheFactory().addPoolLocator(host, port).create();
* Region r = c.createClientRegionFactory(CACHING_PROXY_HEAP_LRU).create("customers");
* // The local LRU "customers" data region will automatically start evicting, by default, at 80%
* // heap utilization threshold
* </PRE>
- *
+ *
* Example 3: Access the query service
- *
+ *
* <PRE>
* QueryService qs = new ClientCacheFactory().create().getQueryService();
* </PRE>
- *
+ *
* Example 4: Construct the client cache region declaratively in cache.xml
- *
+ *
* <PRE>
* <!DOCTYPE client-cache PUBLIC
* "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
@@ -102,9 +102,9 @@ import org.apache.geode.security.AuthenticationRequiredException;
* a region-attributes sub element here -->
* </client-cache>
* </PRE>
- *
+ *
* Now, create the cache telling it to read your cache.xml file:
- *
+ *
* <PRE>
* ClientCache c = new ClientCacheFactory().set("cache-xml-file", "myCache.xml").create();
* Region r = c.getRegion("myRegion");
@@ -118,7 +118,7 @@ import org.apache.geode.security.AuthenticationRequiredException;
* Example 5: Define custom region attributes for persistence in XML and create region using API.
* Define new region attributes with ID "MYAPP_CACHING_PROXY_MEM_LRU" that overrides the
* "CACHING_PROXY" shortcut
- *
+ *
* <PRE>
* <!DOCTYPE client-cache PUBLIC
* "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
@@ -131,9 +131,9 @@ import org.apache.geode.security.AuthenticationRequiredException;
* </region-attributes>
* </client-cache>
* </PRE>
- *
+ *
* Now, create the data region in the client cache using this new attributes ID.
- *
+ *
* <PRE>
* ClientCache c = new ClientCacheFactory().set("cache-xml-file", "myCache.xml")
* .addPoolLocator(host, port).create();
@@ -652,7 +652,7 @@ public class ClientCacheFactory {
* Note that a PdxInstance is only returned if a serialized PDX is found in the cache. If the
* cache contains a deserialized PDX, then a domain class instance is returned instead of a
* PdxInstance.
- *
+ *
* @param pdxReadSerialized true to prefer PdxInstance
* @return this ClientCacheFactory
* @since GemFire 6.6
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java
index 659afd1..c155078 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java
@@ -22,12 +22,12 @@ import org.apache.geode.cache.OperationAbortedException;
* {@link org.apache.geode.cache.Cache#readyForEvents} method, but failed.
* <p>
* This exception was moved from the <code>util</code> package in 5.7.
- *
+ *
*
* @since GemFire 5.7
* @deprecated as of 6.5 this exception is no longer thrown by GemFire so any code that catches it
* should be removed.
- *
+ *
*/
public class ClientNotReadyException extends OperationAbortedException {
private static final long serialVersionUID = -315765802919271588L;
@@ -35,7 +35,7 @@ public class ClientNotReadyException extends OperationAbortedException {
/**
* Constructs an instance of <code>ClientNotReadyException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public ClientNotReadyException(String msg) {
@@ -45,7 +45,7 @@ public class ClientNotReadyException extends OperationAbortedException {
/**
* Constructs an instance of <code>ClientNotReadyException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
index dab476a..f17da49 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
@@ -44,7 +44,7 @@ import org.apache.geode.compression.Compressor;
* See {@link ClientRegionShortcut} for the shortcuts for these three types of client regions.
* <p>
* Example: Create a client region with a CacheListener
- *
+ *
* <PRE>
* ClientCache c = new ClientCacheFactory().addLocator(host, port).create();
* // Create local caching region that is connected to a server side region
@@ -52,14 +52,14 @@ import org.apache.geode.compression.Compressor;
* Region r =
* c.createClientRegionFactory(CACHING_PROXY).addCacheListener(myListener).create("customers");
* </PRE>
- *
+ *
* @since GemFire 6.5
*/
public interface ClientRegionFactory<K, V> {
/**
* Adds a cache listener to the end of the list of cache listeners on this factory.
- *
+ *
* @param aListener the cache listener to add
* @return a reference to this ClientRegionFactory object
* @throws IllegalArgumentException if <code>aListener</code> is null
@@ -70,7 +70,7 @@ public interface ClientRegionFactory<K, V> {
/**
* Removes all cache listeners and then adds each listener in the specified array. for the next
* <code>RegionAttributes</code> created.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this factory.
* @return a reference to this ClientRegionFactory object
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
@@ -99,7 +99,7 @@ public interface ClientRegionFactory<K, V> {
/**
* Sets the custom idleTimeout for the next <code>RegionAttributes</code> created.
- *
+ *
* @param custom the custom method
* @return the receiver
* @see AttributesFactory#setCustomEntryIdleTimeout(CustomExpiry)
@@ -120,7 +120,7 @@ public interface ClientRegionFactory<K, V> {
/**
* Sets the custom timeToLive expiration method for the next <code>RegionAttributes</code>
* created.
- *
+ *
* @param custom the custom method
* @return the receiver
* @see AttributesFactory#setCustomEntryTimeToLive(CustomExpiry)
@@ -212,7 +212,7 @@ public interface ClientRegionFactory<K, V> {
/**
* Enables or disabled concurrent modification checks
- *
+ *
* @since GemFire 7.0
* @param concurrencyChecksEnabled whether to perform concurrency checks on operations
*/
@@ -220,17 +220,17 @@ public interface ClientRegionFactory<K, V> {
/**
* Sets the DiskStore name attribute. This causes the region to belong to the DiskStore.
- *
+ *
* @param name the name of the diskstore
* @return a reference to this ClientRegionFactory object
- *
+ *
* @see AttributesFactory#setDiskStoreName
*/
public ClientRegionFactory<K, V> setDiskStoreName(String name);
/**
* Sets whether or not the writing to the disk is synchronous.
- *
+ *
* @param isSynchronous boolean if true indicates synchronous writes
* @return a reference to this ClientRegionFactory object
*/
@@ -247,7 +247,7 @@ public interface ClientRegionFactory<K, V> {
/**
* Sets cloning on region Note: off-heap regions always behave as if cloning is enabled.
- *
+ *
* @param cloningEnable
* @return a reference to this ClientRegionFactory object
* @see AttributesFactory#setCloningEnabled
@@ -260,7 +260,7 @@ public interface ClientRegionFactory<K, V> {
* <p>
* The named connection pool must exist on the cache at the time these attributes are used to
* create a region. See {@link PoolManager#createFactory} for how to create a connection pool.
- *
+ *
* @param poolName the name of the connection pool to use
* @return a reference to this ClientRegionFactory object
* @throws IllegalStateException if a cache loader or cache writer has already been set.
@@ -270,7 +270,7 @@ public interface ClientRegionFactory<K, V> {
/**
* Set the compressor to be used by this region for compressing region entry values.
- *
+ *
* @param compressor a compressor
* @return a reference to this RegionFactory instance
* @since GemFire 8.0
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
index ec37b51..0d3ca3a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.*;
* <p>
* Another way to use predefined region attributes is in cache.xml by setting the refid attribute on
* a region element or region-attributes element to the string of each value.
- *
+ *
* @since GemFire 6.5
*/
public enum ClientRegionShortcut {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java b/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java
index 10822cd..65a4f19 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.client;
/**
* An exception indicating that there are no active locators available to connect to.
- *
+ *
* @since GemFire 5.7
*/
public class NoAvailableLocatorsException extends ServerConnectivityException {
@@ -30,7 +30,7 @@ public class NoAvailableLocatorsException extends ServerConnectivityException {
/**
* Create a new instance of NoAvailableServersException with a detail message
- *
+ *
* @param message the detail message
*/
public NoAvailableLocatorsException(String message) {
@@ -39,7 +39,7 @@ public class NoAvailableLocatorsException extends ServerConnectivityException {
/**
* Create a new instance of NoAvailableLocatorsException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -49,7 +49,7 @@ public class NoAvailableLocatorsException extends ServerConnectivityException {
/**
* Create a new instance of NoAvailableLocatorsException with a and cause
- *
+ *
* @param cause the cause
*/
public NoAvailableLocatorsException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableServersException.java b/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableServersException.java
index e139efc..6a7a1a1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableServersException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableServersException.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.client;
/**
* An exception indicating that there are no active servers available to connect to.
- *
+ *
* @since GemFire 5.7
*/
public class NoAvailableServersException extends ServerConnectivityException {
@@ -30,7 +30,7 @@ public class NoAvailableServersException extends ServerConnectivityException {
/**
* Create a new instance of NoAvailableServersException with a detail message
- *
+ *
* @param message the detail message
*/
public NoAvailableServersException(String message) {
@@ -39,7 +39,7 @@ public class NoAvailableServersException extends ServerConnectivityException {
/**
* Create a new instance of NoAvailableServersException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -49,7 +49,7 @@ public class NoAvailableServersException extends ServerConnectivityException {
/**
* Create a new instance of NoAvailableServersException with a and cause
- *
+ *
* @param cause the cause
*/
public NoAvailableServersException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java b/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
index e910e01..3973d09 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
@@ -29,17 +29,17 @@ import org.apache.geode.cache.query.QueryService;
* Multiple instances may also be created using {@link PoolFactory#create}. A {@link PoolFactory}
* instance is created by calling {@link PoolManager#createFactory}. So to create a default
* <code>Pool</code> do this:
- *
+ *
* <PRE>
* new ClientCacheFactory().create();
* </PRE>
- *
+ *
* or this:
- *
+ *
* <PRE>
* PoolManager.createFactory().create("myPool");
* </PRE>
- *
+ *
* Instances may also be created by declaring them in cache.xml with a <code>pool</code> element.
* <p>
* Existing Pool instances can be found using {@link PoolManager#find(String)} and
@@ -55,7 +55,7 @@ public interface Pool {
/**
* Get the name of the connection pool
- *
+ *
* @return the name of the pool
* @see PoolFactory#create
*/
@@ -70,91 +70,91 @@ public interface Pool {
/**
* Returns the connection timeout of this pool.
- *
+ *
* @see PoolFactory#setFreeConnectionTimeout
*/
public int getFreeConnectionTimeout();
/**
* Returns the load conditioning interval of this pool.
- *
+ *
* @see PoolFactory#setLoadConditioningInterval
*/
public int getLoadConditioningInterval();
/**
* Returns the socket buffer size of this pool.
- *
+ *
* @see PoolFactory#setSocketBufferSize
*/
public int getSocketBufferSize();
/**
* Returns the read timeout of this pool.
- *
+ *
* @see PoolFactory#setReadTimeout
*/
public int getReadTimeout();
/**
* Get the minimum connections for this pool.
- *
+ *
* @see PoolFactory#setMinConnections(int)
*/
public int getMinConnections();
/**
* Get the maximum connections for this pool.
- *
+ *
* @see PoolFactory#setMaxConnections(int)
*/
public int getMaxConnections();
/**
* Get the maximum connections for this pool.
- *
+ *
* @see PoolFactory#setIdleTimeout(long)
*/
public long getIdleTimeout();
/**
* Get the ping interval for this pool.
- *
+ *
* @see PoolFactory#setPingInterval(long)
*/
public long getPingInterval();
/**
* Get the statistic interval for this pool.
- *
+ *
* @see PoolFactory#setStatisticInterval(int)
*/
public int getStatisticInterval();
/**
* Get the retry attempts for this pool.
- *
+ *
* @see PoolFactory#setRetryAttempts(int)
*/
public int getRetryAttempts();
/**
* Returns <code>true</code> if thread local connections are enabled on this pool.
- *
+ *
* @see PoolFactory#setThreadLocalConnections
*/
public boolean getThreadLocalConnections();
/**
* Returns the true if a server-to-client subscriptions are enabled on this pool.
- *
+ *
* @see PoolFactory#setSubscriptionEnabled
*/
public boolean getSubscriptionEnabled();
/**
* Returns true if single-hop optimisation is enabled on this pool.
- *
+ *
* @see PoolFactory#setPRSingleHopEnabled
* @since GemFire 6.5
*/
@@ -162,35 +162,35 @@ public interface Pool {
/**
* Returns the subscription redundancy level of this pool.
- *
+ *
* @see PoolFactory#setSubscriptionRedundancy
*/
public int getSubscriptionRedundancy();
/**
* Returns the subscription message tracking timeout of this pool.
- *
+ *
* @see PoolFactory#setSubscriptionMessageTrackingTimeout
*/
public int getSubscriptionMessageTrackingTimeout();
/**
* Returns the subscription ack interval of this pool.
- *
+ *
* @see PoolFactory#setSubscriptionAckInterval(int)
*/
public int getSubscriptionAckInterval();
/**
* Returns the server group of this pool.
- *
+ *
* @see PoolFactory#setServerGroup
*/
public String getServerGroup();
/**
* Returns true if multiuser mode is enabled on this pool.
- *
+ *
* @see PoolFactory#setMultiuserAuthentication(boolean)
* @since GemFire 6.5
*/
@@ -225,7 +225,7 @@ public interface Pool {
/**
* Destroys this pool closing any connections it produced.
- *
+ *
* @param keepAlive whether the server should keep the durable client's subscriptions alive for
* the timeout period
* @throws IllegalStateException if the pool is still in use
@@ -234,14 +234,14 @@ public interface Pool {
/**
* Destroys this pool closing any connections it produced.
- *
+ *
* @throws IllegalStateException if the pool is still in use
*/
public void destroy();
/**
* Indicates whether this Pool has been destroyed.
- *
+ *
* @return true if the pool has been destroyed
*/
public boolean isDestroyed();
@@ -250,7 +250,7 @@ public interface Pool {
* If this pool was configured to to use thread local connections, then this method will release
* the connection cached for the calling thread. The connection will then be available for use by
* other threads.
- *
+ *
* If this pool is not using thread local connections, this method will have no effect.
*/
public void releaseThreadLocalConnection();
@@ -258,7 +258,7 @@ public interface Pool {
/**
* Returns the QueryService for this Pool. The query operations performed using this QueryService
* will be executed on the servers that are associated with this pool.
- *
+ *
* @return the QueryService
*/
public QueryService getQueryService();
@@ -283,7 +283,7 @@ public interface Pool {
* possibly causing data loss.
* <p>
* A value -2 indicates that this client pool connected to server for the first time.
- *
+ *
* @return int The number of subscription events maintained at server for this durable client pool
* at the time this pool (re)connected. A negative value indicates no queue was found for
* this client pool.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
index c5bb863..450149d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.cache.client;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.query.*;
import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.cache.*; // for javadocs
-import org.apache.geode.cache.query.*; // for javadocs
/**
@@ -183,7 +183,7 @@ public interface PoolFactory {
* The default value for whether to have single hop optimisations enabled.
* <p>
* Current value: <code>true</code>.
- *
+ *
* @since GemFire 6.5
*/
public static final boolean DEFAULT_PR_SINGLE_HOP_ENABLED = true;
@@ -191,7 +191,7 @@ public interface PoolFactory {
* The default value for whether to use multiuser mode.
* <p>
* Current value: <code>false</code>.
- *
+ *
* @since GemFire 6.5
*/
public static final boolean DEFAULT_MULTIUSER_AUTHENTICATION = false;
@@ -214,7 +214,7 @@ public interface PoolFactory {
* specifies how long those operations will block waiting for a free connection before receiving
* an {@link AllConnectionsInUseException}. If max connections is not set this setting has no
* effect.
- *
+ *
* @see #setMaxConnections(int)
* @param connectionTimeout the connection timeout in milliseconds
* @return a reference to <code>this</code>
@@ -229,7 +229,7 @@ public interface PoolFactory {
* to improve the load balance.
* <p>
* A value of <code>-1</code> disables load conditioning
- *
+ *
* @param loadConditioningInterval the connection lifetime in milliseconds
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>connectionLifetime</code> is less than
@@ -241,7 +241,7 @@ public interface PoolFactory {
* Sets the socket buffer size for each connection made in this pool. Large messages can be
* received and sent faster when this buffer is larger. Larger buffers also optimize the rate at
* which servers can send events for client subscriptions.
- *
+ *
* @param bufferSize the size of the socket buffers used for reading and writing on each
* connection in this pool.
* @return a reference to <code>this</code>
@@ -260,7 +260,7 @@ public interface PoolFactory {
* If <code>false</code> then connections are returned to the pool as soon as the operation being
* done with the connection completes. This allows connections to be shared amonst multiple
* threads keeping the number of connections down.
- *
+ *
* @param threadLocalConnections if <code>true</code> then enable thread local connections.
* @return a reference to <code>this</code>
*/
@@ -269,7 +269,7 @@ public interface PoolFactory {
/**
* Sets the number of milliseconds to wait for a response from a server before timing out the
* operation and trying another server (if any are available).
- *
+ *
* @param timeout number of milliseconds to wait for a response from a server
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>timeout</code> is less than <code>0</code>.
@@ -280,7 +280,7 @@ public interface PoolFactory {
* Set the minimum number of connections to keep available at all times. When the pool is created,
* it will create this many connections. If <code>0</code> then connections will not be made until
* an actual operation is done that requires client-to-server communication.
- *
+ *
* @param minConnections the initial number of connections this pool will create.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>minConnections</code> is less than <code>0</code>.
@@ -291,7 +291,7 @@ public interface PoolFactory {
* Set the max number of client to server connections that the pool will create. If all of the
* connections are in use, an operation requiring a client to server connection will block until a
* connection is available.
- *
+ *
* @see #setFreeConnectionTimeout(int)
* @param maxConnections the maximum number of connections in the pool. this pool will create. -1
* indicates that there is no maximum number of connections
@@ -305,7 +305,7 @@ public interface PoolFactory {
* Set the amount of time a connection can be idle before expiring the connection. If the pool
* size is greater than the minimum specified by {@link PoolFactory#setMinConnections(int)},
* connections which have been idle for longer than the idleTimeout will be closed.
- *
+ *
* @param idleTimeout The amount of time in milliseconds that an idle connection should live
* before expiring. -1 indicates that connections should never expire.
* @return a reference to <code>this</code>
@@ -315,7 +315,7 @@ public interface PoolFactory {
/**
* Set the number of times to retry a request after timeout/exception.
- *
+ *
* @param retryAttempts The number of times to retry a request after timeout/exception. -1
* indicates that a request should be tried against every available server before failing
* @return a reference to <code>this</code>
@@ -326,10 +326,10 @@ public interface PoolFactory {
/**
* How often to ping servers to verify that they are still alive. Each server will be sent a ping
* every pingInterval if there has not been any other communication with the server.
- *
+ *
* These pings are used by the server to monitor the health of the client. Make sure that the
* pingInterval is less than the maximum time between pings allowed by the cache server.
- *
+ *
* @param pingInterval The amount of time in milliseconds between pings.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>pingInterval</code> is less than or equal to
@@ -343,7 +343,7 @@ public interface PoolFactory {
* monitor clients.
* <p>
* A value of <code>-1</code> disables the sending of client statistics to the server.
- *
+ *
* @param statisticInterval The amount of time in milliseconds between sends of client statistics
* to the server.
* @return a reference to <code>this</code>
@@ -354,7 +354,7 @@ public interface PoolFactory {
/**
* Configures the group that all servers this pool connects to must belong to.
- *
+ *
* @param group the server group that this pool will connect to. If <code>null</code> or
* <code>""</code> then all servers will be connected to.
* @return a reference to <code>this</code>
@@ -366,7 +366,7 @@ public interface PoolFactory {
* and will be used to discover other running cache servers and locators. Note that if the host is
* unknown at the time of this call the locator will still be added. When the pool is used for an
* operation if the host is still unknown an exception will be thrown.
- *
+ *
* @param host the host name or ip address that the locator is listening on.
* @param port the port that the locator is listening on
* @return a reference to <code>this</code>
@@ -381,7 +381,7 @@ public interface PoolFactory {
* this client will directly connect to without consulting a server locator. Note that if the host
* is unknown at the time of this call the server will still be added. When the pool is used for
* an operation if the host is still unknown an exception will be thrown.
- *
+ *
* @param host the host name or ip address that the server is listening on.
* @param port the port that the server is listening on
* @return a reference to <code>this</code>
@@ -395,7 +395,7 @@ public interface PoolFactory {
* If set to <code>true</code> then the created pool will have server-to-client subscriptions
* enabled. If set to <code>false</code> then all <code>Subscription*</code> attributes are
* ignored at create time.
- *
+ *
* @return a reference to <code>this</code>
*/
public PoolFactory setSubscriptionEnabled(boolean enabled);
@@ -405,7 +405,7 @@ public interface PoolFactory {
* no redundant copies will be kept on the servers. Otherwise an effort will be made to maintain
* the requested number of copies of the server-to-client subscriptions. At most one copy per
* server will be made up to the requested level.
- *
+ *
* @param redundancy the number of redundant servers for this client's subscriptions.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>redundancyLevel</code> is less than <code>-1</code>.
@@ -417,7 +417,7 @@ public interface PoolFactory {
* for subscription events the client has received from the server. It's used to minimize
* duplicate events. Entries that have not been modified for this amount of time are expired from
* the list
- *
+ *
* @param messageTrackingTimeout number of milliseconds to set the timeout to.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>messageTrackingTimeout</code> is less than or equal
@@ -428,7 +428,7 @@ public interface PoolFactory {
/**
* Sets the interval in milliseconds to wait before sending acknowledgements to the cache server
* for events received from the server subscriptions.
- *
+ *
* @param ackInterval number of milliseconds to wait before sending event acknowledgements.
* @return a reference to <code>this</code>
* @throws IllegalArgumentException if <code>ackInterval</code> is less than or equal to
@@ -438,7 +438,7 @@ public interface PoolFactory {
/**
* Resets the configuration of this factory to its defaults.
- *
+ *
* @return a reference to <code>this</code>
*/
public PoolFactory reset();
@@ -446,7 +446,7 @@ public interface PoolFactory {
/**
* Create a new Pool for connecting a client to a set of GemFire Cache Servers. using this
* factory's settings for attributes.
- *
+ *
* @param name the name of the pool, used when connecting regions to it
* @throws IllegalStateException if a pool with <code>name</code> already exists
* @throws IllegalStateException if a locator or server has not been added.
@@ -471,7 +471,7 @@ public interface PoolFactory {
* {@link org.apache.geode.cache.PartitionAttributesFactory#setLocalMaxMemory(int)
* local-max-memory} equal to zero, no cache operations mentioned above will be routed to those
* servers as they do not host any partitions.
- *
+ *
* @return a reference to <code>this</code>
* @since GemFire 6.5
*/
@@ -480,13 +480,13 @@ public interface PoolFactory {
/**
* If set to <code>true</code> then the created pool can be used by multiple authenticated users.
* <br>
- *
+ *
* This setting should only be used for applications that require the client to authenticate
* itself with the server multiple users.
- *
+ *
* <br>
* Note: If set to true, all the client side regions must have their data-policy set to empty.
- *
+ *
* @return a reference to <code>this</code>
* @see ClientCache#createAuthenticatedView(java.util.Properties)
* @since GemFire 6.5
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/PoolManager.java b/geode-core/src/main/java/org/apache/geode/cache/client/PoolManager.java
index 6356b43..9b5d6ff 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/PoolManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/PoolManager.java
@@ -18,8 +18,8 @@ package org.apache.geode.cache.client;
import java.util.Map;
import org.apache.geode.cache.Region;
+import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolManagerImpl;
-import org.apache.geode.distributed.DistributedSystem; // for javadocs
/**
* Manages creation and access to {@link Pool connection pools} for clients.
@@ -42,7 +42,7 @@ public final class PoolManager {
/**
* Creates a new {@link PoolFactory pool factory}, which is used to configure and create new
* {@link Pool}s.
- *
+ *
* @return the new pool factory
*/
public static PoolFactory createFactory() {
@@ -52,7 +52,7 @@ public final class PoolManager {
/**
* Find by name an existing connection pool returning the existing pool or <code>null</code> if it
* does not exist.
- *
+ *
* @param name the name of the connection pool
* @return the existing connection pool or <code>null</code> if it does not exist.
*/
@@ -66,7 +66,7 @@ public final class PoolManager {
* <p>
* The map contains the pools that this manager knows of at the time of this call. The map is free
* to be changed without affecting this manager.
- *
+ *
* @return a Map that is a snapshot of all the pools currently known to this manager.
*/
public static Map<String, Pool> getAll() {
@@ -75,7 +75,7 @@ public final class PoolManager {
/**
* Unconditionally destroys all created pools that are in this manager.
- *
+ *
* @param keepAlive whether the server should keep the durable client's subscriptions alive for
* the <code>durable-client-timeout</code>.
* @see DistributedSystem#connect for a description of <code>durable-client-timeout</code>.
@@ -86,7 +86,7 @@ public final class PoolManager {
/**
* Find the pool used by the given region.
- *
+ *
* @param region The region that is using the pool.
* @return the pool used by that region or <code>null</code> if the region does not have a pool.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ServerConnectivityException.java b/geode-core/src/main/java/org/apache/geode/cache/client/ServerConnectivityException.java
index 3fe9b4e..5f38376 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ServerConnectivityException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ServerConnectivityException.java
@@ -19,7 +19,7 @@ import org.apache.geode.GemFireException;
/**
* A generic exception indicating that a failure has happened while communicating with a gemfire
* server. Subclasses of this exception provide more detail on specific failures.
- *
+ *
* @since GemFire 5.7
*/
public class ServerConnectivityException extends GemFireException {
@@ -31,9 +31,9 @@ public class ServerConnectivityException extends GemFireException {
public ServerConnectivityException() {}
/**
- *
+ *
* Create a new instance of ServerConnectivityException with a detail message
- *
+ *
* @param message the detail message
*/
public ServerConnectivityException(String message) {
@@ -42,7 +42,7 @@ public class ServerConnectivityException extends GemFireException {
/**
* Create a new instance of ServerConnectivityException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -52,7 +52,7 @@ public class ServerConnectivityException extends GemFireException {
/**
* Create a new instance of ServerConnectivityException with a cause
- *
+ *
* @param cause the cause
*/
public ServerConnectivityException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ServerOperationException.java b/geode-core/src/main/java/org/apache/geode/cache/client/ServerOperationException.java
index 92409a1..6ed0bd4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ServerOperationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ServerOperationException.java
@@ -19,7 +19,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
/**
* An exception indicating that a failure has happened on the server while processing an operation
* that was sent to it by a client.
- *
+ *
* @since GemFire 5.7
*/
public class ServerOperationException extends ServerConnectivityException {
@@ -31,9 +31,9 @@ public class ServerOperationException extends ServerConnectivityException {
public ServerOperationException() {}
/**
- *
+ *
* Create a new instance of ServerOperationException with a detail message
- *
+ *
* @param message the detail message
*/
public ServerOperationException(String message) {
@@ -42,7 +42,7 @@ public class ServerOperationException extends ServerConnectivityException {
/**
* Create a new instance of ServerOperationException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -52,7 +52,7 @@ public class ServerOperationException extends ServerConnectivityException {
/**
* Create a new instance of ServerOperationException with a cause
- *
+ *
* @param cause the cause
*/
public ServerOperationException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ServerRefusedConnectionException.java b/geode-core/src/main/java/org/apache/geode/cache/client/ServerRefusedConnectionException.java
index 02c4d62..f288c05 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ServerRefusedConnectionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ServerRefusedConnectionException.java
@@ -30,7 +30,7 @@ public class ServerRefusedConnectionException extends OperationAbortedException
/**
* Constructs an instance of <code>ServerRefusedConnectionException</code> with the specified
* detail message.
- *
+ *
* @param server the server that rejected the connection
* @param msg the detail message
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/SubscriptionNotEnabledException.java b/geode-core/src/main/java/org/apache/geode/cache/client/SubscriptionNotEnabledException.java
index 2eb6acc..e7dfd33 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/SubscriptionNotEnabledException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/SubscriptionNotEnabledException.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Region;
* An exception indicating that client subscriptions are not enabled on this client, but the client
* is trying to perform an operation that requires a client subscription, such as
* {@link Region#registerInterest(Object)}.
- *
+ *
* @since GemFire 5.7
*/
public class SubscriptionNotEnabledException extends ServerConnectivityException {
@@ -34,7 +34,7 @@ public class SubscriptionNotEnabledException extends ServerConnectivityException
/**
* Create a new instance of SubscriptionNotEnabledException with a detail message
- *
+ *
* @param message the detail message
*/
public SubscriptionNotEnabledException(String message) {
@@ -43,7 +43,7 @@ public class SubscriptionNotEnabledException extends ServerConnectivityException
/**
* Create a new instance of SubscriptionNotEnabledException with a detail message and cause
- *
+ *
* @param message the detail message
* @param cause the cause
*/
@@ -53,7 +53,7 @@ public class SubscriptionNotEnabledException extends ServerConnectivityException
/**
* Create a new instance of SubscriptionNotEnabledException with a and cause
- *
+ *
* @param cause the cause
*/
public SubscriptionNotEnabledException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
index f39b6fa..3e95158 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* Represents an operation that can be performed in a client by sending a message to a server.
- *
+ *
* @since GemFire 5.7
*/
public abstract class AbstractOp implements Op {
@@ -75,7 +75,7 @@ public abstract class AbstractOp implements Op {
/**
* Attempts to send this operation's message out on the given connection
- *
+ *
* @param cnx the connection to use when sending
* @throws Exception if the send fails
*/
@@ -104,7 +104,7 @@ public abstract class AbstractOp implements Op {
/**
* New implementations of AbstractOp should override this method if the implementation should be
* excluded from client authentication. e.g. PingOp#sendMessage(Connection cnx)
- *
+ *
* @see AbstractOp#needsUserId()
* @see AbstractOp#processSecureBytes(Connection, Message)
* @see ServerConnection#updateAndGetSecurityPart()
@@ -186,7 +186,7 @@ public abstract class AbstractOp implements Op {
/**
* Attempts to read a response to this operation by reading it from the given connection, and
* returning it.
- *
+ *
* @param cnx the connection to read the response from
* @return the result of the operation or <code>null</code> if the operation has no result.
* @throws Exception if the execute failed
@@ -230,7 +230,7 @@ public abstract class AbstractOp implements Op {
/**
* Processes the given response message returning the result, if any, of the processing.
- *
+ *
* @return the result of processing the response; null if no result
* @throws Exception if response could not be processed or we received a response with a server
* exception.
@@ -244,7 +244,7 @@ public abstract class AbstractOp implements Op {
/**
* Process a response that contains an ack.
- *
+ *
* @param msg the message containing the response
* @param opName text describing this op
* @throws Exception if response could not be processed or we received a response with a server
@@ -277,7 +277,7 @@ public abstract class AbstractOp implements Op {
/**
* Process a response that contains a single Object result.
- *
+ *
* @param msg the message containing the response
* @param opName text describing this op
* @return the result of the response
@@ -318,7 +318,7 @@ public abstract class AbstractOp implements Op {
public interface ChunkHandler {
/**
* This method will be called once for every incoming chunk
- *
+ *
* @param msg the current chunk to handle
*/
public void handle(ChunkedMessage msg) throws Exception;
@@ -326,7 +326,7 @@ public abstract class AbstractOp implements Op {
/**
* Process a chunked response that contains a single Object result.
- *
+ *
* @param msg the message containing the response
* @param opName text describing this op
* @param callback used to handle each chunks data
@@ -372,7 +372,7 @@ public abstract class AbstractOp implements Op {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.Op#attempt(org.apache.geode.cache.client.internal.
* Connection)
*/
@@ -419,7 +419,7 @@ public abstract class AbstractOp implements Op {
/**
* Subclasses for AbstractOp should override this method to return false in this message should
* not participate in any existing transaction
- *
+ *
* @return true if the message should participate in transaction
*/
protected boolean participateInTransaction() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXEnumOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXEnumOp.java
index 857d1d3..c926358 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXEnumOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXEnumOp.java
@@ -20,14 +20,14 @@ import org.apache.geode.pdx.internal.EnumInfo;
/**
* Push a PDX Enum id to other servers.
- *
+ *
* @since GemFire 6.6.2
*/
public class AddPDXEnumOp {
/**
* Register a bunch of instantiators on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static void execute(ExecutablePool pool, int id, EnumInfo ei) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXTypeOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXTypeOp.java
index 4eb137d..de1e5cb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXTypeOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AddPDXTypeOp.java
@@ -20,14 +20,14 @@ import org.apache.geode.pdx.internal.PdxType;
/**
* Add a PdxType to a server.
- *
+ *
* @since GemFire 6.6
*/
public class AddPDXTypeOp {
/**
* Register a bunch of instantiators on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static void execute(ExecutablePool pool, int id, PdxType type) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java
index c3e69e7..f4a93e2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AuthenticateUserOp.java
@@ -13,10 +13,16 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.client.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.util.Properties;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.client.ServerOperationException;
@@ -38,22 +44,16 @@ import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.NotAuthorizedException;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Authenticates this client (or a user) on a server. This op ideally should get executed
* once-per-server.
- *
+ *
* When multiuser-authentication is set to false, this op gets executed immedialtely after a
* client-to-server connection is established.
- *
+ *
* When multiuser-authentication is set to true, this op gets executed before the user attempts to
* perform an op whose {@link AbstractOp#needsUserId()} returns true.
- *
+ *
* @see PutUserCredentials
* @see ProxyCache
* @since GemFire 6.5
@@ -62,7 +62,7 @@ public class AuthenticateUserOp {
/**
* Sends the auth credentials to the server. Used in single user mode of authentication.
- *
+ *
* @param con The connection to use for this operation.
* @param pool The connection pool to use for this operation.
* @return Object unique user-id.
@@ -75,7 +75,7 @@ public class AuthenticateUserOp {
/**
* Sends the auth credentials to the server for a particular user. Used in multiple user mode of
* authentication.
- *
+ *
* @param location The ServerLocation instance whose connection instance will be used to perform
* the operation.
* @param pool The connection pool to use for this operation.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
index 481f6ed..244e197 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
@@ -59,7 +59,7 @@ import org.apache.geode.internal.net.*;
/**
* A connection source which uses locators to find the least loaded server.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -237,7 +237,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
* If connecting to the locator fails with an IOException, this may be because the locator's IP
* has changed. Add the locator back to the list of locators using host address rather than IP.
* This will cause another DNS lookup, hopefully finding the locator.
- *
+ *
* @param locator
*/
protected void updateLocatorInLocatorList(HostAddress locator) {
@@ -463,7 +463,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
/**
* An iterator which iterates all of the controllers, starting at the last known good
* controller.
- *
+ *
*/
protected class LocatorIterator implements Iterator<HostAddress> {
private int startLocator = currentLocatorIndex.get();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java
index 3b52f33..da7b236 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CacheServerLoadMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.InternalDataSerializer;
* A message from a server to a locator to update the locator with new load information from the
* server. Also includes the id of any clients whose estimate is no longer needed on the
* server-locator.
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
index d603a14..0c1e059 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.cache.client.internal;
+import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.EventID;
/**
* Does a region clear (or create) on a server
- *
+ *
* @since GemFire 5.7
*/
public class ClearOp {
/**
* Does a region clear on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the clear on
* @param eventId the event id for this clear
@@ -42,7 +42,7 @@ public class ClearOp {
/**
* Does a region clear on a server using the given connection from the given pool to communicate
* with the server.
- *
+ *
* @param con the connection to use to send to the server
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the clear on
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index 3502757..5193212 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -14,6 +14,21 @@
*/
package org.apache.geode.cache.client.internal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
@@ -30,26 +45,12 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
/**
* Maintains {@link ClientPartitionAdvisor} for Partitioned Regions on servers Client operations
* will consult this service to identify the server locations on which the data for the client
* operation is residing
- *
+ *
* @since GemFire 6.5
*/
public class ClientMetadataService {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java
index a48a707..44d973d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java
@@ -39,10 +39,10 @@ import org.apache.geode.internal.logging.LogService;
/**
* Stores the information such as partition attributes and meta data details
- *
- *
+ *
+ *
* @since GemFire 6.5
- *
+ *
*/
public class ClientPartitionAdvisor {
@@ -210,7 +210,7 @@ public class ClientPartitionAdvisor {
/**
* This method returns total number of buckets for a PartitionedRegion.
- *
+ *
* @return total number of buckets for a PartitionedRegion.
*/
@@ -239,7 +239,7 @@ public class ClientPartitionAdvisor {
/**
* Returns the PartitionResolver set for custom partitioning
- *
+ *
* @return <code>PartitionResolver</code> for the PartitionedRegion
*/
public PartitionResolver getPartitionResolver() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientRegionFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientRegionFactoryImpl.java
index 07806d9..5d62232 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientRegionFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientRegionFactoryImpl.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.cache.UserSpecifiedRegionAttributes;
/**
* The distributed system will always default to a loner on a client.
- *
+ *
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CloseConnectionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CloseConnectionOp.java
index ea8a8b5..74de7f4 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CloseConnectionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CloseConnectionOp.java
@@ -21,13 +21,13 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Tell a server that a connection is being closed
- *
+ *
* @since GemFire 5.7
*/
public class CloseConnectionOp {
/**
* Tell a server that a connection is being closed
- *
+ *
* @param con the connection that is being closed
* @param keepAlive whether to keep the proxy alive on the server
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CommitOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CommitOp.java
index f44d62d..c961848 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/CommitOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/CommitOp.java
@@ -20,13 +20,13 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Does a commit on a server
- *
+ *
* @since GemFire 6.6
*/
public class CommitOp {
/**
* Does a commit on a server using connections from the given pool to communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static TXCommitMessage execute(ExecutablePool pool, int txId) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
index 2fc524a..3a5379c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
/**
* Represents a connection from a client to a server. Instances are created, kept, and used by
* {@link PoolImpl}.
- *
+ *
* @since GemFire 5.7
*/
public interface Connection {
@@ -52,7 +52,7 @@ public interface Connection {
/**
* Gracefully close the connection by notifying the server. It is not necessary to call destroy
* after closing the connection.
- *
+ *
* @param keepAlive What do do this server to client connection proxy on this server.
* @throws Exception if there was an error notifying the server. The connection will still be
* destroyed.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactory.java
index e5c0f0a..d86e57f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactory.java
@@ -21,7 +21,7 @@ import org.apache.geode.security.GemFireSecurityException;
/**
* A factory for creating new connections.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -29,7 +29,7 @@ public interface ConnectionFactory {
/**
* Create a client to server connection to the given server
- *
+ *
* @param location the server to connection
* @return a connection to that server, or null if a connection could not be established.
* @throws GemFireSecurityException if there was a security exception while trying to establish a
@@ -40,7 +40,7 @@ public interface ConnectionFactory {
/**
* Returns the best server for this client to connect to. Returns null if no servers exist.
- *
+ *
* @param currentServer if non-null then we are trying to replace a connection that we have to
* this server.
* @param excludedServers the list of servers to skip over when finding a server to connect to
@@ -49,7 +49,7 @@ public interface ConnectionFactory {
/**
* Create a client to server connection to any server that is not in the excluded list.
- *
+ *
* @param excludedServers the list of servers to skip over when finding a server to connect to
* @return a connection or null if a connection could not be established.
* @throws GemFireSecurityException if there was a security exception trying to establish a
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
index 62bf8fd..942a1b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
@@ -18,6 +18,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.GemFireConfigException;
@@ -38,13 +40,12 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
/**
* Creates connections, using a connection source to determine which server to connect to.
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public class ConnectionFactoryImpl implements ConnectionFactory {
@@ -69,7 +70,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
/**
* Test hook for client version support
- *
+ *
* @since GemFire 5.7
*/
@@ -334,5 +335,3 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
return updater;
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
index b7341a4..0a74c46 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
@@ -14,6 +14,18 @@
*/
package org.apache.geode.cache.client.internal;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.net.ssl.SSLSocket;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.ForcedDisconnectException;
@@ -32,23 +44,13 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.net.SocketCreator;
-import org.apache.logging.log4j.Logger;
-
-import javax.net.ssl.SSLSocket;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* A single client to server connection.
- *
+ *
* The execute method of this class is synchronized to prevent two ops from using the client to
* server connection at the same time.
- *
+ *
* @since GemFire 5.7
*/
public class ConnectionImpl implements Connection {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
index 58b715f..0e49c42 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
/**
* A source for discovering servers and finding the least loaded server to connect to.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -35,7 +35,7 @@ public interface ConnectionSource {
/**
* Asks if we should replace a connection to <code>currentServer</code> with one to the returned
* server.
- *
+ *
* @param currentServer the server we currently have a connection to.
* @param excludedServers the replacement server can not be one in this set
* @return the server we should connect to; <code>currentServer</code> if a replacement is not
@@ -46,7 +46,7 @@ public interface ConnectionSource {
/**
* Find the servers to host the queue
- *
+ *
* @param excludedServers the servers to exclude from the search
* @param numServers the number of servers to find, or -1 if we should just find all of them
* @param proxyId the proxy id for this client
@@ -63,14 +63,14 @@ public interface ConnectionSource {
/**
* Check to see if the load on the servers is balanced, according to this connection source.
- *
+ *
* @return true if the servers have balanced load.
*/
boolean isBalanced();
/**
* get the list of all the servers
- *
+ *
* @return a list of all servers
*/
List<ServerLocation> getAllServers();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
index ba647c8..c0fa907 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
@@ -20,13 +20,13 @@ import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.distributed.internal.DistributionStats;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.PoolStats;
import org.apache.geode.internal.cache.tier.sockets.MessageStats;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* Stats for a client to server {@link Connection}
- *
+ *
* @since GemFire 5.7
*/
public class ConnectionStats implements MessageStats {
@@ -36,404 +36,404 @@ public class ConnectionStats implements MessageStats {
///////////////////////////////////////////////////////////////////////
/*
- * private final static int opInProgressId; private final static int opSendInProgressId; private
- * final static int opSendFailedId; private final static int opSendId; private final static int
- * opSendDurationId; private final static int opTimedOutId; private final static int opFailedId;
- * private final static int opId; private final static int opDurationId;
+ * private static final int opInProgressId; private static final int opSendInProgressId; private
+ * static final int opSendFailedId; private static final int opSendId; private static final int
+ * opSendDurationId; private static final int opTimedOutId; private static final int opFailedId;
+ * private static final int opId; private static final int opDurationId;
*/
///////////////////////////////////////////////////////////////////////
- private final static int getInProgressId;
- private final static int getSendInProgressId;
- private final static int getSendFailedId;
- private final static int getSendId;
- private final static int getSendDurationId;
- private final static int getTimedOutId;
- private final static int getFailedId;
- private final static int getId;
- private final static int getDurationId;
-
- private final static int putInProgressId;
- private final static int putSendInProgressId;
- private final static int putSendFailedId;
- private final static int putSendId;
- private final static int putSendDurationId;
- private final static int putTimedOutId;
- private final static int putFailedId;
- private final static int putId;
- private final static int putDurationId;
-
- private final static int destroyInProgressId;
- private final static int destroySendInProgressId;
- private final static int destroySendFailedId;
- private final static int destroySendId;
- private final static int destroySendDurationId;
- private final static int destroyTimedOutId;
- private final static int destroyFailedId;
- private final static int destroyId;
- private final static int destroyDurationId;
-
- private final static int destroyRegionInProgressId;
- private final static int destroyRegionSendInProgressId;
- private final static int destroyRegionSendFailedId;
- private final static int destroyRegionSendId;
- private final static int destroyRegionSendDurationId;
- private final static int destroyRegionTimedOutId;
- private final static int destroyRegionFailedId;
- private final static int destroyRegionId;
- private final static int destroyRegionDurationId;
-
- private final static int clearInProgressId;
- private final static int clearSendInProgressId;
- private final static int clearSendFailedId;
- private final static int clearSendId;
- private final static int clearSendDurationId;
- private final static int clearTimedOutId;
- private final static int clearFailedId;
- private final static int clearId;
- private final static int clearDurationId;
-
- private final static int containsKeyInProgressId;
- private final static int containsKeySendInProgressId;
- private final static int containsKeySendFailedId;
- private final static int containsKeySendId;
- private final static int containsKeySendDurationId;
- private final static int containsKeyTimedOutId;
- private final static int containsKeyFailedId;
- private final static int containsKeyId;
- private final static int containsKeyDurationId;
-
- private final static int keySetInProgressId;
- private final static int keySetSendInProgressId;
- private final static int keySetSendFailedId;
- private final static int keySetSendId;
- private final static int keySetSendDurationId;
- private final static int keySetTimedOutId;
- private final static int keySetFailedId;
- private final static int keySetId;
- private final static int keySetDurationId;
-
- private final static int commitInProgressId;
- private final static int commitSendInProgressId;
- private final static int commitSendFailedId;
- private final static int commitSendId;
- private final static int commitSendDurationId;
-
- private final static int commitFailedId;
- private final static int commitTimedOutId;
- private final static int commitId;
- private final static int commitDurationId;
-
- private final static int rollbackInProgressId;
- private final static int rollbackSendInProgressId;
- private final static int rollbackSendFailedId;
- private final static int rollbackSendId;
- private final static int rollbackSendDurationId;
-
- private final static int rollbackFailedId;
- private final static int rollbackTimedOutId;
- private final static int rollbackId;
- private final static int rollbackDurationId;
-
- private final static int getEntryInProgressId;
- private final static int getEntrySendInProgressId;
- private final static int getEntrySendFailedId;
- private final static int getEntrySendId;
- private final static int getEntrySendDurationId;
-
- private final static int getEntryFailedId;
- private final static int getEntryTimedOutId;
- private final static int getEntryId;
- private final static int getEntryDurationId;
-
- private final static int txSynchronizationInProgressId;
- private final static int txSynchronizationSendInProgressId;
- private final static int txSynchronizationSendFailedId;
- private final static int txSynchronizationSendId;
- private final static int txSynchronizationSendDurationId;
-
- private final static int txSynchronizationFailedId;
- private final static int txSynchronizationTimedOutId;
- private final static int txSynchronizationId;
- private final static int txSynchronizationDurationId;
-
- private final static int txFailoverInProgressId;
- private final static int txFailoverSendInProgressId;
- private final static int txFailoverSendFailedId;
- private final static int txFailoverSendId;
- private final static int txFailoverSendDurationId;
-
- private final static int txFailoverFailedId;
- private final static int txFailoverTimedOutId;
- private final static int txFailoverId;
- private final static int txFailoverDurationId;
-
- private final static int sizeInProgressId;
- private final static int sizeSendInProgressId;
- private final static int sizeSendFailedId;
- private final static int sizeSendId;
- private final static int sizeSendDurationId;
-
- private final static int sizeFailedId;
- private final static int sizeTimedOutId;
- private final static int sizeId;
- private final static int sizeDurationId;
-
- private final static int invalidateInProgressId;
- private final static int invalidateSendInProgressId;
- private final static int invalidateSendFailedId;
- private final static int invalidateSendId;
- private final static int invalidateSendDurationId;
-
- private final static int invalidateFailedId;
- private final static int invalidateTimedOutId;
- private final static int invalidateId;
- private final static int invalidateDurationId;
-
-
- private final static int registerInterestInProgressId;
- private final static int registerInterestSendInProgressId;
- private final static int registerInterestSendFailedId;
- private final static int registerInterestSendId;
- private final static int registerInterestSendDurationId;
- private final static int registerInterestTimedOutId;
- private final static int registerInterestFailedId;
- private final static int registerInterestId;
- private final static int registerInterestDurationId;
-
- private final static int unregisterInterestInProgressId;
- private final static int unregisterInterestSendInProgressId;
- private final static int unregisterInterestSendFailedId;
- private final static int unregisterInterestSendId;
- private final static int unregisterInterestSendDurationId;
- private final static int unregisterInterestTimedOutId;
- private final static int unregisterInterestFailedId;
- private final static int unregisterInterestId;
- private final static int unregisterInterestDurationId;
-
- private final static int queryInProgressId;
- private final static int querySendInProgressId;
- private final static int querySendFailedId;
- private final static int querySendId;
- private final static int querySendDurationId;
- private final static int queryTimedOutId;
- private final static int queryFailedId;
- private final static int queryId;
- private final static int queryDurationId;
-
- private final static int createCQInProgressId;
- private final static int createCQSendInProgressId;
- private final static int createCQSendFailedId;
- private final static int createCQSendId;
- private final static int createCQSendDurationId;
- private final static int createCQTimedOutId;
- private final static int createCQFailedId;
- private final static int createCQId;
- private final static int createCQDurationId;
- private final static int stopCQInProgressId;
- private final static int stopCQSendInProgressId;
- private final static int stopCQSendFailedId;
- private final static int stopCQSendId;
- private final static int stopCQSendDurationId;
- private final static int stopCQTimedOutId;
- private final static int stopCQFailedId;
- private final static int stopCQId;
- private final static int stopCQDurationId;
- private final static int closeCQInProgressId;
- private final static int closeCQSendInProgressId;
- private final static int closeCQSendFailedId;
- private final static int closeCQSendId;
- private final static int closeCQSendDurationId;
- private final static int closeCQTimedOutId;
- private final static int closeCQFailedId;
- private final static int closeCQId;
- private final static int closeCQDurationId;
- private final static int gatewayBatchInProgressId;
- private final static int gatewayBatchSendInProgressId;
- private final static int gatewayBatchSendFailedId;
- private final static int gatewayBatchSendId;
- private final static int gatewayBatchSendDurationId;
- private final static int gatewayBatchTimedOutId;
- private final static int gatewayBatchFailedId;
- private final static int gatewayBatchId;
- private final static int gatewayBatchDurationId;
- private final static int getDurableCQsInProgressId;
- private final static int getDurableCQsSendsInProgressId;
- private final static int getDurableCQsSendFailedId;
- private final static int getDurableCQsSendId;
- private final static int getDurableCQsSendDurationId;
- private final static int getDurableCQsTimedOutId;
- private final static int getDurableCQsFailedId;
- private final static int getDurableCQsId;
- private final static int getDurableCQsDurationId;
-
- private final static int readyForEventsInProgressId;
- private final static int readyForEventsSendInProgressId;
- private final static int readyForEventsSendFailedId;
- private final static int readyForEventsSendId;
- private final static int readyForEventsSendDurationId;
- private final static int readyForEventsTimedOutId;
- private final static int readyForEventsFailedId;
- private final static int readyForEventsId;
- private final static int readyForEventsDurationId;
-
- private final static int makePrimaryInProgressId;
- private final static int makePrimarySendInProgressId;
- private final static int makePrimarySendFailedId;
- private final static int makePrimarySendId;
- private final static int makePrimarySendDurationId;
- private final static int makePrimaryTimedOutId;
- private final static int makePrimaryFailedId;
- private final static int makePrimaryId;
- private final static int makePrimaryDurationId;
-
- private final static int closeConInProgressId;
- private final static int closeConSendInProgressId;
- private final static int closeConSendFailedId;
- private final static int closeConSendId;
- private final static int closeConSendDurationId;
- private final static int closeConTimedOutId;
- private final static int closeConFailedId;
- private final static int closeConId;
- private final static int closeConDurationId;
-
- private final static int primaryAckInProgressId;
- private final static int primaryAckSendInProgressId;
- private final static int primaryAckSendFailedId;
- private final static int primaryAckSendId;
- private final static int primaryAckSendDurationId;
- private final static int primaryAckTimedOutId;
- private final static int primaryAckFailedId;
- private final static int primaryAckId;
- private final static int primaryAckDurationId;
-
- private final static int pingInProgressId;
- private final static int pingSendInProgressId;
- private final static int pingSendFailedId;
- private final static int pingSendId;
- private final static int pingSendDurationId;
- private final static int pingTimedOutId;
- private final static int pingFailedId;
- private final static int pingId;
- private final static int pingDurationId;
-
- private final static int registerInstantiatorsInProgressId;
- private final static int registerInstantiatorsSendInProgressId;
- private final static int registerInstantiatorsSendFailedId;
- private final static int registerInstantiatorsSendId;
- private final static int registerInstantiatorsSendDurationId;
- private final static int registerInstantiatorsTimedOutId;
- private final static int registerInstantiatorsFailedId;
- private final static int registerInstantiatorsId;
- private final static int registerInstantiatorsDurationId;
-
- private final static int registerDataSerializersInProgressId;
- private final static int registerDataSerializersSendInProgressId;
- private final static int registerDataSerializersSendFailedId;
- private final static int registerDataSerializersSendId;
- private final static int registerDataSerializersSendDurationId;
- private final static int registerDataSerializersTimedOutId;
- private final static int registerDataSerializersFailedId;
- private final static int registerDataSerializersId;
- private final static int registerDataSerializersDurationId;
-
- private final static int putAllInProgressId;
- private final static int putAllSendInProgressId;
- private final static int putAllSendFailedId;
- private final static int putAllSendId;
- private final static int putAllSendDurationId;
- private final static int putAllTimedOutId;
- private final static int putAllFailedId;
- private final static int putAllId;
- private final static int putAllDurationId;
-
- private final static int removeAllInProgressId;
- private final static int removeAllSendInProgressId;
- private final static int removeAllSendFailedId;
- private final static int removeAllSendId;
- private final static int removeAllSendDurationId;
- private final static int removeAllTimedOutId;
- private final static int removeAllFailedId;
- private final static int removeAllId;
- private final static int removeAllDurationId;
-
- private final static int getAllInProgressId;
- private final static int getAllSendInProgressId;
- private final static int getAllSendFailedId;
- private final static int getAllSendId;
- private final static int getAllSendDurationId;
- private final static int getAllTimedOutId;
- private final static int getAllFailedId;
- private final static int getAllId;
- private final static int getAllDurationId;
-
- private final static int connectionsId;
- private final static int connectsId;
- private final static int disconnectsId;
- private final static int messagesBeingReceivedId;
- private final static int messageBytesBeingReceivedId;
- private final static int receivedBytesId;
- private final static int sentBytesId;
-
- private final static int executeFunctionInProgressId;
- private final static int executeFunctionSendInProgressId;
- private final static int executeFunctionSendFailedId;
- private final static int executeFunctionSendId;
- private final static int executeFunctionSendDurationId;
- private final static int executeFunctionTimedOutId;
- private final static int executeFunctionFailedId;
- private final static int executeFunctionId;
- private final static int executeFunctionDurationId;
-
- private final static int getClientPRMetadataInProgressId;
- private final static int getClientPRMetadataSendInProgressId;
- private final static int getClientPRMetadataSendFailedId;
- private final static int getClientPRMetadataSendId;
- private final static int getClientPRMetadataSendDurationId;
- private final static int getClientPRMetadataTimedOutId;
- private final static int getClientPRMetadataFailedId;
- private final static int getClientPRMetadataId;
- private final static int getClientPRMetadataDurationId;
-
- private final static int getClientPartitionAttributesInProgressId;
- private final static int getClientPartitionAttributesSendInProgressId;
- private final static int getClientPartitionAttributesSendFailedId;
- private final static int getClientPartitionAttributesSendId;
- private final static int getClientPartitionAttributesSendDurationId;
- private final static int getClientPartitionAttributesTimedOutId;
- private final static int getClientPartitionAttributesFailedId;
- private final static int getClientPartitionAttributesId;
- private final static int getClientPartitionAttributesDurationId;
-
- private final static int getPDXIdForTypeInProgressId;
- private final static int getPDXIdForTypeSendInProgressId;
- private final static int getPDXIdForTypeSendFailedId;
- private final static int getPDXIdForTypeSendId;
- private final static int getPDXIdForTypeSendDurationId;
- private final static int getPDXIdForTypeTimedOutId;
- private final static int getPDXIdForTypeFailedId;
- private final static int getPDXIdForTypeId;
- private final static int getPDXIdForTypeDurationId;
-
- private final static int getPDXTypeByIdInProgressId;
- private final static int getPDXTypeByIdSendInProgressId;
- private final static int getPDXTypeByIdSendFailedId;
- private final static int getPDXTypeByIdSendId;
- private final static int getPDXTypeByIdSendDurationId;
- private final static int getPDXTypeByIdTimedOutId;
- private final static int getPDXTypeByIdFailedId;
- private final static int getPDXTypeByIdId;
- private final static int getPDXTypeByIdDurationId;
-
- private final static int addPdxTypeInProgressId;
- private final static int addPdxTypeSendInProgressId;
- private final static int addPdxTypeSendFailedId;
- private final static int addPdxTypeSendId;
- private final static int addPdxTypeSendDurationId;
- private final static int addPdxTypeTimedOutId;
- private final static int addPdxTypeFailedId;
- private final static int addPdxTypeId;
- private final static int addPdxTypeDurationId;
+ private static final int getInProgressId;
+ private static final int getSendInProgressId;
+ private static final int getSendFailedId;
+ private static final int getSendId;
+ private static final int getSendDurationId;
+ private static final int getTimedOutId;
+ private static final int getFailedId;
+ private static final int getId;
+ private static final int getDurationId;
+
+ private static final int putInProgressId;
+ private static final int putSendInProgressId;
+ private static final int putSendFailedId;
+ private static final int putSendId;
+ private static final int putSendDurationId;
+ private static final int putTimedOutId;
+ private static final int putFailedId;
+ private static final int putId;
+ private static final int putDurationId;
+
+ private static final int destroyInProgressId;
+ private static final int destroySendInProgressId;
+ private static final int destroySendFailedId;
+ private static final int destroySendId;
+ private static final int destroySendDurationId;
+ private static final int destroyTimedOutId;
+ private static final int destroyFailedId;
+ private static final int destroyId;
+ private static final int destroyDurationId;
+
+ private static final int destroyRegionInProgressId;
+ private static final int destroyRegionSendInProgressId;
+ private static final int destroyRegionSendFailedId;
+ private static final int destroyRegionSendId;
+ private static final int destroyRegionSendDurationId;
+ private static final int destroyRegionTimedOutId;
+ private static final int destroyRegionFailedId;
+ private static final int destroyRegionId;
+ private static final int destroyRegionDurationId;
+
+ private static final int clearInProgressId;
+ private static final int clearSendInProgressId;
+ private static final int clearSendFailedId;
+ private static final int clearSendId;
+ private static final int clearSendDurationId;
+ private static final int clearTimedOutId;
+ private static final int clearFailedId;
+ private static final int clearId;
+ private static final int clearDurationId;
+
+ private static final int containsKeyInProgressId;
+ private static final int containsKeySendInProgressId;
+ private static final int containsKeySendFailedId;
+ private static final int containsKeySendId;
+ private static final int containsKeySendDurationId;
+ private static final int containsKeyTimedOutId;
+ private static final int containsKeyFailedId;
+ private static final int containsKeyId;
+ private static final int containsKeyDurationId;
+
+ private static final int keySetInProgressId;
+ private static final int keySetSendInProgressId;
+ private static final int keySetSendFailedId;
+ private static final int keySetSendId;
+ private static final int keySetSendDurationId;
+ private static final int keySetTimedOutId;
+ private static final int keySetFailedId;
+ private static final int keySetId;
+ private static final int keySetDurationId;
+
+ private static final int commitInProgressId;
+ private static final int commitSendInProgressId;
+ private static final int commitSendFailedId;
+ private static final int commitSendId;
+ private static final int commitSendDurationId;
+
+ private static final int commitFailedId;
+ private static final int commitTimedOutId;
+ private static final int commitId;
+ private static final int commitDurationId;
+
+ private static final int rollbackInProgressId;
+ private static final int rollbackSendInProgressId;
+ private static final int rollbackSendFailedId;
+ private static final int rollbackSendId;
+ private static final int rollbackSendDurationId;
+
+ private static final int rollbackFailedId;
+ private static final int rollbackTimedOutId;
+ private static final int rollbackId;
+ private static final int rollbackDurationId;
+
+ private static final int getEntryInProgressId;
+ private static final int getEntrySendInProgressId;
+ private static final int getEntrySendFailedId;
+ private static final int getEntrySendId;
+ private static final int getEntrySendDurationId;
+
+ private static final int getEntryFailedId;
+ private static final int getEntryTimedOutId;
+ private static final int getEntryId;
+ private static final int getEntryDurationId;
+
+ private static final int txSynchronizationInProgressId;
+ private static final int txSynchronizationSendInProgressId;
+ private static final int txSynchronizationSendFailedId;
+ private static final int txSynchronizationSendId;
+ private static final int txSynchronizationSendDurationId;
+
+ private static final int txSynchronizationFailedId;
+ private static final int txSynchronizationTimedOutId;
+ private static final int txSynchronizationId;
+ private static final int txSynchronizationDurationId;
+
+ private static final int txFailoverInProgressId;
+ private static final int txFailoverSendInProgressId;
+ private static final int txFailoverSendFailedId;
+ private static final int txFailoverSendId;
+ private static final int txFailoverSendDurationId;
+
+ private static final int txFailoverFailedId;
+ private static final int txFailoverTimedOutId;
+ private static final int txFailoverId;
+ private static final int txFailoverDurationId;
+
+ private static final int sizeInProgressId;
+ private static final int sizeSendInProgressId;
+ private static final int sizeSendFailedId;
+ private static final int sizeSendId;
+ private static final int sizeSendDurationId;
+
+ private static final int sizeFailedId;
+ private static final int sizeTimedOutId;
+ private static final int sizeId;
+ private static final int sizeDurationId;
+
+ private static final int invalidateInProgressId;
+ private static final int invalidateSendInProgressId;
+ private static final int invalidateSendFailedId;
+ private static final int invalidateSendId;
+ private static final int invalidateSendDurationId;
+
+ private static final int invalidateFailedId;
+ private static final int invalidateTimedOutId;
+ private static final int invalidateId;
+ private static final int invalidateDurationId;
+
+
+ private static final int registerInterestInProgressId;
+ private static final int registerInterestSendInProgressId;
+ private static final int registerInterestSendFailedId;
+ private static final int registerInterestSendId;
+ private static final int registerInterestSendDurationId;
+ private static final int registerInterestTimedOutId;
+ private static final int registerInterestFailedId;
+ private static final int registerInterestId;
+ private static final int registerInterestDurationId;
+
+ private static final int unregisterInterestInProgressId;
+ private static final int unregisterInterestSendInProgressId;
+ private static final int unregisterInterestSendFailedId;
+ private static final int unregisterInterestSendId;
+ private static final int unregisterInterestSendDurationId;
+ private static final int unregisterInterestTimedOutId;
+ private static final int unregisterInterestFailedId;
+ private static final int unregisterInterestId;
+ private static final int unregisterInterestDurationId;
+
+ private static final int queryInProgressId;
+ private static final int querySendInProgressId;
+ private static final int querySendFailedId;
+ private static final int querySendId;
+ private static final int querySendDurationId;
+ private static final int queryTimedOutId;
+ private static final int queryFailedId;
+ private static final int queryId;
+ private static final int queryDurationId;
+
+ private static final int createCQInProgressId;
+ private static final int createCQSendInProgressId;
+ private static final int createCQSendFailedId;
+ private static final int createCQSendId;
+ private static final int createCQSendDurationId;
+ private static final int createCQTimedOutId;
+ private static final int createCQFailedId;
+ private static final int createCQId;
+ private static final int createCQDurationId;
+ private static final int stopCQInProgressId;
+ private static final int stopCQSendInProgressId;
+ private static final int stopCQSendFailedId;
+ private static final int stopCQSendId;
+ private static final int stopCQSendDurationId;
+ private static final int stopCQTimedOutId;
+ private static final int stopCQFailedId;
+ private static final int stopCQId;
+ private static final int stopCQDurationId;
+ private static final int closeCQInProgressId;
+ private static final int closeCQSendInProgressId;
+ private static final int closeCQSendFailedId;
+ private static final int closeCQSendId;
+ private static final int closeCQSendDurationId;
+ private static final int closeCQTimedOutId;
+ private static final int closeCQFailedId;
+ private static final int closeCQId;
+ private static final int closeCQDurationId;
+ private static final int gatewayBatchInProgressId;
+ private static final int gatewayBatchSendInProgressId;
+ private static final int gatewayBatchSendFailedId;
+ private static final int gatewayBatchSendId;
+ private static final int gatewayBatchSendDurationId;
+ private static final int gatewayBatchTimedOutId;
+ private static final int gatewayBatchFailedId;
+ private static final int gatewayBatchId;
+ private static final int gatewayBatchDurationId;
+ private static final int getDurableCQsInProgressId;
+ private static final int getDurableCQsSendsInProgressId;
+ private static final int getDurableCQsSendFailedId;
+ private static final int getDurableCQsSendId;
+ private static final int getDurableCQsSendDurationId;
+ private static final int getDurableCQsTimedOutId;
+ private static final int getDurableCQsFailedId;
+ private static final int getDurableCQsId;
+ private static final int getDurableCQsDurationId;
+
+ private static final int readyForEventsInProgressId;
+ private static final int readyForEventsSendInProgressId;
+ private static final int readyForEventsSendFailedId;
+ private static final int readyForEventsSendId;
+ private static final int readyForEventsSendDurationId;
+ private static final int readyForEventsTimedOutId;
+ private static final int readyForEventsFailedId;
+ private static final int readyForEventsId;
+ private static final int readyForEventsDurationId;
+
+ private static final int makePrimaryInProgressId;
+ private static final int makePrimarySendInProgressId;
+ private static final int makePrimarySendFailedId;
+ private static final int makePrimarySendId;
+ private static final int makePrimarySendDurationId;
+ private static final int makePrimaryTimedOutId;
+ private static final int makePrimaryFailedId;
+ private static final int makePrimaryId;
+ private static final int makePrimaryDurationId;
+
+ private static final int closeConInProgressId;
+ private static final int closeConSendInProgressId;
+ private static final int closeConSendFailedId;
+ private static final int closeConSendId;
+ private static final int closeConSendDurationId;
+ private static final int closeConTimedOutId;
+ private static final int closeConFailedId;
+ private static final int closeConId;
+ private static final int closeConDurationId;
+
+ private static final int primaryAckInProgressId;
+ private static final int primaryAckSendInProgressId;
+ private static final int primaryAckSendFailedId;
+ private static final int primaryAckSendId;
+ private static final int primaryAckSendDurationId;
+ private static final int primaryAckTimedOutId;
+ private static final int primaryAckFailedId;
+ private static final int primaryAckId;
+ private static final int primaryAckDurationId;
+
+ private static final int pingInProgressId;
+ private static final int pingSendInProgressId;
+ private static final int pingSendFailedId;
+ private static final int pingSendId;
+ private static final int pingSendDurationId;
+ private static final int pingTimedOutId;
+ private static final int pingFailedId;
+ private static final int pingId;
+ private static final int pingDurationId;
+
+ private static final int registerInstantiatorsInProgressId;
+ private static final int registerInstantiatorsSendInProgressId;
+ private static final int registerInstantiatorsSendFailedId;
+ private static final int registerInstantiatorsSendId;
+ private static final int registerInstantiatorsSendDurationId;
+ private static final int registerInstantiatorsTimedOutId;
+ private static final int registerInstantiatorsFailedId;
+ private static final int registerInstantiatorsId;
+ private static final int registerInstantiatorsDurationId;
+
+ private static final int registerDataSerializersInProgressId;
+ private static final int registerDataSerializersSendInProgressId;
+ private static final int registerDataSerializersSendFailedId;
+ private static final int registerDataSerializersSendId;
+ private static final int registerDataSerializersSendDurationId;
+ private static final int registerDataSerializersTimedOutId;
+ private static final int registerDataSerializersFailedId;
+ private static final int registerDataSerializersId;
+ private static final int registerDataSerializersDurationId;
+
+ private static final int putAllInProgressId;
+ private static final int putAllSendInProgressId;
+ private static final int putAllSendFailedId;
+ private static final int putAllSendId;
+ private static final int putAllSendDurationId;
+ private static final int putAllTimedOutId;
+ private static final int putAllFailedId;
+ private static final int putAllId;
+ private static final int putAllDurationId;
+
+ private static final int removeAllInProgressId;
+ private static final int removeAllSendInProgressId;
+ private static final int removeAllSendFailedId;
+ private static final int removeAllSendId;
+ private static final int removeAllSendDurationId;
+ private static final int removeAllTimedOutId;
+ private static final int removeAllFailedId;
+ private static final int removeAllId;
+ private static final int removeAllDurationId;
+
+ private static final int getAllInProgressId;
+ private static final int getAllSendInProgressId;
+ private static final int getAllSendFailedId;
+ private static final int getAllSendId;
+ private static final int getAllSendDurationId;
+ private static final int getAllTimedOutId;
+ private static final int getAllFailedId;
+ private static final int getAllId;
+ private static final int getAllDurationId;
+
+ private static final int connectionsId;
+ private static final int connectsId;
+ private static final int disconnectsId;
+ private static final int messagesBeingReceivedId;
+ private static final int messageBytesBeingReceivedId;
+ private static final int receivedBytesId;
+ private static final int sentBytesId;
+
+ private static final int executeFunctionInProgressId;
+ private static final int executeFunctionSendInProgressId;
+ private static final int executeFunctionSendFailedId;
+ private static final int executeFunctionSendId;
+ private static final int executeFunctionSendDurationId;
+ private static final int executeFunctionTimedOutId;
+ private static final int executeFunctionFailedId;
+ private static final int executeFunctionId;
+ private static final int executeFunctionDurationId;
+
+ private static final int getClientPRMetadataInProgressId;
+ private static final int getClientPRMetadataSendInProgressId;
+ private static final int getClientPRMetadataSendFailedId;
+ private static final int getClientPRMetadataSendId;
+ private static final int getClientPRMetadataSendDurationId;
+ private static final int getClientPRMetadataTimedOutId;
+ private static final int getClientPRMetadataFailedId;
+ private static final int getClientPRMetadataId;
+ private static final int getClientPRMetadataDurationId;
+
+ private static final int getClientPartitionAttributesInProgressId;
+ private static final int getClientPartitionAttributesSendInProgressId;
+ private static final int getClientPartitionAttributesSendFailedId;
+ private static final int getClientPartitionAttributesSendId;
+ private static final int getClientPartitionAttributesSendDurationId;
+ private static final int getClientPartitionAttributesTimedOutId;
+ private static final int getClientPartitionAttributesFailedId;
+ private static final int getClientPartitionAttributesId;
+ private static final int getClientPartitionAttributesDurationId;
+
+ private static final int getPDXIdForTypeInProgressId;
+ private static final int getPDXIdForTypeSendInProgressId;
+ private static final int getPDXIdForTypeSendFailedId;
+ private static final int getPDXIdForTypeSendId;
+ private static final int getPDXIdForTypeSendDurationId;
+ private static final int getPDXIdForTypeTimedOutId;
+ private static final int getPDXIdForTypeFailedId;
+ private static final int getPDXIdForTypeId;
+ private static final int getPDXIdForTypeDurationId;
+
+ private static final int getPDXTypeByIdInProgressId;
+ private static final int getPDXTypeByIdSendInProgressId;
+ private static final int getPDXTypeByIdSendFailedId;
+ private static final int getPDXTypeByIdSendId;
+ private static final int getPDXTypeByIdSendDurationId;
+ private static final int getPDXTypeByIdTimedOutId;
+ private static final int getPDXTypeByIdFailedId;
+ private static final int getPDXTypeByIdId;
+ private static final int getPDXTypeByIdDurationId;
+
+ private static final int addPdxTypeInProgressId;
+ private static final int addPdxTypeSendInProgressId;
+ private static final int addPdxTypeSendFailedId;
+ private static final int addPdxTypeSendId;
+ private static final int addPdxTypeSendDurationId;
+ private static final int addPdxTypeTimedOutId;
+ private static final int addPdxTypeFailedId;
+ private static final int addPdxTypeId;
+ private static final int addPdxTypeDurationId;
// An array of all of the ids that represent operation statistics. This
@@ -1777,7 +1777,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endGetSend} and
* {@link #endGet}.
- *
+ *
* @return the start time of this get
*/
public long startGet() {
@@ -1789,7 +1789,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the get has completed
- *
+ *
* @param startTime the value returned by {@link #startGet}.
* @param failed true if the send of the get failed
*/
@@ -1809,7 +1809,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified get has ended
- *
+ *
* @param startTime the value returned by {@link #startGet}.
* @param timedOut true if get timed out
* @param failed true if get failed
@@ -1843,7 +1843,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endPutSend} and
* {@link #endPut}.
- *
+ *
* @return the start time of this put
*/
public long startPut() {
@@ -1855,7 +1855,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the put has completed
- *
+ *
* @param startTime the value returned by {@link #startPut}.
* @param failed true if the send of the put failed
*/
@@ -1875,7 +1875,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified put has ended
- *
+ *
* @param startTime the value returned by {@link #startPut}.
* @param timedOut true if put timed out
* @param failed true if put failed
@@ -1909,7 +1909,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endDestroySend} and
* {@link #endDestroy}.
- *
+ *
* @return the start time of this destroy
*/
public long startDestroy() {
@@ -1921,7 +1921,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the destroy has completed
- *
+ *
* @param startTime the value returned by {@link #startDestroy}.
* @param failed true if the send of the destroy failed
*/
@@ -1941,7 +1941,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified destroy has ended
- *
+ *
* @param startTime the value returned by {@link #startDestroy}.
* @param timedOut true if destroy timed out
* @param failed true if destroy failed
@@ -1967,7 +1967,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endDestroyRegionSend} and
* {@link #endDestroyRegion}.
- *
+ *
* @return the start time of this destroyRegion
*/
public long startDestroyRegion() {
@@ -1979,7 +1979,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the destroyRegion has completed
- *
+ *
* @param startTime the value returned by {@link #startDestroyRegion}.
* @param failed true if the send of the destroyRegion failed
*/
@@ -1999,7 +1999,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified destroyRegion has ended
- *
+ *
* @param startTime the value returned by {@link #startDestroyRegion}.
* @param timedOut true if destroyRegion timed out
* @param failed true if destroyRegion failed
@@ -2025,7 +2025,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endClearSend} and
* {@link #endClear}.
- *
+ *
* @return the start time of this clear
*/
public long startClear() {
@@ -2037,7 +2037,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the clear has completed
- *
+ *
* @param startTime the value returned by {@link #startClear}.
* @param failed true if the send of the clear failed
*/
@@ -2057,7 +2057,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified clear has ended
- *
+ *
* @param startTime the value returned by {@link #startClear}.
* @param timedOut true if clear timed out
* @param failed true if clear failed
@@ -2083,7 +2083,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endContainsKeySend} and
* {@link #endContainsKey}.
- *
+ *
* @return the start time of this containsKey
*/
public long startContainsKey() {
@@ -2095,7 +2095,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the containsKey has completed
- *
+ *
* @param startTime the value returned by {@link #startContainsKey}.
* @param failed true if the send of the containsKey failed
*/
@@ -2115,7 +2115,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified containsKey has ended
- *
+ *
* @param startTime the value returned by {@link #startContainsKey}.
* @param timedOut true if containsKey timed out
* @param failed true if containsKey failed
@@ -2141,7 +2141,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endKeySetSend} and
* {@link #endKeySet}.
- *
+ *
* @return the start time of this keySet
*/
public long startKeySet() {
@@ -2153,7 +2153,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the keySet has completed
- *
+ *
* @param startTime the value returned by {@link #startKeySet}.
* @param failed true if the send of the keySet failed
*/
@@ -2173,7 +2173,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified keySet has ended
- *
+ *
* @param startTime the value returned by {@link #startKeySet}.
* @param timedOut true if keySet timed out
* @param failed true if keySet failed
@@ -2199,7 +2199,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endRegisterInterestSend}
* and {@link #endRegisterInterest}.
- *
+ *
* @return the start time of this registerInterest
*/
public long startRegisterInterest() {
@@ -2211,7 +2211,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the registerInterest has completed
- *
+ *
* @param startTime the value returned by {@link #startRegisterInterest}.
* @param failed true if the send of the registerInterest failed
*/
@@ -2231,7 +2231,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified registerInterest has ended
- *
+ *
* @param startTime the value returned by {@link #startRegisterInterest}.
* @param timedOut true if registerInterest timed out
* @param failed true if registerInterest failed
@@ -2257,7 +2257,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call
* {@link #endUnregisterInterestSend} and {@link #endUnregisterInterest}.
- *
+ *
* @return the start time of this unregisterInterest
*/
public long startUnregisterInterest() {
@@ -2269,7 +2269,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the unregisterInterest has completed
- *
+ *
* @param startTime the value returned by {@link #startUnregisterInterest}.
* @param failed true if the send of the unregisterInterest failed
*/
@@ -2289,7 +2289,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified unregisterInterest has ended
- *
+ *
* @param startTime the value returned by {@link #startUnregisterInterest}.
* @param timedOut true if unregisterInterest timed out
* @param failed true if unregisterInterest failed
@@ -2315,7 +2315,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endQuerySend} and
* {@link #endQuery}.
- *
+ *
* @return the start time of this query
*/
public long startQuery() {
@@ -2327,7 +2327,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the query has completed
- *
+ *
* @param startTime the value returned by {@link #startQuery}.
* @param failed true if the send of the query failed
*/
@@ -2347,7 +2347,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified query has ended
- *
+ *
* @param startTime the value returned by {@link #startQuery}.
* @param timedOut true if query timed out
* @param failed true if query failed
@@ -2373,7 +2373,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endCreateCQSend} and
* {@link #endCreateCQ}.
- *
+ *
* @return the start time of this createCQ
*/
public long startCreateCQ() {
@@ -2385,7 +2385,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the createCQ has completed
- *
+ *
* @param startTime the value returned by {@link #startCreateCQ}.
* @param failed true if the send of the createCQ failed
*/
@@ -2405,7 +2405,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified createCQ has ended
- *
+ *
* @param startTime the value returned by {@link #startCreateCQ}.
* @param timedOut true if createCQ timed out
* @param failed true if createCQ failed
@@ -2431,7 +2431,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endStopCQSend} and
* {@link #endStopCQ}.
- *
+ *
* @return the start time of this stopCQ
*/
public long startStopCQ() {
@@ -2443,7 +2443,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the stopCQ has completed
- *
+ *
* @param startTime the value returned by {@link #startStopCQ}.
* @param failed true if the send of the stopCQ failed
*/
@@ -2463,7 +2463,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified stopCQ has ended
- *
+ *
* @param startTime the value returned by {@link #startStopCQ}.
* @param timedOut true if stopCQ timed out
* @param failed true if stopCQ failed
@@ -2489,7 +2489,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endCloseCQSend} and
* {@link #endCloseCQ}.
- *
+ *
* @return the start time of this closeCQ
*/
public long startCloseCQ() {
@@ -2501,7 +2501,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the closeCQ has completed
- *
+ *
* @param startTime the value returned by {@link #startCloseCQ}.
* @param failed true if the send of the closeCQ failed
*/
@@ -2521,7 +2521,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified closeCQ has ended
- *
+ *
* @param startTime the value returned by {@link #startCloseCQ}.
* @param timedOut true if closeCQ timed out
* @param failed true if closeCQ failed
@@ -2547,7 +2547,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endStopCQSend} and
* {@link #endStopCQ}.
- *
+ *
* @return the start time of this stopCQ
*/
public long startGetDurableCQs() {
@@ -2559,7 +2559,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the stopCQ has completed
- *
+ *
* @param startTime the value returned by {@link #startStopCQ}.
* @param failed true if the send of the stopCQ failed
*/
@@ -2579,7 +2579,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified stopCQ has ended
- *
+ *
* @param startTime the value returned by {@link #startStopCQ}.
* @param timedOut true if stopCQ timed out
* @param failed true if stopCQ failed
@@ -2605,7 +2605,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endGatewayBatchSend} and
* {@link #endGatewayBatch}.
- *
+ *
* @return the start time of this gatewayBatch
*/
public long startGatewayBatch() {
@@ -2617,7 +2617,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the gatewayBatch has completed
- *
+ *
* @param startTime the value returned by {@link #startGatewayBatch}.
* @param failed true if the send of the gatewayBatch failed
*/
@@ -2637,7 +2637,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified gatewayBatch has ended
- *
+ *
* @param startTime the value returned by {@link #startGatewayBatch}.
* @param timedOut true if gatewayBatch timed out
* @param failed true if gatewayBatch failed
@@ -2663,7 +2663,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endReadyForEventsSend}
* and {@link #endReadyForEvents}.
- *
+ *
* @return the start time of this readyForEvents
*/
public long startReadyForEvents() {
@@ -2675,7 +2675,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the readyForEvents has completed
- *
+ *
* @param startTime the value returned by {@link #startReadyForEvents}.
* @param failed true if the send of the readyForEvents failed
*/
@@ -2695,7 +2695,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified readyForEvents has ended
- *
+ *
* @param startTime the value returned by {@link #startReadyForEvents}.
* @param timedOut true if readyForEvents timed out
* @param failed true if readyForEvents failed
@@ -2721,7 +2721,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endMakePrimarySend} and
* {@link #endMakePrimary}.
- *
+ *
* @return the start time of this makePrimary
*/
public long startMakePrimary() {
@@ -2733,7 +2733,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the makePrimary has completed
- *
+ *
* @param startTime the value returned by {@link #startMakePrimary}.
* @param failed true if the send of the makePrimary failed
*/
@@ -2753,7 +2753,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified makePrimary has ended
- *
+ *
* @param startTime the value returned by {@link #startMakePrimary}.
* @param timedOut true if makePrimary timed out
* @param failed true if makePrimary failed
@@ -2779,7 +2779,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endCloseConSend} and
* {@link #endCloseCon}.
- *
+ *
* @return the start time of this closeCon
*/
public long startCloseCon() {
@@ -2791,7 +2791,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the closeCon has completed
- *
+ *
* @param startTime the value returned by {@link #startCloseCon}.
* @param failed true if the send of the closeCon failed
*/
@@ -2811,7 +2811,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified closeCon has ended
- *
+ *
* @param startTime the value returned by {@link #startCloseCon}.
* @param timedOut true if closeCon timed out
* @param failed true if closeCon failed
@@ -2837,7 +2837,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endPrimaryAckSend} and
* {@link #endPrimaryAck}.
- *
+ *
* @return the start time of this primaryAck
*/
public long startPrimaryAck() {
@@ -2849,7 +2849,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the primaryAck has completed
- *
+ *
* @param startTime the value returned by {@link #startPrimaryAck}.
* @param failed true if the send of the primaryAck failed
*/
@@ -2869,7 +2869,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified primaryAck has ended
- *
+ *
* @param startTime the value returned by {@link #startPrimaryAck}.
* @param timedOut true if primaryAck timed out
* @param failed true if primaryAck failed
@@ -2895,7 +2895,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endPingSend} and
* {@link #endPing}.
- *
+ *
* @return the start time of this ping
*/
public long startPing() {
@@ -2907,7 +2907,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the ping has completed
- *
+ *
* @param startTime the value returned by {@link #startPing}.
* @param failed true if the send of the ping failed
*/
@@ -2927,7 +2927,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified ping has ended
- *
+ *
* @param startTime the value returned by {@link #startPing}.
* @param timedOut true if ping timed out
* @param failed true if ping failed
@@ -2953,7 +2953,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call
* {@link #endRegisterInstantiatorsSend} and {@link #endRegisterInstantiators}.
- *
+ *
* @return the start time of this registerInstantiators
*/
public long startRegisterInstantiators() {
@@ -2972,7 +2972,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the registerInstantiators has completed
- *
+ *
* @param startTime the value returned by {@link #startRegisterInstantiators}.
* @param failed true if the send of the registerInstantiators failed
*/
@@ -3006,7 +3006,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified registerInstantiators has ended
- *
+ *
* @param startTime the value returned by {@link #startRegisterInstantiators}.
* @param timedOut true if registerInstantiators timed out
* @param failed true if registerInstantiators failed
@@ -3048,7 +3048,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endPutAllSend} and
* {@link #endPutAll}.
- *
+ *
* @return the start time of this putAll
*/
public long startPutAll() {
@@ -3060,7 +3060,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the putAll has completed
- *
+ *
* @param startTime the value returned by {@link #startPutAll}.
* @param failed true if the send of the putAll failed
*/
@@ -3080,7 +3080,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified putAll has ended
- *
+ *
* @param startTime the value returned by {@link #startPutAll}.
* @param timedOut true if putAll timed out
* @param failed true if putAll failed
@@ -3106,7 +3106,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endRemoveAllSend} and
* {@link #endRemoveAll}.
- *
+ *
* @return the start time of this removeAll
*/
public long startRemoveAll() {
@@ -3118,7 +3118,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the removeAll has completed
- *
+ *
* @param startTime the value returned by {@link #startRemoveAll}.
* @param failed true if the send of the removeAll failed
*/
@@ -3138,7 +3138,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified removeAll has ended
- *
+ *
* @param startTime the value returned by {@link #startRemoveAll}.
* @param timedOut true if removeAll timed out
* @param failed true if removeAll failed
@@ -3164,7 +3164,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endGetAllSend} and
* {@link #endGetAll}.
- *
+ *
* @return the start time of this getAll
*/
public long startGetAll() {
@@ -3176,7 +3176,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the getAll has completed
- *
+ *
* @param startTime the value returned by {@link #startGetAll}.
* @param failed true if the send of the getAll failed
*/
@@ -3196,7 +3196,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified getAll has ended
- *
+ *
* @param startTime the value returned by {@link #startGetAll}.
* @param timedOut true if getAll timed out
* @param failed true if getAll failed
@@ -3286,7 +3286,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call {@link #endExecuteFunctionSend}
* and {@link #endExecuteFunction}.
- *
+ *
* @return the start time of this ExecuteFunction
*/
public long startExecuteFunction() {
@@ -3297,7 +3297,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the executeFunction has completed
- *
+ *
* @param startTime the value returned by {@link #startExecuteFunction}.
* @param failed true if the send of the executeFunction failed
*/
@@ -3316,7 +3316,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified executeFunction has ended
- *
+ *
* @param startTime the value returned by {@link #startExecuteFunction}.
* @param timedOut true if executeFunction timed out
* @param failed true if executeFunction failed
@@ -3353,7 +3353,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call
* {@link #endGetClientPRMetadataSend} and {@link #endGetClientPRMetadata}.
- *
+ *
* @return the start time of this ExecuteFunction
*/
public long startGetClientPRMetadata() {
@@ -3365,7 +3365,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the GetClientPRMetadata has completed
- *
+ *
* @param startTime the value returned by {@link #startGetClientPRMetadata}.
* @param failed true if the send of the GetClientPRMetadata failed
*/
@@ -3385,7 +3385,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified GetClientPRMetadata has ended
- *
+ *
* @param startTime the value returned by {@link #startGetClientPRMetadata}.
* @param timedOut true if GetClientPRMetadata timed out
* @param failed true if GetClientPRMetadata failed
@@ -3411,7 +3411,7 @@ public class ConnectionStats implements MessageStats {
* <p>
* Note: for every call of this method the caller must also call
* {@link #endGetClientPartitionAttributesSend} and {@link #endGetClientPartitionAttributes}.
- *
+ *
* @return the start time of this GetClientPartitionAttributes
*/
public long startGetClientPartitionAttributes() {
@@ -3423,7 +3423,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the send part of the GetClientPartitionAttributes operation has completed
- *
+ *
* @param startTime the value returned by {@link #startGetClientPartitionAttributes}.
* @param failed true if the send of the GetClientPartitionAttributes failed
*/
@@ -3443,7 +3443,7 @@ public class ConnectionStats implements MessageStats {
/**
* Records that the specified GetClientPartitionAttributes has ended
- *
+ *
* @param startTime the value returned by {@link #startGetClientPartitionAttributes}.
* @param timedOut true if GetClientPartitionAttributes timed out
* @param failed true if GetClientPartitionAttributes failed
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
index 128ab89..8159bf9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
@@ -19,14 +19,14 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Does a region containsKey on a server
- *
+ *
* @since GemFire 5.7
*/
public class ContainsKeyOp {
/**
* Does a region entry containsKey on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the entry containsKey on
* @param key the entry key to do the containsKey on
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
index 7e15b81..08a1bc8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a region destroy on a server
- *
+ *
* @since GemFire 5.7
*/
public class DestroyOp {
@@ -49,7 +49,7 @@ public class DestroyOp {
/**
* Does a region entry destroy on a server using connections from the given pool to communicate
* with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the region to do the entry destroy on
* @param key the entry key to do the destroy on
@@ -90,7 +90,7 @@ public class DestroyOp {
/**
* Does a region entry destroy on a server using the given connection to communicate with the
* server.
- *
+ *
* @param con the connection to use to send to the server
* @param pool the pool to use to communicate with the server.
* @param region the region to do the entry destroy on
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java
index edf5c4e..0cec72c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.cache.client.internal;
+import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.EventID;
/**
* Does a region destroyRegion (or create) on a server
- *
+ *
* @since GemFire 5.7
*/
public class DestroyRegionOp {
/**
* Does a region destroyRegion on a server using connections from the given pool to communicate
* with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the destroyRegion on
* @param eventId the event id for this destroyRegion
@@ -42,7 +42,7 @@ public class DestroyRegionOp {
/**
* Does a region destroyRegion on a server using the given connection to communicate with the
* server.
- *
+ *
* @param con the connection to use to send to the server
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the destroyRegion on
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Endpoint.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Endpoint.java
index 297fd10..a26076d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Endpoint.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Endpoint.java
@@ -23,7 +23,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* Represents a server. Keeps track of information about the specific server
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
index 3fc37a3..f5f549c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
@@ -37,14 +37,14 @@ public interface EndpointManager {
/**
* Indicate that a particular server has crashed. All of the listeners will be notified that the
* server has crashed.
- *
+ *
* @param endpoint
*/
void serverCrashed(Endpoint endpoint);
/**
* Get the map of all endpoints currently in use.
- *
+ *
* @return a map for ServerLocation->Endpoint
*/
Map<ServerLocation, Endpoint> getEndpointMap();
@@ -63,7 +63,7 @@ public interface EndpointManager {
/**
* Get the stats for all of the servers we ever connected too.
- *
+ *
* @return a map of ServerLocation-> ConnectionStats
*/
public Map getAllStats();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
index f05815f..32157d4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
@@ -30,10 +30,10 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.internal.cache.PoolStats;
import org.apache.geode.internal.cache.tier.InternalClientMembership;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.statistics.DummyStatisticsFactory;
/**
*
@@ -61,7 +61,7 @@ public class EndpointManagerImpl implements EndpointManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.EndpointManager#referenceEndpoint(org.apache.geode.
* distributed.internal.ServerLocation)
*/
@@ -100,7 +100,7 @@ public class EndpointManagerImpl implements EndpointManager {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.EndpointManager#serverCrashed(org.apache.geode.cache.
* client.internal.Endpoint)
@@ -175,7 +175,7 @@ public class EndpointManagerImpl implements EndpointManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.EndpointManager#getEndpointMap()
*/
public Map<ServerLocation, Endpoint> getEndpointMap() {
@@ -184,7 +184,7 @@ public class EndpointManagerImpl implements EndpointManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.EndpointManager#close()
*/
public synchronized void close() {
@@ -200,7 +200,7 @@ public class EndpointManagerImpl implements EndpointManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.EndpointManager#addListener(org.apache.geode.cache.
* client.internal.EndpointManagerImpl.EndpointListener)
*/
@@ -210,7 +210,7 @@ public class EndpointManagerImpl implements EndpointManager {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.EndpointManager#removeListener(org.apache.geode.cache.
* client.internal.EndpointManagerImpl.EndpointListener)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
index 3da550a..50d1c11 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
@@ -20,14 +20,14 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* Provides methods to execute AbstractOp instances on a client pool.
- *
+ *
* @since GemFire 5.7
*/
public interface ExecutablePool {
/**
* Execute the given op on the servers that this pool connects to. This method is responsible for
* retrying the op if an attempt fails. It will only execute it once and on one server.
- *
+ *
* @param op the operation to execute
* @return the result of execution if any; null if not
* @since GemFire 5.7
@@ -37,7 +37,7 @@ public interface ExecutablePool {
/**
* Execute the given op on the servers that this pool connects to. This method is responsible for
* retrying the op if an attempt fails. It will only execute it once and on one server.
- *
+ *
* @param op the operation to execute
* @return the result of execution if any; null if not
* @since GemFire 5.7
@@ -48,7 +48,7 @@ public interface ExecutablePool {
* Execute the given op on all the servers that have server-to-client queues for this pool The
* last exception from any server will be thrown if the op fails. The op is executed with the
* primary first, followed by the backups.
- *
+ *
* @param op the operation to execute.
* @throws NoSubscriptionServersAvailableException if we have no queue server
* @throws SubscriptionNotEnabledException If the pool does not have queues enabled
@@ -60,7 +60,7 @@ public interface ExecutablePool {
* Execute the given op on all the servers that have server-to-client queues for this pool. The op
* will be executed on all backups, and then the primary. This method will block until a primary
* is available.
- *
+ *
* @param op the operation to execute
* @return The result from the primary server.
* @throws NoSubscriptionServersAvailableException if we have no queue server
@@ -72,7 +72,7 @@ public interface ExecutablePool {
/**
* Execute the given op on the given server.
- *
+ *
* @param server the server to do the execution on
* @param op the operation to execute
* @return the result of execution if any; null if not
@@ -81,7 +81,7 @@ public interface ExecutablePool {
/**
* Execute the given op on the given server.
- *
+ *
* @param server the server to do the execution on
* @param op the operation to execute
* @param accessed true if the connection is accessed by this execute
@@ -92,7 +92,7 @@ public interface ExecutablePool {
/**
* Execute the given op on the given connection.
- *
+ *
* @param con the connection to do the execution on
* @param op the operation to execute
* @return the result of execution if any; null if not
@@ -101,7 +101,7 @@ public interface ExecutablePool {
/**
* Execute the given op on the given connection.
- *
+ *
* @param con the connection to do the execution on
* @param op the operation to execute
* @param timeoutFatal true if a timeout exception should be treated as a fatal one
@@ -111,7 +111,7 @@ public interface ExecutablePool {
/**
* Execute the given op on the current primary server.
- *
+ *
* @param op the operation to execute
* @return the result of execution if any; null if not
*/
@@ -127,7 +127,7 @@ public interface ExecutablePool {
/**
* The calling thread will connect to only one server for executing all ops until it calls
* {@link #releaseServerAffinity()}
- *
+ *
* @param allowFailover true if we want to failover to another server when the first server is
* unreachable. Affinity to the new server will be maintained
* @since GemFire 6.6
@@ -136,7 +136,7 @@ public interface ExecutablePool {
/**
* Release the server affinity established by {@link #setupServerAffinity(boolean)}
- *
+ *
* @since GemFire 6.6
*/
public void releaseServerAffinity();
@@ -144,7 +144,7 @@ public interface ExecutablePool {
/**
* When server affinity is enabled by this thread, returns the server against which all ops in
* this thread are performed
- *
+ *
* @return location of the affinity server
* @since GemFire 6.6
* @see ExecutablePool#setupServerAffinity(boolean)
@@ -154,7 +154,7 @@ public interface ExecutablePool {
/**
* All subsequent operations by this thread will be performed on the given ServerLocation. Used
* for resuming suspended transactions.
- *
+ *
* @param serverLocation
* @since GemFire 6.6
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionHelper.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionHelper.java
index b0d4572..e9d6fd2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionHelper.java
@@ -16,8 +16,8 @@ package org.apache.geode.cache.client.internal;
public class ExecuteFunctionHelper {
- public final static byte BUCKETS_AS_FILTER_MASK = 0x02;
- public final static byte IS_REXECUTE_MASK = 0x01;
+ public static final byte BUCKETS_AS_FILTER_MASK = 0x02;
+ public static final byte IS_REXECUTE_MASK = 0x01;
static byte createFlags(boolean executeOnBucketSet, byte isReExecute) {
byte flags = executeOnBucketSet ? (byte) (0x00 | BUCKETS_AS_FILTER_MASK) : 0x00;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
index e819bc9..c35eb1d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Does a Execution of function on server (possibly without region/cache) It does not get the resulf
* from the server (follows Fire&Forget approch)
- *
+ *
* @since GemFire 5.8Beta
*/
public class ExecuteFunctionNoAckOp {
@@ -51,7 +51,7 @@ public class ExecuteFunctionNoAckOp {
/**
* Does a execute Function on a server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param function of the function to be executed
* @param args specified arguments to the application function
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
index 5e7da23..2a5e7dc 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
@@ -45,7 +45,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Executes the function on server (possibly without region/cache).<br>
* Also gets the result back from the server
- *
+ *
* @since GemFire 5.8
*/
@@ -65,7 +65,7 @@ public class ExecuteFunctionOp {
/**
* Does a execute Function on a server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param function of the function to be executed
* @param args specified arguments to the application function
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
index 3eac654..e20d3ac 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Does a Execution of function on server region It does not get the resul from the server (follows
* Fire&Forget approch)
- *
+ *
* @since GemFire 5.8Beta
*/
public class ExecuteRegionFunctionNoAckOp {
@@ -49,7 +49,7 @@ public class ExecuteRegionFunctionNoAckOp {
/**
* Does a execute Function on a server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the put on
* @param function to be executed
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
index 6e11110..4d4ab95 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
@@ -48,7 +48,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a Execution of function on server region.<br>
* It alos gets result from the server
- *
+ *
* @since GemFire 5.8Beta
*/
public class ExecuteRegionFunctionOp {
@@ -62,7 +62,7 @@ public class ExecuteRegionFunctionOp {
/**
* Does a execute Function on a server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the put on
* @param function to be executed
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
index 59dac22..5ac9655 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
@@ -14,22 +14,23 @@
*/
package org.apache.geode.cache.client.internal;
+import java.net.InetSocketAddress;
+import java.util.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.net.InetSocketAddress;
-import java.util.*;
/**
* A connection source where the list of endpoints is specified explicitly.
- *
+ *
* @since GemFire 5.7
- *
+ *
* TODO - the UnusedServerMonitor basically will force the pool to have at least one
* connection to each server. Maybe we need to have it create connections that are outside
* the pool?
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
index d3a5c18..ae81865 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a region getAll on a server
- *
+ *
* @since GemFire 5.7
*/
public class GetAllOp {
@@ -47,7 +47,7 @@ public class GetAllOp {
/**
* Does a region getAll on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the getAll on
* @param keys list of keys to get
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
index cc25416..94ad7d1 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
@@ -31,8 +31,8 @@ import org.apache.geode.internal.logging.LogService;
/**
* Retrieves {@link ClientPartitionAdvisor} for the specified PartitionedRegion from one of the
* servers
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
public class GetClientPRMetaDataOp {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
index ba7463e..ccda3d0 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
@@ -28,13 +28,13 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
* Retrieves {@link ClientPartitionAdvisor} related information for the specified PartitionedRegion
* from one of the servers
- *
- *
+ *
+ *
* @since GemFire 6.5
- *
+ *
*/
public class GetClientPartitionAttributesOp {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java
index 09f3496..615c15c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java
@@ -26,7 +26,7 @@ public class GetEntryOp {
/**
* Does a region.getEntry on the server using the given pool
- *
+ *
* @param pool
* @param region
* @param key
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEventValueOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEventValueOp.java
index 8804e05..10b973f 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEventValueOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEventValueOp.java
@@ -24,13 +24,13 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
/**
* Gets (full) value (unlike GetOp, which may get either a full value or a delta depending upon
* delta flag) of a given event from the ha container on server.
- *
+ *
* @since GemFire 6.1
*/
public class GetEventValueOp {
/**
* Does a get on the primary server using connections from the given pool
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param event the eventid to do the get on
* @param callbackArg an optional callback arg to pass to any cache callbacks
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java
index 271c92e..cce4c29 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a region get on a server
- *
+ *
* @since GemFire 5.7
*/
public class GetOp {
@@ -49,7 +49,7 @@ public class GetOp {
/**
* Does a region get on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the region to do the get on
* @param key the entry key to do the get on
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumByIdOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumByIdOp.java
index dc94fe5..aa221bc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumByIdOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumByIdOp.java
@@ -20,13 +20,13 @@ import org.apache.geode.pdx.internal.EnumInfo;
/**
* Retrieve the PDXType, given an integer PDX id, from a server.
- *
+ *
* @since GemFire 6.6.2
*/
public class GetPDXEnumByIdOp {
/**
* Get a enum from the given pool.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static EnumInfo execute(ExecutablePool pool, int enumId) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumsOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumsOp.java
index 3158eb3..fcc68b7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumsOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXEnumsOp.java
@@ -25,7 +25,7 @@ import org.apache.geode.pdx.internal.EnumInfo;
/**
* Retrieve all known PDX types.
- *
+ *
* @since GemFire 7.0
*/
public class GetPDXEnumsOp {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForEnumOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForEnumOp.java
index 9ad85f0..064dd24 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForEnumOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForEnumOp.java
@@ -23,14 +23,14 @@ import org.apache.geode.pdx.internal.EnumInfo;
/**
* Retrieve the PDXType, given an integer PDX id, from a server.
- *
+ *
* @since GemFire 6.6.2
*/
public class GetPDXIdForEnumOp {
/**
* Register a bunch of instantiators on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static int execute(ExecutablePool pool, EnumInfo ei) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForTypeOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForTypeOp.java
index cc0cd65..dd6e609 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForTypeOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXIdForTypeOp.java
@@ -23,14 +23,14 @@ import org.apache.geode.pdx.internal.PdxType;
/**
* Retrieve the PDXType, given an integer PDX id, from a server.
- *
+ *
* @since GemFire 6.6
*/
public class GetPDXIdForTypeOp {
/**
* Register a bunch of instantiators on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static int execute(ExecutablePool pool, PdxType type) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypeByIdOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypeByIdOp.java
index 826d4cd..c103066 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypeByIdOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypeByIdOp.java
@@ -20,13 +20,13 @@ import org.apache.geode.pdx.internal.PdxType;
/**
* Retrieve the PDXType, given an integer PDX id, from a server.
- *
+ *
* @since GemFire 6.6
*/
public class GetPDXTypeByIdOp {
/**
* Get a PdxType from the given pool.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static PdxType execute(ExecutablePool pool, int pdxId) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypesOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypesOp.java
index 9186680..fefecb2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypesOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetPDXTypesOp.java
@@ -25,7 +25,7 @@ import org.apache.geode.pdx.internal.PdxType;
/**
* Retrieve all known PDX types.
- *
+ *
* @since GemFire 7.0
*/
public class GetPDXTypesOp {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java
index 7a084e2..551e18a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java
@@ -38,9 +38,9 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* connect to a new server before realizing that all the servers crashed. To fix this, we would need
* to get some kind of birthdate of the server ds we connect and use that to decide if we need to
* recover instantiators. As it is, the window is not very large.
- *
- *
- *
+ *
+ *
+ *
*/
public class InstantiatorRecoveryListener extends EndpointManager.EndpointListenerAdapter {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InternalPool.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InternalPool.java
index 083c8d6..b51fe93 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InternalPool.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InternalPool.java
@@ -15,8 +15,8 @@
package org.apache.geode.cache.client.internal;
import java.util.Map;
-
import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.internal.cache.PoolStats;
@@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.PoolStats;
/**
* The contract between a connection source and a connection pool. Provides methods for the
* connection source to access the cache and update the list of endpoints on the connection pool.
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java
index 3e6070b..97d233c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a region invalidate on a server
- *
+ *
* @since GemFire 6.6
*/
public class InvalidateOp {
@@ -37,7 +37,7 @@ public class InvalidateOp {
/**
* Does a region invalidate on a server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the entry keySet on
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
index d52bcde..ce2e492 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
@@ -14,28 +14,28 @@
*/
package org.apache.geode.cache.client.internal;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
+import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.cache.client.ServerOperationException;
-
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
/**
* Does a region keySet on a server
- *
+ *
* @since GemFire 5.7
*/
public class KeySetOp {
/**
* Does a region entry keySet on a server using connections from the given pool to communicate
* with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the entry keySet on
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallback.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallback.java
index 3fa5127..a2d19ef 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallback.java
@@ -18,21 +18,21 @@ import java.util.List;
/**
* A callback to receive notifications about locator discovery. Currently only used internally.
- *
+ *
* @since GemFire 5.7
*/
public interface LocatorDiscoveryCallback {
/**
* Called to indicate that new locators have been discovered
- *
+ *
* @param locators a list of InetSocketAddresses of new locators that have been discovered.
*/
void locatorsDiscovered(List locators);
/**
* Called to indicated that locators have been removed from the list of available locators.
- *
+ *
* @param locators a list of InetSocketAddresses of locators that have been removed
*/
void locatorsRemoved(List locators);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallbackAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
index 1ed0cd0..f2bb4d6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
@@ -18,7 +18,7 @@ import java.util.List;
/**
* A locator discovery callback that does nothing.
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/MakePrimaryOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/MakePrimaryOp.java
index 0332507..b3b54e6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/MakePrimaryOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/MakePrimaryOp.java
@@ -19,13 +19,13 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Tell a server to become the primary host of a server-to-client queue
- *
+ *
* @since GemFire 5.7
*/
public class MakePrimaryOp {
/**
* Tell the given server to become the primary host of a server-to-client queue
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param conn the connection to do the execution on
* @param sentClientReady true if the client ready message has already been sent
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Op.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Op.java
index 290a4b1..989c31f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Op.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Op.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.client.internal;
/**
* An operation to perform on a server. Used by {@link ExecutablePool} to attempt the operation on
* multiple servers until the retryAttempts is exceeded.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -26,7 +26,7 @@ public interface Op {
/**
* Attempts to execute this operation by sending its message out on the given connection, waiting
* for a response, and returning it.
- *
+ *
* @param cnx the connection to use when attempting execution of the operation.
* @return the result of the operation or <code>null</code if the operation has no result.
* @throws Exception if the execute failed
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
index 6c2d077..32ecd13 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.cache.client.internal;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.net.ConnectException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.nio.BufferUnderflowException;
+import java.util.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.*;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.RegionDestroyedException;
@@ -41,21 +52,11 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.net.ConnectException;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.nio.BufferUnderflowException;
-import java.util.*;
/**
* Called from the client and execute client to server requests against servers. Handles retrying to
* different servers, and marking servers dead if we get exception from them.
- *
+ *
* @since GemFire 5.7
*/
public class OpExecutorImpl implements ExecutablePool {
@@ -209,7 +210,7 @@ public class OpExecutorImpl implements ExecutablePool {
/**
* execute the given op on the given server. If the server cannot be reached, sends a
* TXFailoverOp, then retries the given op
- *
+ *
* @param loc the server to execute the op on
* @param op the op to execute
* @return the result of execution
@@ -316,7 +317,7 @@ public class OpExecutorImpl implements ExecutablePool {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.OpExecutor#executeOn(org.apache.geode.distributed.
* internal.ServerLocation, org.apache.geode.cache.client.internal.Op)
*/
@@ -411,7 +412,7 @@ public class OpExecutorImpl implements ExecutablePool {
* gets a connection to the given serverLocation either by looking up the threadLocal
* {@link #localConnectionMap}. If a connection does not exist (or has been destroyed) we borrow
* one from connectionManager.
- *
+ *
* @return the activated connection
*/
private Connection getActivatedThreadLocalConnectionForSingleHop(ServerLocation server,
@@ -460,7 +461,7 @@ public class OpExecutorImpl implements ExecutablePool {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ExecutablePool#executeOnPrimary(org.apache.geode.cache.
* client.internal.Op)
@@ -528,7 +529,7 @@ public class OpExecutorImpl implements ExecutablePool {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ExecutablePool#executeOnAllQueueServers(org.apache.geode
* .cache.client.internal.Op)
@@ -720,7 +721,7 @@ public class OpExecutorImpl implements ExecutablePool {
* note: the old code in ConnectionProxyImpl used to create a new socket here to the server to
* determine if it really crashed. We may have to add this back in for some reason, but
* hopefully not.
- *
+ *
* note 05/21/08: an attempt to address this was made by increasing the time waited on server
* before closing timeoutd clients see ServerConnection.hasBeenTimedOutOnClient
*/
@@ -928,4 +929,3 @@ public class OpExecutorImpl implements ExecutablePool {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PdxRegistryRecoveryListener.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PdxRegistryRecoveryListener.java
index 8c52551..ec64ad0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PdxRegistryRecoveryListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PdxRegistryRecoveryListener.java
@@ -31,13 +31,13 @@ import org.apache.geode.pdx.internal.TypeRegistry;
* connect to a new server before realizing that all the servers crashed. To fix this, we would need
* to get some kind of birthdate of the server ds we connect and use that to decide if we need to
* recover the PDX registry.
- *
+ *
* We can also lose connectivity with the servers, even if the servers are still running. Maybe for
* the PDX registry we need some way of telling if the PDX registry was lost at the server side in
* the interval.
- *
- *
- *
+ *
+ *
+ *
*/
public class PdxRegistryRecoveryListener extends EndpointManager.EndpointListenerAdapter {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
index fb07b39..6429098 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
@@ -20,14 +20,14 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Ping a server to see if it is still alive.
- *
+ *
* @since GemFire 5.7
*/
public class PingOp {
/**
* Ping the specified server to see if it is still alive
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param server the server to do the execution on
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
index d2e1f4b..c266b8b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
@@ -73,7 +73,7 @@ import org.apache.geode.internal.statistics.DummyStatisticsFactory;
/**
* Manages the client side of client to server connections and client queues.
- *
+ *
* @since GemFire 5.7
*/
public class PoolImpl implements InternalPool {
@@ -96,7 +96,7 @@ public class PoolImpl implements InternalPool {
* For durable client tests only. Connection Sources read this flag and return an empty list of
* servers.
*/
- public volatile static boolean TEST_DURABLE_IS_NET_DOWN = false;
+ public static volatile boolean TEST_DURABLE_IS_NET_DOWN = false;
private final String name;
private final int socketConnectTimeout;
@@ -272,7 +272,7 @@ public class PoolImpl implements InternalPool {
/**
* Return true if the given Pool is compatible with these attributes. Currently this does what
* equals would but in the future we might decide to weaken the compatibility contract.
- *
+ *
* @since GemFire 6.5
*/
public boolean isCompatible(Pool p) {
@@ -362,7 +362,7 @@ public class PoolImpl implements InternalPool {
/**
* Returns the cancellation criterion for this proxy
- *
+ *
* @return the cancellation criterion
*/
public CancelCriterion getCancelCriterion() {
@@ -383,7 +383,7 @@ public class PoolImpl implements InternalPool {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Pool#getName()
*/
public String getName() {
@@ -757,7 +757,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on the servers that this pool connects to. This method is responsible for
* retrying the op if an attempt fails. It will only execute it once and on one server.
- *
+ *
* @param op the operation to execute
* @return the result of execution if any; null if not
* @since GemFire 5.7
@@ -777,7 +777,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on the servers that this pool connects to. This method is responsible for
* retrying the op if an attempt fails. It will only execute it once and on one server.
- *
+ *
* @param op the operation to execute
* @param retries how many times to retry the operation
* @return the result of execution if any; null if not
@@ -790,7 +790,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on the given server.
- *
+ *
* @param server the server to do the execution on
* @param op the operation to execute
* @return the result of execution if any; null if not
@@ -802,7 +802,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on the given server.
- *
+ *
* @param server the server to do the execution on
* @param op the operation to execute
* @param accessed true if the connection is accessed by this execute
@@ -816,7 +816,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on the given connection.
- *
+ *
* @param con the connection to do the execution on
* @param op the operation to execute
* @return the result of execution if any; null if not
@@ -832,7 +832,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on all the servers that have server-to-client queues for this pool
- *
+ *
* @param op the operation to execute
* @return the result of execution if any; null if not
* @since GemFire 5.7
@@ -850,7 +850,7 @@ public class PoolImpl implements InternalPool {
/**
* Execute the given op on the current primary server.
- *
+ *
* @param op the operation to execute
* @return the result of execution if any; null if not
*/
@@ -896,7 +896,7 @@ public class PoolImpl implements InternalPool {
/**
* Borrows a connection from the pool.. Used by gateway and tests. Any connection that is acquired
* using this method must be returned using returnConnection, even if it is destroyed.
- *
+ *
*/
public Connection acquireConnection() {
return manager.borrowConnection(45000L);
@@ -1115,7 +1115,7 @@ public class PoolImpl implements InternalPool {
/**
* Atomic counter used to keep track of services using this pool.
- *
+ *
* @since GemFire 5.7
*/
private final AtomicInteger attachCount = new AtomicInteger();
@@ -1125,7 +1125,7 @@ public class PoolImpl implements InternalPool {
* Returns number of services currently using/attached to this pool.
* <p>
* Made public so it can be used by tests
- *
+ *
* @since GemFire 5.7
*/
public int getAttachCount() {
@@ -1134,7 +1134,7 @@ public class PoolImpl implements InternalPool {
/**
* This needs to be called when a service (like a Region or CQService) starts using a pool.
- *
+ *
* @since GemFire 5.7
*/
public void attach() {
@@ -1143,7 +1143,7 @@ public class PoolImpl implements InternalPool {
/**
* This needs to be called when a service (like a Region or CQService) stops using a pool.
- *
+ *
* @since GemFire 5.7
*/
public void detach() {
@@ -1152,9 +1152,9 @@ public class PoolImpl implements InternalPool {
/**
* Get the connection held by this thread if we're using thread local connections
- *
+ *
* This is a a hook for hydra code to pass thread local connections between threads.
- *
+ *
* @return the connection from the thread local, or null if there is no thread local connection.
*/
public Connection getThreadLocalConnection() {
@@ -1193,7 +1193,7 @@ public class PoolImpl implements InternalPool {
/**
* Fetch the connection source for this pool
- *
+ *
* @return the source
*/
public ConnectionSource getConnectionSource() {
@@ -1245,7 +1245,7 @@ public class PoolImpl implements InternalPool {
/**
* Set the connection held by this thread if we're using thread local connections
- *
+ *
* This is a a hook for hydra code to pass thread local connections between threads.
*/
public void setThreadLocalConnection(Connection conn) {
@@ -1319,7 +1319,7 @@ public class PoolImpl implements InternalPool {
*/
public static volatile boolean AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG = false;
- public static abstract class PoolTask implements Runnable {
+ public abstract static class PoolTask implements Runnable {
public void run() {
try {
@@ -1401,7 +1401,7 @@ public class PoolImpl implements InternalPool {
/**
* Returns the QueryService, that can be used to execute Query functions on the servers associated
* with this pool.
- *
+ *
* @return the QueryService
*/
public QueryService getQueryService() {
@@ -1507,10 +1507,10 @@ public class PoolImpl implements InternalPool {
/**
* Assert thread-local var is not null, if it has multiuser-authentication set to true.
- *
+ *
* If serverLocation is non-null, check if the the user is authenticated on that server. If not,
* authenticate it and return.
- *
+ *
* @param serverLocation
* @param op
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PrimaryAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PrimaryAckOp.java
index d7d32a7..8c7de27 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PrimaryAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PrimaryAckOp.java
@@ -14,23 +14,23 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.Message;
-
import java.util.Iterator;
import java.util.List;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+
/**
* Send the primary server acknowledgement on the events this client has received and processed from
* it.
- *
+ *
* @since GemFire 5.7
*/
public class PrimaryAckOp {
/**
* Send the primary server acknowledgement on the events this client has received and processed
* from it using connections from the given pool to communicate with the server.
- *
+ *
* @param connection
* @param pool the pool to use to communicate with the server.
* @param events list of events to acknowledge
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java
index 8953e8c..bb56597 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java
@@ -40,9 +40,9 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
* attribute is set to true. Application must use its {@link #getRegion(String)} API instead that of
* actual Cache instance for getting a reference to Region instances, to perform operations on
* server.
- *
+ *
* TODO Avoid creating multiple instances of ProxyCache for a single user.
- *
+ *
* @see ClientCache#createAuthenticatedView(Properties)
* @see ProxyQueryService
* @see ProxyRegion
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java
index 369f87d..2ab578e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java
@@ -25,7 +25,6 @@ import java.util.concurrent.locks.Lock;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheStatistics;
@@ -36,6 +35,7 @@ import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionExistsException;
+import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.StatisticsDisabledException;
import org.apache.geode.cache.TimeoutException;
import org.apache.geode.cache.query.FunctionDomainException;
@@ -49,7 +49,7 @@ import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl;
/**
* A wrapper class over an actual Region instance. This is used when the multiuser-authentication
* attribute is set to true.
- *
+ *
* @see ProxyCache
* @since GemFire 6.5
*/
@@ -623,7 +623,7 @@ public class ProxyRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#putIfAbsent(java.lang.Object, java.lang.Object)
*/
public Object putIfAbsent(Object key, Object value) {
@@ -637,7 +637,7 @@ public class ProxyRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#remove(java.lang.Object, java.lang.Object)
*/
public boolean remove(Object key, Object value) {
@@ -651,7 +651,7 @@ public class ProxyRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object)
*/
public Object replace(Object key, Object value) {
@@ -665,7 +665,7 @@ public class ProxyRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object,
* java.lang.Object)
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
index dca145d..5d145ee 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a region putAll on a server
- *
+ *
* @since GemFire 5.7
*/
public class PutAllOp {
@@ -59,7 +59,7 @@ public class PutAllOp {
/**
* Does a region put on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the putAll on
* @param map the Map of keys and values to put
@@ -80,7 +80,7 @@ public class PutAllOp {
/**
* Does a region put on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the putAll on
* @param map the Map of keys and values to put
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
index 1390c2d..60888ce 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.cache.client.internal;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.Operation;
@@ -33,14 +38,9 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.logging.LogService;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-
-import org.apache.logging.log4j.Logger;
-
/**
* Does a region put (or create) on a server
- *
+ *
* @since GemFire 5.7
*/
public class PutOp {
@@ -50,7 +50,7 @@ public class PutOp {
/**
* Does a region put on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the region to do the put on
* @param key the entry key to do the put on
@@ -108,7 +108,7 @@ public class PutOp {
* This is a unit test method. It does a region put on a server using the given connection from
* the given pool to communicate with the server. Do not call this method if the value is Delta
* instance.
- *
+ *
* @param con the connection to use
* @param pool the pool to use to communicate with the server.
* @param regionName the name of the region to do the put on
@@ -294,14 +294,14 @@ public class PutOp {
/*
* Process a response that contains an ack.
- *
+ *
* @param msg the message containing the response
- *
+ *
* @param con Connection on which this op is executing
- *
+ *
* @throws Exception if response could not be processed or we received a response with a server
* exception.
- *
+ *
* @since GemFire 6.1
*/
@Override
@@ -353,7 +353,7 @@ public class PutOp {
/**
* Process a response that contains an ack.
- *
+ *
* @param msg the message containing the response
* @param opName text describing this op
* @param con Connection on which this op is executing
@@ -446,7 +446,7 @@ public class PutOp {
/**
* Attempts to read a response to this operation by reading it from the given connection, and
* returning it.
- *
+ *
* @param cnx the connection to read the response from
* @return the result of the operation or <code>null</code if the operation has no result.
* @throws Exception if the execute failed
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java
index b7d6a8e..9ca1dbe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueryOp.java
@@ -15,32 +15,33 @@
package org.apache.geode.cache.client.internal;
import java.util.Arrays;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
-import org.apache.geode.internal.cache.tier.sockets.Part;
+
+import org.apache.geode.SerializationException;
+import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.types.CollectionType;
-import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.internal.QueryUtils;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.types.TypeUtils;
-import org.apache.geode.SerializationException;
-import org.apache.geode.cache.client.ServerOperationException;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
+import org.apache.geode.internal.cache.tier.sockets.Part;
/**
* Does a region query on a server
- *
+ *
* @since GemFire 5.7
*/
public class QueryOp {
/**
* Does a region query on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param queryPredicate A query language boolean query predicate
* @return A <code>SelectResults</code> containing the values that match the
@@ -88,7 +89,7 @@ public class QueryOp {
/**
* This constructor is used by our subclass CreateCQWithIROpImpl
- *
+ *
* @throws org.apache.geode.SerializationException if serialization fails
*/
protected QueryOpImpl(int msgType, int numParts) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueConnectionImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueConnectionImpl.java
index d43ceae..47e0503 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueConnectionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueConnectionImpl.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* A wrapper that holds a client to server connection and a server to client connection.
- *
+ *
* The clientToServerConnection should not be used outside of this class.
*
*/
@@ -179,7 +179,7 @@ public class QueueConnectionImpl implements Connection {
/**
* Indicate that we have, or are about to send the client create message on this connection.
- *
+ *
* @return true if we have not yet sent client ready.
*/
public boolean sendClientReady() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
index 9704bbb..f5fc5d3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
@@ -15,14 +15,14 @@
package org.apache.geode.cache.client.internal;
import java.util.List;
-
import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.InternalLogWriter;
/**
* @since GemFire 5.7
- *
+ *
*/
public interface QueueManager {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
index 6c367e9..9431ade 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
@@ -74,7 +74,7 @@ import org.apache.geode.security.GemFireSecurityException;
/**
* Manages Client Queues. Responsible for creating callback connections and satisfying redundancy
* requirements.
- *
+ *
* @since GemFire 5.7
*/
public class QueueManagerImpl implements QueueManager {
@@ -628,7 +628,7 @@ public class QueueManagerImpl implements QueueManager {
/**
* Make sure that we have enough backup servers.
- *
+ *
* Add any servers we fail to connect to to the excluded servers list.
*/
protected boolean recoverRedundancy(Set excludedServers, boolean recoverInterest) {
@@ -786,7 +786,7 @@ public class QueueManagerImpl implements QueueManager {
/**
* Create a new primary server from a non-redundant server.
- *
+ *
* Add any failed servers to the excludedServers set.
*/
private QueueConnectionImpl createNewPrimary(Set excludedServers) {
@@ -858,7 +858,7 @@ public class QueueManagerImpl implements QueueManager {
/**
* Find a new primary, adding any failed servers we encounter to the excluded servers list
- *
+ *
* First we try to make a backup server the primary, but if run out of backup servers we will try
* to find a new server.
*/
@@ -1266,8 +1266,8 @@ public class QueueManagerImpl implements QueueManager {
/**
* A comparator which sorts queue elements in the order of primary first redundant with smallest
* queue size ... redundant with largest queue size
- *
- *
+ *
+ *
*/
protected static class QSizeComparator implements java.util.Comparator {
public int compare(Object o1, Object o2) {
@@ -1292,10 +1292,10 @@ public class QueueManagerImpl implements QueueManager {
/**
* A data structure for holding the current set of connections the queueConnections reference
* should be maintained by making a copy of this data structure for each change.
- *
+ *
* Note the the order of the backups is significant. The first backup in the list is the first
* server that will be become primary after the primary fails, etc.
- *
+ *
* The order of backups in this list is the reverse of the order or endpoints from the old
* ConnectionProxyImpl .
*/
@@ -1380,7 +1380,7 @@ public class QueueManagerImpl implements QueueManager {
/**
* Return the cache client updater from the previously failed primary
- *
+ *
* @return the previous updater or null if there is no previous updater
*/
public ClientUpdater getFailedUpdater() {
@@ -1427,11 +1427,11 @@ public class QueueManagerImpl implements QueueManager {
/**
* Asynchronous task which tries to restablish a primary connection and satisfy redundant
* requirements.
- *
+ *
* This task should only be running in a single thread at a time. This task is the only way that
* new queue servers will be added, and the only way that a backup server can transistion to a
* primary server.
- *
+ *
*/
protected class RedundancySatisfierTask extends PoolTask {
private boolean isCancelled;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
index 6b537c3..2819a5f 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
@@ -15,6 +15,7 @@
package org.apache.geode.cache.client.internal;
import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.geode.internal.cache.EventID;
public interface QueueState {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
index 2530472..4c70ab8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
@@ -48,7 +48,7 @@ public class QueueStateImpl implements QueueState {
/**
* This will store the ThreadId to latest received sequence Id
- *
+ *
* Keys are instances of {@link ThreadIdentifier} Values are instances of
* {@link SequenceIdAndExpirationObject}
*/
@@ -220,15 +220,15 @@ public class QueueStateImpl implements QueueState {
}
/**
- *
+ *
* Thread which will iterate over threadIdToSequenceId map
- *
+ *
* 1)It will send an ack primary server for all threadIds for which it has not send an ack. 2)It
* will expire the entries which have exceeded the specified expiry time and for which ack has
* been alerady sent.
- *
+ *
* @since GemFire 5.1
- *
+ *
*/
private class ThreadIdToSequenceIdExpiryTask extends PoolTask {
@@ -250,7 +250,7 @@ public class QueueStateImpl implements QueueState {
/**
* constructs the Thread and initializes the expiry time
- *
+ *
*/
public ThreadIdToSequenceIdExpiryTask() {
expiryTime = QueueStateImpl.this.qManager.getPool().getSubscriptionMessageTrackingTimeout();
@@ -368,9 +368,9 @@ public class QueueStateImpl implements QueueState {
/**
* A class to store sequenceId and the creation time of the object to be used for expiring the
* entry
- *
+ *
* @since GemFire 5.1
- *
+ *
*/
public static class SequenceIdAndExpirationObject {
/** The sequence Id of the entry * */
@@ -411,7 +411,7 @@ public class QueueStateImpl implements QueueState {
}
/**
- *
+ *
* @return Returns the ackSend
*/
public boolean getAckSend() {
@@ -420,7 +420,7 @@ public class QueueStateImpl implements QueueState {
/**
* Sets the ackSend
- *
+ *
* @param ackSend
*/
public void setAckSend(boolean ackSend) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java
index 12e15b4..5a77c17 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java
@@ -19,14 +19,14 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Tells the server we are ready to receive server-to-client events from durable subscriptions.
- *
+ *
* @since GemFire 5.7
*/
public class ReadyForEventsOp {
/**
* Tells the primary server we are ready to receive server-to-client events from durable
* subscriptions.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param primary
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInstantiatorsOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInstantiatorsOp.java
index 40ce619..899a5e8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInstantiatorsOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInstantiatorsOp.java
@@ -28,14 +28,14 @@ import org.apache.geode.internal.util.BlobHelper;
/**
* Register a bunch of instantiators on a server
- *
+ *
* @since GemFire 5.7
*/
public class RegisterInstantiatorsOp {
/**
* Register a bunch of instantiators on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param instantiators the instantiators to register
* @param eventId the id of this event
@@ -48,7 +48,7 @@ public class RegisterInstantiatorsOp {
/**
* Register a bunch of instantiators on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param holders the {@link InstantiatorAttributesHolder}s containing info about the
* instantiators to register
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java
index bf460fe..69acdfb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java
@@ -23,14 +23,14 @@ import org.apache.geode.internal.cache.tier.MessageType;
/**
* Does a region registerInterestList on a server
- *
+ *
* @since GemFire 5.7
*/
public class RegisterInterestListOp {
/**
* Does a region registerInterestList on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the registerInterestList on
* @param keys list of keys we are interested in
@@ -54,7 +54,7 @@ public class RegisterInterestListOp {
/**
* Does a region registerInterestList on a server using connections from the given pool to
* communicate with the given server location.
- *
+ *
* @param sl the server to do the register interest on.
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the registerInterest on
@@ -76,7 +76,7 @@ public class RegisterInterestListOp {
/**
* Does a region registerInterestList on a server using connections from the given pool to
* communicate with the given server location.
- *
+ *
* @param conn the connection to do the register interest on.
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the registerInterest on
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
index ce9d8f0..1da5e99 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
@@ -33,14 +33,14 @@ import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
/**
* Does a region registerInterest on a server
- *
+ *
* @since GemFire 5.7
*/
public class RegisterInterestOp {
/**
* Does a region registerInterest on a server using connections from the given pool to communicate
* with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the registerInterest on
* @param key describes what we are interested in
@@ -61,7 +61,7 @@ public class RegisterInterestOp {
/**
* Does a region registerInterest on a server using connections from the given pool to communicate
* with the given server location.
- *
+ *
* @param sl the server to do the register interest on.
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the registerInterest on
@@ -84,7 +84,7 @@ public class RegisterInterestOp {
/**
* Does a region registerInterest on a server using connections from the given pool to communicate
* with the given server location.
- *
+ *
* @param conn the connection to do the register interest on.
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the registerInterest on
@@ -139,7 +139,7 @@ public class RegisterInterestOp {
/**
* This constructor is used by our subclass CreateCQWithIROpImpl
- *
+ *
* @throws org.apache.geode.SerializationException if serialization fails
*/
protected RegisterInterestOpImpl(String region, int msgType, int numParts) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestTracker.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestTracker.java
index 7ba62bc..9eae523 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestTracker.java
@@ -35,16 +35,16 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Used to keep track of what interest a client has registered. This code was extracted from the old
* ConnectionProxyImpl.
- *
+ *
* @since GemFire 5.7
*/
public class RegisterInterestTracker {
private static final Logger logger = LogService.getLogger();
- public final static int interestListIndex = 0;
- public final static int durableInterestListIndex = 1;
- public final static int interestListIndexForUpdatesAsInvalidates = 2;
- public final static int durableInterestListIndexForUpdatesAsInvalidates = 3;
+ public static final int interestListIndex = 0;
+ public static final int durableInterestListIndex = 1;
+ public static final int interestListIndexForUpdatesAsInvalidates = 2;
+ public static final int durableInterestListIndexForUpdatesAsInvalidates = 3;
private final FailoverInterestList[] fils = new FailoverInterestList[4];
@@ -186,7 +186,7 @@ public class RegisterInterestTracker {
/**
* Remove all interests of a given type on the given proxy's region.
- *
+ *
* @param interestType the interest type
* @param durable a boolean stating whether to remove durable or non-durable registrations
*/
@@ -313,11 +313,11 @@ public class RegisterInterestTracker {
/**
* A Holder object for client's register interest, this is required when a client fails over to
* another server and does register interest based on this Data structure
- *
+ *
* @since GemFire 5.5
*
*/
- static protected class FailoverInterestList {
+ protected static class FailoverInterestList {
/**
* Record of enumerated keys of interest.
*
@@ -374,7 +374,7 @@ public class RegisterInterestTracker {
*
*
*/
- static public class RegionInterestEntry {
+ public static class RegionInterestEntry {
private final LocalRegion region;
private final ConcurrentMap interests;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
index 93de0ca..cdd3cce 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
@@ -44,7 +44,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Does a region removeAll on a server
- *
+ *
* @since GemFire 8.1
*/
public class RemoveAllOp {
@@ -58,7 +58,7 @@ public class RemoveAllOp {
/**
* Does a region removeAll on a server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the removeAll on
* @param keys Collection of keys to remove
@@ -78,7 +78,7 @@ public class RemoveAllOp {
/**
* Does a region put on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the removeAll on
* @param keys the Collection of keys to remove
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RollbackOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RollbackOp.java
index 97cb2e6..3c068a8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RollbackOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RollbackOp.java
@@ -19,14 +19,14 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Does a Rollback on the server
- *
+ *
* @since GemFire 6.6
*/
public class RollbackOp {
/**
* Does a rollback on the server for given transaction
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param txId the id of the transaction to rollback
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
index 3f4b38f..aacd19e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
@@ -14,12 +14,6 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.cache.client.internal.PoolImpl.PoolTask;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.RejectedExecutionException;
@@ -27,17 +21,24 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.cache.client.internal.PoolImpl.PoolTask;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.internal.logging.LogService;
+
/**
* This class is designed to prevent the client from spinning and reconnected to the same failed
* server over and over. We've removed the old dead server monitor code because the locator is
* supposed to keep track of what servers are alive or dead. However, there is still the possibility
* that the locator may tell us a server is alive but we are unable to reach it.
- *
+ *
* This class keeps track of the number of consecutive failures that happen to on each server. If
* the number of failures exceeds the limit, the server is added to a blacklist for a certain period
* of time. After the time is expired, the server comes off the blacklist, but the next failure will
* put the server back on the list for a longer period of time.
- *
+ *
*
*/
public class ServerBlackList {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java
index da64684..a6b7e83 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java
@@ -21,7 +21,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* Used to send operations from a client to a server.
- *
+ *
* @since GemFire 5.7
*/
public class ServerProxy {
@@ -29,7 +29,7 @@ public class ServerProxy {
/**
* Creates a server proxy for the given pool.
- *
+ *
* @param pool the pool that this proxy will use to communicate with servers
*/
public ServerProxy(InternalPool pool) {
@@ -52,7 +52,7 @@ public class ServerProxy {
/**
* Ping the specified server to see if it is still alive
- *
+ *
* @param server the server to do the execution on
*/
public void ping(ServerLocation server) {
@@ -61,7 +61,7 @@ public class ServerProxy {
/**
* Does a query on a server
- *
+ *
* @param queryPredicate A query language boolean query predicate
* @return A <code>SelectResults</code> containing the values that match the
* <code>queryPredicate</code>.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
index e11284e..e667be7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
@@ -32,7 +32,7 @@ public interface ServerRegionDataAccess {
/**
* Does a get on the server
- *
+ *
* @param key the entry key to do the get on
* @param callbackArg an optional callback arg to pass to any cache callbacks
* @param clientEvent the client event, if any, for version propagation
@@ -42,7 +42,7 @@ public interface ServerRegionDataAccess {
/**
* Does a region put on the server
- *
+ *
* @param key the entry key to do the put on
* @param value the entry value to put
* @param clientEvent the client event, if any, for eventID and version tag propagation
@@ -59,7 +59,7 @@ public interface ServerRegionDataAccess {
/**
* Does a region entry destroy on the server
- *
+ *
* @param key the entry key to do the destroy on
* @param expectedOldValue the value that must be associated with the entry, or null
* @param operation the operation being performed (Operation.DESTROY, Operation.REMOVE)
@@ -72,7 +72,7 @@ public interface ServerRegionDataAccess {
/**
* Does a region entry invalidate on the server
- *
+ *
* @param event the entryEventImpl that represents the invalidate
*/
public abstract void invalidate(EntryEventImpl event);
@@ -80,7 +80,7 @@ public interface ServerRegionDataAccess {
/**
* Does a region clear on the server
- *
+ *
* @param eventId the event id for this clear
* @param callbackArg an optional callback arg to pass to any cache callbacks
*/
@@ -89,14 +89,14 @@ public interface ServerRegionDataAccess {
/**
* Does a region containsKey on a server
- *
+ *
* @param key the entry key to do the containsKey on
*/
public abstract boolean containsKey(Object key);
/**
* Does a region containsKey on a server
- *
+ *
* @param key the entry key to do the containsKey on
*/
public abstract boolean containsValueForKey(Object key);
@@ -104,7 +104,7 @@ public interface ServerRegionDataAccess {
/**
* Does a region containsValue on a server
- *
+ *
* @param value the entry value to search for
*/
public boolean containsValue(Object value);
@@ -127,7 +127,7 @@ public interface ServerRegionDataAccess {
/**
* gets an entry from the server, does not invoke loaders
- *
+ *
* @param key
* @return an {@link EntrySnapshot} for the given key
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionProxy.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionProxy.java
index 7a1f160..96a6e51 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionProxy.java
@@ -54,7 +54,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Used to send region operations from a client to a server
- *
+ *
* @since GemFire 5.7
*/
@SuppressWarnings("deprecation")
@@ -67,7 +67,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Creates a server region proxy for the given region.
- *
+ *
* @param r the region
* @throws IllegalStateException if the region does not have a pool
*/
@@ -104,7 +104,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.ServerRegionDataAccess#get(java.lang.Object,
* java.lang.Object)
*/
@@ -124,7 +124,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
* Do not call this method if the value is Delta instance. Exclicitly passing
* <code>Operation.CREATE</code> to the <code>PutOp.execute()</code> method as the caller of this
* method does not put Delta instances as value.
- *
+ *
* @param key
* @param value
* @param event
@@ -164,7 +164,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region put on the server using the given connection.
- *
+ *
* @param con the connection to use to send to the server
* @param key the entry key to do the put on
* @param value the entry value to put
@@ -180,7 +180,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.ServerRegionDataAccess#destroy(java.lang.Object,
* java.lang.Object, org.apache.geode.cache.Operation, org.apache.geode.internal.cache.EventID,
* java.lang.Object)
@@ -206,7 +206,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region entry destroy on the server using the given connection.
- *
+ *
* @param con the connection to use to send to the server
* @param key the entry key to do the destroy on
* @param expectedOldValue the value that the entry must have to perform the operation, or null
@@ -222,7 +222,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region destroy on the server
- *
+ *
* @param eventId the event id for this destroy
* @param callbackArg an optional callback arg to pass to any cache callbacks
*/
@@ -232,7 +232,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region destroy on the server using the given connection.
- *
+ *
* @param con the connection to use to send to the server
* @param eventId the event id for this destroy
* @param callbackArg an optional callback arg to pass to any cache callbacks
@@ -252,7 +252,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ServerRegionDataAccess#clear(org.apache.geode.internal.
* cache.EventID, java.lang.Object)
@@ -263,7 +263,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region clear on the server using the given connection.
- *
+ *
* @param con the connection to use to send to the server
* @param eventId the event id for this clear
* @param callbackArg an optional callback arg to pass to any cache callbacks
@@ -274,7 +274,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ServerRegionDataAccess#containsKey(java.lang.Object)
*/
@@ -285,7 +285,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ServerRegionDataAccess#containsKey(java.lang.Object)
*/
@@ -296,7 +296,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ServerRegionDataAccess#containsKey(java.lang.Object)
*/
@@ -307,7 +307,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.ServerRegionDataAccess#keySet()
*/
public Set keySet() {
@@ -317,7 +317,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region registerInterest on a server
- *
+ *
* @param key describes what we are interested in
* @param interestType the {@link InterestType} for this registration
* @param policy the interest result policy for this registration
@@ -332,7 +332,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region registerInterest on a server
- *
+ *
* @param key describes what we are interested in
* @param interestType the {@link InterestType} for this registration
* @param policy the interest result policy for this registration
@@ -427,7 +427,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
* Does a region registerInterest on a server described by the given server location
* <p>
* Note that this call by-passes the RegisterInterestTracker.
- *
+ *
* @param sl the server to do the register interest on.
* @param key describes what we are interested in
* @param interestType the {@link InterestType} for this registration
@@ -445,7 +445,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
* Does a region registerInterest on a server described by the given server location
* <p>
* Note that this call by-passes the RegisterInterestTracker.
- *
+ *
* @param sl the server to do the register interest on.
* @param key describes what we are interested in
* @param interestType the {@link InterestType} for this registration
@@ -471,7 +471,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
* Does a region registerInterest on a server described by the given connection
* <p>
* Note that this call by-passes the RegisterInterestTracker.
- *
+ *
* @param conn the connection to do the register interest on.
* @param key describes what we are interested in
* @param interestType the {@link InterestType} for this registration
@@ -489,7 +489,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
* Does a region registerInterest on a server described by the given connection
* <p>
* Note that this call by-passes the RegisterInterestTracker.
- *
+ *
* @param conn the connection to do the register interest on.
* @param key describes what we are interested in
* @param interestType the {@link InterestType} for this registration
@@ -515,7 +515,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region registerInterestList on a server
- *
+ *
* @param keys list of keys we are interested in
* @param policy the interest result policy for this registration
* @param isDurable true if this registration is durable
@@ -549,7 +549,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region unregisterInterest on a server
- *
+ *
* @param key describes what we are no longer interested in
* @param interestType the {@link InterestType} for this unregister
* @param isClosing true if this unregister is done by a close
@@ -574,7 +574,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Does a region unregisterInterestList on a server
- *
+ *
* @param keys list of keys we are interested in
* @param isClosing true if this unregister is done by a close
* @param keepAlive true if this unregister should not undo a durable registration
@@ -793,7 +793,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Transaction synchronization notification to the servers
- *
+ *
* @see org.apache.geode.internal.cache.tx.ClientTXStateStub#beforeCompletion()
*/
public void beforeCompletion(int txId) {
@@ -803,7 +803,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
/**
* Transaction synchronization notification to the servers
- *
+ *
* @param status
* @return the server's TXCommitMessage
* @see org.apache.geode.internal.cache.tx.ClientTXStateStub#afterCompletion(int)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
index 4d40acd..f00c228 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
@@ -28,7 +28,6 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireException;
@@ -49,6 +48,7 @@ import org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetE
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
public class SingleHopClientExecutor {
@@ -223,7 +223,7 @@ public class SingleHopClientExecutor {
/**
* execute bulk op (putAll or removeAll) on multiple PR servers, returning a map of the results.
* Results are either a VersionedObjectList or a BulkOpPartialResultsException
- *
+ *
* @param callableTasks
* @param cms
* @param region
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopOperationCallable.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopOperationCallable.java
index bc32d70..73e4c5a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopOperationCallable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopOperationCallable.java
@@ -22,18 +22,18 @@ import org.apache.geode.cache.client.internal.ExecuteRegionFunctionSingleHopOp.E
import org.apache.geode.distributed.internal.ServerLocation;
/**
- *
+ *
*
*/
public class SingleHopOperationCallable implements Callable {
- final private ServerLocation server;
+ private final ServerLocation server;
- final private PoolImpl pool;
+ private final PoolImpl pool;
- final private AbstractOp op;
+ private final AbstractOp op;
- final private UserAttributes securityAttributes;
+ private final UserAttributes securityAttributes;
public SingleHopOperationCallable(ServerLocation server, PoolImpl pool, AbstractOp op,
UserAttributes securityAttributes) {
@@ -78,4 +78,3 @@ public class SingleHopOperationCallable implements Callable {
return this.op;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java
index fb3ffec..27e2c01 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java
@@ -19,14 +19,14 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Does a region size on a server
- *
+ *
* @since GemFire 6.6
*/
public class SizeOp {
/**
* Does a region size on a server using connections from the given pool to communicate with the
* server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the entry keySet on
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXFailoverOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXFailoverOp.java
index 0995981..90714c1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXFailoverOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXFailoverOp.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* Indicates to the server that a transaction is failing over to this server. The server then
* performs the necessary bootstrapping for the tx.
- *
+ *
* @since GemFire 6.6
*/
public class TXFailoverOp {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXSynchronizationOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXSynchronizationOp.java
index a02d463..8f5a702 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXSynchronizationOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/TXSynchronizationOp.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
/**
* TXSynchronizationOp sends JTA beforeCompletion and afterCompletion messages to the server pool.
- *
+ *
*
*/
public class TXSynchronizationOp {
@@ -98,7 +98,7 @@ public class TXSynchronizationOp {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.AbstractOp#processResponse(org.apache.geode.internal.
* cache.tier.sockets.Message)
@@ -123,7 +123,7 @@ public class TXSynchronizationOp {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.AbstractOp#isErrorResponse(int)
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java
index 6a6da4a..694d3a7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java
@@ -14,22 +14,22 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.Message;
-
import java.util.Iterator;
import java.util.List;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+
/**
* Does a region unregisterInterestList on a server
- *
+ *
* @since GemFire 5.7
*/
public class UnregisterInterestListOp {
/**
* Does a region unregisterInterestList on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the unregisterInterestList on
* @param keys list of keys we are interested in
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java
index 60f8d6d..962858c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.cache.client.internal;
+import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.InterestType;
/**
* Does a region unregisterInterest on a server
- *
+ *
* @since GemFire 5.7
*/
public class UnregisterInterestOp {
/**
* Does a region unregisterInterest on a server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param region the name of the region to do the unregisterInterest on
* @param key describes what we are no longer interested in
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java
index e55cfb7..36592fd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersRequest.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.geode.internal.DataSerializableFixedID;
/**
- *
+ *
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
index 5f9decb..82425e7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
@@ -25,7 +25,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.DataSerializableFixedID;
/**
- *
+ *
*
*/
public class GetAllServersResponse extends ServerLocationResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
index f0405b4..c0d4803 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
@@ -58,7 +58,7 @@ public class LocatorListResponse extends ServerLocationResponse {
/**
* Returns an array list of type ServerLocation containing controllers.
- *
+ *
* @return list of controllers
*/
public List<ServerLocation> getLocators() {
@@ -68,7 +68,7 @@ public class LocatorListResponse extends ServerLocationResponse {
/**
* Returns whether or not the locator thinks that the servers in this group are currently
* balanced.
- *
+ *
* @return true if the servers are balanced.
*/
public boolean isBalanced() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java
index a4ea052..2e70576 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusRequest.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
/**
* The LocatorStatusRequest class...
* </p>
- *
+ *
* @see org.apache.geode.cache.client.internal.locator.ServerLocationRequest
* @see org.apache.geode.internal.DataSerializableFixedID
* @since GemFire 7.0
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
index 677db4d..ea0afe9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
@@ -15,13 +15,6 @@
package org.apache.geode.cache.client.internal.locator;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.process.PidUnavailableException;
-import org.apache.geode.internal.process.ProcessUtils;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -31,10 +24,17 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.process.PidUnavailableException;
+import org.apache.geode.internal.process.ProcessUtils;
+
/**
* The LocatorStatusResponse class...
* </p>
- *
+ *
* @see org.apache.geode.cache.client.internal.locator.ServerLocationResponse
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
index bc5e1d5..a1815db 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
@@ -14,18 +14,18 @@
*/
package org.apache.geode.cache.client.internal.locator.wan;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.admin.remote.DistributionLocatorId;
-
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.admin.remote.DistributionLocatorId;
+
/**
* A listener to handle membership when new locator is added to remote locator metadata. This
* listener is expected to inform all other locators in remote locator metadata about the new
* locator so that they can update their remote locator metadata.
- *
- *
+ *
+ *
*/
public interface LocatorMembershipListener {
@@ -38,7 +38,7 @@ public interface LocatorMembershipListener {
/**
* When the new locator is added to remote locator metadata, inform all other locators in remote
* locator metadata about the new locator so that they can update their remote locator metadata.
- *
+ *
* @param locator
*/
public void locatorJoined(int distributedSystemId, DistributionLocatorId locator,
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
index a624883..081c1d1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
@@ -15,8 +15,8 @@
package org.apache.geode.cache.client.internal.pooling;
import java.util.Set;
-
import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.geode.cache.client.AllConnectionsInUseException;
import org.apache.geode.cache.client.NoAvailableServersException;
import org.apache.geode.cache.client.internal.Connection;
@@ -25,7 +25,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* A pool for managing client to server connections. This interface allows connections to be checked
* out and checked in, and keeps the number of connections within the min and max boundaries.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -33,7 +33,7 @@ public interface ConnectionManager {
/**
* Borrow an existing idle connection or create a new one.
- *
+ *
* @param aquireTimeout The amount of time to wait for a connection to become available.
* @return A connection to use.
* @throws AllConnectionsInUseException If the maximum number of connections are already in use
@@ -52,21 +52,21 @@ public interface ConnectionManager {
* @throws AllConnectionsInUseException If the maximum number of connections are already in use
* and no connection becomes free within the aquireTimeout.
* @throws NoAvailableServersException if we can't connect to any server
- *
+ *
*/
Connection borrowConnection(ServerLocation server, long aquireTimeout, boolean onlyUseExistingCnx)
throws AllConnectionsInUseException, NoAvailableServersException;
/**
* Return a connection to the pool. The connection should not be used after it is returned.
- *
+ *
* @param connection the connection to return
*/
void returnConnection(Connection connection);
/**
* Return a connection to the pool. The connection should not be used after it is returned.
- *
+ *
* @param connection the connection to return
* @param accessed if true then the connection was accessed
*/
@@ -79,14 +79,14 @@ public interface ConnectionManager {
/**
* Shutdown the pool.
- *
+ *
* @param keepAlive whether to signal to servers to keep the connection alive
*/
void close(boolean keepAlive);
/**
* Exchange one connection for a new connection to a different server.
- *
+ *
* @param conn connection to exchange. It will be returned to the pool (or destroyed if it has
* been invalidated).
* @param excludedServers servers to exclude when looking for a new connection
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
index 44e7480..b2fb679 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.cache.client.internal.pooling;
+import java.net.SocketException;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
@@ -32,18 +40,11 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.net.SocketException;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
/**
* Manages client to server connections for the connection pool. This class contains all of the
* pooling logic to checkout/checkin connections.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -87,7 +88,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/**
* Create a connection manager
- *
+ *
* @param poolName the name of the pool that owns us
* @param factory the factory for new connections
* @param maxConnections The maximum number of connections that can exist
@@ -144,7 +145,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.pooling.ConnectionManager#borrowConnection(long)
*/
public Connection borrowConnection(long acquireTimeout)
@@ -458,7 +459,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.pooling.ConnectionManager#invalidateServer(org.apache.
* geode.distributed.internal.ServerLocation)
@@ -522,7 +523,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.pooling.ConnectionManager#returnConnection(org.apache.
* geode.cache.client.internal.Connection)
@@ -613,7 +614,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.client.internal.pooling.ConnectionManager#close(boolean, long)
*/
public void close(boolean keepAlive) {
@@ -881,7 +882,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/**
* Offer the replacement "con" to any cnx currently connected to "currentServer".
- *
+ *
* @return true if someone takes our offer; false if not
*/
private boolean offerReplacementConnection(Connection con, ServerLocation currentServer) {
@@ -927,7 +928,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
* at a time so this guy should block until this connection replaces an existing one. Note that if
* a connection is created here it must not count against the pool max and its idle time and
* lifetime must not begin until it actually replaces the existing one.
- *
+ *
* @param currentServer the server the candidate connection is connected to
* @param idlePossible true if we have more cnxs than minPoolSize
* @return true if caller should recheck for expired lifetimes; false if a background check was
@@ -1152,7 +1153,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
/**
* Returns a pooled connection that can have its underlying cnx to currentServer replaced by a
* new connection.
- *
+ *
* @return null if a target could not be found
*/
public synchronized PooledConnection findReplacementTarget(ServerLocation currentServer) {
@@ -1237,7 +1238,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
* See if any of the expired connections (that have not idle expired) are already connected to
* this sl and have not idle expired. If so then just update them in-place to simulate a
* replace.
- *
+ *
* @param sl the location of the server we should see if we are connected to
* @return true if we were able to extend an existing connection's lifetime or if we have no
* connection's whose lifetime has expired. false if we need to create a replacement
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/PooledConnection.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/PooledConnection.java
index bda458d..11413d1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/PooledConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/PooledConnection.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
/**
* A connection managed by the connection manager. Keeps track of the current state of the
* connection.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -128,7 +128,7 @@ class PooledConnection implements Connection {
/**
* Set the destroy bit if it is not already set.
- *
+ *
* @return true if we were able to set to bit; false if someone else already did
*/
public boolean setShouldDestroy() {
@@ -249,8 +249,8 @@ class PooledConnection implements Connection {
* If we were able to idle timeout this connection then return -1. If this connection has already
* been destroyed return 0. Otherwise return the amount of idle time he has remaining. If he is
* active we can't time him out now and a hint is returned as when we should check him next.
- *
- *
+ *
+ *
*/
public long doIdleTimeout(long now, long timeoutNanos) {
if (shouldDestroy())
diff --git a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
index d0537e4..0241abb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
@@ -19,7 +19,7 @@ import java.util.Set;
/**
* Factory for defining and starting a {@link RebalanceOperation}.
- *
+ *
* @since GemFire 6.0
*/
public interface RebalanceFactory {
@@ -27,7 +27,7 @@ public interface RebalanceFactory {
/**
* Specify which regions to include in the rebalance operation. The default, <code>null<code>,
* means all regions should be rebalanced. Includes take precedence over excludes.
- *
+ *
* @param regions A set containing the names of regions to include.
* @since GemFire 6.5
*/
@@ -36,7 +36,7 @@ public interface RebalanceFactory {
/**
* Exclude specific regions from the rebalancing operation. The default, <code>null<code>, means
* don't exclude any regions.
- *
+ *
* @param regions A set containing the names of regions to exclude.
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
index fd8297f..851ff55 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeoutException;
/**
* Operation for rebalancing resources used by the {@link org.apache.geode.cache.Cache}.
- *
+ *
* @since GemFire 6.0
*/
public interface RebalanceOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
index c33cc3d..fd267cf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.partition.PartitionRebalanceInfo;
/**
* The results of rebalancing <code>Cache</code> resources.
- *
+ *
* @since GemFire 6.0
*/
public interface RebalanceResults {
@@ -29,7 +29,7 @@ public interface RebalanceResults {
/**
* Returns a <code>Set</code> of detailed information about each partitioned region that was
* rebalanced.
- *
+ *
* @return a <code>Set</code> of detailed information about each partitioned region that was
* rebalanced
*/
@@ -37,14 +37,14 @@ public interface RebalanceResults {
/**
* Returns the total time, in milliseconds, that the rebalance operation took.
- *
+ *
* @return the total time, in milliseconds, that the rebalance operation took
*/
public long getTotalTime();
/**
* Returns the total number of buckets created during the rebalance operation.
- *
+ *
* @return the total number of buckets created during the rebalance operation
*/
public int getTotalBucketCreatesCompleted();
@@ -52,7 +52,7 @@ public interface RebalanceResults {
/**
* Returns the total size, in bytes, of all of the buckets that were created as part of the
* rebalance operation.
- *
+ *
* @return the total size, in bytes, of all of the buckets that were created as part of the
* rebalance operation
*/
@@ -60,42 +60,42 @@ public interface RebalanceResults {
/**
* Returns the total time, in milliseconds, taken to create buckets.
- *
+ *
* @return the total time, in milliseconds, taken to create buckets
*/
public long getTotalBucketCreateTime();
/**
* Returns the total number of buckets transferred.
- *
+ *
* @return the total number of buckets transferred
*/
public int getTotalBucketTransfersCompleted();
/**
* Returns the total size, in bytes, of buckets that were transferred.
- *
+ *
* @return the total size, in bytes, of buckets that were transferred
*/
public long getTotalBucketTransferBytes();
/**
* Returns the total amount of time, in milliseconds, it took to transfer buckets.
- *
+ *
* @return the total amount of time, in milliseconds, it took to transfer buckets
*/
public long getTotalBucketTransferTime();
/**
* Returns the total number of primaries that were transferred.
- *
+ *
* @return the total number of primaries that were transferred
*/
public int getTotalPrimaryTransfersCompleted();
/**
* Returns the total time, in milliseconds, spent transferring primaries.
- *
+ *
* @return the total time, in milliseconds, spent transferring primaries
*/
public long getTotalPrimaryTransferTime();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java b/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
index 37ebe5e..a3a6898 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
@@ -28,15 +28,15 @@ import org.apache.geode.cache.query.QueryService;
* Provides support for managing resources used by the local {@link org.apache.geode.cache.Cache}.
* <p>
* Re-balancing the GemFire Cache resources can be accomplished using a {@link RebalanceOperation}:
- *
+ *
* <pre>
* ResourceManager resourceManager = cache.getResourceManager();
* RebalanceOperation rebalanceOp = resourceManager.createRebalanceFactory().start();
* </pre>
- *
+ *
* Monitoring of heap utilization is enabled by setting the critical heap percentage using
* {@link #setCriticalHeapPercentage(float)}.
- *
+ *
* @since GemFire 6.0
*/
public interface ResourceManager {
@@ -44,7 +44,7 @@ public interface ResourceManager {
/**
* The default percent of heap memory at which the VM is considered in a critical state. Current
* value is <code>0.0</code>.
- *
+ *
* @see ResourceManager#setCriticalHeapPercentage(float)
* @see ResourceManager#getCriticalHeapPercentage()
*/
@@ -56,7 +56,7 @@ public interface ResourceManager {
* been set then it will default <code>80.0</code> unless the critical heap percentage has been
* set in which case it will default to a value <code>5.0</code> less than the critical heap
* percentage.
- *
+ *
* @see ResourceManager#setEvictionHeapPercentage(float)
* @see ResourceManager#getEvictionHeapPercentage()
*/
@@ -64,7 +64,7 @@ public interface ResourceManager {
/**
* Creates a factory for defining and starting {@link RebalanceOperation RebalanceOperations}.
- *
+ *
* @return a factory for defining and starting RebalanceOperations
*/
public RebalanceFactory createRebalanceFactory();
@@ -98,7 +98,7 @@ public interface ResourceManager {
* <p>
* Only one change to this attribute or the eviction heap percentage will be allowed at any given
* time and its effect will be fully realized before the next change is allowed.
- *
+ *
* When using this threshold, the VM must be launched with the <code>-Xmx</code> and
* <code>-Xms</code> switches set to the same values. Many virtual machine implementations have
* additional VM switches to control the behavior of the garbage collector. We suggest that you
@@ -108,13 +108,13 @@ public interface ResourceManager {
* <code>-XX:+UseConcMarkSweepGC</code> flag needs to be set, and
* <code>-XX:CMSInitiatingOccupancyFraction=N</code> should be set with N being a percentage that
* is less than the {@link ResourceManager} critical and eviction heap thresholds.
- *
+ *
* The JRockit VM has similar flags, <code>-Xgc:gencon</code> and <code>-XXgcTrigger:N</code>,
* which are required if using this feature. Please Note: the JRockit gcTrigger flag is based on
* heap free, not heap in use like the GemFire parameter. This means you need to set gcTrigger to
* 100-N. for example, if your eviction threshold is 30 percent, you will need to set gcTrigger to
* 70 percent.
- *
+ *
* On the IBM VM, the flag to get a similar collector is <code>-Xgcpolicy:gencon</code>, but there
* is no corollary to the gcTrigger/CMSInitiatingOccupancyFraction flags, so when using this
* feature with an IBM VM, the heap usage statistics might lag the true memory usage of the VM,
@@ -195,7 +195,7 @@ public interface ResourceManager {
* This feature requires additional VM flags to perform properly. See
* {@linkplain ResourceManager#setCriticalHeapPercentage(float) setCriticalHeapPercentage() for
* details.}
- *
+ *
* @param heapPercentage a percentage of the maximum tenured heap for the VM
* @throws IllegalStateException if the heapPercentage value is not >= 0 or <= 100 or when greater
* than the current critical heap percentage.
@@ -225,7 +225,7 @@ public interface ResourceManager {
* <p>
* Only one change to this attribute or critical off-heap percentage will be allowed at any given
* time and its effect will be fully realized before the next change is allowed.
- *
+ *
* @param offHeapPercentage a percentage of the maximum off-heap memory available
* @throws IllegalStateException if the offHeapPercentage value is not >= 0 or <= 100 or when
* greater than the current critical off-heap percentage.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java
index 92ba776..7df9b12 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java
@@ -18,9 +18,9 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Exception to indicate that Region is empty for data aware functions.
- *
+ *
* @since GemFire 6.5
- *
+ *
*/
public class EmptyRegionFunctionException extends FunctionException {
@@ -28,7 +28,7 @@ public class EmptyRegionFunctionException extends FunctionException {
/**
* Construct an instance of EmtpyRegionFunctionException
- *
+ *
* @param cause a Throwable cause of this exception
*/
public EmptyRegionFunctionException(Throwable cause) {
@@ -37,7 +37,7 @@ public class EmptyRegionFunctionException extends FunctionException {
/**
* Construct an instance of EmtpyRegionFunctionException
- *
+ *
* @param msg Exception message
*/
public EmptyRegionFunctionException(String msg) {
@@ -46,7 +46,7 @@ public class EmptyRegionFunctionException extends FunctionException {
/**
* Construct an instance of EmtpyRegionFunctionException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
index 5b97da9..b3efbcd 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
@@ -31,7 +31,7 @@ import org.apache.geode.cache.LowMemoryException;
* @param <AGG> The type of the aggregated result returned by the ResultCollector
*
* @since GemFire 6.0
- *
+ *
* @see FunctionService
* @see Function
*/
@@ -43,7 +43,7 @@ public interface Execution<IN, OUT, AGG> {
* <p>
* Applicable only for regions with {@link DataPolicy#PARTITION} DataPolicy. If the filter is
* null, it will execute on all data of the region.
- *
+ *
* @param filter Set defining the data filter to be used for executing the function
* @return an Execution with the filter
* @throws IllegalArgumentException if filter passed is null.
@@ -56,12 +56,12 @@ public interface Execution<IN, OUT, AGG> {
/**
* Specifies the user data passed to the function when it is executed. The function can retrieve
* these arguments using {@link FunctionContext#getArguments()}
- *
+ *
* @param args user data passed to the function execution
* @return an Execution with args
* @throws IllegalArgumentException if the input parameter is null
* @since Geode 1.2
- *
+ *
*/
public Execution<IN, OUT, AGG> setArguments(IN args);
@@ -82,7 +82,7 @@ public interface Execution<IN, OUT, AGG> {
* Specifies the {@link ResultCollector} that will receive the results after the function has been
* executed. Collector will receive results as they are sent from the
* {@link Function#execute(FunctionContext)} using {@link ResultSender}.
- *
+ *
* @return an Execution with a collector
* @throws IllegalArgumentException if {@link ResultCollector} is null
* @see ResultCollector
@@ -101,7 +101,7 @@ public interface Execution<IN, OUT, AGG> {
* @return ResultCollector to retrieve the results received. This is different object than the
* ResultCollector provided in {@link Execution#withCollector(ResultCollector)}. User has
* to use this reference to retrieve results.
- *
+ *
* @since GemFire 6.0
*/
public ResultCollector<OUT, AGG> execute(String functionId) throws FunctionException;
@@ -111,14 +111,14 @@ public interface Execution<IN, OUT, AGG> {
* <p>
* {@link Function#execute(FunctionContext)} is called on the de-serialized instance on the
* executing member.
- *
+ *
* @param function instance to execute
* @throws LowMemoryException if the {@link Function#optimizeForWrite()} returns true and there is
* a low memory condition
* @return ResultCollector to retrieve the results received. This is different object than the
* ResultCollector provided in {@link Execution#withCollector(ResultCollector)}. User has
* to use this reference to retrieve results.
- *
+ *
* @since GemFire 6.0
*/
public ResultCollector<OUT, AGG> execute(Function function) throws FunctionException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
index 3a48919..1d89fa0 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
@@ -35,7 +35,7 @@ import org.apache.geode.security.ResourcePermission;
* {@link FunctionService#registerFunction(Function)} or the cache.xml <code>function</code>
* element.
* </p>
- *
+ *
* @since GemFire 6.0
*/
@FunctionalInterface
@@ -52,7 +52,7 @@ public interface Function<T> extends Identifiable<String> {
* If {@link Function#hasResult()} returns true, {@link ResultCollector#getResult()} blocks and
* waits for the result of function execution
* </p>
- *
+ *
* @return whether this function returns a Result back to the caller.
* @since GemFire 6.0
*/
@@ -66,7 +66,7 @@ public interface Function<T> extends Identifiable<String> {
* provided to this function is the one which was built using {@linkplain Execution}. The contexts
* can be data dependent or data-independent so user should check to see if the context provided
* in parameter is instance of {@link RegionFunctionContext}.
- *
+ *
* @param context as created by {@link Execution}
* @since GemFire 6.0
*/
@@ -74,7 +74,7 @@ public interface Function<T> extends Identifiable<String> {
/**
* Return a unique function identifier, used to register the function with {@link FunctionService}
- *
+ *
* @return string identifying this function
* @since GemFire 6.0
*/
@@ -99,7 +99,7 @@ public interface Function<T> extends Identifiable<String> {
* This method is only consulted when Region passed to
* FunctionService#onRegion(org.apache.geode.cache.Region) is a partitioned region
* </p>
- *
+ *
* @return false if the function is read only, otherwise returns true
* @see FunctionService
* @since GemFire 6.0
@@ -110,7 +110,7 @@ public interface Function<T> extends Identifiable<String> {
/**
* Specifies whether the function is eligible for re-execution (in case of failure).
- *
+ *
* @return whether the function is eligible for re-execution.
* @see RegionFunctionContext#isPossibleDuplicate()
* @since GemFire 6.5
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionAdapter.java
index 7c8350f..e10664e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionAdapter.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.execute;
/**
* Application developers can extend this class instead of implementing the {@link Function}
* interface.
- *
+ *
* <p>
* This implementation provides the following defaults
* </p>
@@ -27,12 +27,12 @@ package org.apache.geode.cache.execute;
* <li>{@link Function#isHA()} returns true</li>
* </ol>
* </p>
- *
+ *
* @since GemFire 6.0
* @see Function
* @deprecated Use {@link Function} instead. Function has default methods that now mimic the
* behavior of FunctionAdapter.
- *
+ *
*/
public abstract class FunctionAdapter implements Function {
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
index 7901620..b4a357f 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
@@ -36,7 +36,7 @@ public interface FunctionContext<T1> {
/**
* Returns the arguments provided to this function execution. These are the arguments specified by
* the caller using {@link Execution#setArguments(Object)}
- *
+ *
* @return the arguments or null if there are no arguments
* @since GemFire 6.0
*/
@@ -44,7 +44,7 @@ public interface FunctionContext<T1> {
/**
* Returns the identifier of the function.
- *
+ *
* @return a unique identifier
* @see Function#getId()
* @since GemFire 6.0
@@ -58,7 +58,7 @@ public interface FunctionContext<T1> {
*
* The returned ResultSender is only valid for the duration of the function call. If the Function
* needs to return a result, the result should be sent before the function exits.
- *
+ *
* @return ResultSender
* @since GemFire 6.0
*/
@@ -68,9 +68,9 @@ public interface FunctionContext<T1> {
/**
* Returns a boolean to identify whether this is a re-execute. Returns true if it is a re-execute
* else returns false
- *
+ *
* @return a boolean (true) to identify whether it is a re-execute (else false)
- *
+ *
* @since GemFire 6.5
* @see Function#isHA()
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
index 54b4427..0feb2ac 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
@@ -48,14 +48,14 @@ public class FunctionException extends GemFireException {
/**
* Creates new function exception with given error message.
- *
+ *
* @since GemFire 6.5
*/
public FunctionException() {}
/**
* Creates new function exception with given error message.
- *
+ *
* @param msg
* @since GemFire 6.0
*/
@@ -65,7 +65,7 @@ public class FunctionException extends GemFireException {
/**
* Creates new function exception with given error message and optional nested exception.
- *
+ *
* @param msg
* @param cause
* @since GemFire 6.0
@@ -76,7 +76,7 @@ public class FunctionException extends GemFireException {
/**
* Creates new function exception given throwable as a cause and source of error message.
- *
+ *
* @param cause
* @since GemFire 6.0
*/
@@ -86,7 +86,7 @@ public class FunctionException extends GemFireException {
/**
* Adds exceptions thrown from different nodes to a ds
- *
+ *
* @param cause
* @since GemFire 6.5
*/
@@ -97,7 +97,7 @@ public class FunctionException extends GemFireException {
/**
* Returns the list of exceptions thrown from different nodes
- *
+ *
* @since GemFire 6.5
*/
public List<Throwable> getExceptions() {
@@ -109,7 +109,7 @@ public class FunctionException extends GemFireException {
/**
* Adds the list of exceptions provided
- *
+ *
* @since GemFire 6.5
*/
public void addExceptions(Collection<? extends Throwable> ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionInvocationTargetException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionInvocationTargetException.java
index 7f05cd1..9034111 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionInvocationTargetException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionInvocationTargetException.java
@@ -20,9 +20,9 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Thrown if one of the function execution nodes goes away or cache is closed. Function needs to be
* re-executed if the {@link FunctionException#getCause()} is FunctionInvocationTargetException.
- *
+ *
* @since GemFire 6.0
- *
+ *
*/
public class FunctionInvocationTargetException extends FunctionException {
@@ -32,7 +32,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param cause a Throwable cause of this exception
*/
public FunctionInvocationTargetException(Throwable cause) {
@@ -41,11 +41,11 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param id the DistributedMember id of the source
* @since GemFire 6.5
- *
+ *
*/
public FunctionInvocationTargetException(String msg, DistributedMember id) {
super(msg);
@@ -54,7 +54,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param msg Exception message
*/
public FunctionInvocationTargetException(String msg) {
@@ -63,7 +63,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -73,7 +73,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Method to get the member id of the Exception
- *
+ *
* @return DistributedMember id
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
index 8489275..40ed42e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* Function execution provides a means to route application behaviour to {@linkplain Region data} or
* more generically to peers in a {@link DistributedSystem} or servers in a {@link Pool}.
* </p>
- *
+ *
* @since GemFire 6.0
*/
public class FunctionService {
@@ -52,14 +52,14 @@ public class FunctionService {
* Depending on the filters setup on the {@link Execution}, the function is executed on all
* GemFire members that define the data region, or a subset of members.
* {@link Execution#withFilter(Set)}).
- *
+ *
* For DistributedRegions with DataPolicy.NORMAL, it throws UnsupportedOperationException. For
* DistributedRegions with DataPolicy.EMPTY, execute the function on any random member which has
* DataPolicy.REPLICATE <br>
* . For DistributedRegions with DataPolicy.REPLICATE, execute the function locally. For Regions
* with DataPolicy.PARTITION, it executes on members where the data resides as specified by the
* filter.
- *
+ *
* @param region
* @return Execution
* @throws FunctionException if the region passed in is null
@@ -75,7 +75,7 @@ public class FunctionService {
* <p>
* If the server goes down while dispatching or executing the function, an Exception will be
* thrown.
- *
+ *
* @param pool from which to chose a server for execution
* @return Execution
* @throws FunctionException if Pool instance passed in is null
@@ -89,7 +89,7 @@ public class FunctionService {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* all the servers in the provided {@link Pool}. If one of the servers goes down while dispatching
* or executing the function on the server, an Exception will be thrown.
- *
+ *
* @param pool the set of servers to execute the function
* @return Execution
* @throws FunctionException if Pool instance passed in is null
@@ -105,7 +105,7 @@ public class FunctionService {
* <p>
* If the server goes down while dispatching or executing the function, an Exception will be
* thrown.
- *
+ *
* @param regionService obtained from {@link ClientCacheFactory#create} or
* {@link ClientCache#createAuthenticatedView(Properties)}.
* @return Execution
@@ -121,7 +121,7 @@ public class FunctionService {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* all the servers that the given cache is connected to. If one of the servers goes down while
* dispatching or executing the function on the server, an Exception will be thrown.
- *
+ *
* @param regionService obtained from {@link ClientCacheFactory#create} or
* {@link ClientCache#createAuthenticatedView(Properties)}.
* @return Execution
@@ -138,12 +138,12 @@ public class FunctionService {
* a {@link DistributedMember}. If the member is not found, executing the function will throw an
* Exception. If the member goes down while dispatching or executing the function on the member,
* an Exception will be thrown.
- *
+ *
* @param distributedMember defines a member in the distributed system
* @return Execution
* @throws FunctionException if distributedMember is null
* @since GemFire 7.0
- *
+ *
*/
public static Execution onMember(DistributedMember distributedMember) {
return functionSvcMgr.onMember(getDistributedSystem(), distributedMember);
@@ -156,12 +156,12 @@ public class FunctionService {
* <p>
* If one of the members goes down while dispatching or executing the function on the member, an
* Exception will be thrown.
- *
+ *
* @param groups optional list of GemFire configuration property "groups" (see
* <a href="../../distributed/DistributedSystem.html#groups"> <code>groups</code></a>) on
* which to execute the function. Function will be executed on all members of each group
* @return Execution
- *
+ *
* @throws FunctionException if no members are found belonging to the provided groups
* @since GemFire 7.0
*/
@@ -173,7 +173,7 @@ public class FunctionService {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* the set of {@link DistributedMember}s. If one of the members goes down while dispatching or
* executing the function, an Exception will be thrown.
- *
+ *
* @param distributedMembers set of distributed members on which {@link Function} to be executed
* @throws FunctionException if distributedMembers is null
* @since GemFire 7.0
@@ -185,11 +185,11 @@ public class FunctionService {
/**
* Returns an {@link Execution} object that can be used to execute a data independent function on
* one member of each group provided.
- *
+ *
* @param groups list of GemFire configuration property "groups" (see
* <a href="../../distributed/DistributedSystem.html#groups"> <code>groups</code></a>) on
* which to execute the function. Function will be executed on one member of each group
- *
+ *
* @return Execution
* @throws FunctionException if no members are found belonging to the provided groups
* @since GemFire 7.0
@@ -201,7 +201,7 @@ public class FunctionService {
/**
* Returns the {@link Function} defined by the functionId, returns null if no function is found
* for the specified functionId
- *
+ *
* @param functionId
* @return Function
* @throws FunctionException if functionID passed is null
@@ -219,7 +219,7 @@ public class FunctionService {
* {@link Execution#execute(String)}. Every member that could execute a function using its
* {@link Function#getId()} should register the function.
* </p>
- *
+ *
* @throws FunctionException if function instance passed is null or Function.getId() returns null
* @since GemFire 6.0
*/
@@ -231,7 +231,7 @@ public class FunctionService {
* Unregisters the given {@link Function} with the {@link FunctionService} using
* {@link Function#getId()}.
* <p>
- *
+ *
* @throws FunctionException if function instance passed is null or Function.getId() returns null
* @since GemFire 6.0
*/
@@ -241,7 +241,7 @@ public class FunctionService {
/**
* Returns true if the function is registered to FunctionService
- *
+ *
* @throws FunctionException if function instance passed is null or Function.getId() returns null
* @since GemFire 6.0
*/
@@ -252,7 +252,7 @@ public class FunctionService {
/**
* Returns all locally registered functions
- *
+ *
* @return A view of registered functions as a Map of {@link Function#getId()} to {@link Function}
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java b/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
index 5bf7cd9..3a93379 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
/**
* Defines the execution context of a data dependent {@link Function}.
- *
+ *
* Applications can use the methods provided to retrieve the Region and context specific routing
* objects. When the function is executed using {@link FunctionService#onRegion(Region)}, the
* {@link Function#execute(FunctionContext) FunctionContext} can be typecast to this type.
@@ -31,10 +31,10 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
* If the region is a partitioned region, {@link PartitionRegionHelper} can be used to get local and
* {@linkplain PartitionAttributesFactory#setColocatedWith(String) colocated} data references.
* </p>
- *
- *
+ *
+ *
* @since GemFire 6.0
- *
+ *
* @see FunctionContext
* @see PartitionRegionHelper
*/
@@ -43,9 +43,9 @@ public interface RegionFunctionContext extends FunctionContext {
/**
* Returns subset of keys (filter) provided by the invoking thread (aka routing objects). The set
* of filter keys are locally present in the datastore on the executing cluster member.
- *
+ *
* @see Execution#withFilter(Set)
- *
+ *
* @return the objects that caused the function to be routed to this cluster member
* @since GemFire 6.0
*/
@@ -53,11 +53,11 @@ public interface RegionFunctionContext extends FunctionContext {
/**
* Returns the reference to the Region on which the function is executed
- *
+ *
* @see FunctionService#onRegion(Region)
- *
+ *
* @return returns the Region on which the function is executed
- *
+ *
* @since GemFire 6.0
*/
public <K, V> Region<K, V> getDataSet();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
index 605d4f1..b896f0c 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
@@ -27,12 +27,12 @@ import org.apache.geode.distributed.DistributedMember;
* to the result using a custom ResultCollector. Results arrive as they are sent using the
* {@link ResultSender#sendResult(Object)} and can be used as they arrive. To indicate that all
* results have been received {@link #endResults()} is called.
- *
+ *
* </p>
* Example: <br>
- *
+ *
* <pre>
- * Region region ;
+ * Region region ;
* Set keySet = Collections.singleton("myKey");
* Function multiGetFunction ;
* Object args ;
@@ -43,19 +43,19 @@ import org.apache.geode.distributed.DistributedMember;
* .execute(multiGetFunction.getId());
* Application can do something else here before retrieving the result
* Or it can have some logic in {{@link #addResult(DistributedMember, Object)} to use the partial results.
- * If it wants to see all the results it can use
+ * If it wants to see all the results it can use
* Object functionResult = rc.getResult();
* or
* Object functionResult = rc.getResult(timeout,TimeUnit);
* depending on if it wants to wait for all the results or wait for a timeout period.
* </pre>
- *
+ *
* GemFire provides default implementation of ResultCollector which collects results in Arraylist.
* There is no need to provide a synchronization mechanism in the user implementations of
* ResultCollector
- *
+ *
* @since GemFire 6.0
- *
+ *
*/
public interface ResultCollector<T, S> {
@@ -63,7 +63,7 @@ public interface ResultCollector<T, S> {
* Method used to pull results from the ResultCollector. It returns the result of function
* execution, potentially blocking until {@link #endResults() all the results are available} has
* been called.
- *
+ *
* @return the result
* @throws FunctionException if result retrieval fails
* @since GemFire 6.0
@@ -74,21 +74,21 @@ public interface ResultCollector<T, S> {
* Method used to pull results from the ResultCollector. It returns the result of function
* execution, blocking for the timeout period until {@link #endResults() all the results are
* available}. If all the results are not received in provided time a FunctionException is thrown.
- *
+ *
* @param timeout the maximum time to wait
* @param unit the time unit of the timeout argument
* @return the result
* @throws FunctionException if result retrieval fails within timeout provided
* @throws InterruptedException if the current thread was interrupted while waiting
* @since GemFire 6.0
- *
+ *
*/
public S getResult(long timeout, TimeUnit unit) throws FunctionException, InterruptedException;
/**
* Method used to feed result to the ResultCollector. It adds a single function execution result
* to the ResultCollector It is invoked every time a result is sent using ResultSender.
- *
+ *
* @param resultOfSingleExecution
* @since GemFire 6.0
* @param memberID DistributedMember ID to which result belongs
@@ -101,9 +101,9 @@ public interface ResultCollector<T, S> {
* ResultCollector} Unless the {@link ResultCollector} has received
* {@link ResultSender#lastResult(Object) last result} from all the executing nodes, it keeps
* waiting for more results to come.
- *
+ *
* @since GemFire 6.0
- *
+ *
* @see ResultSender#lastResult(Object)
*/
public void endResults();
@@ -111,7 +111,7 @@ public interface ResultCollector<T, S> {
/**
* GemFire will invoke this method before re-executing function (in case of Function Execution
* HA). This is to clear the previous execution results from the result collector
- *
+ *
* @since GemFire 6.5
*/
public void clearResults();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
index 5d33bd1..fec1f90 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
@@ -21,12 +21,12 @@ package org.apache.geode.cache.execute;
* each piece back to the calling thread's {@link ResultCollector}. For each result sent using this
* method, {@link ResultCollector#addResult(org.apache.geode.distributed.DistributedMember, Object)}
* is called, making that result available to the calling thread immediately.
- *
+ *
* <p>
* Example:
- *
+ *
* <pre>
- *
+ *
* execute(FunctionContext context){
* ResultSender rs = context.getResultSender();
* int lastResult = -1;
@@ -35,24 +35,24 @@ package org.apache.geode.cache.execute;
* }
* rs.lastResult(lastResult);
* }
- *
+ *
* Application can receive the results as they are sent using ResultSender in the above for loop.
* It is very important to send a last result as it informs {@link ResultCollector}
* to stop waiting for the result.
* <br>
* </pre>
- *
- *
+ *
+ *
* @since GemFire 6.0
- *
+ *
* @see ResultCollector#addResult(org.apache.geode.distributed.DistributedMember, Object)
- *
+ *
*/
public interface ResultSender<T> {
/**
* Sends a result back to the FunctionService calling thread and invokes
* {@link ResultCollector#addResult(org.apache.geode.distributed.DistributedMember, Object)}.
- *
+ *
* @param oneResult
*/
public void sendResult(T oneResult);
@@ -63,9 +63,9 @@ public interface ResultSender<T> {
* then {@link ResultCollector#endResults()} if it is the last instance of the Function to report
* results. The ResultCollector will keep waiting for results until it receives last result.
* Therefore, it is very important to use this method to indicate end of function execution.
- *
+ *
* @throws IllegalStateException if called more than once
- *
+ *
* @see ResultCollector#endResults()
*/
public void lastResult(T lastResult);
@@ -75,9 +75,9 @@ public interface ResultSender<T> {
* ResultCollector as a result. If sendException is called then {@link ResultCollector#getResult}
* will not throw exception but will have exception as a part of results received. Calling
* sendException will act as a lastResult.
- *
+ *
* @param t
- *
+ *
* @see #lastResult(Object)
* @since GemFire 6.3
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/internal/FunctionServiceManager.java b/geode-core/src/main/java/org/apache/geode/cache/execute/internal/FunctionServiceManager.java
index f6573a7..39e58ad 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/internal/FunctionServiceManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/internal/FunctionServiceManager.java
@@ -58,10 +58,10 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* Function execution provides a means to route application behaviour to {@linkplain Region data} or
* more generically to peers in a {@link DistributedSystem} or servers in a {@link Pool}.
* </p>
- *
+ *
* While {@link FunctionService} is a customer facing interface to this functionality, all of the
* work is done here. In addition, internal only functionality is exposed in this class.
- *
+ *
* @since GemFire 7.0
*/
public class FunctionServiceManager {
@@ -87,14 +87,14 @@ public class FunctionServiceManager {
* Depending on the filters setup on the {@link Execution}, the function is executed on all
* GemFire members that define the data region, or a subset of members.
* {@link Execution#withFilter(Set)}).
- *
+ *
* For DistributedRegions with DataPolicy.NORMAL, it throws UnsupportedOperationException. For
* DistributedRegions with DataPolicy.EMPTY, execute the function on any random member which has
* DataPolicy.REPLICATE <br>
* . For DistributedRegions with DataPolicy.REPLICATE, execute the function locally. For Regions
* with DataPolicy.PARTITION, it executes on members where the data resides as specified by the
* filter.
- *
+ *
* @return Execution
* @throws FunctionException if the region passed in is null
* @since GemFire 6.0
@@ -135,7 +135,7 @@ public class FunctionServiceManager {
* <p>
* If the server goes down while dispatching or executing the function, an Exception will be
* thrown.
- *
+ *
* @param pool from which to chose a server for execution
* @return Execution
* @throws FunctionException if Pool instance passed in is null
@@ -158,7 +158,7 @@ public class FunctionServiceManager {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* all the servers in the provided {@link Pool}. If one of the servers goes down while dispatching
* or executing the function on the server, an Exception will be thrown.
- *
+ *
* @param pool the set of servers to execute the function
* @return Execution
* @throws FunctionException if Pool instance passed in is null
@@ -183,7 +183,7 @@ public class FunctionServiceManager {
* <p>
* If the server goes down while dispatching or executing the function, an Exception will be
* thrown.
- *
+ *
* @param regionService obtained from {@link ClientCacheFactory#create} or
* {@link ClientCache#createAuthenticatedView(Properties)} .
* @return Execution
@@ -216,7 +216,7 @@ public class FunctionServiceManager {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* all the servers that the given cache is connected to. If one of the servers goes down while
* dispatching or executing the function on the server, an Exception will be thrown.
- *
+ *
* @param regionService obtained from {@link ClientCacheFactory#create} or
* {@link ClientCache#createAuthenticatedView(Properties)} .
* @return Execution
@@ -250,13 +250,13 @@ public class FunctionServiceManager {
* a {@link DistributedMember} of the {@link DistributedSystem}. If the member is not found in the
* system, the function execution will throw an Exception. If the member goes down while
* dispatching or executing the function on the member, an Exception will be thrown.
- *
+ *
* @param system defines the distributed system
* @param distributedMember defines a member in the distributed system
* @return Execution
* @throws FunctionException if either input parameter is null
* @since GemFire 6.0
- *
+ *
*/
public Execution onMember(DistributedSystem system, DistributedMember distributedMember) {
if (system == null) {
@@ -274,10 +274,10 @@ public class FunctionServiceManager {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* all members of the {@link DistributedSystem}. If one of the members goes down while dispatching
* or executing the function on the member, an Exception will be thrown.
- *
+ *
* @param system defines the distributed system
* @return Execution
- *
+ *
* @throws FunctionException if DistributedSystem instance passed is null
* @since GemFire 6.0
*/
@@ -304,7 +304,7 @@ public class FunctionServiceManager {
* Returns an {@link Execution} object that can be used to execute a data independent function on
* the set of {@link DistributedMember}s of the {@link DistributedSystem}. If one of the members
* goes down while dispatching or executing the function, an Exception will be thrown.
- *
+ *
* @param system defines the distributed system
* @param distributedMembers set of distributed members on which {@link Function} to be executed
* @throws FunctionException if DistributedSystem instance passed is null
@@ -325,7 +325,7 @@ public class FunctionServiceManager {
/**
* Returns the {@link Function} defined by the functionId, returns null if no function is found
* for the specified functionId
- *
+ *
* @return Function
* @throws FunctionException if functionID passed is null
* @since GemFire 6.0
@@ -346,7 +346,7 @@ public class FunctionServiceManager {
* {@link Execution#execute(String)}. Every member that could execute a function using its
* {@link Function#getId()} should register the function.
* </p>
- *
+ *
* @throws FunctionException if function instance passed is null or Function.getId() returns null
* @since GemFire 6.0
*/
@@ -371,7 +371,7 @@ public class FunctionServiceManager {
* Unregisters the given {@link Function} with the {@link FunctionService} using
* {@link Function#getId()}.
* <p>
- *
+ *
* @throws FunctionException if function instance passed is null or Function.getId() returns null
* @since GemFire 6.0
*/
@@ -385,7 +385,7 @@ public class FunctionServiceManager {
/**
* Returns true if the function is registered to FunctionService
- *
+ *
* @throws FunctionException if function instance passed is null or Function.getId() returns null
* @since GemFire 6.0
*/
@@ -399,7 +399,7 @@ public class FunctionServiceManager {
/**
* Returns all locally registered functions
- *
+ *
* @return A view of registered functions as a Map of {@link Function#getId()} to {@link Function}
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/CloseCQOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/CloseCQOperationContext.java
index e3fd1d8..095a026 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/CloseCQOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/CloseCQOperationContext.java
@@ -20,7 +20,7 @@ import java.util.Set;
/**
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#CLOSE_CQ}
* operation for the pre-operation case.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class CloseCQOperationContext extends ExecuteCQOperationContext {
/**
* Constructor for the CLOSE_CQ operation.
- *
+ *
* @param cqName the name of the continuous query being closed
* @param queryString the query string for this operation
* @param regionNames names of regions that are part of the query string
@@ -39,7 +39,7 @@ public class CloseCQOperationContext extends ExecuteCQOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.CLOSE_CQ</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/DestroyOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/DestroyOperationContext.java
index abdf3bc..fe1f214 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/DestroyOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/DestroyOperationContext.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#DESTROY}
* region operation having the key object for both the pre-operation case and for post-operation
* updates.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class DestroyOperationContext extends KeyOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
*/
public DestroyOperationContext(Object key) {
@@ -37,7 +37,7 @@ public class DestroyOperationContext extends KeyOperationContext {
/**
* Constructor for the operation to use for post-operation in updates.
- *
+ *
* @param key the key for this operation
* @param postOperation true to set the post-operation flag
*/
@@ -47,7 +47,7 @@ public class DestroyOperationContext extends KeyOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.DESTROY</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteCQOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteCQOperationContext.java
index fe0ccc0..5bc7c88 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteCQOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteCQOperationContext.java
@@ -20,7 +20,7 @@ import java.util.Set;
/**
* Encapsulates a continuous query registeration operation for both the pre-operation and
* post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -31,7 +31,7 @@ public class ExecuteCQOperationContext extends QueryOperationContext {
/**
* Constructor for the EXECUTE_CQ operation.
- *
+ *
* @param cqName the name of the continuous query being registered
* @param queryString the query string for this operation
* @param regionNames names of regions that are part of the query string
@@ -45,7 +45,7 @@ public class ExecuteCQOperationContext extends QueryOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return the <code>OperationCode</code> of this operation
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteFunctionOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteFunctionOperationContext.java
index 656a2a7..becdc5d 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteFunctionOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/ExecuteFunctionOperationContext.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* OperationContext for Function execution operation. This is for the pre-operation case
- *
+ *
* @since GemFire 6.0
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/GetDurableCQsOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/GetDurableCQsOperationContext.java
index 5683c40..93a72b2 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/GetDurableCQsOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/GetDurableCQsOperationContext.java
@@ -19,7 +19,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#GET_DURABLE_CQS}
* operation for the pre-operation case.
- *
+ *
* @since GemFire 7.0
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -27,8 +27,8 @@ public class GetDurableCQsOperationContext extends OperationContext {
/**
* Constructor for the GET_DURABLE_CQS operation.
- *
- *
+ *
+ *
*/
public GetDurableCQsOperationContext() {
super();
@@ -36,7 +36,7 @@ public class GetDurableCQsOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.GET_DURABLE_CQS</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/GetOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/GetOperationContext.java
index 5d3b393..c8dfc50 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/GetOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/GetOperationContext.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#GET}
* region operation having the key object for the pre-operation case and both key, value objects for
* the post-operation case.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class GetOperationContext extends KeyValueOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param postOperation true if the context is for the post-operation case
*/
@@ -38,7 +38,7 @@ public class GetOperationContext extends KeyValueOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.GET</code>.
*/
@Override
@@ -56,7 +56,7 @@ public class GetOperationContext extends KeyValueOperationContext {
/**
* Get the value of this get operation.
- *
+ *
* @return the result of get operation; null when the result is a serialized value in which case
* user should invoke {@link #getSerializedValue()} or {@link #getDeserializedValue()}.
*/
@@ -70,7 +70,7 @@ public class GetOperationContext extends KeyValueOperationContext {
/**
* Set the result value of the object for this operation.
- *
+ *
* @param value the result of this operation; can be a serialized byte array or a deserialized
* object
* @param isObject true when the value is an object (either serialized or deserialized); false
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/InterestOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/InterestOperationContext.java
index 5317194..2a14d6e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/InterestOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/InterestOperationContext.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache.operations;
/**
* Encapsulates registration/unregistration of interest in a region.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -51,7 +51,7 @@ public abstract class InterestOperationContext extends OperationContext {
/**
* Get the key for this register/unregister interest operation.
- *
+ *
* @return the key to be registered/unregistered.
*/
public Object getKey() {
@@ -60,7 +60,7 @@ public abstract class InterestOperationContext extends OperationContext {
/**
* Set the key for this register/unregister interest operation.
- *
+ *
* @param key the new key
*/
public void setKey(Object key) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/InterestType.java b/geode-core/src/main/java/org/apache/geode/cache/operations/InterestType.java
index 2cc99af..1097857 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/InterestType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/InterestType.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.operations;
/**
* Enumeration for various interest types supported by GemFire.
- *
+ *
* @since GemFire 5.5
*/
public final class InterestType {
@@ -128,7 +128,7 @@ public final class InterestType {
/**
* Returns the ordinal for this interest type.
- *
+ *
* @return the ordinal of this interest type.
*/
public byte toOrdinal() {
@@ -137,7 +137,7 @@ public final class InterestType {
/**
* Returns a string representation for this interest type.
- *
+ *
* @return the name of this interest type.
*/
@Override // GemStoneAddition
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/InvalidateOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/InvalidateOperationContext.java
index 3bbc07b..1a2b400 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/InvalidateOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/InvalidateOperationContext.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#INVALIDATE} region
* operation having the key object for both the pre-operation case and for post-operation updates.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class InvalidateOperationContext extends KeyOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
*/
public InvalidateOperationContext(Object key) {
@@ -37,7 +37,7 @@ public class InvalidateOperationContext extends KeyOperationContext {
/**
* Constructor for the operation to use for post-operation in updates.
- *
+ *
* @param key the key for this operation
* @param isPostOperation true if the context is at the time of sending updates
*/
@@ -47,7 +47,7 @@ public class InvalidateOperationContext extends KeyOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.INVALIDATE</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/KeyOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/KeyOperationContext.java
index e0d7ee8..0773b7f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/KeyOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/KeyOperationContext.java
@@ -21,7 +21,7 @@ package org.apache.geode.cache.operations;
* operations this class encapsulates are
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#DESTROY} and
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#CONTAINS_KEY}.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -38,7 +38,7 @@ public abstract class KeyOperationContext extends OperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
*/
public KeyOperationContext(Object key) {
@@ -49,7 +49,7 @@ public abstract class KeyOperationContext extends OperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param postOperation true to set the post-operation flag
*/
@@ -61,7 +61,7 @@ public abstract class KeyOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return The <code>OperationCode</code> of this operation. This is one of
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#DESTROY} or
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#CONTAINS_KEY}
@@ -90,7 +90,7 @@ public abstract class KeyOperationContext extends OperationContext {
/**
* Get the key object for this operation.
- *
+ *
* @return the key object for this operation.
*/
public Object getKey() {
@@ -99,7 +99,7 @@ public abstract class KeyOperationContext extends OperationContext {
/**
* Get the callback argument object for this operation.
- *
+ *
* @return the callback argument object for this operation.
*/
public Object getCallbackArg() {
@@ -108,7 +108,7 @@ public abstract class KeyOperationContext extends OperationContext {
/**
* Set the callback argument object for this operation.
- *
+ *
* @param callbackArg the callback argument object for this operation.
*/
public void setCallbackArg(Object callbackArg) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/KeySetOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/KeySetOperationContext.java
index 88df329..8c56902 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/KeySetOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/KeySetOperationContext.java
@@ -15,14 +15,14 @@
package org.apache.geode.cache.operations;
-import org.apache.geode.cache.Region;
-
import java.util.Set;
+import org.apache.geode.cache.Region;
+
/**
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#KEY_SET}
* operation for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -36,7 +36,7 @@ public class KeySetOperationContext extends OperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param postOperation true to set the post-operation flag
*/
public KeySetOperationContext(boolean postOperation) {
@@ -45,7 +45,7 @@ public class KeySetOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.KEY_SET</code>.
*/
@Override
@@ -70,7 +70,7 @@ public class KeySetOperationContext extends OperationContext {
/**
* Get the set of keys returned as a result of {@link Region#keySet} operation.
- *
+ *
* @return the set of keys
*/
public Set getKeySet() {
@@ -79,7 +79,7 @@ public class KeySetOperationContext extends OperationContext {
/**
* Set the keys to be returned as the result of {@link Region#keySet} operation.
- *
+ *
* @param keySet the set of keys to be returned for this operation.
*/
public void setKeySet(Set keySet) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/KeyValueOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/KeyValueOperationContext.java
index 23eea77..031507e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/KeyValueOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/KeyValueOperationContext.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.cache.EntryEventImpl;
/**
* Encapsulates a region operation that requires both key and serialized value for the pre-operation
* and post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -31,7 +31,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* The value of the create/update operation.
- *
+ *
* @since GemFire 6.5
*/
private Object value;
@@ -43,7 +43,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param value the value for this operation
* @param isObject true when the value is an object; false when it is a raw byte array
@@ -58,7 +58,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param value the value for this operation
* @param isObject true when the value is an object; false when it is a raw byte array
@@ -75,7 +75,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* Get the serialized value for this operation.
- *
+ *
* @return the serialized value for this operation or null if the value is not serialized
*/
public byte[] getSerializedValue() {
@@ -92,7 +92,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
* Get the deserialized value for this operation. Note that if the value is serialized this method
* will attempt to deserialize it. If PDX read-serialized is set to true and the value was
* serialized with PDX then this method will return a PdxInstance.
- *
+ *
* @return the deserialized value for this operation
* @throws SerializationException if deserialization of the value fails
* @since Geode 1.0
@@ -111,7 +111,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
* contains serialized bytes or is the deserialized value call {@link #isObject()}. If you need to
* deserialize the serialized bytes use {@link DataSerializer#readObject(java.io.DataInput)} or
* you can just call {@link #getDeserializedValue()}.
- *
+ *
* @return the value for this operation
* @since GemFire 6.5
*/
@@ -121,7 +121,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* Return true when the value is an object and not a raw byte array.
- *
+ *
* @return true when the value is an object; false when it is a raw byte array
*/
public boolean isObject() {
@@ -130,7 +130,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* Set the serialized value object for this operation.
- *
+ *
* @param serializedValue the serialized value for this operation
* @param isObject true when the value is an object; false when it is a raw byte array
*/
@@ -141,7 +141,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
/**
* Set the result value of the object for this operation.
- *
+ *
* @param value the result of this operation; can be a serialized byte array or a deserialized
* object
* @param isObject true when the value is an object (either serialized or deserialized); false
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/PutAllOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/PutAllOperationContext.java
index 438b7e4..3a0f2fa 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/PutAllOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/PutAllOperationContext.java
@@ -15,14 +15,14 @@
package org.apache.geode.cache.operations;
-import org.apache.geode.cache.operations.internal.UpdateOnlyMap;
-
import java.util.Map;
+import org.apache.geode.cache.operations.internal.UpdateOnlyMap;
+
/**
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#PUTALL}
* operation for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 5.7
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -38,7 +38,7 @@ public class PutAllOperationContext extends OperationContext {
/**
* Constructor for the operation.
- *
+ *
*/
public PutAllOperationContext(Map map) {
this.map = new UpdateOnlyMap(map);
@@ -46,7 +46,7 @@ public class PutAllOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.PUTALL</code>.
*/
@Override
@@ -82,7 +82,7 @@ public class PutAllOperationContext extends OperationContext {
/**
* Set the authorized map.
- *
+ *
* @throws IllegalArgumentException if the given map is null or if its keys are not the same as
* the original keys.
* @deprecated use getMap() instead and modify the values in the map it returns
@@ -113,7 +113,7 @@ public class PutAllOperationContext extends OperationContext {
/**
* Get the callback argument object for this operation.
- *
+ *
* @return the callback argument object for this operation.
* @since GemFire 8.1
*/
@@ -123,7 +123,7 @@ public class PutAllOperationContext extends OperationContext {
/**
* Set the callback argument object for this operation.
- *
+ *
* @param callbackArg the callback argument object for this operation.
* @since GemFire 8.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/PutOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/PutOperationContext.java
index b698ee2..1ea9984 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/PutOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/PutOperationContext.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Region;
* Encapsulates an {@link org.apache.geode.cache.operations.OperationContext.OperationCode#PUT}
* region operation having both key and value objects for for both the pre-operation case and for
* post-operation updates.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -51,7 +51,7 @@ public class PutOperationContext extends KeyValueOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param value the value for this operation
* @param isObject true when the value is an object; false when it is a raw byte array
@@ -64,7 +64,7 @@ public class PutOperationContext extends KeyValueOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param value the value for this operation
* @param isObject true when the value is an object; false when it is a raw byte array
@@ -78,7 +78,7 @@ public class PutOperationContext extends KeyValueOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
* @param value the value for this operation
* @param isObject true when the value is an object; false when it is a raw byte array
@@ -94,7 +94,7 @@ public class PutOperationContext extends KeyValueOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.PUT</code>.
*/
@Override
@@ -104,12 +104,12 @@ public class PutOperationContext extends KeyValueOperationContext {
/**
* Return whether the operation is a create or update or unknown.
- *
+ *
* The user should check against {@link PutOperationContext#CREATE},
* {@link PutOperationContext#UPDATE}, {@link PutOperationContext#UNKNOWN}. For the
* {@link PutOperationContext#UNKNOWN} case, the authorization callback should explicitly invoke
* {@link Region#containsKey} to determine if it is create or update when required.
- *
+ *
* @return one of {@link PutOperationContext#CREATE}, {@link PutOperationContext#UPDATE},
* {@link PutOperationContext#UNKNOWN}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/QueryOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/QueryOperationContext.java
index 17c5645..8660d33 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/QueryOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/QueryOperationContext.java
@@ -19,7 +19,7 @@ import java.util.Set;
/**
* Encapsulates a cache query operation for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -42,7 +42,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Constructor for the query operation.
- *
+ *
* @param queryString the query string for this operation
* @param regionNames names of regions that are part of the query string
* @param postOperation true to set the post-operation flag
@@ -56,7 +56,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Constructor for the query operation.
- *
+ *
* @param queryString the query string for this operation
* @param regionNames names of regions that are part of the query string
* @param postOperation true to set the post-operation flag
@@ -70,7 +70,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return the <code>OperationCode</code> of this operation
*/
@Override
@@ -100,7 +100,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Modify the query string.
- *
+ *
* @param query the new query string for this query.
*/
public void modifyQuery(String query) {
@@ -110,7 +110,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Get the names of regions that are part of the query string.
- *
+ *
* @return names of regions being queried.
*/
public Set getRegionNames() {
@@ -119,7 +119,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Set the names of regions that are part of the query string.
- *
+ *
* @param regionNames names of regions being queried
*/
public void setRegionNames(Set regionNames) {
@@ -128,7 +128,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Get the result of the query execution.
- *
+ *
* @return result of the query.
*/
public Object getQueryResult() {
@@ -137,7 +137,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Set the result of query operation.
- *
+ *
* @param queryResult the new result of the query operation.
*/
public void setQueryResult(Object queryResult) {
@@ -146,7 +146,7 @@ public class QueryOperationContext extends OperationContext {
/**
* Get the bind parameters for the query
- *
+ *
* @return bind parameters for the query
*/
public Object[] getQueryParams() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionClearOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionClearOperationContext.java
index 49c5f3f..715748f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionClearOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionClearOperationContext.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_CLEAR} operation
* for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class RegionClearOperationContext extends RegionOperationContext {
/**
* Default constructor for the region operation.
- *
+ *
* @param postOperation true to set the post-operation flag
*/
public RegionClearOperationContext(boolean postOperation) {
@@ -37,7 +37,7 @@ public class RegionClearOperationContext extends RegionOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.REGION_CLEAR</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionCreateOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionCreateOperationContext.java
index 6598405..1b6dd43 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionCreateOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionCreateOperationContext.java
@@ -19,7 +19,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_CREATE} operation
* for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -30,7 +30,7 @@ public class RegionCreateOperationContext extends OperationContext {
/**
* Constructor for the region creation operation.
- *
+ *
* @param postOperation true to set the post-operation flag
*/
public RegionCreateOperationContext(boolean postOperation) {
@@ -39,7 +39,7 @@ public class RegionCreateOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.REGION_CREATE</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionDestroyOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionDestroyOperationContext.java
index 45f7058..91829ab 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionDestroyOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionDestroyOperationContext.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_DESTROY} operation
* for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class RegionDestroyOperationContext extends RegionOperationContext {
/**
* Constructor for the region destroy operation.
- *
+ *
* @param postOperation true to set the post-operation flag
*/
public RegionDestroyOperationContext(boolean postOperation) {
@@ -37,7 +37,7 @@ public class RegionDestroyOperationContext extends RegionOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.REGION_DESTROY</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionOperationContext.java
index 677b84d..715975c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/RegionOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/RegionOperationContext.java
@@ -21,7 +21,7 @@ package org.apache.geode.cache.operations;
* operations this class encapsulates are
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_CLEAR} and
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_DESTROY}.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -35,7 +35,7 @@ public abstract class RegionOperationContext extends OperationContext {
/**
* Constructor for a region operation.
- *
+ *
* @param postOperation true to set the post-operation flag
*/
public RegionOperationContext(boolean postOperation) {
@@ -45,7 +45,7 @@ public abstract class RegionOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return The <code>OperationCode</code> of this operation. This is one of
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_CLEAR}
* or
@@ -64,7 +64,7 @@ public abstract class RegionOperationContext extends OperationContext {
/**
* Get the callback argument object for this operation.
- *
+ *
* @return the callback argument object for this operation.
*/
public Object getCallbackArg() {
@@ -73,7 +73,7 @@ public abstract class RegionOperationContext extends OperationContext {
/**
* Set the callback argument object for this operation.
- *
+ *
* @param callbackArg the callback argument object for this operation.
*/
public void setCallbackArg(Object callbackArg) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/RegisterInterestOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/RegisterInterestOperationContext.java
index 9ac2442..c75cb8a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/RegisterInterestOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/RegisterInterestOperationContext.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.InterestResultPolicy;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGISTER_INTEREST} region
* operation for the pre-operation case.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -32,7 +32,7 @@ public class RegisterInterestOperationContext extends InterestOperationContext {
/**
* Constructor for the register interest operation.
- *
+ *
* @param key the key or list of keys being registered
* @param interestType the <code>InterestType</code> of the register request
* @param policy the <code>InterestResultPolicy</code> of the register request
@@ -45,7 +45,7 @@ public class RegisterInterestOperationContext extends InterestOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.REGISTER_INTEREST</code>.
*/
@Override
@@ -55,7 +55,7 @@ public class RegisterInterestOperationContext extends InterestOperationContext {
/**
* Get the <code>InterestResultPolicy</code> of this register/unregister operation.
- *
+ *
* @return the <code>InterestResultPolicy</code> of this request.
*/
public InterestResultPolicy getInterestResultPolicy() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/RemoveAllOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/RemoveAllOperationContext.java
index c0c58f4..b530fd1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/RemoveAllOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/RemoveAllOperationContext.java
@@ -21,7 +21,7 @@ import java.util.Collections;
/**
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REMOVEALL}
* operation for both the pre-operation and post-operation cases.
- *
+ *
* @since GemFire 8.1
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -37,7 +37,7 @@ public class RemoveAllOperationContext extends OperationContext {
/**
* Constructor for the operation.
- *
+ *
*/
public RemoveAllOperationContext(Collection<?> keys) {
this.keys = keys;
@@ -45,7 +45,7 @@ public class RemoveAllOperationContext extends OperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.RemoveAll</code>.
*/
@Override
@@ -77,7 +77,7 @@ public class RemoveAllOperationContext extends OperationContext {
/**
* Get the callback argument object for this operation.
- *
+ *
* @return the callback argument object for this operation.
*/
public Object getCallbackArg() {
@@ -86,7 +86,7 @@ public class RemoveAllOperationContext extends OperationContext {
/**
* Set the callback argument object for this operation.
- *
+ *
* @param callbackArg the callback argument object for this operation.
*/
public void setCallbackArg(Object callbackArg) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/StopCQOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/StopCQOperationContext.java
index 92fc67c..f0d70a1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/StopCQOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/StopCQOperationContext.java
@@ -21,7 +21,7 @@ import java.util.Set;
/**
* Encapsulates a {@link org.apache.geode.cache.operations.OperationContext.OperationCode#STOP_CQ}
* operation for the pre-operation case.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -29,7 +29,7 @@ public class StopCQOperationContext extends ExecuteCQOperationContext {
/**
* Constructor for the STOP_CQ operation.
- *
+ *
* @param cqName the name of the continuous query being stopped
* @param queryString the query string for this operation
* @param regionNames names of regions that are part of the query string
@@ -40,7 +40,7 @@ public class StopCQOperationContext extends ExecuteCQOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.STOP_CQ</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/UnregisterInterestOperationContext.java b/geode-core/src/main/java/org/apache/geode/cache/operations/UnregisterInterestOperationContext.java
index b3a599d..ca291bc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/UnregisterInterestOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/UnregisterInterestOperationContext.java
@@ -20,7 +20,7 @@ package org.apache.geode.cache.operations;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#UNREGISTER_INTEREST}
* region operation for the pre-operation case.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -28,7 +28,7 @@ public class UnregisterInterestOperationContext extends InterestOperationContext
/**
* Constructor for the unregister interest operation.
- *
+ *
* @param key the key or list of keys being unregistered
* @param interestType the <code>InterestType</code> of the unregister request
*/
@@ -38,7 +38,7 @@ public class UnregisterInterestOperationContext extends InterestOperationContext
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.UNREGISTER_INTEREST</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java b/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
index a3884c4..f6340d4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
@@ -15,16 +15,15 @@
package org.apache.geode.cache.operations.internal;
import java.io.Serializable;
-
import java.util.AbstractCollection;
import java.util.AbstractSet;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
-import java.util.Map.Entry;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.Token;
@@ -48,7 +47,7 @@ public class UpdateOnlyMap implements Map, Serializable {
/**
* Only called by internal code to bypass exportValue() method
- *
+ *
* @return internal map
*/
public Map getInternalMap() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
index deb319f..2c13aa5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
/**
- *
+ *
* A callback for partitioned regions, invoked when a partition region is created or any bucket is
* created/deleted or any bucket in a partitioned region becomes primary.<br>
* <br>
@@ -34,19 +34,19 @@ import org.apache.geode.cache.Region;
* private String regionName;
*
* public MyPartitionListener() {}
- *
+ *
* public void afterPrimary(int bucketId) {
* System.out.println("bucket:" + bucketId + " has become primary on " + this.regionName);
* }
- *
+ *
* public void afterRegionCreate(Region<?, ?> region) {
* this.regionName = region.getName();
* }
* }
* </pre>
- *
+ *
* A sample declaration of the MyPartitionListener in cache.xml as follows :<br>
- *
+ *
* <pre>
* <partition-attributes redundant-copies="1">
* <partition-listener>
@@ -54,17 +54,17 @@ import org.apache.geode.cache.Region;
* </partition-listener>
* </partition-attributes>
* </pre>
- *
+ *
* @see PartitionAttributesFactory#addPartitionListener(PartitionListener)
- *
+ *
* @since GemFire 6.5
- *
+ *
*/
public interface PartitionListener {
/**
* Callback invoked when any bucket in a partitioned region becomes primary
- *
+ *
* @param bucketId id of the bucket which became primary
* @since GemFire 6.5
*/
@@ -76,13 +76,13 @@ public interface PartitionListener {
* @param bucketId id of the bucket which stopped being primary
* @since Geode 1.1
*/
- default public void afterSecondary(int bucketId) {
+ public default void afterSecondary(int bucketId) {
}
/**
* Callback invoked when a partition region is created
- *
+ *
* @param region handle of the region which is created
* @since GemFire 6.5
*/
@@ -91,7 +91,7 @@ public interface PartitionListener {
/**
* Callback invoked after a bucket has been removed from a member (e.g. during rebalancing). This
* API is useful for maintaining external data structures by bucket id or key.
- *
+ *
* @param bucketId id of the bucket removed
* @param keys keys in the bucket removed
* @since GemFire 6.6.1
@@ -103,7 +103,7 @@ public interface PartitionListener {
* API is useful for maintaining external data structures by bucket id or key. Note that this API
* is invoked after the initial image has been completed so creates and destroys may occur in the
* keys. It is best to use this API during periods of no cache activity.
- *
+ *
* @param bucketId id of the bucket created
* @param keys keys in the bucket created
* @since GemFire 6.6.1
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
index 88aeadd..6e2640a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
@@ -22,16 +22,16 @@ import org.apache.geode.cache.Region;
* Utility class that implements all methods in <code>PartitionListener</code> with empty
* implementations. Applications can subclass this class and only override the methods of interest.
* <p>
- *
+ *
* <p>
* Subclasses declared in a Cache XML file, it must also implement
* {@link org.apache.geode.cache.Declarable}
* </p>
- *
+ *
* Note : Please request help on the Geode developer mailing list (dev@geode.apache.org) before
* using these APIs.
*
- *
+ *
* @since GemFire 6.6.2
*/
public class PartitionListenerAdapter implements PartitionListener {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
index 250da6b..c1ff0eb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
@@ -21,14 +21,14 @@ import org.apache.geode.distributed.DistributedMember;
* Describes a member that has been configured to provide storage space for a partitioned region.
* <p>
* This is an immutable snapshot of the details.
- *
+ *
* @since GemFire 6.0
*/
public interface PartitionMemberInfo {
/**
* Identifies the member for which these details pertain to.
- *
+ *
* @return the member for which these details pertain to
*/
public DistributedMember getDistributedMember();
@@ -37,7 +37,7 @@ public interface PartitionMemberInfo {
* Returns the {@link org.apache.geode.cache.PartitionAttributes#getLocalMaxMemory() max memory}
* in bytes that the member was configured to provide for storage of data for the partitioned
* region.
- *
+ *
* @return the max memory in bytes that the member was configured to provide for storage
*/
public long getConfiguredMaxMemory(); // in bytes
@@ -45,7 +45,7 @@ public interface PartitionMemberInfo {
/**
* The total size in bytes of memory being used by the member for storage of actual data in the
* partitioned region.
- *
+ *
* @return size in bytes of memory being used by the member for storage
*/
public long getSize(); // in bytes
@@ -53,7 +53,7 @@ public interface PartitionMemberInfo {
/**
* Returns the number of buckets hosted within the member's partition space for the partitioned
* region.
- *
+ *
* @return the number of buckets hosted within the member
*/
public int getBucketCount();
@@ -61,7 +61,7 @@ public interface PartitionMemberInfo {
/**
* The number of hosted buckets for which the member is hosting the primary copy. Other copies are
* known as redundant backup copies.
- *
+ *
* @return the number of hosted buckets for which the member is hosting the primary copy
*/
public int getPrimaryCount();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionNotAvailableException.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionNotAvailableException.java
index afca307..d4f599a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionNotAvailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionNotAvailableException.java
@@ -19,7 +19,7 @@ import org.apache.geode.GemFireException;
/**
* This exception is thrown when for the given fixed partition, datastore (local-max-memory > 0) is
* not available.
- *
+ *
* @since GemFire 6.6
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
index c70ab88..447d7be 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
@@ -19,7 +19,7 @@ import java.util.Set;
/**
* The detailed results of rebalancing a partitioned region.
- *
+ *
* @since GemFire 6.0
*/
public interface PartitionRebalanceInfo {
@@ -27,7 +27,7 @@ public interface PartitionRebalanceInfo {
/**
* Returns the {@link org.apache.geode.cache.Region#getFullPath() full path} of the partitioned
* region that these details describe.
- *
+ *
* @return the full name of partioned region that these details describe.
*/
public String getRegionPath();
@@ -35,7 +35,7 @@ public interface PartitionRebalanceInfo {
/**
* Returns a <code>Set</code> of detailed information about each member that had rebalancable
* resources at the time that the rebalance started.
- *
+ *
* @return a <code>Set</code> of detailed information about each member that had rebalancable
* resources at the time that the rebalance started
*/
@@ -44,7 +44,7 @@ public interface PartitionRebalanceInfo {
/**
* Returns a <code>Set</code> of detailed information about each member that had rebalancable
* resources at the time that the rebalance completed.
- *
+ *
* @return a <code>Set</code> of detailed information about each member that had rebalancable
* resources at the time that the rebalance completed
*/
@@ -52,14 +52,14 @@ public interface PartitionRebalanceInfo {
/**
* Returns the time, in milliseconds, that the rebalance operation took for this region.
- *
+ *
* @return the time, in milliseconds, that the rebalance operation took for this region.
*/
public long getTime();
/**
* Returns the number of buckets created during the rebalance operation.
- *
+ *
* @return the number of buckets created during the rebalance operation
*/
public int getBucketCreatesCompleted();
@@ -67,7 +67,7 @@ public interface PartitionRebalanceInfo {
/**
* Returns the size, in bytes, of all of the buckets that were created as part of the rebalance
* operation.
- *
+ *
* @return the size, in bytes, of all of the buckets that were created as part of the rebalance
* operation
*/
@@ -75,14 +75,14 @@ public interface PartitionRebalanceInfo {
/**
* Returns the time, in milliseconds, taken to create buckets for this region.
- *
+ *
* @return the time, in milliseconds, taken to create buckets for this region
*/
public long getBucketCreateTime();
/**
* Returns the number of buckets removed during the rebalance operation.
- *
+ *
* @return the number of buckets removed during the rebalance operation
*/
public int getBucketRemovesCompleted();
@@ -90,7 +90,7 @@ public interface PartitionRebalanceInfo {
/**
* Returns the size, in bytes, of all of the buckets that were removed as part of the rebalance
* operation.
- *
+ *
* @return the size, in bytes, of all of the buckets that were removed as part of the rebalance
* operation
*/
@@ -98,42 +98,42 @@ public interface PartitionRebalanceInfo {
/**
* Returns the time, in milliseconds, taken to remove buckets for this region.
- *
+ *
* @return the time, in milliseconds, taken to remove buckets for this region
*/
public long getBucketRemoveTime();
/**
* Returns the number of buckets transferred for this region.
- *
+ *
* @return the number of buckets transferred for this region
*/
public int getBucketTransfersCompleted();
/**
* Returns the size, in bytes, of buckets that were transferred for this region.
- *
+ *
* @return the size, in bytes, of buckets that were transferred for this region
*/
public long getBucketTransferBytes();
/**
* Returns the amount of time, in milliseconds, it took to transfer buckets for this region.
- *
+ *
* @return the amount of time, in milliseconds, it took to transfer buckets for this region
*/
public long getBucketTransferTime();
/**
* Returns the number of primaries that were transferred for this region.
- *
+ *
* @return the number of primaries that were transferred for this region
*/
public int getPrimaryTransfersCompleted();
/**
* Returns the time, in milliseconds, spent transferring primaries for this region.
- *
+ *
* @return the time, in milliseconds, spent transferring primaries for this region
*/
public long getPrimaryTransferTime();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
index 41c022c..6f6146b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
@@ -51,7 +51,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* Functions} on a Partitioned Region.
* <p>
* Example of a Function using utility methods:
- *
+ *
* <pre>
* public Serializable execute(FunctionContext context) {
* if (context instanceof RegionFunctionContext) {
@@ -81,7 +81,7 @@ public final class PartitionRegionHelper {
* local data reference to a partitioned region, return a map of local
* {@linkplain PartitionAttributesFactory#setColocatedWith(String) colocated Regions}. If there
* are no colocated regions, return an empty map.
- *
+ *
* @param r a partitioned Region
* @throws IllegalStateException if the Region is not a {@linkplain DataPolicy#PARTITION
* partitioned Region}
@@ -118,7 +118,7 @@ public final class PartitionRegionHelper {
/**
* Test a Region to see if it is a partitioned Region
- *
+ *
* @param r
* @return true if it is a partitioned Region
* @since GemFire 6.0
@@ -133,7 +133,7 @@ public final class PartitionRegionHelper {
/**
* Test a Region to see if it is a partitioned Region
- *
+ *
* @param r
* @throws IllegalStateException
* @return PartitionedRegion if it is a partitioned Region
@@ -165,7 +165,7 @@ public final class PartitionRegionHelper {
/**
* Gathers details about the specified partitioned region. Returns null if the partitioned region
* is not locally defined.
- *
+ *
* @param region the region to get info about
* @return details about the specified partitioned region
* @since GemFire 6.0
@@ -204,9 +204,9 @@ public final class PartitionRegionHelper {
* the buckets without putting any data in partition region. This method should not be called
* until all of the partitions are running because it will divide the buckets between the running
* partitions. If the buckets are already assigned this method will have no effect.
- *
+ *
* This method will block until all buckets are assigned.
- *
+ *
* @param region The region which should have it's buckets assigned.
* @throws IllegalStateException if the provided region is something other than a
* {@linkplain DataPolicy#PARTITION partitioned Region}
@@ -251,7 +251,7 @@ public final class PartitionRegionHelper {
* <p>
* This method is not a substitute for {@link Region#containsKey(Object)}.
* </p>
- *
+ *
* @param r a PartitionedRegion
* @param key the key to evaluate
* @throws IllegalStateException if the provided region is something other than a
@@ -279,7 +279,7 @@ public final class PartitionRegionHelper {
* allMembers.remove(primary);
* </code>
* </p>
- *
+ *
* @param r a PartitionedRegion
* @param key the key to evaluate
* @throws IllegalStateException if the provided region is something other than a
@@ -354,7 +354,7 @@ public final class PartitionRegionHelper {
* optimizeForWrite} as true,the returned Region will only contain primary copy of the data.
* <p>
* Writes using this Region have no constraints and behave the same as a partitioned Region.
- *
+ *
* @param c a functions context
* @throws IllegalStateException if {@link RegionFunctionContext#getDataSet()} returns something
* other than a {@linkplain DataPolicy#PARTITION partitioned Region}
@@ -371,7 +371,7 @@ public final class PartitionRegionHelper {
/**
* Given a partitioned Region return a Region providing read access limited to the local heap,
* writes using this Region have no constraints and behave the same as a partitioned Region.<br>
- *
+ *
* @param r a partitioned region
* @throws IllegalStateException if the provided region is something other than a
* {@linkplain DataPolicy#PARTITION partitioned Region}
@@ -401,7 +401,7 @@ public final class PartitionRegionHelper {
* Given a partitioned Region return a Region providing read access to primary copy of the data
* which is limited to the local heap, writes using this Region have no constraints and behave the
* same as a partitioned Region.<br>
- *
+ *
* @param r a partitioned region
* @throws IllegalStateException if the provided region is something other than a
* {@linkplain DataPolicy#PARTITION partitioned Region}
@@ -438,7 +438,7 @@ public final class PartitionRegionHelper {
* <p>
* This method allows direct control of what data to move. To automatically balance buckets, see
* {@link ResourceManager#createRebalanceFactory()}
- *
+ *
* @param region The region in which to move the bucket. Data in regions colocated with this
* region will also be moved.
* @param source A member that is currently hosting this bucket. The bucket is moved off of this
@@ -448,11 +448,11 @@ public final class PartitionRegionHelper {
* @param key A key which maps to the bucket to move. This key does not actually need to exist in
* the region, but if using a {@link PartitionResolver} the resolver should be able to get
* the routing object from this key to determine the bucket to move.
- *
+ *
* @throws IllegalStateException if the bucket is not present on the source, if the source or
* destination are not valid members of the system, if the destination already hosts a
* copy of the bucket, or if the bucket does not exist.
- *
+ *
* @since GemFire 7.1
*/
public static <K> void moveBucketByKey(Region<K, ?> region, DistributedMember source,
@@ -475,7 +475,7 @@ public final class PartitionRegionHelper {
* method does not throw an exception. The percentage is a percentage of the amount of data in
* bytes on the source member for this region.
* <p>
- *
+ *
* If this region has colocated regions, the colocated data will also be moved. The total amount
* of data in all colocated regions will be taken into consideration when determining what
* percentage of data will be moved.
@@ -487,20 +487,20 @@ public final class PartitionRegionHelper {
* <p>
* This method allows direct control of what data to move. To automatically balance buckets, see
* {@link ResourceManager#createRebalanceFactory()}
- *
+ *
* @param region The region in which to move data. Data in regions colocated with this region will
* also be moved.
* @param source A member that is currently hosting data. The bucket is moved off of this member.
* @param destination A member that that has the partitioned region defined. Data is moved to this
* member.
* @param percentage the maximum amount of data to move, as a percentage from 0 to 100.
- *
+ *
* @throws IllegalStateException if the source or destination are not valid members of the system.
* @throws IllegalArgumentException if the percentage is not between 0 to 100.
- *
+ *
* @return A RebalanceResult object that contains information about what what data was actually
* moved.
- *
+ *
* @since GemFire 7.1
*/
public static RebalanceResults moveData(Region<?, ?> region, DistributedMember source,
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
index bd189cf..3e667b3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
@@ -25,7 +25,7 @@ import org.apache.geode.cache.control.ResourceManager;
* describes a single partitioned region identified by {@link #getRegionPath()}.
* <p>
* This is an immutable snapshot of the information.
- *
+ *
* @since GemFire 6.0
*/
public interface PartitionRegionInfo {
@@ -33,7 +33,7 @@ public interface PartitionRegionInfo {
/**
* Returns the {@link org.apache.geode.cache.Region#getFullPath() full path} of the partitioned
* region that this object describes.
- *
+ *
* @return the full path of the partitioned region that this info describes
*/
public String getRegionPath();
@@ -41,7 +41,7 @@ public interface PartitionRegionInfo {
/**
* Returns an immutable set of <code>PartitionMemberInfo</code> representing every member that is
* configured to provide storage space to the partitioned region.
- *
+ *
* @return set of member info configured for storage space
*/
public Set<PartitionMemberInfo> getPartitionMemberInfo();
@@ -49,7 +49,7 @@ public interface PartitionRegionInfo {
/**
* Returns the {@link org.apache.geode.cache.PartitionAttributes#getTotalNumBuckets() configured
* number of buckets} for the partitioned region.
- *
+ *
* @return the configured number of buckets
*/
public int getConfiguredBucketCount();
@@ -57,7 +57,7 @@ public interface PartitionRegionInfo {
/**
* Returns the number of actual buckets that have been created to hold data for the partitioned
* region. This is less than or equal to {#link #getConfiguredBucketCount()}.
- *
+ *
* @return the current number of actual buckets that have been created
*/
public int getCreatedBucketCount();
@@ -66,7 +66,7 @@ public interface PartitionRegionInfo {
* Returns the number of created buckets that have fewer than the
* {@link #getConfiguredRedundantCopies() configured redundant copies} for this partitioned
* region.
- *
+ *
* @return the number of created buckets that have fewer than the configured redundant copies
* @see #getActualRedundantCopies()
*/
@@ -75,7 +75,7 @@ public interface PartitionRegionInfo {
/**
* Returns the number of {@link org.apache.geode.cache.PartitionAttributes#getRedundantCopies()
* redundant copies} the partitioned region was configured for.
- *
+ *
* @return the number of redundant copies the partitioned region was configured for
*/
public int getConfiguredRedundantCopies();
@@ -84,7 +84,7 @@ public interface PartitionRegionInfo {
* Returns the lowest number of redundant copies for any bucket holding data for the partitioned
* region. If all data is currently at full redundancy then this will return the same value as
* {@link #getConfiguredRedundantCopies}.
- *
+ *
* @return the lowest number of redundant copies for any bucket of the partitioned region.
*/
public int getActualRedundantCopies();
@@ -94,7 +94,7 @@ public interface PartitionRegionInfo {
* region that this region has been configured to be
* {@link org.apache.geode.cache.PartitionAttributes#getColocatedWith() colocated with} or null if
* it is not colocated.
- *
+ *
* @return the full path of the partitioned region that the region is colocated with or null if
* there is none.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java
index 3ea7c3e..8a0ece4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java
@@ -20,12 +20,12 @@ import org.apache.geode.cache.DiskAccessException;
/**
* Thrown when a member with persistence is recovering, and it discovers that the data it has on
* disk was never part of the same distributed system as the members that are currently online.
- *
+ *
* This exception can occur when two members both have persistent files for the same region, but
* they were online at different times, so the contents of their persistent files are completely
* different. In that case, gemfire throws this exception rather than discarding one of the sets of
* persistent files.
- *
+ *
* @since GemFire 6.5
*/
public class ConflictingPersistentDataException extends DiskAccessException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/PartitionOfflineException.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/PartitionOfflineException.java
index 6a4987d..ed274e2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/PartitionOfflineException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/PartitionOfflineException.java
@@ -21,18 +21,18 @@ import org.apache.geode.GemFireException;
/**
* Thrown when a paritioned region is configured for disk persistence, and part of the data is
* stored on members that are known to be offline.
- *
+ *
* With a partitioned region, the keyspace is segmented into buckets which are assigned to
* individual members. If all members that are storing data for a particular bucket are offline, any
* attempt to access or update data in that bucket will throw this exception.
- *
+ *
* If you see this exception, that means that you need to restart the members that host the missing
* data.
- *
+ *
* If you receive this exception when attempting an operation that modifies the region (such as a
* put), it is possible that the change was actually persisted to disk before the member went
* offline.
- *
+ *
* @since GemFire 6.5
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
index 7cfbc82..5219374 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
@@ -27,10 +27,10 @@ import org.apache.geode.cache.DataPolicy;
* persistent files are assigned a unique ID. After a failure of all members, during recovery, the
* persistent members will wait for all persistent copies of the region to be recovered before
* completing region initialization.
- *
+ *
* This pattern describes what unique ids the currently recovering persistent members are waiting
* for. See {@link AdminDistributedSystem#getMissingPersistentMembers()}
- *
+ *
* @since GemFire 6.5
*
*/
@@ -48,7 +48,7 @@ public interface PersistentID extends DataSerializable {
/**
* The unique identifier for the persistent data.
- *
+ *
* @since GemFire 7.0
*/
public abstract UUID getUUID();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentReplicatesOfflineException.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentReplicatesOfflineException.java
index 1344dd8..0e66af7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentReplicatesOfflineException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentReplicatesOfflineException.java
@@ -19,10 +19,10 @@ import org.apache.geode.GemFireException;
/**
* Thrown when a replicated region is configured for persistence on some members but none of those
* members are currently online.
- *
+ *
* If you see this exception you should restart members that are configured for hosting persistent
* replicates.
- *
+ *
* @since GemFire 7.0
*/
public class PersistentReplicatesOfflineException extends GemFireException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokeFailedException.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokeFailedException.java
index ebd7254..46afc20 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokeFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokeFailedException.java
@@ -19,7 +19,7 @@ import org.apache.geode.GemFireException;
/**
* Thrown when a member tries to revoke a persistent ID, but the member with that persistent ID is
* currently running. You can only revoke members which is not running.
- *
+ *
* @since GemFire 6.6.2
*/
public class RevokeFailedException extends GemFireException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokedPersistentDataException.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokedPersistentDataException.java
index b0ce8d4..0617f2e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokedPersistentDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/RevokedPersistentDataException.java
@@ -20,12 +20,12 @@ import org.apache.geode.admin.AdminDistributedSystem;
/**
* Thrown when a member with persistence is recovering, and it discovers that other members in the
* system have revoked the persistent data stored on this member.
- *
+ *
* This exception can also occur if set of persistent files was thought to be lost and was revoked,
* but is later brought online. Once a persistent member is revoked, that member cannot rejoin the
* distributed system unless the persistent files are removed. See
* {@link AdminDistributedSystem#revokePersistentMember(java.net.InetAddress, String)}
- *
+ *
* @since GemFire 7.0
*/
public class RevokedPersistentDataException extends GemFireException {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java b/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
index 38de60d..df952c0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
@@ -17,14 +17,14 @@ package org.apache.geode.cache.query;
/**
* Behavior of a user-defined aggregator. Aggregates values and returns a result. In addition to the
* methods in the interface, implementing classes must have a 0-arg public constructor.
- *
+ *
*
*/
public interface Aggregator {
/**
* Accumulate the next scalar value
- *
+ *
* @param value
*/
public void accumulate(Object value);
@@ -35,7 +35,7 @@ public interface Aggregator {
public void init();
/**
- *
+ *
* @return Return the result scalar value
*/
public Object terminate();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/AmbiguousNameException.java b/geode-core/src/main/java/org/apache/geode/cache/query/AmbiguousNameException.java
index 82d58bc..260339d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/AmbiguousNameException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/AmbiguousNameException.java
@@ -26,7 +26,7 @@ public class AmbiguousNameException extends NameResolutionException {
/**
* Constructs instance of AmbiguousNameException with error message
- *
+ *
* @param msg the error message
*/
public AmbiguousNameException(String msg) {
@@ -35,7 +35,7 @@ public class AmbiguousNameException extends NameResolutionException {
/**
* Constructs instance of AmbiguousNameException with error message and cause
- *
+ *
* @param msg the error message
* @param cause a Throwable that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
index 4711e92..06cafb6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache.query;
* This interface holds all attribute values for a CQ and provides methods for retrieving all
* attribute settings. This interface can be modified only by the CqAttributesFactory class (before
* CQ creation) and the CqAttributesMutator interface (after CQ creation).
- *
+ *
* For compatibility rules and default values, see {@link CqAttributesFactory}.
*
* @since GemFire 5.5
@@ -28,7 +28,7 @@ public interface CqAttributes {
/**
* Get the CqListeners set with the CQ. Returns all the Listener associated with this CQ.
- *
+ *
* @see CqListener
* @return CQListener[] array of CqListner
*/
@@ -37,7 +37,7 @@ public interface CqAttributes {
/**
* Get the CqListener set with the CQ. Returns the CqListener associated with the CQ. If there are
* more than one CqListener throws IllegalStateException.
- *
+ *
* @see CqListener
* @return CqListener Object, returns null if there is no CqListener.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesFactory.java
index 1323246..5d699c2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesFactory.java
@@ -61,7 +61,7 @@ public class CqAttributesFactory {
/**
* Adds a CQ listener to the end of the list of cq listeners on this factory.
- *
+ *
* @param cqListener the CqListener to add to the factory.
* @throws IllegalArgumentException if <code>cqListener</code> is null
*/
@@ -76,7 +76,7 @@ public class CqAttributesFactory {
/**
* Removes all Cq listeners and then adds each listener in the specified array.
- *
+ *
* @param cqListeners a possibly null or empty array of listeners to add to this factory.
* @throws IllegalArgumentException if the <code>cqListeners</code> array has a null element
*/
@@ -96,7 +96,7 @@ public class CqAttributesFactory {
/**
* Creates a <code>CqAttributes</code> with the current settings.
- *
+ *
* @return the newly created <code>CqAttributes</code>
*/
public CqAttributes create() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
index ffdb9cf..b966405 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
@@ -19,14 +19,14 @@ package org.apache.geode.cache.query;
* This interface is used to modify the listeners that are associated with a CQ. Each CqQuery has an
* CqAttributesMutator interface which supports modification of certain CQ attributes after the CQ
* has been created.
- *
+ *
* @since GemFire 5.5
*/
public interface CqAttributesMutator {
/**
* Adds a CQ listener to the end of the list of CQ listeners on this CqQuery.
- *
+ *
* @param aListener the user defined CQ listener to add to the CqQuery.
* @throws IllegalArgumentException if <code>aListener</code> is null
*/
@@ -36,7 +36,7 @@ public interface CqAttributesMutator {
* Removes given CQ listener from the list of CQ listeners on this CqQuery. Does nothing if the
* specified listener has not been added. If the specified listener has been added then will be
* called on it; otherwise does nothing.
- *
+ *
* @param aListener the CQ listener to remove from the CqQuery.
* @throws IllegalArgumentException if <code>aListener</code> is null
*/
@@ -45,7 +45,7 @@ public interface CqAttributesMutator {
/**
* Adds the given set CqListner on this CQ. If the CQ already has CqListeners, this removes those
* old CQs and initializes with the newListeners.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this CqQuery.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqClosedException.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqClosedException.java
index 816524a..4c306d2 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqClosedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqClosedException.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.CacheRuntimeException;
/**
* Thrown if the CqQuery on which the operation performed is closed.
- *
+ *
* @since GemFire 5.5
*/
@@ -29,7 +29,7 @@ public class CqClosedException extends CacheRuntimeException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -39,7 +39,7 @@ public class CqClosedException extends CacheRuntimeException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
*/
public CqClosedException(String msg) {
@@ -48,7 +48,7 @@ public class CqClosedException extends CacheRuntimeException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param cause a Throwable cause of this exception
*/
public CqClosedException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
index 24ae7f9..88bd00c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
@@ -24,14 +24,14 @@ import org.apache.geode.cache.Operation;
* information as the region operation, CQ operation associated with the event, the new key and
* value from the event, and the CqQuery object associated with the event. The CqEvent is not an
* extension of CacheEvent.
- *
+ *
* @since GemFire 5.5
*/
public interface CqEvent {
/**
* Get the CqQuery object of this event.
- *
+ *
* @see CqQuery
* @return CqQuery object.
*/
@@ -39,7 +39,7 @@ public interface CqEvent {
/**
* Get the operation on the base region that triggered this event.
- *
+ *
* @return Operation operation on the base region (on which CQ is created).
*/
public Operation getBaseOperation();
@@ -47,7 +47,7 @@ public interface CqEvent {
/**
* Get the operation on the query results. Supported operations include update, create, destroy,
* region clear and region invalidate.
- *
+ *
* @return Operation operation with respect to CQ.
*/
public Operation getQueryOperation();
@@ -55,7 +55,7 @@ public interface CqEvent {
/**
* Get the key relating to the event. In case of REGION_CLEAR and REGION_INVALIDATE operation, the
* key will be null.
- *
+ *
* @return Object key.
*/
public Object getKey();
@@ -64,7 +64,7 @@ public interface CqEvent {
* Get the new value of the modification. If there is no new value returns null, this will happen
* during delete operation. May throw <code>InvalidDeltaException</code>, if value is null and
* Delta Propagation is enabled.
- *
+ *
* @return Object new/modified value.
*/
public Object getNewValue();
@@ -73,7 +73,7 @@ public interface CqEvent {
* If an error occurred, return the Throwable, otherwise return null. If an error occurred, then
* this event will be passed to the <code>onError</code> method of the CqListener instead of the
* <code>onEvent</code> method.
- *
+ *
* @return Throwable exception related to error.
*/
public Throwable getThrowable();
@@ -81,10 +81,9 @@ public interface CqEvent {
/**
* Get the delta modification. If there is no delta, returns null. New value may still be
* available.
- *
+ *
* @return byte[] delta value.
* @since GemFire 6.5
*/
public byte[] getDeltaValue();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqException.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqException.java
index e5e0196..827660a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqException.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.query;
/**
* Thrown during continuous query creation, execution time.
- *
+ *
* @since GemFire 5.5
*/
@@ -27,7 +27,7 @@ public class CqException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -37,7 +37,7 @@ public class CqException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
*/
public CqException(String msg) {
@@ -46,7 +46,7 @@ public class CqException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param cause a Throwable cause of this exception
*/
public CqException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqExistsException.java
index ba91149..3605f09 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqExistsException.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.query;
/**
* Thrown if a CQ by this name already exists on this client
- *
+ *
* @since GemFire 5.5
*/
@@ -26,7 +26,7 @@ public class CqExistsException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -36,7 +36,7 @@ public class CqExistsException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
*/
public CqExistsException(String msg) {
@@ -45,7 +45,7 @@ public class CqExistsException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param cause a Throwable cause of this exception
*/
public CqExistsException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
index 0cb54ba..a494ac0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
@@ -35,7 +35,7 @@ public interface CqListener extends CacheCallback {
* in progress. The CQ does not block any region operation as it could affect the performance of
* region operation. Its up to the application to synchronize between the region operation and CQ
* registration to avoid duplicate event being delivered.
- *
+ *
* @see org.apache.geode.cache.query.CqQuery#executeWithInitialResults
*/
public void onEvent(CqEvent aCqEvent);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
index cddf0f4..876a295 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
@@ -28,35 +28,35 @@ public interface CqQuery {
/**
* Get the original query string that was specified with CQ.
- *
+ *
* @return String the query string associated with CQ.
*/
public String getQueryString();
/**
* Get the query object generated for this CQs query.
- *
+ *
* @return Query query object for the query string.
*/
public Query getQuery();
/**
* Get the name of the CQ.
- *
+ *
* @return the name of the CQ.
*/
public String getName();
/**
* Get statistics information for this CQ.
- *
+ *
* @return CqStatistics CQ statistics object.
*/
public CqStatistics getStatistics();
/**
* Get CqAttributes for this CQ.
- *
+ *
* @see CqAttributes
* @return CqAttributes cqAttribute set with this CqQuery.
*/
@@ -64,7 +64,7 @@ public interface CqQuery {
/**
* Get CqAttributesMutator for this CQ.
- *
+ *
* @see CqAttributesMutator
* @return CqAttributesMutator.
*/
@@ -77,7 +77,7 @@ public interface CqQuery {
* query is complex and the data set is large, this execution may take a long time, which may
* cause a socket read timeout in the client. To allow adequate time, you may need to set a longer
* pool read-timeout in the client.
- *
+ *
* @throws CqClosedException if this CqQuery is closed.
* @throws RegionNotFoundException if the specified region in the query string is not found.
* @throws IllegalStateException if the CqQuery is in the RUNNING state already.
@@ -91,7 +91,7 @@ public interface CqQuery {
* Start executing the CQ or if this CQ is stopped earlier, resumes execution of the CQ. The CQ is
* executed on primary and redundant servers, if CQ execution fails on all the server then a
* CqException is thrown.
- *
+ *
* @throws CqClosedException if this CqQuery is closed.
* @throws RegionNotFoundException if the specified region in the query string is not found.
* @throws IllegalStateException if the CqQuery is in the RUNNING state already.
@@ -102,7 +102,7 @@ public interface CqQuery {
/**
* Stops this CqQuery without releasing resources. Puts the CqQuery into the STOPPED state. Can be
* resumed by calling execute or executeWithInitialResults.
- *
+ *
* @throws IllegalStateException if the CqQuery is in the STOPPED state already.
* @throws CqClosedException if the CQ is CLOSED.
*/
@@ -111,7 +111,7 @@ public interface CqQuery {
/**
* Get the state of the CQ in CqState object form. CqState supports methods like isClosed(),
* isRunning(), isStopped().
- *
+ *
* @see CqState
* @return CqState state object of the CQ.
*/
@@ -119,7 +119,7 @@ public interface CqQuery {
/**
* Close the CQ and stop execution. Releases the resources associated with this CqQuery.
- *
+ *
* @throws CqClosedException Further calls on this CqQuery instance except for getState() or
* getName().
* @throws CqException - if failure during cleanup of CQ resources.
@@ -128,28 +128,28 @@ public interface CqQuery {
/**
* This allows to check if the CQ is in running or active.
- *
+ *
* @return boolean true if running, false otherwise
*/
public boolean isRunning();
/**
* This allows to check if the CQ is in stopped.
- *
+ *
* @return boolean true if stopped, false otherwise
*/
public boolean isStopped();
/**
* This allows to check if the CQ is closed.
- *
+ *
* @return boolean true if closed, false otherwise
*/
public boolean isClosed();
/**
* This allows to check if the CQ is durable.
- *
+ *
* @return boolean true if durable, false otherwise
* @since GemFire 5.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqResults.java
index e59a71d..2925332 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqResults.java
@@ -20,29 +20,29 @@ package org.apache.geode.cache.query;
* {@linkplain org.apache.geode.cache.query.CqQuery#executeWithInitialResults()} The result will
* contain the instances of {@link Struct} having key and value of the region entry that satisfy the
* CQ query condition.
- *
+ *
* <pre>
* ClientCache cache = ...
* QueryService queryService = PoolManager.find("client").getQueryService();
* CqAttributesFactory cqAf = new CqAttributesFactory();
* CqAttributes cqa = cqAf.create();
- *
+ *
* String cqQueryStr = "SELECT * FROM /root/employees " +
* "WHERE salary > 50000";
- *
- * CqQuery cq = queryService.newCq("MyCq", cqQueryStr, cqa);
- * CqResults results = cq.executeWithInitialResults();
- *
+ *
+ * CqQuery cq = queryService.newCq("MyCq", cqQueryStr, cqa);
+ * CqResults results = cq.executeWithInitialResults();
+ *
* for (Object o : results.asList()) {
* Struct s = (Struct)o;
* System.out.println("key : " + s.get("key") + " value : " + s.get("value"));
* }
*
* </pre>
- *
+ *
* @see org.apache.geode.cache.query.Query#execute()
* @see org.apache.geode.cache.query.CqQuery#executeWithInitialResults()
- *
+ *
* @since GemFire 6.5
*/
public interface CqResults<E> extends SelectResults<E> {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
index 38c47b5..7e5150b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
@@ -25,28 +25,28 @@ public interface CqServiceStatistics {
/**
* Get the number of CQs currently active. Active CQs are those which are executing (in running
* state).
- *
+ *
* @return long number of CQs
*/
public long numCqsActive();
/**
* Get the total number of CQs created. This is a cumulative number.
- *
+ *
* @return long number of CQs created.
*/
public long numCqsCreated();
/**
* Get the total number of closed CQs. This is a cumulative number.
- *
+ *
* @return long number of CQs closed.
*/
public long numCqsClosed();
/**
* Get the number of stopped CQs currently.
- *
+ *
* @return number of CQs stopped.
*/
public long numCqsStopped();
@@ -54,7 +54,7 @@ public interface CqServiceStatistics {
/**
* Get number of CQs that are currently active or stopped. The CQs included in this number are
* either running or stopped (suspended). Closed CQs are not included.
- *
+ *
* @return long number of CQs on client.
*/
public long numCqsOnClient();
@@ -62,7 +62,7 @@ public interface CqServiceStatistics {
/**
* Get number of CQs on the given region. Active CQs and stopped CQs on this region are included
* and closed CQs are not included.
- *
+ *
* @param regionFullPath
* @return long number of CQs on the region.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
index b9b16f5..d657ffb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache.query;
/**
* This interface gives information on the state of a CqQuery. It is provided by the getState method
* of the CqQuery instance.
- *
+ *
* @since GemFire 5.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
index c492771..719b10c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
@@ -18,35 +18,35 @@ package org.apache.geode.cache.query;
/**
* This class provides methods to get statistical information about a registered Continuous Query
* (CQ) represented by the CqQuery object.
- *
+ *
* @since GemFire 5.5
*/
public interface CqStatistics {
/**
* Get number of Insert events qualified by this CQ.
- *
+ *
* @return long number of inserts.
*/
public long numInserts();
/**
* Get number of Delete events qualified by this CQ.
- *
+ *
* @return long number of deletes.
*/
public long numDeletes();
/**
* Get number of Update events qualified by this CQ.
- *
+ *
* @return long number of updates.
*/
public long numUpdates();
/**
* Get total of all the events qualified by this CQ.
- *
+ *
* @return long total number of events.
*/
public long numEvents();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
index 417c18d..3af14b3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
@@ -19,7 +19,7 @@ package org.apache.geode.cache.query;
/**
* Extension of CqListener. Adds two new methods to CqListener, one that is called when the cq is
* connected and one that is called when the cq is disconnected
- *
+ *
*
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/FunctionDomainException.java b/geode-core/src/main/java/org/apache/geode/cache/query/FunctionDomainException.java
index ad6acb5..b91a1f4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/FunctionDomainException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/FunctionDomainException.java
@@ -25,7 +25,7 @@ public class FunctionDomainException extends QueryException {
/**
* Constructs and instance of FunctionDomainException.
- *
+ *
* @param msg error message
*/
public FunctionDomainException(String msg) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Index.java b/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
index 21867d0..b52741f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.query;
-// import java.util.*;
import org.apache.geode.cache.*;
/**
@@ -38,7 +37,7 @@ import org.apache.geode.cache.*;
* <p>
* The optional projectAttributes specifies a tranformation that is done on the values and is used
* for pre-computing a corresponding projection as defined in a query.
- *
+ *
* @see QueryService#createIndex(String, IndexType, String, String)
* @see IndexType
*
@@ -53,21 +52,21 @@ public interface Index {
/**
* Get the index type
- *
+ *
* @return the type of index
*/
public IndexType getType();
/**
* The Region this index is on
- *
+ *
* @return the Region for this index
*/
public Region<?, ?> getRegion();
/**
* Get statistics information for this index.
- *
+ *
* @throws UnsupportedOperationException for indexes created on Maps. Example: Index on Maps with
* expression p['key']. <br>
* On Map type indexes the stats are created at individual key level that can be viewed in
@@ -105,14 +104,14 @@ public interface Index {
/**
* Get the original projectionAttributes for this expression.
- *
+ *
* @return the projectionAttributes, or "*" if there were none specified at index creation.
*/
public String getProjectionAttributes();
/**
* Get the canonicalized projectionAttributes for this expression.
- *
+ *
* @return the projectionAttributes, or "*" if there were none specified at index creation.
*/
public String getCanonicalizedProjectionAttributes();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexCreationException.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexCreationException.java
index 0512d36..8ce9c53 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexCreationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexCreationException.java
@@ -16,14 +16,14 @@ package org.apache.geode.cache.query;
/**
* This class is used to represent any partitioned index creation exceptions.
- *
+ *
*/
public class IndexCreationException extends QueryException {
private static final long serialVersionUID = -2218359458870240534L;
/**
* Constructor with a string message representing the problem.
- *
+ *
* @param msg message representing the cause of exception
*/
public IndexCreationException(String msg) {
@@ -32,7 +32,7 @@ public class IndexCreationException extends QueryException {
/**
* Constructor with a string message representing the problem and also the throwable.
- *
+ *
* @param msg representing the cause of exception
* @param cause the actual exception.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexExistsException.java
index dd04234..e683368 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexExistsException.java
@@ -32,7 +32,7 @@ public class IndexExistsException extends QueryException {
/**
* Constructs instance of IndexNameConflictException with error message
- *
+ *
* @param msg the error message
*/
public IndexExistsException(String msg) {
@@ -41,7 +41,7 @@ public class IndexExistsException extends QueryException {
/**
* Constructs instance of IndexNameConflictException with error message and cause
- *
+ *
* @param msg the error message
* @param cause a Throwable that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexInvalidException.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexInvalidException.java
index 448a452..0be448b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexInvalidException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexInvalidException.java
@@ -33,7 +33,7 @@ public class IndexInvalidException extends GemFireException {
/**
* Construct an instance of IndexInvalidException
- *
+ *
* @param msg the error message
*/
public IndexInvalidException(String msg) {
@@ -42,7 +42,7 @@ public class IndexInvalidException extends GemFireException {
/**
* Construct an instance of IndexInvalidException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause
*/
@@ -53,7 +53,7 @@ public class IndexInvalidException extends GemFireException {
/**
* Construct an instance of IndexInvalidException
- *
+ *
* @param cause a Throwable cause
*/
public IndexInvalidException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexMaintenanceException.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexMaintenanceException.java
index 5a6a041..5e65d18 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexMaintenanceException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexMaintenanceException.java
@@ -34,7 +34,7 @@ public class IndexMaintenanceException extends CacheRuntimeException {
/**
* Constructs an instance of <code>IndexMaintenanceException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message.
*/
public IndexMaintenanceException(String msg) {
@@ -45,7 +45,7 @@ public class IndexMaintenanceException extends CacheRuntimeException {
/**
* Constructs an instance of <code>IndexMaintenanceException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -55,7 +55,7 @@ public class IndexMaintenanceException extends CacheRuntimeException {
/**
* Constructs an instance of <code>IndexMaintenanceException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public IndexMaintenanceException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexNameConflictException.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexNameConflictException.java
index 2ed3b97..fb1bb4b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexNameConflictException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexNameConflictException.java
@@ -31,7 +31,7 @@ public class IndexNameConflictException extends QueryException {
/**
* Constructs instance of IndexNameConflictException with error message
- *
+ *
* @param msg the error message
*/
public IndexNameConflictException(String msg) {
@@ -40,7 +40,7 @@ public class IndexNameConflictException extends QueryException {
/**
* Constructs instance of IndexNameConflictException with error message and cause
- *
+ *
* @param msg the error message
* @param cause a Throwable that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
index 29c5a41..3669cc1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.query;
-// import java.util.*;
/**
* Provides statistics about a GemFire cache {@link Index}.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexType.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexType.java
index 246b110..79bb0a3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexType.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.query;
/**
* @deprecated As of 6.6.1. Check {@link QueryService} for changes.
- *
+ *
* Enumerated type for types of {@linkplain Index indexes}
*
* @since GemFire 4.0
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java b/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java
index 9a6fd41..158db05 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java
@@ -30,9 +30,9 @@ import org.apache.geode.cache.query.internal.DefaultQueryService;
* <li>{@link IndexInvalidException}</li>
* <li>{@link UnsupportedOperationException}</li>
* </ul>
- *
+ *
* @since GemFire 8.1
- *
+ *
*/
public class MultiIndexCreationException extends Exception {
private static final long serialVersionUID = 6312081720315894780L;
@@ -43,7 +43,7 @@ public class MultiIndexCreationException extends Exception {
/**
* Creates an {@link MultiIndexCreationException}
- *
+ *
*/
public MultiIndexCreationException(HashMap<String, Exception> exceptionMap) {
super();
@@ -52,7 +52,7 @@ public class MultiIndexCreationException extends Exception {
/**
* Returns a map of index names and Exceptions
- *
+ *
* @return a map of index names and Exceptions
*/
public Map<String, Exception> getExceptionsMap() {
@@ -61,7 +61,7 @@ public class MultiIndexCreationException extends Exception {
/**
* Returns a set of names for the indexes that failed to create
- *
+ *
* @return set of failed index names
*/
public Set<String> getFailedIndexNames() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/NameNotFoundException.java b/geode-core/src/main/java/org/apache/geode/cache/query/NameNotFoundException.java
index e4e1a8e..e404f8b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/NameNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/NameNotFoundException.java
@@ -28,7 +28,7 @@ public class NameNotFoundException extends NameResolutionException {
/**
* Constructs instance of ObjectNameNotFoundException with error message
- *
+ *
* @param message the error message
*/
public NameNotFoundException(String message) {
@@ -37,7 +37,7 @@ public class NameNotFoundException extends NameResolutionException {
/**
* Constructs instance of ObjectNameNotFoundException with error message and cause
- *
+ *
* @param message the error message
* @param cause a Throwable that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/NameResolutionException.java b/geode-core/src/main/java/org/apache/geode/cache/query/NameResolutionException.java
index b92a022..0496a9c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/NameResolutionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/NameResolutionException.java
@@ -25,7 +25,7 @@ public class NameResolutionException extends QueryException {
/**
* Constructs a NameResolutionException
- *
+ *
* @param msg the error message
*/
public NameResolutionException(String msg) {
@@ -34,7 +34,7 @@ public class NameResolutionException extends QueryException {
/**
* Constructs a NameResolutionException
- *
+ *
* @param msg the error message
* @param cause a Throwable that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/ParameterCountInvalidException.java b/geode-core/src/main/java/org/apache/geode/cache/query/ParameterCountInvalidException.java
index 97413f5..e0bd595 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/ParameterCountInvalidException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/ParameterCountInvalidException.java
@@ -25,7 +25,7 @@ public class ParameterCountInvalidException extends QueryException {
/**
* Creates a new instance of QueryParameterCountInvalidException
- *
+ *
* @param message the error message
*/
public ParameterCountInvalidException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Query.java b/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
index cfb59fd..8d6cdcc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
@@ -16,11 +16,11 @@
package org.apache.geode.cache.query;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.persistence.PartitionOfflineException;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.RegionFunctionContext;
+import org.apache.geode.cache.persistence.PartitionOfflineException;
/**
* Interface for query objects. Supports execution of queries with optional parameters.
@@ -31,7 +31,7 @@ import org.apache.geode.cache.execute.RegionFunctionContext;
public interface Query {
/**
* Return the original query string that was specified in the constructor.
- *
+ *
* @return the original query string
*/
public String getQueryString();
@@ -42,7 +42,7 @@ public interface Query {
* primitive type, an instance of the corresponding wrapper type ({@link java.lang.Integer}, etc.)
* is returned. If the query resolves to more than one object, a {@link SelectResults} is
* returned.
- *
+ *
* Query execution can potentially take a long time depending on data size and query complexity.
* The system property "gemfire.Cache.MAX_QUERY_EXECUTION_TIME" can be set to define the maximum
* time allowed for a query to complete its execution. If query execution time exceeds
@@ -52,7 +52,7 @@ public interface Query {
* the client with its cause set to QueryExecutionTimeoutException. This timeout does not account
* for the time taken to construct the results after execution completes and the results returned
* to the caller.
- *
+ *
* @return The object that represents the result of the query. Note that if a query is just a
* select statement then it will return a result that is an instance of
* {@link SelectResults}. However, since a query is not necessarily just a select
@@ -96,7 +96,7 @@ public interface Query {
* the client with its cause set to QueryExecutionTimeoutException. This timeout does not account
* for the time taken to construct the results after execution completes and the results returned
* to the caller.
- *
+ *
* @param params Values that are bound to parameters (such as <code>$1</code>) in this query.
*
* @return The object that represents the result of the query. Note that if a query is just a
@@ -123,7 +123,7 @@ public interface Query {
* conditions and the resource manager critical heap percentage has been set
* @throws PartitionOfflineException If persistent data recovery is not complete for a partitioned
* region referred to in the query.
- *
+ *
*/
public Object execute(Object... params) throws FunctionDomainException, TypeMismatchException,
NameResolutionException, QueryInvocationTargetException;
@@ -146,15 +146,15 @@ public interface Query {
*
* Using this method a join query query can be executed between two co-located PartitionRegion
* data-set referenced through {@link RegionFunctionContext}.
- *
+ *
* This method should NOT be used for multiple partitioned regions based join queries. We support
* equi-join queries only on co-located PartitionedRegions if the the co-located columns ACTUALLY
* EXIST IN WHERE CLAUSE and in case of multi-column partitioning , should have "AND" clause.
*
* E.g.: // Equi-join query:
- *
+ *
* Select * from /partitionRegion1 p1, /PartitionRegion2 p2 where p1.field = p2.field [AND .....]
- *
+ *
* @since GemFire 6.2.2
* @param context RegionFunctionContext which will target the query on subset of data if executed
* on PartitionedRegion.
@@ -196,7 +196,7 @@ public interface Query {
* The RegionFunctionContext defines the execution context of a data dependent {@link Function}.
* And is obtained when the function is executed using {@link FunctionService#onRegion(Region)},
* the {@link Function#execute(FunctionContext) FunctionContext}
- *
+ *
* E.g.: // Function service execute() method:
*
* public void execute(FunctionContext context) { RegionFunctionContext regionContext =
@@ -205,15 +205,15 @@ public interface Query {
*
* Using this method a join query query can be executed between two co-located PartitionRegion
* data-set referenced through {@link RegionFunctionContext}.
- *
+ *
* This method should NOT be used for multiple partitioned regions based join queries. We support
* equi-join queries only on co-located PartitionedRegions if the the co-located columns ACTUALLY
* EXIST IN WHERE CLAUSE and in case of multi-column partitioning , should have "AND" clause.
*
* E.g.: // Equi-join query:
- *
+ *
* Select * from /partitionRegion1 p1, /PartitionRegion2 p2 where p1.field = p2.field [AND .....]
- *
+ *
* @since GemFire 6.2.2
* @param context RegionFunctionContext which will target the query on subset of data if executed
* on PartitionedRegion.
@@ -261,7 +261,7 @@ public interface Query {
/**
* Return whether this query has been compiled into VM bytecodes.
- *
+ *
* @return <code>true</code> if this query has been compiled into bytecodes
* @deprecated as of 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryException.java
index c12b0cd..732e1f0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryException.java
@@ -20,7 +20,7 @@ import org.apache.geode.GemFireCheckedException;
/**
* Thrown during by the query engine during parsing or execution. Instances of subclasses are thrown
* for more specific exceptions.
- *
+ *
* @since GemFire 4.0
*/
@@ -37,7 +37,7 @@ public /* abstract */ class QueryException extends GemFireCheckedException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -47,7 +47,7 @@ public /* abstract */ class QueryException extends GemFireCheckedException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
*/
public QueryException(String msg) {
@@ -56,7 +56,7 @@ public /* abstract */ class QueryException extends GemFireCheckedException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param cause a Throwable cause of this exception
*/
public QueryException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
index de8a3ab..b2c1c36 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
@@ -20,10 +20,10 @@ import org.apache.geode.cache.control.ResourceManager;
/**
* Thrown when the query is executing and the critical heap percentage is met.
- *
+ *
* @see ResourceManager#setCriticalHeapPercentage(float)
* @see ResourceManager#getCriticalHeapPercentage()
- *
+ *
* If critical heap percentage is set, the query monitor can be disabled from sending out
* QueryExecutionLowMemoryExeceptions at the risk of a query exhausting all memory.
*
@@ -40,7 +40,7 @@ public class QueryExecutionLowMemoryException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionLowMemoryException</code> with the specified
* detail message.
- *
+ *
* @param msg the detail message.
*/
public QueryExecutionLowMemoryException(String msg) {
@@ -50,7 +50,7 @@ public class QueryExecutionLowMemoryException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionLowMemoryException</code> with the specified
* detail message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -61,7 +61,7 @@ public class QueryExecutionLowMemoryException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionLowMemoryException</code> with the specified
* cause.
- *
+ *
* @param cause the causal Throwable
*/
public QueryExecutionLowMemoryException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
index 59a7235..8c4feb6 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
@@ -34,7 +34,7 @@ public class QueryExecutionTimeoutException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionTimeoutException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message.
*/
public QueryExecutionTimeoutException(String msg) {
@@ -44,7 +44,7 @@ public class QueryExecutionTimeoutException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionTimeoutException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -54,7 +54,7 @@ public class QueryExecutionTimeoutException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionTimeoutException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public QueryExecutionTimeoutException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvalidException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvalidException.java
index 937ec2d..0ec9632 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvalidException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvalidException.java
@@ -27,7 +27,7 @@ public class QueryInvalidException extends GemFireException {
/**
* Construct an instance of QueryInvalidException
- *
+ *
* @param msg the error message
*/
public QueryInvalidException(String msg) {
@@ -36,7 +36,7 @@ public class QueryInvalidException extends GemFireException {
/**
* Construct an instance of QueryInvalidException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvocationTargetException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvocationTargetException.java
index cef1233..72a19e3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvocationTargetException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryInvocationTargetException.java
@@ -25,7 +25,7 @@ public class QueryInvocationTargetException extends QueryException {
/**
* Construct an instance of QueryInvalidException
- *
+ *
* @param cause a Throwable cause of this exception
*/
public QueryInvocationTargetException(Throwable cause) {
@@ -35,7 +35,7 @@ public class QueryInvocationTargetException extends QueryException {
/**
* Construct an instance of QueryInvalidException
- *
+ *
* @param msg the error message
*/
public QueryInvocationTargetException(String msg) {
@@ -44,7 +44,7 @@ public class QueryInvocationTargetException extends QueryException {
/**
* Construct an instance of QueryInvalidException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
index f9e53ab..f244b22 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
@@ -15,23 +15,24 @@
package org.apache.geode.cache.query;
import java.util.*;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.internal.Undefined;
/**
* Interface for the query service, which is used for instantiating queries, creating and destroying
* indexes, creating CQs and operating on CQs.
- *
+ *
* Creating an index on an employee's age using QueryService in region "employeeRegion",
* QueryService queryService = cache.getQueryService(); queryService.createIndex ("SampleIndex",
* //IndexName "e.age" //indexExpression "/employeeRegion e", //regionPath );
- *
+ *
* The CQs work on the server regions, the client can use the CQ methods supported in this class to
* create/operate CQs on the server. The CQ obtains the Server connection from the corresponding
* local region on the client. The implementation of this interface is obtained from the Cache using
* {@link Cache#getQueryService}.
*
- *
+ *
* @since GemFire 4.0
*/
public interface QueryService {
@@ -41,7 +42,7 @@ public interface QueryService {
/**
* Constructs a new <code>Query</code> object.
- *
+ *
* @param queryString the String that is the query program
* @return The new <code>Query</code> object.
* @throws QueryInvalidException if the syntax of the queryString is invalid.
@@ -54,17 +55,17 @@ public interface QueryService {
* not supported with asynchronous index maintenance. Hash index is also not supported with a from
* clause with multiple iterators. Queries on numeric types must match the indexed value. For
* Example: For a float field the query should be specified as floatField = 1.0f
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the field of the region values that are referenced by the
* regionPath.
* @param regionPath that resolves to region values or nested collections of region values which
* will correspond to the FROM clause in a query. Check following examples. The regionPath
* is restricted to only one expression
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue = 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* @return the newly created Index
* @throws QueryInvalidException if the argument query language strings have invalid syntax
* @throws IndexInvalidException if the arguments do not correctly specify an index
@@ -74,7 +75,7 @@ public interface QueryService {
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
* @throws UnsupportedOperationException If Index is being created on a region which does not
* support indexes.
- *
+ *
*/
public Index createHashIndex(String indexName, String indexedExpression, String regionPath)
throws IndexInvalidException, IndexNameConflictException, IndexExistsException,
@@ -84,17 +85,17 @@ public interface QueryService {
* Defines a key index that can be used when executing queries. The key index expression indicates
* query engine to use region key as index for query evaluation. They are used to make use of the
* implicit hash index supported with GemFire regions.
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the keys of the region that is referenced by the regionPath.
* For example, an index with indexedExpression "ID" might be used for a query with a WHERE
* clause of "ID > 10", In this case the ID value is evaluated using region keys.
* @param regionPath that resolves to the region which will correspond to the FROM clause in a
* query. The regionPath must include exactly one region.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.ID = 10" indexExpression: "p.ID"
* regionPath: "/portfolio p"
- *
+ *
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
*/
public void defineKeyIndex(String indexName, String indexedExpression, String regionPath)
@@ -106,19 +107,19 @@ public interface QueryService {
* clause with multiple iterators. Queries on numeric types must match the indexed value. For
* Example: For a float field the query should be specified as floatField = 1.0f To create all the
* defined indexes call {@link #createDefinedIndexes()}
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the field of the region values that are referenced by the
* regionPath.
* @param regionPath that resolves to region values or nested collections of region values which
* will correspond to the FROM clause in a query. Check following examples. The regionPath
* is restricted to only one expression
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue = 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
- *
+ *
*/
public void defineHashIndex(String indexName, String indexedExpression, String regionPath)
throws RegionNotFoundException;
@@ -140,10 +141,10 @@ public interface QueryService {
* @param imports string containing imports (in the query language syntax, each import statement
* separated by a semicolon), provides packages and classes used in variable typing in the
* Indexed and FROM expressions. The use is the same as for the FROM clause in querying.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue = 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
*/
public void defineHashIndex(String indexName, String indexedExpression, String regionPath,
@@ -160,15 +161,15 @@ public interface QueryService {
* will correspond to the FROM clause in a query. Check following examples. The regionPath
* must include exactly one region, but may include multiple expressions as required to
* drill down into nested region contents.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue > 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* Query2: "Select * from /portfolio p, p.positions.values pos where pos.secId ='VMWARE'"
* For index on secId field: indexExpression: "pos.secId" regionPath: "/portfolio p,
* p.positions.values pos"
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
- *
+ *
*/
public void defineIndex(String indexName, String indexedExpression, String regionPath)
throws RegionNotFoundException;
@@ -176,7 +177,7 @@ public interface QueryService {
/**
* Defines an index that can be used when executing queries. To create all the defined indexes
* call {@link #createDefinedIndexes()}
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the field of the region values that are referenced by the
* regionPath.
@@ -187,10 +188,10 @@ public interface QueryService {
* @param imports string containing imports (in the query language syntax, each import statement
* separated by a semicolon), provides packages and classes used in variable typing in the
* Indexed and FROM expressions. The use is the same as for the FROM clause in querying.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue > 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* Query2: "Select * from /portfolio p, p.positions.values pos where pos.secId ='VMWARE'"
* For index on secId field: indexExpression: "pos.secId" regionPath: "/portfolio p,
* p.positions.values pos TYPE Position" imports: "package.Position"
@@ -218,10 +219,10 @@ public interface QueryService {
* @param imports string containing imports (in the query language syntax, each import statement
* separated by a semicolon), provides packages and classes used in variable typing in the
* Indexed and FROM expressions. The use is the same as for the FROM clause in querying.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue = 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* @return the newly created Index
* @throws QueryInvalidException if the argument query language strings have invalid syntax
* @throws IndexInvalidException if the arguments do not correctly specify an index
@@ -237,12 +238,12 @@ public interface QueryService {
IndexExistsException, RegionNotFoundException, UnsupportedOperationException;
/**
- *
+ *
* @deprecated As of 6.6.2, use {@link #createIndex(String, String, String)} and
* {@link #createKeyIndex(String, String, String)} instead.
- *
+ *
* Create an index that can be used when executing queries.
- *
+ *
* @param indexName the name of this index, used for statistics collection and to identify this
* index for later access
* @param indexType the type of index. The indexType must be either IndexType.FUNCTIONAL or
@@ -271,7 +272,7 @@ public interface QueryService {
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
* @throws UnsupportedOperationException If Index is being created on a region which overflows to
* disk
- *
+ *
*/
@Deprecated
public Index createIndex(String indexName, IndexType indexType, String indexedExpression,
@@ -281,9 +282,9 @@ public interface QueryService {
/**
* @deprecated As of 6.6.2, use {@link #createIndex(String, String, String, String)} and
* {@link #createKeyIndex(String, String, String)} instead.
- *
+ *
* Create an index that can be used when executing queries.
- *
+ *
* @param indexName the name of this index, used for statistics collection and to identify this
* index for later access
* @param indexType the type of index. The indexType must be either IndexType.FUNCTIONAL or
@@ -323,7 +324,7 @@ public interface QueryService {
/**
* Create an index that can be used when executing queries.
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the field of the region values that are referenced by the
* regionPath.
@@ -331,10 +332,10 @@ public interface QueryService {
* will correspond to the FROM clause in a query. Check following examples. The regionPath
* must include exactly one region, but may include multiple expressions as required to
* drill down into nested region contents.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue > 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* Query2: "Select * from /portfolio p, p.positions.values pos where pos.secId ='VMWARE'"
* For index on secId field: indexExpression: "pos.secId" regionPath: "/portfolio p,
* p.positions.values pos"
@@ -347,7 +348,7 @@ public interface QueryService {
* @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
* @throws UnsupportedOperationException If Index is being created on a region which does not
* support indexes.
- *
+ *
*/
public Index createIndex(String indexName, String indexedExpression, String regionPath)
throws IndexInvalidException, IndexNameConflictException, IndexExistsException,
@@ -355,7 +356,7 @@ public interface QueryService {
/**
* Create an index that can be used when executing queries.
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the field of the region values that are referenced by the
* regionPath.
@@ -366,10 +367,10 @@ public interface QueryService {
* @param imports string containing imports (in the query language syntax, each import statement
* separated by a semicolon), provides packages and classes used in variable typing in the
* Indexed and FROM expressions. The use is the same as for the FROM clause in querying.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.mktValue > 25.00" For index on
* mktValue field: indexExpression: "p.mktValue" regionPath: "/portfolio p"
- *
+ *
* Query2: "Select * from /portfolio p, p.positions.values pos where pos.secId ='VMWARE'"
* For index on secId field: indexExpression: "pos.secId" regionPath: "/portfolio p,
* p.positions.values pos TYPE Position" imports: "package.Position"
@@ -391,17 +392,17 @@ public interface QueryService {
* Create a key index that can be used when executing queries. The key index expression indicates
* query engine to use region key as index for query evaluation. They are used to make use of the
* implicit hash index supported with GemFire regions.
- *
+ *
* @param indexName the name of this index.
* @param indexedExpression refers to the keys of the region that is referenced by the regionPath.
* For example, an index with indexedExpression "ID" might be used for a query with a WHERE
* clause of "ID > 10", In this case the ID value is evaluated using region keys.
* @param regionPath that resolves to the region which will correspond to the FROM clause in a
* query. The regionPath must include exactly one region.
- *
+ *
* Example: Query1: "Select * from /portfolio p where p.ID = 10" indexExpression: "p.ID"
* regionPath: "/portfolio p"
- *
+ *
* @return the newly created Index
* @throws QueryInvalidException if the argument query language strings have invalid syntax
* @throws IndexInvalidException if the arguments do not correctly specify an index
@@ -419,7 +420,7 @@ public interface QueryService {
/**
* Creates all the indexes that were defined using {@link #defineIndex(String, String, String)}
- *
+ *
* @throws MultiIndexCreationException which consists a map of failed indexNames and the
* Exceptions.
*/
@@ -432,7 +433,7 @@ public interface QueryService {
/**
* Get the Index from the specified Region with the specified name.
- *
+ *
* @param region the Region for the requested index
* @return the index of the region with this name, or null if there isn't one
*/
@@ -440,26 +441,26 @@ public interface QueryService {
/**
* Get a collection of all the indexes in the Cache.
- *
+ *
* @return the collection of all indexes in this Cache
*/
public Collection<Index> getIndexes();
/**
* Get a collection of all the indexes on the specified Region
- *
+ *
* @param region the region for the requested indexes
* @return the collection of indexes on the specified region
*/
public Collection<Index> getIndexes(Region<?, ?> region);
/**
- *
+ *
* @deprecated As of 6.6.2, use {@link #getIndexes(Region)} only.
- *
+ *
* Get a collection of all the indexes on the specified Region of the specified index
* type.
- *
+ *
* @param region the region for the requested indexes
* @param indexType the type of indexes to get. Currently must be Indexable.FUNCTIONAL
* @return the collection of indexes for the specified region and type
@@ -469,7 +470,7 @@ public interface QueryService {
/**
* Remove the specified index.
- *
+ *
* @param index the Index to remove
*/
public void removeIndex(Index index);
@@ -481,7 +482,7 @@ public interface QueryService {
/**
* Remove all the indexes on the specified Region
- *
+ *
* @param region the Region to remove all indexes from
*/
public void removeIndexes(Region<?, ?> region);
@@ -492,7 +493,7 @@ public interface QueryService {
/**
* Constructs a new continuous query, represented by an instance of CqQuery. The CqQuery is not
* executed until the execute method is invoked on the CqQuery.
- *
+ *
* @since GemFire 5.5
* @param queryString the OQL query
* @param cqAttr the CqAttributes
@@ -584,7 +585,7 @@ public interface QueryService {
* Unregister all Continuous Queries. All artifacts and resources associated with the CQs are
* released. Any attempt to access closed CqQuery objects will result in the CqClosedException
* being thrown to the caller.
- *
+ *
* @since GemFire 5.5
*/
public void closeCqs();
@@ -600,7 +601,7 @@ public interface QueryService {
/**
* Retrieves all the registered Continuous Queries for a given region. This is a collection of
* CqQuery objects.
- *
+ *
* @since GemFire 5.5
* @return CqQuery[] list of registered CQs on the specified region, null if there are no CQs.
* @exception CqException if the region does not exist.
@@ -609,7 +610,7 @@ public interface QueryService {
/**
* Retrieves the Continuous Query specified by the name.
- *
+ *
* @since GemFire 5.5
* @param cqName - String, name of the CQ
* @return CqQuery object, null if no CqQuery object is found.
@@ -619,9 +620,9 @@ public interface QueryService {
/**
* Starts execution of all the registered continuous queries for this client. This is
* complementary to stopCqs.
- *
+ *
* @see QueryService#stopCqs()
- *
+ *
* @since GemFire 5.5
* @throws CqException if failure to execute CQ.
*/
@@ -630,9 +631,9 @@ public interface QueryService {
/**
* Stops execution of all the continuous queries for this client to become inactive. This is
* useful when client needs to control the incoming CQ messages during bulk region operations.
- *
+ *
* @see QueryService#executeCqs()
- *
+ *
* @since GemFire 5.5
* @throws CqException if failure to execute CQ.
*/
@@ -641,9 +642,9 @@ public interface QueryService {
/**
* Starts execution of all the continuous queries registered on the specified region for this
* client. This is complementary method to stopCQs().
- *
+ *
* @see QueryService#stopCqs()
- *
+ *
* @since GemFire 5.5
* @throws CqException if failure to stop CQs.
*/
@@ -653,9 +654,9 @@ public interface QueryService {
* Stops execution of all the continuous queries registered on the specified region for this
* client. This is useful when client needs to control the incoming CQ messages during bulk region
* operations.
- *
+ *
* @see QueryService#executeCqs()
- *
+ *
* @since GemFire 5.5
* @throws CqException if failure to execute CQs.
*/
@@ -675,12 +676,12 @@ public interface QueryService {
* CQs is collected: Number of CQs created (cumulative) Number of CQs active currently Number of
* CQs stopped or suspended currently Number of CQs closed (cumulative) Number of CQs active on a
* specified region currently
- *
+ *
* @see CqServiceStatistics
- *
+ *
* @since GemFire 5.5
* @return CqServiceStatistics
- *
+ *
*/
public CqServiceStatistics getCqStatistics();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/RegionNotFoundException.java b/geode-core/src/main/java/org/apache/geode/cache/query/RegionNotFoundException.java
index d1112d7..708bc8c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/RegionNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/RegionNotFoundException.java
@@ -25,7 +25,7 @@ public class RegionNotFoundException extends NameResolutionException {
/**
* Construct an instance of RegionNotFoundException
- *
+ *
* @param msg the error message
*/
public RegionNotFoundException(String msg) {
@@ -34,7 +34,7 @@ public class RegionNotFoundException extends NameResolutionException {
/**
* Constructs an instance of RegionNotFoundException
- *
+ *
* @param msg the error message
* @param cause a Throwable that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
index 71a45c2..a32d823 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.query;
import java.util.*;
+
import org.apache.geode.cache.query.types.*;
/**
@@ -65,7 +66,7 @@ public interface SelectResults<E> extends Collection<E> {
/**
* Return whether this collection is modifiable. The result of this method has no bearing on
* whether the elements in the collection themselves are modifiable.
- *
+ *
* @return true if this collection is modifiable, false if not.
*/
public boolean isModifiable();
@@ -74,7 +75,7 @@ public interface SelectResults<E> extends Collection<E> {
* Return the number of times element occurs in this collection, that is the number of duplicates
* <code>element</code> has in this collection as defined by the <code>equals></code> method. If
* <code>element</code> is not present in this collection, then 0 is returned.
- *
+ *
* @param element the element
* @return the number of occurrances of element
* @since GemFire 5.1
@@ -85,7 +86,7 @@ public interface SelectResults<E> extends Collection<E> {
* Returns this <code>SelectResults</code> as a <code>java.util.Set</code>. If this collection is
* distinct and unordered, then no copying is necessary. Otherwise, the contents of this
* collection will be copied into a new instance of java.util.HashSet.
- *
+ *
* @return Is this collection as a <code>java.util.Set</code>?
*/
public Set<E> asSet();
@@ -94,14 +95,14 @@ public interface SelectResults<E> extends Collection<E> {
* Returns this <code>SelectedResults</code> as a <code>java.util.List</code>. If this collection
* is ordered, then no copying is necessary. Otherwise, the contents of this collection will be
* copied into a new instance of java.util.ArrayList.
- *
+ *
* @return this collection as a java.util.List
*/
public List<E> asList();
/**
* Return the ObjectType for the type of collection this represents.
- *
+ *
* @return the CollectionType for the type of collection this represents
*/
public CollectionType getCollectionType();
@@ -110,7 +111,7 @@ public interface SelectResults<E> extends Collection<E> {
* Specify a new elementType, overriding any existing known elementType. This modifies the
* CollectionType for this object to be the same collection type but with the newly specified
* element type.
- *
+ *
* @param elementType the new elementType
*/
public void setElementType(ObjectType elementType);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java b/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
index 735d2fb..d3836af 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.query;
-// import java.util.*;
import org.apache.geode.cache.query.types.StructType;
/**
@@ -42,7 +41,7 @@ public interface Struct {
/**
* Get the values in this struct
- *
+ *
* @return the array of values
*/
public Object[] getFieldValues();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/TypeMismatchException.java b/geode-core/src/main/java/org/apache/geode/cache/query/TypeMismatchException.java
index be92852..f19f6ec 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/TypeMismatchException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/TypeMismatchException.java
@@ -25,7 +25,7 @@ public class TypeMismatchException extends QueryException {
/**
* Construct an instance of TypeMismatchException
- *
+ *
* @param msg the error message
*/
public TypeMismatchException(String msg) {
@@ -34,7 +34,7 @@ public class TypeMismatchException extends QueryException {
/**
* Construct an instance of TypeMismatchException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
index 85ad6fa..3565478 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
@@ -15,16 +15,16 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.cache.query.internal.types.TypeUtils;
/**
* Class Description
- *
+ *
* @version $Revision: 1.1 $
*/
public abstract class AbstractCompiledValue implements CompiledValue, Filter, OQLLexerTokenTypes {
@@ -185,7 +185,7 @@ public abstract class AbstractCompiledValue implements CompiledValue, Filter, OQ
* normal filterEvaluate. This is here for benefit of nested CompiledJunctions: filterEvaluate is
* called first, then auxFilterEvaluate is called on the operands that have been organized to be
* filters
- *
+ *
* @see CompiledJunction#filterEvaluate
*/
public SelectResults auxFilterEvaluate(ExecutionContext context,
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
index 35f0290..bf8dbda 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
@@ -18,6 +18,8 @@
*/
package org.apache.geode.cache.query.internal;
+import java.util.*;
+
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
@@ -26,10 +28,8 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.*;
-
/**
- *
+ *
*/
public abstract class AbstractGroupOrRangeJunction extends AbstractCompiledValue
implements Filter, OQLLexerTokenTypes {
@@ -429,7 +429,7 @@ public abstract class AbstractGroupOrRangeJunction extends AbstractCompiledValue
* Segregates the Where clause operands of a Range or Group Junction into filter evaluatable &
* iter evaluatable operands by creating an Object of Organizedoperands. This method is invoked
* from organizeOperands of Group or Range Junction.
- *
+ *
* @param indexCount Indicates the number of operands of the evalOperands List which are filter
* evaluatable. The filter evaluatable operands are present at the start of the List
* @param evalOperands List containing the operands of the Group or Range Junction. The operands
@@ -490,7 +490,7 @@ public abstract class AbstractGroupOrRangeJunction extends AbstractCompiledValue
* else if a GroupJunction then that will be created. This method retains the operands of the old
* junction while creating the new junction and adds the iter operands passed, to the existing
* operands.
- *
+ *
* @param completeExpansion if true indicates that the junction on evaluation should be expanded
* to the query from clause level.
* @param indpnds The independent runtime iterators to which this group belongs to. Normally it
@@ -511,7 +511,7 @@ public abstract class AbstractGroupOrRangeJunction extends AbstractCompiledValue
* else if a GroupJunction then that will be created. This method discards the operands of the old
* junction while creating the new junction . The new junction will only have the operands passed
* to it.
- *
+ *
* @param operator The junction type ( AND or OR ) of the old junction
* @param indpndntItr Array of RuntimeIterator representing the Independent Iterator for the Group
* or Range Junction
@@ -527,7 +527,7 @@ public abstract class AbstractGroupOrRangeJunction extends AbstractCompiledValue
* Segregates the conditions into those which are filter evaluatable and which are iter
* evaluatable. This method is appropriately overridden in the GroupJunction and RangeJunction
* class.
- *
+ *
* @param context ExecutionContext object
* @return Object of type OrganizedOperands
* @throws FunctionDomainException
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
index 857ce95..c72ce11 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
@@ -18,6 +18,7 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
@@ -36,7 +37,7 @@ import org.apache.geode.cache.query.types.StructType;
* actual creation will occur iff there exists more than one GroupJunction or more than one
* CompositeGroupJunction or a combination of one or more GroupJunctions & one or more
* CompositeGroupJunctions
- *
+ *
*/
public class AllGroupJunction extends AbstractCompiledValue implements Filter, OQLLexerTokenTypes {
@@ -88,7 +89,7 @@ public class AllGroupJunction extends AbstractCompiledValue implements Filter, O
* well as evaluating any iter evaluatable conditions. The evaluated result of an AllGroupJunction
* will always be of the query from clause level which can be ORed or ANDd with filter evaluatable
* subtree CompiledJunction
- *
+ *
* @param context ExecutionContext object
* @return SelectResults
* @throws FunctionDomainException
@@ -182,7 +183,7 @@ public class AllGroupJunction extends AbstractCompiledValue implements Filter, O
* expanded results so obtained are then merged (union) to get the ORed results.The evaluated
* result of an AllGroupJunction will always be of the query from clause iterator level (top
* level) which can be ORed or ANDd with filter evaluable subtree CompiledJunction.
- *
+ *
* @param context ExecutionContext object
* @return SelectResults object
* @throws FunctionDomainException
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
index 55cfe2c..53c2e7f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
@@ -198,7 +198,7 @@ public class AttributeDescriptor {
/**
* reads field value from a PdxInstance
- *
+ *
* @param target
* @return the value of the field from PdxInstance
* @throws NameNotFoundException
@@ -309,4 +309,3 @@ public class AttributeDescriptor {
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java
index 9317c93..bfc2a0a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java
@@ -45,7 +45,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Implementation of SelectResults that allows duplicates . The keys store the elements of the
* collection and the the values store the number of occurrences as an int.
- *
+ *
* @see ResultsBag
* @see StructBag
* @see SortedResultsBag
@@ -344,7 +344,7 @@ public abstract class Bag<E> extends AbstractCollection<E> implements CqResults<
}
/**
- *
+ *
* @param out
* @throws IOException
*/
@@ -353,7 +353,7 @@ public abstract class Bag<E> extends AbstractCollection<E> implements CqResults<
}
/**
- *
+ *
* @param in
* @throws IOException
*/
@@ -528,7 +528,7 @@ public abstract class Bag<E> extends AbstractCollection<E> implements CqResults<
* package visibility so ResultsCollectionWrapper can reference it. This SetView is serialized as
* a special case by a ResultsCollectionWrapper. Keith: Refactored to add consideration for LIMIT,
* April 1, 2009
- *
+ *
* @see ResultsCollectionWrapper#toData
*/
class SetView extends AbstractSet {
@@ -667,7 +667,7 @@ public abstract class Bag<E> extends AbstractCollection<E> implements CqResults<
*
*/
protected class LimitBagIterator extends Bag.BagIterator {
- final private int localLimit;
+ private final int localLimit;
private int currPos = 0;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledAggregateFunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledAggregateFunction.java
index 9544bbb..d6b2eed 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledAggregateFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledAggregateFunction.java
@@ -19,6 +19,7 @@ import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.cache.query.internal.aggregate.Avg;
import org.apache.geode.cache.query.internal.aggregate.AvgBucketNode;
import org.apache.geode.cache.query.internal.aggregate.AvgDistinct;
import org.apache.geode.cache.query.internal.aggregate.AvgDistinctPRQueryNode;
@@ -26,19 +27,18 @@ import org.apache.geode.cache.query.internal.aggregate.AvgPRQueryNode;
import org.apache.geode.cache.query.internal.aggregate.Count;
import org.apache.geode.cache.query.internal.aggregate.CountDistinct;
import org.apache.geode.cache.query.internal.aggregate.CountDistinctPRQueryNode;
-import org.apache.geode.cache.query.internal.aggregate.SumDistinctPRQueryNode;
import org.apache.geode.cache.query.internal.aggregate.CountPRQueryNode;
import org.apache.geode.cache.query.internal.aggregate.DistinctAggregator;
import org.apache.geode.cache.query.internal.aggregate.MaxMin;
-import org.apache.geode.cache.query.internal.aggregate.Avg;
import org.apache.geode.cache.query.internal.aggregate.Sum;
import org.apache.geode.cache.query.internal.aggregate.SumDistinct;
+import org.apache.geode.cache.query.internal.aggregate.SumDistinctPRQueryNode;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
/**
- *
+ *
*
*/
public class CompiledAggregateFunction extends AbstractCompiledValue {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
index 03ec478..24f8b2f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
@@ -18,12 +18,12 @@ package org.apache.geode.cache.query.internal;
import java.util.*;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.cache.query.AmbiguousNameException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.pdx.internal.PdxString;
/**
* Class Description
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java
index 360d655..651cf23 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java
@@ -42,7 +42,7 @@ import org.apache.geode.pdx.internal.PdxString;
/**
* Comparison value: <, >, <=, >=, <>, =
- *
+ *
*/
public class CompiledComparison extends AbstractCompiledValue
implements Negatable, OQLLexerTokenTypes, Indexable {
@@ -144,7 +144,7 @@ public class CompiledComparison extends AbstractCompiledValue
* passed will be null except if a GroupJunction has only one filter evaluatable condition & rest
* are iter operands. In such cases , the iter operands will be evaluated while expanding/cutting
* down the index resultset
- *
+ *
* @return SelectResults
*/
@Override
@@ -179,7 +179,7 @@ public class CompiledComparison extends AbstractCompiledValue
* is no index available. Asif :The booelan true implies that CompiledComparsion when existing on
* its own always requires a Completeexpansion to top level iterators. This flag can get toggled
* to false only from inside a GroupJunction
- *
+ *
* @param intermediateResults if this parameter is provided, and we have to iterate, then iterate
* over this result set instead of the entire base collection.
*/
@@ -353,7 +353,7 @@ public class CompiledComparison extends AbstractCompiledValue
* is a StructBag). If the match level is zero & expand to to top level flag is true & iff the
* total no. of iterators in current scope is greater than the no. of fields in StructBag , then
* only we need to do any expansion.
- *
+ *
*/
try {
@@ -515,7 +515,7 @@ public class CompiledComparison extends AbstractCompiledValue
* empty or null, in such cases , we have to definitely use indexes on both conditions & go for
* complete expansion or CompsoiteGroupJunction expansion as be the case. ( ie retaining the old
* logic of expanding the index result to top or compositeGroupJunction level)
- *
+ *
* The condition in which we sure are to use indexes on both LHS & RHS & the the resultset
* expanded to CGJ or top level are 1) A stand alone filterable composite condition : In such
* cases the independent group of itr is passed as null , the intermediate resultset is empty &
@@ -523,23 +523,23 @@ public class CompiledComparison extends AbstractCompiledValue
* Multiple filterable composite condition in OR junction: In such cases the independent grp of
* its passed is not null but the intermediate resultset is null . This means that indexes on
* both LHS & RHS to be used & expanded to top or CGJ level ( same as above)
- *
+ *
* The case which is different from above is AND condition evaluation In such cases, till the
* last but one filerable condition we pass complete expn flag as false & group of indpndt itrs
* as null. Only last filterabel condn is passed genuine value of expn flag & the not null grp
* of independent itrs . The intermedaite set is not null & not empty for such cases which wil
* help us distinguish the case from OR junction
- *
+ *
* IndependentGroup Iterators being null or not null is not a definitive & exclusive * criteria
* for knowing whether the CC result needs to be expanded to Top or CGJ level as for independent
* grp not null will happen in OR junction implying expn to CGJ level & ignoring intermediate
* resultset as well as in evalaution of last filterable condition of AND junction implying
* usage of intermediate resultset for cartesian.
- *
+ *
* Similarly grp of indpendent itrs can be null for stand alone condition implying expn to top
* level & ignoring intermediate set & also for evaluating all the conditions except last in AND
* junction( which means using intermediate resultset for cartesian)
- *
+ *
*/
if ((intermediateResults == null || intermediateResults.isEmpty())
&& (indpdntItrs != null || completeExpansionNeeded)) {
@@ -549,7 +549,7 @@ public class CompiledComparison extends AbstractCompiledValue
* resultset is a StructBag). If the match level is zero & expand to to top level flag is true
* & iff the total no. of iterators in current scope is greater than the no. of fields in
* StructBag , then only we need to do any expansion.
- *
+ *
*/
Support.Assert(this._operator == TOK_EQ,
"A relationship index is not usable for any condition other than equality");
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
index bc9039a..325ff2b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.query.*;
import org.apache.geode.internal.Assert;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
index 349e3f4..ca883ee 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.query.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -111,4 +112,3 @@ public class CompiledFunction extends AbstractCompiledValue {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java
index 1c4a691..5d8c97d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java
@@ -41,7 +41,7 @@ import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
*
*/
public class CompiledGroupBySelect extends CompiledSelect {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
index 6eb716b..300185c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
@@ -15,8 +15,9 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
-import org.apache.geode.cache.query.*;
+
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.*;
import org.apache.geode.internal.cache.PartitionedRegion;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIn.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIn.java
index 2a6566d..409fb29 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIn.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIn.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.Region;
@@ -41,6 +40,7 @@ import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.index.IndexData;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.IndexUtils;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.cache.query.types.ObjectType;
@@ -240,7 +240,7 @@ public class CompiledIn extends AbstractCompiledValue implements Indexable {
/**
* specialized optimization for doing a bulk get on a region.
- *
+ *
* @return a List of entries if optimization was performed, null if no match
*/
List optimizeBulkGet(CompiledRegion cRgn, ExecutionContext context)
@@ -361,7 +361,7 @@ public class CompiledIn extends AbstractCompiledValue implements Indexable {
* passed will be null except if a GroupJunction has only one filter evaluatable condition & rest
* are iter operands. In such cases , the iter operands will be evaluated while expanding/cutting
* down the index resultset
- *
+ *
* @return SelectResults
*/
public SelectResults filterEvaluate(ExecutionContext context, SelectResults intermediateResults,
@@ -633,7 +633,7 @@ public class CompiledIn extends AbstractCompiledValue implements Indexable {
* is no index available. The boolean true implies that CompiledComparison when existing on its
* own always requires a CompleteExpansion to top level iterators. This flag can get toggled to
* false only from inside a GroupJunction
- *
+ *
* @param intermediateResults if this parameter is provided, and we have to iterate, then iterate
* over this result set instead of the entire base collection.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
index f480ebf..97c8b25 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.cache.query.internal;
+import java.lang.reflect.Array;
import java.util.*;
-import org.apache.geode.cache.query.*;
import org.apache.geode.cache.*;
+import org.apache.geode.cache.query.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.lang.reflect.Array;
-
/**
* Class Description
- *
+ *
* @version $Revision: 1.1 $
*/
public class CompiledIndexOperation extends AbstractCompiledValue implements MapIndexable {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIteratorDef.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIteratorDef.java
index fda594d..bb46d91 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIteratorDef.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIteratorDef.java
@@ -160,7 +160,7 @@ public class CompiledIteratorDef extends AbstractCompiledValue {
/**
* Evaluate just the collectionExpr
- *
+ *
* @param stopAtIter the RuntimeIterator associated with this iterator defn -- don't use this or
* any subsequent runtime iterators to evaluate.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledJunction.java
index ece8a9d..3c5c268 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledJunction.java
@@ -50,34 +50,34 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* AllGroupJunction & CompositeGroupJunction. The method createJunction is where the decision of
* creating an AllGroupJunction ( wrapping multiple GroupJunctions and CompositeGroupJunctions) or a
* single GroupJunction or a singe CompositeGroupJunction is taken.
- *
+ *
* CompiledJunction -----> on organization of Operands may result in any of the following cases
- *
+ *
* 1) CompiledJunction | | -------------------------------- | | CompiledJunction GroupJunction
* (Filter evaluable) (Filter evaluable)
- *
+ *
* 2) CompiledJunction | | -------------------------------- | | CompiledJunction RangeJunction
* (Filter evaluable same index operands. May contain iter operands belonging to the same Group)
* (Filter evaluable)
- *
- *
+ *
+ *
* 3) CompiledJunction | | -------------------------------- | | CompiledJunction GroupJunction
* (Filter evaluable) (Filter evaluable) | | ---------------------------------------------- | |
* CompiledComparison RangeJunction (at least one filter evaluable compiled Comparison using an
* index shared by no other condition)
- *
- *
+ *
+ *
* 5) CompiledJunction | | -------------------------------- | | CompiledJunction GroupJunction
* (Filter evaluable) (Filter evaluable) | | --------------------------------------- | | |
* RangeJunction RangeJunction CompiledComparison (zero or more Filter evaluable or iter evaluable )
- *
+ *
* 6) CompiledJunction | ---------------------------------- | | CompiledJunction AllGroupJunction
* (filter evaluable) | ------------------------------------------------ | | | GroupJunction
* GroupJunction CompositeGroupJunction | --------------------------------------- | | |
* GroupJunction equi join conditions GroupJunction
- *
- *
- *
+ *
+ *
+ *
* @version $Revision: 1.2 $
*/
public class CompiledJunction extends AbstractCompiledValue implements Negatable {
@@ -97,7 +97,7 @@ public class CompiledJunction extends AbstractCompiledValue implements Negatable
// join is added
// after a valid operand has already set the counter to an integer, we instead just ignore and do
// not set the place holder
- private final static String PLACEHOLDER_FOR_JOIN = "join";
+ private static final String PLACEHOLDER_FOR_JOIN = "join";
CompiledJunction(CompiledValue[] operands, int operator) {
// invariant: operator must be LITERAL_and or LITERAL_or
@@ -443,7 +443,7 @@ public class CompiledJunction extends AbstractCompiledValue implements Negatable
* exclusively dependent only on the independent iterator of the group. Any iterator which is
* ultimately dependent on more than one independent iterators cannot be assumed to be part of the
* GroupJunction, even if one of independent iterator belongs to a different scope.
- *
+ *
* @param context
* @return New combination of AbstractCompiledValue(s) in form of CompiledJunction.
* @throws FunctionDomainException
@@ -622,7 +622,7 @@ public class CompiledJunction extends AbstractCompiledValue implements Negatable
* exists operands using multiple indexes, then a GroupJunction is created. In that case , the
* operands using the same index are grouped in a RangeJunction & that Range Junction becomes part
* of the GroupJunction. A GroupJunction may contain one or more RangeJunction
- *
+ *
* @param needsCompacting boolean indicating if there is a possibility of RangeJunction or not. If
* needsCompacting is false , then a GroupJunction will be formed, without any
* RangeJunction
@@ -1067,16 +1067,16 @@ public class CompiledJunction extends AbstractCompiledValue implements Negatable
* optimizes the limit on index intermediate results ONLY if ONE index is used for whole query and
* all conditions in where clause use that index. Look at the call hierarchy of this function.
* There are two cases:
- *
+ *
* Literal_OR: A junction with OR will contain operands which are CompiledComparison or
* CompiledJunction (or subjunction). we recursively check if all of those use the same index and
* if ANY one of those comparisons or subjunctions does not use the index, it retruns false.
- *
+ *
* Literal_AND: If we get combination of comparisons and subjunctions then limit is NOT applicable
* on index results. Like, "where ID != 10 AND (ID < 5 OR ID > 10) LIMIT 5". If we get only
* comparisons ONLY then if all comparisons use the same index then limit is applicable and this
* returns true. Like, "where ID != 10 AND (ID < 5 AND ID > 10) LIMIT 5".
- *
+ *
*/
@Override
public boolean isLimitApplicableAtIndexLevel(ExecutionContext context)
@@ -1155,7 +1155,7 @@ public class CompiledJunction extends AbstractCompiledValue implements Negatable
/*
* class CGJData { RuntimeIterator [] indpndItrs = null; List iterOperands = null; List
* groupJunctions = null; CompiledValue [] compositeCompiledComparisons = null;
- *
+ *
* CGJData(RuntimeIterator [] indpndItrs, List iterOperands,List groupJunctions, CompiledValue []
* compositeCompiledComparisons) { this.indpndItrs = indpndItrs; this.iterOperands = iterOperands;
* this.groupJunctions = groupJunctions; this.compositeCompiledComparisons =
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLike.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLike.java
index 4930aed..ee4860c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLike.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLike.java
@@ -120,7 +120,7 @@ public class CompiledLike extends CompiledComparison {
/**
* Expands the CompiledLike operands based on sargability into multiple CompiledComparisons
- *
+ *
* @return The generated CompiledComparisons
*/
CompiledComparison[] getExpandedOperandsWithIndexInfoSetIfAny(ExecutionContext context)
@@ -194,7 +194,7 @@ public class CompiledLike extends CompiledComparison {
/**
* Breaks down the like predicate (if sargable) into 2 or 3 CompiledComparisons based on the
* presence of wildcard
- *
+ *
* @return The generated CompiledComparisons
*/
CompiledComparison[] getRangeIfSargable(ExecutionContext context, CompiledValue var,
@@ -364,7 +364,7 @@ public class CompiledLike extends CompiledComparison {
/**
* Checks if index can be used for Strings with wildcards. Two wild cards are supported % and _.
* The wildcard could be at any index position of the string.
- *
+ *
* @return position of wildcard if sargable otherwise -1
*/
int checkIfSargableAndRemoveEscapeChars(ExecutionContext context, StringBuffer buffer) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
index 32c5c4d..3fc47e5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
@@ -15,10 +15,8 @@
package org.apache.geode.cache.query.internal;
-// import java.util.*;
import org.apache.geode.cache.query.*;
import org.apache.geode.pdx.internal.PdxString;
-// import org.apache.geode.internal.Assert;
/**
* Class Description
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
index 0e5bd14..e9c5bd9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
@@ -111,7 +111,7 @@ public class CompiledOperation extends AbstractCompiledValue {
/*
* // evaluate on current iteration of collection if (rcvrItr != null) { result =
* eval0(rcvrItr.evaluate(context), rcvrItr.getElementType().resolveClass(), context); }
- *
+ *
* // function call: no functions implemented except keywords in the grammar throw new
* TypeMismatchException(LocalizedStrings.CompiledOperation_COULD_NOT_RESOLVE_METHOD_NAMED_0.
* toLocalizedString(this.methodName));
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
index 4df2287..92eb985 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
@@ -17,9 +17,9 @@ package org.apache.geode.cache.query.internal;
import java.util.*;
-import org.apache.geode.cache.query.*;
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.*;
import org.apache.geode.internal.cache.PartitionedRegion;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
index 83228f3..5a80613 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
@@ -15,9 +15,10 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.*;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java
index dbaba84..760d36f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java
@@ -87,7 +87,7 @@ public class CompiledSelect extends AbstractCompiledValue {
* locks. Now we set a value so that it will not do this. See where we use this value to see how
* unlock is determined
*/
- private final static String CLAUSE_EVALUATED = "Evaluated";
+ private static final String CLAUSE_EVALUATED = "Evaluated";
public CompiledSelect(boolean distinct, boolean count, CompiledValue whereClause, List iterators,
List projAttrs, List<CompiledSortCriterion> orderByAttrs, CompiledValue limit,
@@ -357,9 +357,9 @@ public class CompiledSelect extends AbstractCompiledValue {
* Gets the appropriate empty results set when outside of actual query evalutaion.
*
* @param parameters the parameters that will be passed into the query when evaluated
- *
+ *
* @param cache the cache the query will be executed in the context of
- *
+ *
* @return the empty result set of the appropriate type
*/
public SelectResults getEmptyResultSet(Object[] parameters, InternalCache cache, Query query)
@@ -587,7 +587,7 @@ public class CompiledSelect extends AbstractCompiledValue {
/*
* We still have to get size of SelectResults in some cases like, if index was used OR query
* is a distinct query.
- *
+ *
* If SelectResult size is zero then we need to put Integer for 0 count.
*/
if (this.count) {
@@ -1463,19 +1463,19 @@ public class CompiledSelect extends AbstractCompiledValue {
/*
* A special evaluation of limit for when limit needs to be evaluated before an execution context
* is created.
- *
+ *
* It assumes the limit is either a CompiledBindArgument or a CompiledLiteral
- *
+ *
* @param bindArguments
- *
+ *
* @return
- *
+ *
* @throws FunctionDomainException
- *
+ *
* @throws TypeMismatchException
- *
+ *
* @throws NameResolutionException
- *
+ *
* @throws QueryInvocationTargetException
*/
private Integer evaluateLimitValue(Object[] bindArguments) throws FunctionDomainException,
@@ -1511,5 +1511,3 @@ public class CompiledSelect extends AbstractCompiledValue {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
index 036895b..f1b62e4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
@@ -15,6 +15,7 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.query.AmbiguousNameException;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
@@ -24,14 +25,14 @@ import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
*/
public class CompiledUnaryMinus extends AbstractCompiledValue {
private CompiledValue _value;
/**
- *
+ *
* @param value
*/
public CompiledUnaryMinus(CompiledValue value) {
@@ -61,7 +62,7 @@ public class CompiledUnaryMinus extends AbstractCompiledValue {
}
/**
- *
+ *
*/
@Override
public Set computeDependencies(ExecutionContext context)
@@ -70,7 +71,7 @@ public class CompiledUnaryMinus extends AbstractCompiledValue {
}
/**
- *
+ *
* @param obj
* @return Object
* @throws TypeMismatchException
@@ -97,5 +98,3 @@ public class CompiledUnaryMinus extends AbstractCompiledValue {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
index 0a8b129..59f523c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
@@ -26,7 +26,7 @@ import org.apache.geode.cache.query.types.StructType;
/**
* Predefined function for identity of the UNDEFINED literal
- *
+ *
* @version $Revision: 1.2 $
*/
public class CompiledUndefined extends AbstractCompiledValue implements Negatable, Indexable {
@@ -63,7 +63,7 @@ public class CompiledUndefined extends AbstractCompiledValue implements Negatabl
* passed will be null except if a GroupJunction has only one filter evaluatable condition & rest
* are iter operands. In such cases , the iter operands will be evaluated while expanding/cutting
* down the index resultset
- *
+ *
* @return SelectResults
*/
@Override
@@ -128,7 +128,7 @@ public class CompiledUndefined extends AbstractCompiledValue implements Negatabl
* is no index available. Asif :The boolean true implies that CompiledComparsion when existing on
* its own always requires a Complete expansion to top level iterators. This flag can get toggled
* to false only from inside a GroupJunction
- *
+ *
* <p>
* param intermediateResults if this parameter is provided, and we have to iterate, then iterate
* over this result set instead of the entire base collection.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledValue.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledValue.java
index 4747980..684e0cd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledValue.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledValue.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.cache.query.internal;
+import java.util.List;
+import java.util.Set;
+
import org.apache.geode.cache.query.AmbiguousNameException;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
@@ -24,9 +27,6 @@ import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.distributed.internal.DistributionConfig;
-import java.util.List;
-import java.util.Set;
-
public interface CompiledValue {
// extra node types: use negative numbers so they don't collide with token types
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompositeGroupJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompositeGroupJunction.java
index 8f57ad6..dc32f78 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompositeGroupJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompositeGroupJunction.java
@@ -25,6 +25,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
+
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
@@ -42,8 +43,8 @@ import org.apache.geode.cache.query.types.StructType;
* GroupJunctions belonging to the regions participating in the equi join condition. A single
* CompositeGroupJunction may span multiple Regions and hence may contain multiple filter
* evaluatable equi join conditions of different regions as well as their GroupJunctions if any.
- *
- *
+ *
+ *
*/
public class CompositeGroupJunction extends AbstractCompiledValue
implements Filter, OQLLexerTokenTypes {
@@ -102,7 +103,7 @@ public class CompositeGroupJunction extends AbstractCompiledValue
/**
* Add the Independent iterator of the Group which is constituent of this CompositeGroupJunction
- *
+ *
* @param itr RuntimeIterator The independent iterator for the region forming the
* CompositeGroupJunction
*/
@@ -114,7 +115,7 @@ public class CompositeGroupJunction extends AbstractCompiledValue
* Add the GroupJunction for a Region as a part of CompositeGroupJunction , implying that their
* exists atleast one equi join condition which involes the Region which the GroupJunction
* represents
- *
+ *
* @param gj GroupJunction object which is a part of CompositeGroupJunction
*/
void addGroupOrRangeJunction(AbstractGroupOrRangeJunction gj) {
@@ -125,7 +126,7 @@ public class CompositeGroupJunction extends AbstractCompiledValue
}
/**
- *
+ *
* @param iterOps List of CompiledValues representing conditions which are iter evaluatable. This
* will be set only if there does not exist any independent condition or filter evaluatabel
* subtree CompiledJunction and the complete expansion flag is turned on
@@ -138,12 +139,12 @@ public class CompositeGroupJunction extends AbstractCompiledValue
}
/**
- *
+ *
* This flag gets toggled if only a Single CompositeGroupJunction gets created. It means that an
* AllGroupJunction will not exist and the result obtained from the evaluation of
* CompositeGroupJunction will be expanded to the level of query from clause ( i.e top level
* iterators).
- *
+ *
*/
void setCompleteExpansionOn() {
this.completeExpansion = true;
@@ -161,7 +162,7 @@ public class CompositeGroupJunction extends AbstractCompiledValue
}
/**
- *
+ *
* @param temp CompositeGroupJunction which gets merged in this CompositeGroupJunction. This
* fusion occurs during creation of junction if the order in which the conditions of where
* clause arrival are such that condition1 tying region1 & region2 , condition 2 tying
@@ -464,7 +465,7 @@ public class CompositeGroupJunction extends AbstractCompiledValue
}
/**
- *
+ *
* @return List containing the filter evaluatable Composite Comparison conditions ( equi join
* conditions across the regions)
*/
@@ -474,12 +475,12 @@ public class CompositeGroupJunction extends AbstractCompiledValue
}
/**
- *
+ *
* @return List containg GroupJunctions which are part of this CompositeGroupJunction. It can be
* null if there does not exist any filter evaluatable condition belonging solely to an
* independent region or its group of iterators, constituting the CompositeGroupJunction,
* so that no GroupJunctions get assosciated with the CompositeGroupJunction
- *
+ *
*/
List getGroupJunctionList() {
// return unmodifiable copy
@@ -487,7 +488,7 @@ public class CompositeGroupJunction extends AbstractCompiledValue
}
/**
- *
+ *
* @return List containing the iter evaluatable conditions.This Can be null in case there exists
* more than one filter operand in CompiledJunction in which case all the iter ops will
* become part of iter operand of CompiledJunction. This can be not null iff the complete
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
index 43f50aa..29b7a53 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqEntry.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.Version;
/**
* This represents the CQ key value pair for the CQ query results.
- *
+ *
* @since GemFire 6.5
*/
@@ -48,7 +48,7 @@ public class CqEntry implements DataSerializableFixedID {
/**
* return key
- *
+ *
* @return Object key
*/
public Object getKey() {
@@ -57,7 +57,7 @@ public class CqEntry implements DataSerializableFixedID {
/**
* return value
- *
+ *
* @return Object value
*/
public Object getValue() {
@@ -67,7 +67,7 @@ public class CqEntry implements DataSerializableFixedID {
/**
* Returns key values as Object[] with key as the first and value as the last element of the
* array.
- *
+ *
* @return Object[] key, value pair
*/
public Object[] getKeyValuePair() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java
index 0580ff4..a60fbab 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java
@@ -20,12 +20,12 @@ import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.cache.query.CqEvent;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* This class tracks GemFire statistics related to a {@link org.apache.geode.cache.query.CqQuery}.
- *
+ *
* @since GemFire 5.5
*/
public class CqQueryVsdStats {
@@ -130,7 +130,7 @@ public class CqQueryVsdStats {
/**
* Constructor.
- *
+ *
* @param factory The <code>StatisticsFactory</code> which creates the <code>Statistics</code>
* instance
* @param name The name of the <code>Statistics</code>
@@ -150,7 +150,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "cqInitialResultsTime" stat.
- *
+ *
* @return the current value of the "cqInitialResultsTime" stat
*/
public long getCqInitialResultsTime() {
@@ -166,7 +166,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "numInserts" stat.
- *
+ *
* @return the current value of the "numInserts" stat
*/
public long getNumInserts() {
@@ -182,7 +182,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "numUpdates" stat.
- *
+ *
* @return the current value of the "numUpdates" stat
*/
public long getNumUpdates() {
@@ -198,7 +198,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "numDeletes" stat.
- *
+ *
* @return the current value of the "numDeletes" stat
*/
public long getNumDeletes() {
@@ -214,7 +214,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "numEvents" stat.
- *
+ *
* @return the current value of the "numEvents" stat
*/
public long getNumEvents() {
@@ -230,7 +230,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "numQueuedEvents" stat.
- *
+ *
* @return the current value of the "numQueuedEvents" stat
*/
public long getNumHAQueuedEvents() {
@@ -246,7 +246,7 @@ public class CqQueryVsdStats {
/**
* Returns the current value of the "numCqListenerInvocations" stat.
- *
+ *
* @return the current value of the "numCqListenerInvocations" stat
*/
public long getNumCqListenerInvocations() {
@@ -274,7 +274,7 @@ public class CqQueryVsdStats {
/**
* Update stats for a CQ for VSD
- *
+ *
* @param cqEvent object containing info on the newly qualified CQ event
*/
public void updateStats(CqEvent cqEvent) {
@@ -294,7 +294,7 @@ public class CqQueryVsdStats {
/**
* Update stats for a CQ for VSD
- *
+ *
* @param cqEvent object the type of CQ event
*/
public void updateStats(Integer cqEvent) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqStateImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqStateImpl.java
index 35265ff..213f0b7 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqStateImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqStateImpl.java
@@ -68,7 +68,7 @@ public class CqStateImpl implements CqState {
/**
* Sets the state of CQ.
- *
+ *
* @param state
*/
public void setState(int state) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
index 2565dd3..d0d63d5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
@@ -43,7 +43,7 @@ import org.apache.geode.internal.Version;
/**
* This is used as a wrapper over all the results of PR which are of non distinct type
- *
+ *
*
*/
public class CumulativeNonDistinctResults<E> implements SelectResults<E>, DataSerializableFixedID {
@@ -215,7 +215,7 @@ public class CumulativeNonDistinctResults<E> implements SelectResults<E>, DataSe
protected final Iterator<E>[] iterators;
protected int currentIterator = 0;
private Boolean cachedHasNext = null;
- final private boolean isStruct;
+ private final boolean isStruct;
private final boolean[] objectChangedMarker = new boolean[1];
protected CumulativeCollectionIterator() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
index 01ecd8f..d6e1163 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
@@ -261,7 +261,7 @@ public class DefaultQuery implements Query {
/**
* Should be constructed from DefaultQueryService
- *
+ *
* @see QueryService#newQuery
*/
public DefaultQuery(String queryString, InternalCache cache, boolean isForRemote) {
@@ -1014,7 +1014,7 @@ public class DefaultQuery implements Query {
/**
* For queries which are executed from a Function "with a Filter".
- *
+ *
* @return returns if this query is coming from a {@link Function}.
*/
public boolean isQueryWithFunctionContext() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
index 8fc1c9e..6ff058b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.cache.query.internal;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.Map.Entry;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.LowMemoryException;
import org.apache.geode.cache.Region;
@@ -37,11 +43,6 @@ import org.apache.geode.internal.cache.control.MemoryThresholds;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.Map.Entry;
/**
* @version $Revision: 1.2 $
@@ -99,7 +100,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Constructs a new <code>Query</code> object. Uses the default namespace, which is the Objects
* Context of the current application.
- *
+ *
* @return The new <code>Query</code> object.
* @throws IllegalArgumentException if the query syntax is invalid.
* @see org.apache.geode.cache.query.Query
@@ -262,7 +263,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Asif : Gets an exact match index ( match level 0)
- *
+ *
* @param regionPath String containing the region name
* @param definitions An array of String objects containing canonicalized definitions of
* RuntimeIterators. A Canonicalized definition of a RuntimeIterator is the canonicalized
@@ -319,7 +320,7 @@ public class DefaultQueryService implements InternalQueryService {
* match level greater than 0 will definitely mean expansion of index results but may also require
* a cut down of results . The order of preference is match level 0 , less than 0 and lastly
* greater than 0
- *
+ *
* @param regionPath String containing the region name
* @param definitions An array of String objects containing canonicalized definitions of
* RuntimeIterators. A Canonicalized definition of a RuntimeIterator is the canonicalized
@@ -473,7 +474,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Constructs a new continuous query, represented by an instance of CqQuery. The CqQuery is not
* executed until the execute method is invoked on the CqQuery.
- *
+ *
* @param queryString the OQL query
* @param cqAttributes the CqAttributes
* @return the newly created CqQuery object
@@ -503,7 +504,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Constructs a new continuous query, represented by an instance of CqQuery. The CqQuery is not
* executed until the execute method is invoked on the CqQuery.
- *
+ *
* @param queryString the OQL query
* @param cqAttributes the CqAttributes
* @param isDurable true if the CQ is durable
@@ -610,7 +611,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Retrieve a CqQuery by name.
- *
+ *
* @return the CqQuery or null if not found
*/
public CqQuery getCq(String cqName) {
@@ -627,7 +628,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Retrieve all CqQuerys created by this VM.
- *
+ *
* @return null if there are no cqs.
*/
public CqQuery[] getCqs() {
@@ -658,9 +659,9 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Starts execution of all the registered continuous queries for this client. This is
* complementary to stopCqs.
- *
+ *
* @see QueryService#stopCqs()
- *
+ *
* @throws CqException if failure to execute CQ.
*/
public void executeCqs() throws CqException {
@@ -677,9 +678,9 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Stops execution of all the continuous queries for this client to become inactive. This is
* useful when client needs to control the incoming cq messages during bulk region operations.
- *
+ *
* @see QueryService#executeCqs()
- *
+ *
* @throws CqException if failure to execute CQ.
*/
public void stopCqs() throws CqException {
@@ -695,9 +696,9 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Starts execution of all the continuous queries registered on the specified region for this
* client. This is complementary method to stopCQs().
- *
+ *
* @see QueryService#stopCqs()
- *
+ *
* @throws CqException if failure to stop CQs.
*/
public void executeCqs(String regionName) throws CqException {
@@ -715,9 +716,9 @@ public class DefaultQueryService implements InternalQueryService {
* Stops execution of all the continuous queries registered on the specified region for this
* client. This is useful when client needs to control the incoming cq messages during bulk region
* operations.
- *
+ *
* @see QueryService#executeCqs()
- *
+ *
* @throws CqException if failure to execute CQs.
*/
public void stopCqs(String regionName) throws CqException {
@@ -733,7 +734,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Get statistics information for this query.
- *
+ *
* @return CQ statistics null if the continuous query object not found for the given cqName.
*/
public CqServiceStatistics getCqStatistics() {
@@ -750,7 +751,7 @@ public class DefaultQueryService implements InternalQueryService {
/**
* Is the CQ service in a cache server environment
- *
+ *
* @return true if cache server, false otherwise
*/
public boolean isServer() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java
index 1cddac1..c286ff8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DerivedInfo.java
@@ -276,13 +276,13 @@ public class DerivedInfo {
/*
* private void createObjectResultsFromStructResults(IndexInfo indexInfo, SelectResults sr) {
* Iterator srIterator = sr.iterator(); SelectResults[] newSrs = null;
- *
+ *
* while (srIterator.hasNext()) { Struct struct = (Struct) srIterator.next(); Object[] fieldValues
* = struct.getFieldValues(); int structLength = struct.getFieldValues().length; if (newSrs ==
* null) { newSrs = new FakeSelectResults[structLength]; for (int x = 0; x < structLength; x++) {
* newSrs[x] = new FakeSelectResults(); } } for (int i = 0; i < structLength; i++) {
* newSrs[i].add(fieldValues[i]); } }
- *
+ *
* if (newSrs != null) { this.addDerivedResults(indexInfo, newSrs); } }
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ExecutionContext.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ExecutionContext.java
index 10cab17..d186dea 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ExecutionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ExecutionContext.java
@@ -96,7 +96,7 @@ public class ExecutionContext {
/**
* Param specialIteratorVar name of special variable to use to denote the current iteration
* element. Used to implement the "this" var in the query shortcut methods
- *
+ *
* @see org.apache.geode.cache.Region#query
*/
public ExecutionContext(Object[] bindArguments, InternalCache cache) {
@@ -111,7 +111,7 @@ public class ExecutionContext {
/**
* Add RuntimeIterator as a dependency of a CompiledValue. ASSUMPTION: unsynchronized, assumed to
* be single-threaded.
- *
+ *
* @return the dependency set as a shortcut
*/
Set addDependency(CompiledValue cv, RuntimeIterator itr) {
@@ -178,7 +178,7 @@ public class ExecutionContext {
/**
* Returns all dependencies in from this context which are reused during index update by new
* ExecutionContext for concurrent updates on indexes.
- *
+ *
* @return All {@link AbstractCompiledValue} dependencies.
*/
public Map getDependencyGraph() {
@@ -267,7 +267,7 @@ public class ExecutionContext {
* <p>
* TODO: If we are storing a single Iterator instead of Set , in the itrDefToIndpndtRuntimeItrMap
* , we need to take care of this function.
- *
+ *
* @param rIter Independent RuntimeIterator on which dependent iterators of current scope need to
* identified
* @return List containing the independent Runtime Iterator & its dependent iterators
@@ -306,7 +306,7 @@ public class ExecutionContext {
/**
* returns implicit iterator receiver of operation with numArgs args, or null if cannot be
* resolved.
- *
+ *
* SPECIAL CASE: If we are unable to resolve the name on any iterator, but there is only one
* iterator that we don't have type information for it (for now OBJECT_TYPE, this has to change),
* then return that one iterator under the assumption that the operation name must belong to it.
@@ -447,7 +447,7 @@ public class ExecutionContext {
* RuntimeIterators to which the current CompilediteratorDef is dependent upon. Also it sets the
* index_internal_id for the RuntimeIterator, which is used for calculating the canonicalized
* iterator definitions for identifying the available index.
- *
+ *
* @param itrDef CompiledIteratorDef object representing iterator in the query from clause
*/
public void addToIndependentRuntimeItrMap(CompiledIteratorDef itrDef)
@@ -519,7 +519,7 @@ public class ExecutionContext {
* returns null. It is the caller's responsibility to ensure that the passed Iterator is the
* ultimate Independent Runtime Iterator or else the method may return null if the RunTimeIterator
* is genuinely dependent on a Region iterator
- *
+ *
* @return String containing region path
*/
String getRegionPathForIndependentRuntimeIterator(RuntimeIterator riter) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
index ed9142a..fdcd571 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
@@ -15,19 +15,20 @@
package org.apache.geode.cache.query.internal;
import java.util.List;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+
import org.apache.geode.cache.query.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Class Description
- *
+ *
* @version $Revision: 1.1 $
*/
public interface Filter {
/**
* Evaluates as a filter taking advantage of indexes if appropriate.
- *
+ *
* @return SelectResults
*/
public SelectResults filterEvaluate(ExecutionContext context, SelectResults iterationLimit)
@@ -35,7 +36,7 @@ public interface Filter {
QueryInvocationTargetException;
/**
- *
+ *
* Asif : Evaluates as a filter taking advantage of indexes if appropriate. This function has a
* meaningful implementation only in CompiledComparison & CompiledUndefined . It is unsupported in
* other classes. The additional parameters which it takes are a boolean which is used to indicate
@@ -51,7 +52,7 @@ public interface Filter {
* iter operand can get evaluated during cartesian/expansion of GroupJunctions. Ofcourse, the iter
* operands will get pushed to CompositeGroupJunction level, in the first place , only if a single
* CompositeGroupJunction gets created. *
- *
+ *
* @param context ExecutionContext object
* @param iterationLimit SelectResults object representing the intermediate ResultSet. It is
* mostly passed as null or the value is ignored except when evaluating a filter
@@ -94,7 +95,7 @@ public interface Filter {
/**
* This method gets invoked from the filterEvaluate of CompiledJunction and GroupJunction if the
* boolean isSingleFilter of OrganizedOperands happens to be false
- *
+ *
* @param context ExecutionContext object
* @param intermediateResults SelectResults Object which will usually be null or will mostly be
* ignored
@@ -113,7 +114,7 @@ public interface Filter {
TypeMismatchException, NameResolutionException, QueryInvocationTargetException;
/**
- *
+ *
* @param context
* @return boolean
* @throws FunctionDomainException
@@ -127,7 +128,7 @@ public interface Filter {
/**
* Only used by single base collection index
- *
+ *
* @param independentIter
* @param context
* @param completeExpnsNeeded
@@ -141,7 +142,7 @@ public interface Filter {
throws AmbiguousNameException, TypeMismatchException, NameResolutionException;
/**
- *
+ *
* @param comparedTo
* @param context
* @param thisSize
@@ -162,7 +163,7 @@ public interface Filter {
* works only if it has been ensured that the query is dependent on single iterator and for Group
* junction so created in case of AND clause, would use exactly one index & rest to be iter
* evaluated
- *
+ *
* @return true if limit can be applied at index level
*/
public boolean isLimitApplicableAtIndexLevel(ExecutionContext context)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
index 43a7885..edfd2c7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
@@ -15,14 +15,13 @@
package org.apache.geode.cache.query.internal;
+import java.text.*;
import java.util.*;
import org.apache.geode.cache.query.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.internal.PdxString;
-import java.text.*;
-
/**
* Class Description
*
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/GroupJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/GroupJunction.java
index 84971fd..393a1df 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/GroupJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/GroupJunction.java
@@ -19,6 +19,7 @@ package org.apache.geode.cache.query.internal;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
@@ -29,9 +30,9 @@ import org.apache.geode.cache.query.TypeMismatchException;
* a group of iterators derived from a single independent iterator ( an iterator on the region) .
* The iter evaluatable conditions belonging to other group of iterators can be a part of
* GroupJunction only if the complete expansion flag is true.
- *
- *
- *
+ *
+ *
+ *
*/
public class GroupJunction extends AbstractGroupOrRangeJunction {
private List unevaluatedFilterOperands = null;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
index 0e5f909..0b5574e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal;
@@ -22,7 +22,7 @@ import java.io.Serializable;
/**
* This interface defines a Hashing strategy for keys(OR values) in a HashMap(OR HashSet) for
* calculation of hash-code for custom objects and primitive types.
- *
+ *
* @since GemFire 8.0
*
*/
@@ -31,7 +31,7 @@ public interface HashingStrategy extends Serializable {
/**
* Computes a hash code for the specified object. Implementors can use the object's own
* <tt>hashCode</tt> method, the Java runtime's <tt>identityHashCode</tt>, or a custom scheme.
- *
+ *
* @param o object for which the hash-code is to be computed
* @return the hashCode
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexInfo.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexInfo.java
index c2a54bd..e7ff1c1 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexInfo.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.query.internal.index.AbstractIndex;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
public class IndexInfo {
- final private CompiledValue _key;
+ private final CompiledValue _key;
final CompiledValue _path;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
index da223d5..7204eec 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
@@ -18,8 +18,6 @@
//
package org.apache.geode.cache.query.internal;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -27,6 +25,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.internal.index.CompactMapRangeIndex;
import org.apache.geode.cache.query.internal.index.MapRangeIndex;
@@ -170,7 +170,7 @@ public class IndexTrackingQueryObserver extends QueryObserverAdapter {
/**
* Adds a results map (mostly a bucket index lookup results) to the "this" IndexInfo.
- *
+ *
* @param rslts
*/
public void addResults(Map rslts) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Indexable.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Indexable.java
index fba40d9..7daf32f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Indexable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Indexable.java
@@ -21,13 +21,13 @@ import org.apache.geode.cache.query.TypeMismatchException;
/**
* Interface implemented by CompiledComparision and CompiledUndefibed to indicate that index can be
* created on such CompiledValues.It indicates that they are filter evaluatable at the atomic level.
- *
- *
+ *
+ *
*/
public interface Indexable {
/**
* Returns the IndexInfo object, if any, associated with the CompiledValue
- *
+ *
* @param context ExecutionContext object
* @return IndexInfo object , if any, associated with the CompiledValue
* @throws TypeMismatchException
@@ -38,7 +38,7 @@ public interface Indexable {
throws TypeMismatchException, AmbiguousNameException, NameResolutionException;
/**
- *
+ *
* @return boolean indicating whether the CompiledValue is RangeEvaluatable or not. Presently
* CompiledUndefined is assumed to be not range evaluatable while a CompiledComparison is
* assumed to be range evaluatable ( though we do not club compiled comparison having null
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java
index 6dde7c3..52aad36 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java
@@ -29,7 +29,6 @@ import java.util.SortedSet;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
-
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
@@ -92,7 +91,7 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
/**
* For internal use. Just add the Object[] values for a struct with same type
- *
+ *
* public boolean addFieldValues(Object[] fieldValues) { //return super.add(fieldValues);
* StructImpl s = new StructImpl(this.structType, fieldValues); return super.add(s); }
*/
@@ -113,7 +112,7 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
/**
* Does this set contain a Struct of the correct type with the specified values?
- *
+ *
* public boolean containsFieldValues(Object[] fieldValues) { return super.contains(fieldValues);
* }
*/
@@ -252,7 +251,7 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
/**
* Getter for property modifiable.
- *
+ *
* @return Value of property modifiable.
*/
public boolean isModifiable() {
@@ -265,7 +264,7 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
/**
* Setter for property modifiable.
- *
+ *
* @param modifiable New value of property modifiable.
*/
public void setModifiable(boolean modifiable) {
@@ -292,7 +291,7 @@ public class LinkedStructSet extends LinkedHashSet<Struct>
/**
* Iterator wrapper to construct Structs on demand.
*/
- static private class StructIterator implements Iterator {
+ private static class StructIterator implements Iterator {
private final Iterator itr;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
index 1a267d8..9ba85d6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
@@ -14,19 +14,6 @@
*/
package org.apache.geode.cache.query.internal;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
-import org.apache.geode.cache.query.internal.types.StructTypeImpl;
-import org.apache.geode.cache.query.internal.utils.LimitIterator;
-import org.apache.geode.cache.query.types.CollectionType;
-import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.HeapDataOutputStream.LongUpdater;
-import org.apache.geode.internal.Version;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -40,10 +27,23 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.internal.types.StructTypeImpl;
+import org.apache.geode.cache.query.internal.utils.LimitIterator;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.HeapDataOutputStream.LongUpdater;
+import org.apache.geode.internal.Version;
+
/**
* The n - way merge results returns a sorted results on the cumulative sorted results for
* partitioned region based query
- *
+ *
*
*/
public class NWayMergeResults<E> implements SelectResults<E>, Ordered, DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
index 6887776..c7301c7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
@@ -20,4 +20,3 @@ package org.apache.geode.cache.query.internal;
public interface Negatable {
public void negate();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java
index f7902b3..f7ead1f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NullToken.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.Version;
/**
* A Token representing null.
- *
+ *
* @since GemFire cedar
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
index 8a82181..54687ab 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
@@ -35,7 +35,7 @@ import java.util.TreeMap;
* <tt>ObjectIntHashMap</tt> class is roughly equivalent to <tt>HashMap</tt>, except that it is
* unsynchronized and permits nulls.) This class makes no guarantees as to the order of the map; in
* particular, it does not guarantee that the order will remain constant over time.
- *
+ *
* <p>
* This implementation provides constant-time performance for the basic operations (<tt>get</tt> and
* <tt>put</tt>), assuming the hash function disperses the elements properly among the buckets.
@@ -43,7 +43,7 @@ import java.util.TreeMap;
* <tt>HashMap</tt> instance (the number of buckets) plus its size (the number of key-value
* mappings). Thus, it's very important not to set the initial capacity too high (or the load factor
* too low) if iteration performance is important.
- *
+ *
* <p>
* An instance of <tt>HashMap</tt> has two parameters that affect its performance: <i>initial
* capacity</i> and <i>load factor</i>. The <i>capacity</i> is the number of buckets in the hash
@@ -53,7 +53,7 @@ import java.util.TreeMap;
* the load factor and the current capacity, the hash table is <i>rehashed</i> (that is, internal
* data structures are rebuilt) so that the hash table has approximately twice the number of
* buckets.
- *
+ *
* <p>
* As a general rule, the default load factor (.75) offers a good tradeoff between time and space
* costs. Higher values decrease the space overhead but increase the lookup cost (reflected in most
@@ -62,12 +62,12 @@ import java.util.TreeMap;
* setting its initial capacity, so as to minimize the number of rehash operations. If the initial
* capacity is greater than the maximum number of entries divided by the load factor, no rehash
* operations will ever occur.
- *
+ *
* <p>
* If many mappings are to be stored in a <tt>HashMap</tt> instance, creating it with a sufficiently
* large capacity will allow the mappings to be stored more efficiently than letting it perform
* automatic rehashing as needed to grow the table.
- *
+ *
* <p>
* <strong>Note that this implementation is not synchronized.</strong> If multiple threads access a
* hash map concurrently, and at least one of the threads modifies the map structurally, it
@@ -75,15 +75,15 @@ import java.util.TreeMap;
* deletes one or more mappings; merely changing the value associated with a key that an instance
* already contains is not a structural modification.) This is typically accomplished by
* synchronizing on some object that naturally encapsulates the map.
- *
+ *
* If no such object exists, the map should be "wrapped" using the
* {@link Collections#synchronizedMap Collections.synchronizedMap} method. This is best done at
* creation time, to prevent accidental unsynchronized access to the map:
- *
+ *
* <pre>
* Map m = Collections.synchronizedMap(new IntHashMap(...));
* </pre>
- *
+ *
* <p>
* The iterators returned by all of this class's "collection view methods" are <i>fail-fast</i>: if
* the map is structurally modified at any time after the iterator is created, in any way except
@@ -91,19 +91,19 @@ import java.util.TreeMap;
* {@link ConcurrentModificationException}. Thus, in the face of concurrent modification, the
* iterator fails quickly and cleanly, rather than risking arbitrary, non-deterministic behavior at
* an undetermined time in the future.
- *
+ *
* <p>
* Note that the fail-fast behavior of an iterator cannot be guaranteed as it is, generally
* speaking, impossible to make any hard guarantees in the presence of unsynchronized concurrent
* modification. Fail-fast iterators throw <tt>ConcurrentModificationException</tt> on a best-effort
* basis. Therefore, it would be wrong to write a program that depended on this exception for its
* correctness: <i>the fail-fast behavior of iterators should be used only to detect bugs.</i>
- *
+ *
* @author Doug Lea
* @author Josh Bloch
* @author Arthur van Hoff
* @author Neal Gafter
- *
+ *
* @version %I%, %G%
* @see Object#hashCode()
* @see Collection
@@ -145,7 +145,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
/**
* The next size value at which to resize (capacity * load factor).
- *
+ *
* @serial
*/
int threshold;
@@ -167,7 +167,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
/**
* Hashing strategy for key objects.
- *
+ *
*/
final HashingStrategy hashingStrategy; // GemFire addition
@@ -1071,5 +1071,3 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
}
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
index 04469cb..891caeb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
@@ -45,7 +45,7 @@ public class OrderByComparator implements Comparator {
/**
* This method evaluates sort criteria and returns an ArrayList of Object[] arrays of the
* evaluated criteria.
- *
+ *
* @param value the criteria to be evaluated.
* @return an Object array of Object arrays of the evaluated criteria.
*/
@@ -92,7 +92,7 @@ public class OrderByComparator implements Comparator {
/**
* Compares its two arguments for order. Returns a negative integer, zero, or a positive integer
* as the first argument is less than, equal to, or greater than the second.
- *
+ *
* @param obj1 the first object to be compared.
* @param obj2 the second object to be compared.
* @return a negative integer, zero, or a positive integer as the first argument is less than,
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Ordered.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Ordered.java
index be9f9ad..966ae8f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Ordered.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Ordered.java
@@ -21,7 +21,7 @@ import java.util.Comparator;
* This interface is to be implemented by all the query SelectResults implementation which have
* ordered data. This encompasses those classes which have data stored in a List, LinkedMap,
* LinkedSet, TreeMap , TreeSet etc.
- *
+ *
* @see NWayMergeResults
* @see SortedResultsBag
* @see SortedStructBag
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrganizedOperands.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrganizedOperands.java
index 9fd4457..0e30407 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrganizedOperands.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrganizedOperands.java
@@ -15,7 +15,7 @@
/*
* Created on Nov 18, 2005
*
- *
+ *
*/
package org.apache.geode.cache.query.internal;
@@ -26,9 +26,9 @@ package org.apache.geode.cache.query.internal;
* also be a CompiledJunction, if there exists a filter evaluatable subtree of CompiledJunction
* along with any of the above mentioned three structures . The iterateOperand refers to a single or
* group of conditions which are not filter evaluatable.
- *
- *
- *
+ *
+ *
+ *
*/
class OrganizedOperands {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PathUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PathUtils.java
index f7daac6..f762973 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PathUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PathUtils.java
@@ -193,7 +193,7 @@ public class PathUtils {
/**
* Collects all the compiled values in the path , starting from the self at position 0 in the
* returned List
- *
+ *
* @param expr
* @return List of CompiledValues ( includes the RuntimeIterator)
* @throws TypeMismatchException
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java
index 32f766f..59209b8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java
@@ -16,13 +16,13 @@ package org.apache.geode.cache.query.internal;
/**
* Encapsulates evaluation info about compiled values
- *
+ *
* @version $Revision: 1.1 $
* @since GemFire 4.1
*/
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
class PlanInfo {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java
index 9083b5b..cec4ed8 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java
@@ -49,7 +49,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* A wrapper class over an actual QueryService instance. This is used when the
* multiuser-authentication attribute is set to true.
- *
+ *
* @see ProxyCache
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QCompiler.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QCompiler.java
index 1ee4d17..d088f38 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QCompiler.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QCompiler.java
@@ -23,9 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Stack;
-import org.apache.geode.cache.query.internal.parse.OQLLexer;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.cache.query.internal.parse.OQLParser;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.query.FunctionDomainException;
@@ -34,6 +31,9 @@ import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.parse.GemFireAST;
+import org.apache.geode.cache.query.internal.parse.OQLLexer;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
+import org.apache.geode.cache.query.internal.parse.OQLParser;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.internal.types.MapTypeImpl;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
@@ -56,7 +56,7 @@ public class QCompiler implements OQLLexerTokenTypes {
private Stack stack = new Stack();
private Map imports = new HashMap();
- final private boolean isForIndexCompilation;
+ private final boolean isForIndexCompilation;
private boolean traceOn;
public QCompiler() {
@@ -139,7 +139,7 @@ public class QCompiler implements OQLLexerTokenTypes {
/**
* Yogesh: compiles order by clause and push into the stack
- *
+ *
* @param numOfChildren
*/
public void compileOrederByClause(int numOfChildren) {
@@ -162,7 +162,7 @@ public class QCompiler implements OQLLexerTokenTypes {
/**
* Yogesh: compiles sort criteria present in order by clause and push into the stack
- *
+ *
* @param sortCriterion
*/
public void compileSortCriteria(String sortCriterion) {
@@ -452,7 +452,7 @@ public class QCompiler implements OQLLexerTokenTypes {
* or otherwise. It also works on the last character to see if the sargable like predicate results
* in a CompiledJunction or a Comparison. Currently we are supporting only the '%' terminated
* "like" predicate.
- *
+ *
* @param var The CompiledValue representing the variable
* @param patternOrBindParam The CompiledLiteral reprsenting the pattern of the like predicate
* @return CompiledValue representing the "like" predicate
@@ -683,5 +683,3 @@ public class QCompiler implements OQLLexerTokenTypes {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
index 5f0d6e5..ff124c9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
@@ -14,13 +14,14 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
import java.io.*;
+import java.util.*;
+import java.util.concurrent.locks.Lock;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.*;
-import java.util.concurrent.locks.Lock;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.*;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
index 7b001ab..dc39504 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
@@ -19,9 +19,9 @@ import java.util.*;
/**
* Nested name scope for name resolution Currently allow only one iterator per scope, and can be
* known by zero or one identifier
- *
+ *
* @version $Revision: 1.1 $
- *
+ *
*/
class QScope {
@@ -34,7 +34,7 @@ class QScope {
private int scopeID = 0;
/**
- *
+ *
* @param scopeID The scopeID assosciated with the scope
*/
QScope(int scopeID) {
@@ -78,7 +78,7 @@ class QScope {
/**
- *
+ *
* @return unique int identifying the scope. It also indicates the relative visibility of scopes,
* with higher scope being able to see iterators of lower scope.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
index 63703ea..030fa41 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.control.ResourceManager;
* QueryMonitor.isQueryExecutionCanceled() is called Due to various threads using the method, access
* to the query object may not be available for certain threads This exception is generically used
* and caught by DefaultQuery, which will then throw the appropriate exception
- *
+ *
* @since GemFire 7.0
*/
public class QueryExecutionCanceledException extends CacheRuntimeException {
@@ -37,7 +37,7 @@ public class QueryExecutionCanceledException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionCanceledException</code> with the specified
* detail message.
- *
+ *
* @param msg the detail message.
*/
public QueryExecutionCanceledException(String msg) {
@@ -47,7 +47,7 @@ public class QueryExecutionCanceledException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionCanceledException</code> with the specified
* detail message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -58,7 +58,7 @@ public class QueryExecutionCanceledException extends CacheRuntimeException {
/**
* Constructs an instance of <code>QueryExecutionCanceledException</code> with the specified
* cause.
- *
+ *
* @param cause the causal Throwable
*/
public QueryExecutionCanceledException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
index 270fb71..bee4884 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.query.TypeMismatchException;
/**
* An interface allowing different Region implementations to support querying.
- *
+ *
* @since GemFire 5.5
*/
public interface QueryExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryMonitor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryMonitor.java
index 89885f1..8a90ede 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryMonitor.java
@@ -33,12 +33,12 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* QueryMonitor class, monitors the query execution time. Instantiated based on the system property
* MAX_QUERY_EXECUTION_TIME. At most there will be one query monitor-thread that cancels the long
* running queries.
- *
+ *
* The queries to be monitored is added into the ordered queue, ordered based on its start/arrival
* time. The first one in the Queue is the older query that will be canceled first.
- *
+ *
* The QueryMonitor cancels a query-execution thread if its taking more than the max time.
- *
+ *
* @since GemFire 6.0
*/
public class QueryMonitor implements Runnable {
@@ -64,9 +64,9 @@ public class QueryMonitor implements Runnable {
private ConcurrentMap queryMonitorTasks = null;
// Variables for cancelling queries due to low memory
- private volatile static Boolean LOW_MEMORY = Boolean.FALSE;
+ private static volatile Boolean LOW_MEMORY = Boolean.FALSE;
- private volatile static long LOW_MEMORY_USED_BYTES = 0;
+ private static volatile long LOW_MEMORY_USED_BYTES = 0;
public QueryMonitor(long maxQueryExecutionTime) {
this.maxQueryExecutionTime = maxQueryExecutionTime;
@@ -74,7 +74,7 @@ public class QueryMonitor implements Runnable {
/**
* Add query to be monitored.
- *
+ *
* @param queryThread Thread executing the query.
* @param query Query.
*/
@@ -162,7 +162,7 @@ public class QueryMonitor implements Runnable {
* This method is called to check if the query execution is canceled. The QueryMonitor cancels the
* query execution if it takes more than the max query execution time set or in low memory
* situations where critical heap percentage has been set on the resource manager
- *
+ *
* The max query execution time is set using the system property
* gemfire.Cache.MAX_QUERY_EXECUTION_TIME
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
index 2a96566..6372fd1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
@@ -15,12 +15,13 @@
package org.apache.geode.cache.query.internal;
import java.util.*;
+
import org.apache.geode.cache.query.*;
/**
* This interface is used by testing/debugging code to be notified of query events. See the
* documentation for class QueryObserverHolder for details.
- *
+ *
* @version $Revision: 1.2 $
*/
public interface QueryObserver {
@@ -33,7 +34,7 @@ public interface QueryObserver {
/**
* Called immediately before the query expression is evaluated. (After it was compiled)
- *
+ *
* @param expression The query Expression
* @param context The execution context that will be used to evaluate the expression.
*/
@@ -41,7 +42,7 @@ public interface QueryObserver {
/**
* Called once right before iteration of a 'select' statement begins.
- *
+ *
* @param collection The collection being iterated over
* @param whereClause The expression being evaluated for each iteration
*/
@@ -51,7 +52,7 @@ public interface QueryObserver {
* Called once before the evaluation of an expression for a single iteration of a 'select'
* statment. The RuntimeIterator that was passed to startIteration should already be referencing
* the current iteration value.
- *
+ *
* @param executer the object performing the iteration.
* @param currentObject The current object in the iteration.
*/
@@ -60,7 +61,7 @@ public interface QueryObserver {
/**
* Called once after the evaluation of an expression for a single iteration of a 'select'
* statment.
- *
+ *
* @param result The result of evaluating the where clause. Should be either a Boolean, NULL, or
* UNDEFINED. If evaluating the where clause threw an exception, should be NULL.
*/
@@ -68,7 +69,7 @@ public interface QueryObserver {
/**
* Called once right before iteration of a 'select' statement ends.
- *
+ *
* @param results The set of results returned so far by the iteration.
*/
void endIteration(SelectResults results);
@@ -76,7 +77,7 @@ public interface QueryObserver {
/**
* Called once right before the query subsystem has requested that the indexing subsystem attempt
* an index lookup.
- *
+ *
* @param index The index being used for the lookup
* @param oper The operation being attemped on the index. AbstractIndex
*/
@@ -86,7 +87,7 @@ public interface QueryObserver {
* Called once right before the query subsystem has requested that the indexing subsystem attempt
* an index lookup. This is invoked only for the range query ( having an upper & a lower bound)
* from RangeJunction.DoubleCondnRangeJunctionEvaluator
- *
+ *
* @param index The index being used for the lookup
* @param lowerBoundOperator integer indicating whether it is a > or >=
* @param lowerBoundKey Object indicating the lower bound key
@@ -100,14 +101,14 @@ public interface QueryObserver {
/**
* Called once right after the query subsystem has requested that the indexing subsystem attempt
* an index lookup.
- *
+ *
* @param results The results of the index lookup, or null if an exception was thrown.
*/
void afterIndexLookup(Collection results);
/**
* Called immediately after the query expression is evaluated.
- *
+ *
* @param result The results of the evaluation, or null if an exception was thrown.
*/
void afterQueryEvaluation(Object result);
@@ -123,7 +124,7 @@ public interface QueryObserver {
* function gets invoked, IndexManager will iterate over all the indexes of the region making the
* data maps null & re running the index creation query on the region. The method of Index Manager
* gets executed from the clear function of the Region
- *
+ *
*/
void beforeRerunningIndexCreationQuery();
@@ -131,10 +132,10 @@ public interface QueryObserver {
* Asif : Invoked just before the cartesian of the SelectResults obtained from GroupJunctions, is
* done so as to expand the final resultset to the level of iterators in the query. This function
* will get invoked from AllGroupJunction during the evaluation of AND condition
- *
+ *
* @param grpResults An array of intermediate SelectResults obtained by evaluation of
* GroupJunctions
- *
+ *
*/
void beforeCartesianOfGroupJunctionsInAnAllGroupJunctionOfType_AND(Collection[] grpResults);
@@ -142,8 +143,8 @@ public interface QueryObserver {
* Asif : Invoked just after the cartesian of the SelectResults obtained from GroupJunctions, is
* done so as to expand the final resultset to the level of iterators in the query. This function
* will get invoked from AllGroupJunction during the evaluation of AND condition
- *
- *
+ *
+ *
*/
void afterCartesianOfGroupJunctionsInAnAllGroupJunctionOfType_AND();
@@ -153,10 +154,10 @@ public interface QueryObserver {
* CompositeGroupJunction. This function will get invoked from CompositeGroupJunction during the
* evaluation of AND condition and only if there exists more than one GroupJunction objects in the
* CompositeGroupJunction
- *
+ *
* @param grpResults An array of intermediate SelectResults obtained by evaluation of
* GroupJunctions
- *
+ *
*/
void beforeCartesianOfGroupJunctionsInCompositeGroupJunctionOfType_AND(Collection[] grpResults);
@@ -172,19 +173,19 @@ public interface QueryObserver {
/**
* Asif : Invoked just before doing expansion or cutdown of results obtained from index usage for
* a filter evaluatable , non composite condition i.e for a single base collection.
- *
+ *
* @param index The index used by the filter evaluatable condition
* @param initialResult The raw resultset obtained for the condition
- *
+ *
*/
void beforeCutDownAndExpansionOfSingleIndexResult(Index index, Collection initialResult);
/**
* Asif : Invoked just after doing expansion or cutdown of results obtained from index usage for a
* filter evaluatable , non composite condition i.e for a single base collection.
- *
+ *
* @param finalResult The final conditioned resultset obtained from use of index on the condition
- *
+ *
*/
void afterCutDownAndExpansionOfSingleIndexResult(Collection finalResult);
@@ -194,7 +195,7 @@ public interface QueryObserver {
* merging the appropriate expansion & cutdown of the individual index results to the final query
* level or CompositeGroupJunction level also occurs. Also for AND conditions, the cartesian with
* the intermediate resultset will also occur.
- *
+ *
* @param index1 Range Index identified for one of the operand, to be used in equi join condition
* @param index2 Range Index identified for the other operand , to be used in equi join condition
* @param initialResult A list in which each element contains a TWO dimensional Object array
@@ -203,8 +204,8 @@ public interface QueryObserver {
* represents an equi join satisfying value ( i.e something like 1 = 1, 2 = 2 , 3 = 3 )
* etc. Since multiple objects of a region can have same value , so there exits rows of
* Object Array for each Index.
- *
- *
+ *
+ *
*/
void beforeMergeJoinOfDoubleIndexResults(Index index1, Index index2, Collection initialResult);
@@ -214,14 +215,14 @@ public interface QueryObserver {
* merging the appropriate expansion & cutdown of the individual index results to the final query
* level or CompositeGroupJunction level also occurs. Also for AND conditions, the cartesian with
* the intermediate resultset will also occur.
- *
+ *
* @param finalResult A SelectResults object created after expansion cutdown of two index results
* for a filter evaluatable CompositeCondition ( which may have been cartesianed with the
* intermediate Results. The Results obtained may or may not be to the Top Level/
* CompositeGroupJunction level. The number & positions of iterators present will depend on
* whether it is invoked for an OR Junction or if Complete Expansion is true or not & the
* stage of evaluation it is in for an AND junction.
- *
+ *
*/
void afterMergeJoinOfDoubleIndexResults(Collection finalResult);
@@ -235,11 +236,11 @@ public interface QueryObserver {
* the respective RuntimeIterators. The operand without usable index is evaluated & the Index on
* the other operand is used to get resultset for that value. Thus for each tuple we query the
* index on other operand .
- *
+ *
* @param usedIndex : The Index which will be used to obtain the ResultSet
* @param unusedIndex : The Index which does not get used as the relevant iterators are present in
* the intermediate resultset
- *
+ *
*/
void beforeIterJoinOfSingleIndexResults(Index usedIndex, Index unusedIndex);
@@ -253,14 +254,14 @@ public interface QueryObserver {
* the respective RuntimeIterators. The operand without usable index is evaluated & the Index on
* the other operand is used to get resultset for that value. Thus for each tuple we query the
* index on other operand .
- *
+ *
* @param finalResult : A SelectResults object created after expansion / cutdown of mergred
* results where one operand uses Index Results & other operand though has an Index
* available but cannot be used. The value of that operand is calculated by iteration of
* intermediate resultset for each tuple. This function gets invoked only for an AND
* junction. The resultset may or may not be up to the level of top level query iterators
* or CompositeGroupJunction iterators level.
- *
+ *
*/
void afterIterJoinOfSingleIndexResults(Collection finalResult);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
index b4a92b0..cc2b2dd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.query.*;
/**
* This class provides 'do-nothing' implementations of all of the methods of interface
* QueryObserver. See the documentation for class QueryObserverHolder for details.
- *
+ *
* @version $Revision: 1.2 $
*/
public class QueryObserverAdapter implements QueryObserver {
@@ -34,7 +34,7 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Called immediately before the query expression is evaluated. (After it was compiled)
- *
+ *
* @param expression The query Expression
* @param context The execution context that will be used to evaluate the expression.
*/
@@ -42,7 +42,7 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Called once right before iteration of a 'select' statement begins.
- *
+ *
* @param collection The collection being iterated over
* @param whereClause The 'where' clause of the select statement
*/
@@ -52,7 +52,7 @@ public class QueryObserverAdapter implements QueryObserver {
* Called once before the evaluation of an expression for a single iteration of a 'select'
* statment. The RuntimeIterator that was passed to startIteration should already be referencing
* the current iteration value.
- *
+ *
* @param executer the object performing the iteration.
* @param currentObject The current object in the iteration.
*/
@@ -61,7 +61,7 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Called once after the evaluation of an expression for a single iteration of a 'select'
* statment.
- *
+ *
* @param result The result of evaluating the where clause. Should be either a Boolean, NULL, or
* UNDEFINED. If evaluating the where clause threw an exception, should be NULL.
*/
@@ -69,7 +69,7 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Called once right before iteration of a 'select' statement ends.
- *
+ *
* @param results The set of results returned so far by the iteration.
*/
public void endIteration(SelectResults results) {}
@@ -77,7 +77,7 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Called once right before the query subsystem has requested that the indexing subsystem attempt
* an index lookup.
- *
+ *
* @param index The index being used for the lookup
* @param oper The operation being attemped on the index. AbstractIndex
*/
@@ -86,14 +86,14 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Called once right after the query subsystem has requested that the indexing subsystem attempt
* an index lookup.
- *
+ *
* @param results The results of the index lookup, or null if an exception was thrown.
*/
public void afterIndexLookup(Collection results) {}
/**
* Called immediately after the query expression is evaluated.
- *
+ *
* @param result The results of the evaluation, or null if an exception was thrown.
*/
public void afterQueryEvaluation(Object result) {}
@@ -116,10 +116,10 @@ public class QueryObserverAdapter implements QueryObserver {
* Asif : Invoked just before the cartesian of the SelectResults obtained from GroupJunctions, is
* done so as to expand the final resultset to the level of iterators in the query. This function
* will get invoked from AllGroupJunction during the evaluation of AND condition
- *
+ *
* @param grpResults An array of intermediate SelectResults obtained by evaluation of
* GroupJunctions
- *
+ *
*/
public void beforeCartesianOfGroupJunctionsInAnAllGroupJunctionOfType_AND(
Collection[] grpResults) {};
@@ -128,8 +128,8 @@ public class QueryObserverAdapter implements QueryObserver {
* Asif : Invoked just after the cartesian of the SelectResults obtained from GroupJunctions, is
* done so as to expand the final resultset to the level of iterators in the query. This function
* will get invoked from AllGroupJunction during the evaluation of AND condition
- *
- *
+ *
+ *
*/
public void afterCartesianOfGroupJunctionsInAnAllGroupJunctionOfType_AND() {};
@@ -139,10 +139,10 @@ public class QueryObserverAdapter implements QueryObserver {
* CompositeGroupJunction. This function will get invoked from CompositeGroupJunction during the
* evaluation of AND condition and only if there exists more than one GroupJunction objects in the
* CompositeGroupJunction
- *
+ *
* @param grpResults An array of intermediate SelectResults obtained by evaluation of
* GroupJunctions
- *
+ *
*/
public void beforeCartesianOfGroupJunctionsInCompositeGroupJunctionOfType_AND(
Collection[] grpResults) {};
@@ -159,19 +159,19 @@ public class QueryObserverAdapter implements QueryObserver {
/**
* Asif : Invoked just before doing expansion or cutdown of results obtained from index usage for
* a filter evaluatable , non composite condition i.e for a single base collection.
- *
+ *
* @param index The index used by the filter evaluatable condition
* @param initialResult The raw resultset obtained for the condition
- *
+ *
*/
public void beforeCutDownAndExpansionOfSingleIndexResult(Index index, Collection initialResult) {}
/**
* Asif :Invoked just after doing expansion or cutdown of results obtained from index usage for a
* filter evaluatable , non composite condition i.e for a single base collection.
- *
+ *
* @param finalResult The final conditioned resultset obtained from use of index on the condition
- *
+ *
*/
public void afterCutDownAndExpansionOfSingleIndexResult(Collection finalResult) {}
@@ -181,7 +181,7 @@ public class QueryObserverAdapter implements QueryObserver {
* merging the appropriate expansion & cutdown of the individual index results to the final query
* level or CompositeGroupJunction level also occurs. Also for AND conditions, the cartesian with
* the intermediate resultset will also occur.
- *
+ *
* @param index1 Range Index identified for one of the operand, to be used in equi join condition
* @param index2 Range Index identified for the other operand , to be used in equi join condition
* @param initialResult A list in which each element contains a TWO dimensional Object array
@@ -190,7 +190,7 @@ public class QueryObserverAdapter implements QueryObserver {
* represents an equi join satisfying value ( i.e something like 1 = 1, 2 = 2 , 3 = 3 )
* etc. Since multiple objects of a region can have same value , so there exits rows of
* Object Array for each Index.
- *
+ *
*/
public void beforeMergeJoinOfDoubleIndexResults(Index index1, Index index2,
Collection initialResult) {}
@@ -201,14 +201,14 @@ public class QueryObserverAdapter implements QueryObserver {
* merging the appropriate expansion & cutdown of the individual index results to the final query
* level or CompositeGroupJunction level also occurs. Also for AND conditions, the cartesian with
* the intermediate resultset will also occur.
- *
+ *
* @param finalResult A SelectResults object created after expansion cutdown of two index results
* for a filter evaluatable CompositeCondition ( which may have been cartesianed with the
* intermediate Results. The Results obtained may or may not be to the Top Level/
* CompositeGroupJunction level. The number & positions of iterators present will depend on
* whether it is invoked for an OR Junction or if Complete Expansion is true or not & the
* stage of evaluation it is in for an AND junction.
- *
+ *
*/
public void afterMergeJoinOfDoubleIndexResults(Collection finalResult) {}
@@ -222,12 +222,12 @@ public class QueryObserverAdapter implements QueryObserver {
* the respective RuntimeIterators. The operand without usable index is evaluated & the Index on
* the other operand is used to get resultset for that value. Thus for each tuple we query the
* index on other operand .
- *
+ *
* @param usedIndex : The Index which will be used to obtain the ResultSet
* @param unusedIndex : The Index which does not get used as the relevant iterators are present in
* the intermediate resultset
- *
- *
+ *
+ *
*/
public void beforeIterJoinOfSingleIndexResults(Index usedIndex, Index unusedIndex) {}
@@ -241,14 +241,14 @@ public class QueryObserverAdapter implements QueryObserver {
* the respective RuntimeIterators. The operand without usable index is evaluated & the Index on
* the other operand is used to get resultset for that value. Thus for each tuple we query the
* index on other operand .
- *
+ *
* @param finalResult : A SelectResults object created after expansion / cutdown of mergred
* results where one operand uses Index Results & other operand though has an Index
* available but cannot be used. The value of that operand is calculated by iteration of
* intermediate resultset for each tuple. This function gets invoked only for an AND
* junction. The resultset may or may not be up to the level of top level query iterators
* or CompositeGroupJunction iterators level.
- *
+ *
*/
public void afterIterJoinOfSingleIndexResults(Collection finalResult) {}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
index 5bba736..faebbbc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
@@ -19,20 +19,20 @@ package org.apache.geode.cache.query.internal;
* subsystem when various events take place. There can be only one such observer at a time. If no
* observer is needed, this member variable should point to an object with 'do-nothing' methods,
* such as QueryObserverAdapter.
- *
+ *
* Code which wishes to observe events during a query should do so using the following technique:
- *
+ *
* class MyQueryObserver extends QueryObserverAdapter { // ... override methods of interest ... }
- *
+ *
* QueryObserver old = QueryObserverHolder.setInstance(new MyQueryObserver()); try { //... call
* query methods here ... } finally { // reset to the original QueryObserver.
* QueryObserverHolder.setInstance(old); }
- *
+ *
* The query code will call methods on this static member using the following technique:
- *
+ *
* QueryObserver observer = QueryObserverHolder.getInstance(); try {
* observer.startMethod(arguments); doSomething(); } finally { observer.stopMethod(arguments); }
- *
+ *
* @version $Revision: 1.1 $
*/
public class QueryObserverHolder {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java
index 4d43729..b73bf28 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java
@@ -23,7 +23,6 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.query.AmbiguousNameException;
@@ -42,6 +41,7 @@ import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.IndexUtils;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
+import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
@@ -127,7 +127,7 @@ public class QueryUtils {
/**
* Returns an appropriate, empty {@code SelectResults}
- *
+ *
* @param objectType The {@code ObjectType} of the query results
* @return an appropriate, empty {@code SelectResults}
*/
@@ -146,7 +146,7 @@ public class QueryUtils {
* Returns an appropriate, empty {@code SelectResults}
*
* TODO: statsOrNull is always null
- *
+ *
* @param collectionType The {@code CollectionType} of the query results
* @return an appropriate, empty {@code SelectResults}
*/
@@ -289,7 +289,7 @@ public class QueryUtils {
* dependent on given independent RuntimeIterators. The order of dependent iterators in the List
* is based on the order of independent Iterators present in the array . For each group the first
* iterator is its independent iterator
- *
+ *
* @param indpndntItrs array of independent RuntimeIterators
*/
static List getDependentItrChainForIndpndntItrs(RuntimeIterator[] indpndntItrs,
@@ -307,7 +307,7 @@ public class QueryUtils {
* fields in the final result is governed by the order of RuntimeIterators present in the
* finalList. If any condition needs to be evaluated during cartesian , it can be passed as
* operand
- *
+ *
* @param results Array of SelectResults object which are to be cartesianed
* @param itrsForResultFields A two dimensional array of RuntimeIterator. Each row of this two
* dimensional RuntimeIterator array , maps to a SelectResults object in the results array.
@@ -319,14 +319,14 @@ public class QueryUtils {
* the number of RuntimeIterators in each row should be equal to the number of fields in
* the SelectResults object . The SelectResults object itself may be a ResultBag object or
* a StructBag object.
- *
+ *
* @param expansionList List containing RunimeIterators to which the final Results should be
* expanded to.
* @param finalList List containing RuntimeIterators which define the number of fields to be
* present in the resultant SelectResults and their relative positions. The Runtime
* Iterators present in the List should be either available in the expansion List or should
* be present in each row of the two dimensional RuntimeIterator array.
- *
+ *
* @param context ExecutionContext object
* @param operand The CompiledValue which needs to be iter evaluated during cartesian. Only those
* tuples will be selected in the final Result for which oerand evaluates to true.
@@ -760,7 +760,7 @@ public class QueryUtils {
* can be null. If it is null, then for a CompiledOperation , if supposed to get resolved
* implicitly, will have its receiver as null. This is because in normal cases , a CompiledID
* marks the termination, but in case of CompiledOperation this is not the case
- *
+ *
* @param expr CompiledValue object
* @return CompiledValue
*/
@@ -801,10 +801,10 @@ public class QueryUtils {
/**
* This function creates a StructType using Internal IDs of the iterators as the field names for
* the StructType. It should be invoked iff the iterators size is greater than 1
- *
+ *
* @param runTimeIterators List of RuntimeIterator objects
* @return StructType object
- *
+ *
*/
static StructType createStructTypeForRuntimeIterators(List runTimeIterators) {
int len = runTimeIterators.size();
@@ -829,7 +829,7 @@ public class QueryUtils {
* CompiledValue passed is dependent upon. This does not return the RuntimeIterators on which it
* may be dependent but are not part of the current scope. If no such RuntimeIterator exists it
* returns empty set.
- *
+ *
* @param compiledValue CompiledValue Object
* @param context ExecutionContextobject
* @return Set containing the ultimate independent RuntimeIterators of current scope
@@ -850,7 +850,7 @@ public class QueryUtils {
/**
* Returns the pair of RangeIndexes available for a composite condition ( equi join across the
* region). It will either return two indexes or will return null. *
- *
+ *
* @param lhs One of the operands of the equi-join condition
* @param rhs The other operand of the equi-join condition
* @param context ExecutionContext object
@@ -895,7 +895,7 @@ public class QueryUtils {
/**
* Gets an Index available for the condition
- *
+ *
* @param cv Condition on which index needs to be obtained
* @param context ExecutionContext object
* @param operator int argument identifying the type of operator
@@ -959,7 +959,7 @@ public class QueryUtils {
* fields of SelectResults( StructBag) , with the Iterators of the query from clause ( if complete
* expansion flag is true) or the chain of iterators identified by the indpendent iterator for the
* group.
- *
+ *
* @param indexResults The raw index results which may be a ResultBag object or an StructBag
* object
* @param indexInfo IndexInfo object containing data such as match level & the mapping of the
@@ -1056,7 +1056,7 @@ public class QueryUtils {
* array will be used to get the final position of iterators in the resultant StructBag
*
* TODO: break this method up
- *
+ *
* @param intermediateResults SelectResults object containing the intermediate resultset obtained
* by evaluation of previous filter evaluatable composite conditions of the
* CompositeGroupJunction
@@ -1382,7 +1382,7 @@ public class QueryUtils {
* condition. In the later case the boolean completeExpansion flag is always true. While in the
* former case it may be true or false. If it is false, the array of independent iterators passed
* is not null.
- *
+ *
* @param data A List object whose elements are two dimensional object array. Each element of the
* List represent a value which satisfies the equi-join condition. Since there may be more
* than one tuples on either side of the equality condition which meet the criteria for a
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RangeJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RangeJunction.java
index 72137d0..652d46b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RangeJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RangeJunction.java
@@ -34,11 +34,11 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* This structure contains all the filter evaluatable CompiledComparision conditions which are using
@@ -46,10 +46,10 @@ import org.apache.geode.cache.query.types.StructType;
* either be a part of a GroupJunction or can be a stand alone Junction. In case it is a stand alone
* Junction, then it can possibly have a not null Iter Operand, so that it can be evaluated along
* with the expansion/truncation of index result.
- *
+ *
*/
public class RangeJunction extends AbstractGroupOrRangeJunction {
- private final static int RANGE_SIZE_ESTIMATE = 3;
+ private static final int RANGE_SIZE_ESTIMATE = 3;
// moved to AbstractGroupOrRangeJunction
// private CompiledValue iterOperands;
@@ -382,7 +382,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Checks if key1 operator key2 is true or not. The operator could be =, != , <, >,<=,>=
- *
+ *
* @param key1
* @param key2
* @param operator
@@ -399,7 +399,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* upper bound , in the sense that they do not represent a mutually exclusive condition like a> 10
* and a <9 etc. If the condition is bounded in nature, it further checks if the not equal type
* keys fall in the bounded range , else it removes it from the Not Equal Keys set
- *
+ *
* @param notEqualKeys Set containing keys of operands having 'Not Equal' (!=) type conditions
* @param lessCondnKey Key of the 'Less' condition operand
* @param lessOperator Type of 'less' operator ( < or <=)
@@ -438,7 +438,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* Creates a Filter of type SingleCondnEvaluator if there exists atleast one key of type "NOT
* EQUAL" which satisfies the 'less' or 'greater' type operand. Otherwise the Filter is nothing
* but the CompiledComparison representing the 'less' or 'greater' inequality
- *
+ *
* @param notEqualKeys Set containing NotEqual type Keys
* @param operand CompiledValue representing the 'Less' or 'Greater' operand
* @param operator Type of 'Less' or 'Greater' operand
@@ -548,7 +548,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the "NOT EQUAL KEYS"
- *
+ *
* @param o Object of type NotEqualConditionEvaluator from which the set containing the keys for
* removal need to be retrieved
* @return Unmodifiable Set containing the keys for removal
@@ -568,7 +568,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the SingleCondnEvaluator operator
- *
+ *
* @param o Object of type SingleCondnEvaluator from which the set containing the keys for removal
* need to be retrieved
* @return int indicating the operator
@@ -585,7 +585,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the evaluated Key for a SingleCondnEvaluator operator
- *
+ *
* @param o Object of type SingleCondnEvaluator from which the set containing the keys for removal
* need to be retrieved
* @return Object representing the evaluated Key
@@ -602,7 +602,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the LESS type evaluated Key for a DoubleCondnEvaluator operator
- *
+ *
* @param o Object of type DoubleCondnEvaluator
* @return Object representing the evaluated Key of Less Type
*/
@@ -619,7 +619,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the GREATER type evaluated Key for a DoubleCondnEvaluator
* operator
- *
+ *
* @param o Object of type DoubleCondnEvaluator
* @return Object representing the evaluated Key of GREATER Type
*/
@@ -635,7 +635,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the operator of Less Type
- *
+ *
* @param o Object of type DoubleCondnEvaluator
* @return int indicating the operator of less Type
*/
@@ -651,7 +651,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the operator of GREATER Type
- *
+ *
* @param o Object of type DoubleCondnEvaluator
* @return int indicating the operator of less Type
*/
@@ -667,7 +667,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
/**
* Test function which retrieves the underlying Index for a NotEqualConditionEvaluator operator
- *
+ *
* @param o Object of type NotEqualConditionEvaluator from which the index needs to be retrieved
* @return Index
*/
@@ -686,8 +686,8 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* object of this class will be created only if RangeJunction contains more than one 'NOT EQUAL' (
* != ) type conditions ( apart from conditions having null or undefined as key). This class is
* also extended by SingleCondnEvaluator and DoubleCondnRangeJunctionEvaluator
- *
- *
+ *
+ *
*/
private static class NotEqualConditionEvaluator extends AbstractCompiledValue implements Filter {
final Set notEqualTypeKeys;
@@ -695,7 +695,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
final IndexInfo indxInfo;
/**
- *
+ *
* @param notEqualTypeKeys java.utils.Set object containing the Keys of the 'NOT EQUAL' type
* conditions ( a != 3 and a !=5) For DoubleCondnRangeJunctionEvaluator , this may be
* null
@@ -764,7 +764,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* resultset is a StructBag). If the match level is zero & expand to to top level flag is true
* & iff the total no. of iterators in current scope is greater than the no. of fields in
* StructBag , then only we need to do any expansion.
- *
+ *
*/
try {
observer.beforeIndexLookup(this.indxInfo._index, OQLLexerTokenTypes.TOK_NE,
@@ -873,8 +873,8 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* though not both 'Less' and 'Greater' together). The RangeJunction will identify the most
* specific inequality for the AND junction. Thus if something like a > 7 and a >=6 , will be
* sufficiently represented by a > 7
- *
- *
+ *
+ *
*/
private static class SingleCondnEvaluator extends NotEqualConditionEvaluator {
protected int condnOp = -1;
@@ -889,7 +889,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
}
/**
- *
+ *
* @param operator integer identifying the type of 'Less' or 'Greater' inequality
* @param key Object representing the Key for the inequality
* @param notEqualKeys Set containing the 'NOT EQUAL' Keys accompanying the 'Less' or 'Greater'
@@ -952,7 +952,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* resultset is a StructBag). If the match level is zero & expand to to top level flag is true
* & iff the total no. of iterators in current scope is greater than the no. of fields in
* StructBag , then only we need to do any expansion.
- *
+ *
*/
try {
observer.beforeIndexLookup(this.indxInfo._index, this.condnOp, this.condnKey);
@@ -1000,8 +1000,8 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* for the AND junction. Thus the conditions a > 8 and a <10 will be used to form the Object of
* this class. For this evaluator only, the notEqualTypeKeys present in its super class may be
* null ( if there is no 'NOT EQUAL' type condition satisfying the bounded condition)
- *
- *
+ *
+ *
*/
private static class DoubleCondnRangeJunctionEvaluator extends NotEqualConditionEvaluator {
protected final int lessCondnOp;
@@ -1013,7 +1013,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
protected final Object greaterCondnKey;
/**
- *
+ *
* @param lessCondnOp integer identifying the upper bound ( < or <= )
* @param lessCondnKey Object representing the Upper Bound Key
* @param greaterCondnOp integer identifying the lower bound ( > or >= )
@@ -1092,7 +1092,7 @@ public class RangeJunction extends AbstractGroupOrRangeJunction {
* resultset is a StructBag). If the match level is zero & expand to to top level flag is true
* & iff the total no. of iterators in current scope is greater than the no. of fields in
* StructBag , then only we need to do any expansion.
- *
+ *
*/
try {
observer.beforeIndexLookup(this.indxInfo._index, this.greaterCondnOp, this.greaterCondnKey,
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
index 80dee1d..a814c77 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
@@ -35,12 +35,12 @@ import org.apache.geode.cache.query.types.ObjectType;
* iterator.next(). This wrapper will only be used for queries executed locally PartitionedRegion
* queries that are executed on the local node will already have been copied and will be treated as
* remote queries, so will not use this class
- *
+ *
* The downside is that we may actually make two copies of the data if the cached data is actually a
* serialized byte array. toSet, toList, toArray and toArray(Object[] a) will create new structures
* that will iterate through the results using a SelectResultsCopyOnReadIterator. The new structures
* will then have a copy of the values.
- *
+ *
* @since GemFire 8.0
*/
public class ResultsCollectionCopyOnReadWrapper implements SelectResults {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
index e4ea56c..ecb1f4a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
@@ -14,25 +14,26 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
import java.io.*;
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
+import java.util.*;
+
+import org.apache.geode.*;
import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.internal.cache.EntriesSet;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.*;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.EntriesSet;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Implementation of SelectResults that wraps an existing java.util.Collection and optionally adds a
* specified element type. Considered ordered if the base collection is a List; duplicates allowed
* unless base collection is a Set. Defaults to modifiable unless set otherwise.
- *
+ *
* @since GemFire 4.0
*/
public class ResultsCollectionWrapper implements SelectResults, DataSerializableFixedID {
@@ -460,7 +461,7 @@ public class ResultsCollectionWrapper implements SelectResults, DataSerializable
/**
* Getter for property modifiable.
- *
+ *
* @return Value of property modifiable.
*/
public boolean isModifiable() {
@@ -469,7 +470,7 @@ public class ResultsCollectionWrapper implements SelectResults, DataSerializable
/**
* Setter for property modifiable.
- *
+ *
* @param modifiable New value of property modifiable.
*/
public void setModifiable(boolean modifiable) {
@@ -558,7 +559,7 @@ public class ResultsCollectionWrapper implements SelectResults, DataSerializable
}
/**
- *
+ *
*
*/
class LimitIterator implements Iterator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
index 1e7a2f9..22bcabc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
@@ -20,14 +20,14 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.*;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.*;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
// @todo probably should assert element type when elements added
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RuntimeIterator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RuntimeIterator.java
index 3373b96..6b33a5f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RuntimeIterator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RuntimeIterator.java
@@ -33,14 +33,14 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Value representing a current iteration element. This is the representation used during
* evaluation.
- *
+ *
* A RuntimeIterator can be in one of two states. If it is independent of the current context scope
* then its collection is evaluated lazily, in which case collection is initialized and knows its
* elementType. The elementType field is the same value as in the collection. Otherwise, collection
* is UNINITIALIZED and the elementType is set in any case.
- *
+ *
* A RuntimeIterator can also be named or anonymous (name is null).
- *
+ *
*/
public class RuntimeIterator extends AbstractCompiledValue {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SelectResultsComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SelectResultsComparator.java
index 53f8e47..138cfb5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SelectResultsComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SelectResultsComparator.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.query.SelectResults;
* Comparator used by the sorted set for storing the results obtained from evaluation of various
* filter operands in an increasing order of the size , which will ensure that the intersection of
* the results for evaluation of AND junction is optimum in performance.
- *
+ *
*/
class SelectResultsComparator implements Comparator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
index db925b9..2183e69 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
@@ -15,20 +15,21 @@
package org.apache.geode.cache.query.internal;
-import java.util.*;
import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Implementation of SelectResults that extends TreeSet This is the sorted version of ResultSet used
* for order by clause If the elements are Structs, then use SortedStructSet instead.
- *
+ *
* @since GemFire 4.0
*/
public class SortedResultSet extends TreeSet
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultsBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultsBag.java
index fe41c15..dc5a888 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultsBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultsBag.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.CachePerfStats;
* sorted, than the underlying Map is a LinkedHashMap , else a TreeMap is created. For index results
* expecting duplicates, the constructor used is the one which creates LinkedHashMap This class is
* used to store ordered data of Structs too, obtained from index lookup
- *
+ *
*
* @param <E>
*/
@@ -43,7 +43,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param nullAtStart Indicates that the first order by coumn is asc , so that tuple with null
* order by column value need to be emitted at start, else if desc, then emit at last
@@ -57,7 +57,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param elementType
* @param nullAtStart Indicates that the first order by coumn is asc , so that tuple with null
@@ -73,7 +73,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param elementType
* @param stats
@@ -90,7 +90,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param stats
* @param nullAtStart Indicates that the first order by coumn is asc , so that tuple with null
@@ -105,7 +105,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for ordered input. Creates underlying Map as LinkedHashMap
- *
+ *
* @param stats
* @param nullAtStart Indicates that the first order by coumn is asc , so that tuple with null
* order by column value need to be emitted at start, else if desc, then emit at last
@@ -119,7 +119,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for ordered input. Creates underlying Map as LinkedHashMap
- *
+ *
* @param nullAtStart Indicates that the first order by coumn is asc , so that tuple with null
* order by column value need to be emitted at start, else if desc, then emit at last
*/
@@ -132,7 +132,7 @@ public class SortedResultsBag<E> extends Bag implements Ordered {
/**
* Constructor for ordered input. Creates underlying Map as LinkedHashMap
- *
+ *
* @param elementType
* @param nullAtStart Indicates that the first order by coumn is asc , so that tuple with null
* order by column value need to be emitted at start, else if desc, then emit at last
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructBag.java
index cbefcc6..c84578c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructBag.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
*
*/
public class SortedStructBag extends SortedResultsBag<Object[]> implements StructFields {
@@ -39,7 +39,7 @@ public class SortedStructBag extends SortedResultsBag<Object[]> implements Struc
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param nullAtStart
*/
@@ -50,7 +50,7 @@ public class SortedStructBag extends SortedResultsBag<Object[]> implements Struc
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param elementType
* @param nullAtStart
@@ -62,7 +62,7 @@ public class SortedStructBag extends SortedResultsBag<Object[]> implements Struc
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param elementType
* @param stats
@@ -76,7 +76,7 @@ public class SortedStructBag extends SortedResultsBag<Object[]> implements Struc
/**
* Constructor for unordered input
- *
+ *
* @param comparator
* @param stats
* @param nullAtStart
@@ -321,7 +321,7 @@ public class SortedStructBag extends SortedResultsBag<Object[]> implements Struc
/**
* Getter for property modifiable.
- *
+ *
* @return Value of property modifiable.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
index f3fd661..ca59fc0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
@@ -14,22 +14,23 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A TreeSet constrained to contain Structs of all the same type. To conserve on objects, we store
* the StructType once and reuse it to generate Struct instances on demand.
- *
+ *
* The values in this set are stored as Object[] and get wrapped in Structs as necessary.
- *
+ *
* @since GemFire 4.0
*/
public class SortedStructSet extends TreeSet
@@ -106,7 +107,7 @@ public class SortedStructSet extends TreeSet
/**
* For internal use. Just add the Object[] values for a struct with same type
- *
+ *
* public boolean addFieldValues(Object[] fieldValues) { //return super.add(fieldValues);
* StructImpl s = new StructImpl(this.structType, fieldValues); return super.add(s); }
*/
@@ -133,7 +134,7 @@ public class SortedStructSet extends TreeSet
/**
* Does this set contain a Struct of the correct type with the specified values?
- *
+ *
* public boolean containsFieldValues(Object[] fieldValues) { return super.contains(fieldValues);
* }
*/
@@ -272,7 +273,7 @@ public class SortedStructSet extends TreeSet
/**
* Getter for property modifiable.
- *
+ *
* @return Value of property modifiable.
*/
public boolean isModifiable() {
@@ -285,7 +286,7 @@ public class SortedStructSet extends TreeSet
/**
* Setter for property modifiable.
- *
+ *
* @param modifiable New value of property modifiable.
*/
public void setModifiable(boolean modifiable) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
index 5db6e28..4e6ce24 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.cache.query.internal;
-import it.unimi.dsi.fastutil.Hash;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -24,6 +22,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
+import it.unimi.dsi.fastutil.Hash;
+
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
@@ -36,9 +36,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A Bag constrained to contain Structs of all the same type. To conserve on objects, we store the
* StructType once and reuse it to generate Struct instances on demand.
- *
+ *
* The values in this set are stored as Object[] and get wrapped in Structs as necessary.
- *
+ *
* @since GemFire 5.1
*/
public class StructBag extends ResultsBag implements StructFields {
@@ -111,7 +111,7 @@ public class StructBag extends ResultsBag implements StructFields {
/**
* Creates a new instance of StructBag
- *
+ *
* @param stats the CachePerfStats to track hash collisions. Should be null unless this is used as
* a query execution-time result set.
*/
@@ -413,7 +413,7 @@ public class StructBag extends ResultsBag implements StructFields {
/**
* Getter for property modifiable.
- *
+ *
* @return Value of property modifiable.
*/
@Override
@@ -423,7 +423,7 @@ public class StructBag extends ResultsBag implements StructFields {
/**
* Setter for property modifiable.
- *
+ *
* @param modifiable New value of property modifiable.
*/
public void setModifiable(boolean modifiable) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
index e5f4b2a..bee930e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
@@ -21,12 +21,12 @@ import org.apache.geode.cache.query.types.CollectionType;
/**
* This interface is to be implemented by all SelectResults implementation which can hold struct
* using field values array ( Object[])
- *
+ *
* @see SortedStructSet
* @see StructSet
* @see StructBag
* @see SortedStructBag
- *
+ *
*
*/
public interface StructFields {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java
index f7a46e1..76bd3b3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructImpl.java
@@ -34,7 +34,7 @@ import org.apache.geode.pdx.internal.PdxString;
/**
* Implementation of Struct
- *
+ *
* @since GemFire 4.0
*/
public class StructImpl implements Struct, DataSerializableFixedID, Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
index bbc6979..5870632 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
@@ -14,29 +14,29 @@
*/
package org.apache.geode.cache.query.internal;
-import it.unimi.dsi.fastutil.objects.AbstractObjectIterator;
-import it.unimi.dsi.fastutil.objects.ObjectIterator;
-import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.*;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
+import it.unimi.dsi.fastutil.objects.AbstractObjectIterator;
+import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.types.*;
import org.apache.geode.cache.query.internal.types.*;
+import org.apache.geode.cache.query.types.*;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A Set constrained to contain Structs of all the same type. To conserve on objects, we store the
* StructType once and reuse it to generate Struct instances on demand.
- *
+ *
* The values in this set are stored as Object[] and get wrapped in Structs as necessary.
- *
+ *
* @since GemFire 4.0
*/
public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, SelectResults,
@@ -110,7 +110,7 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
/**
* Creates a StructSet directly from a StructBag; (internal use)
- *
+ *
* @since GemFire 5.1
*/
StructSet(StructBag bag) {
@@ -358,7 +358,7 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
/**
* Getter for property modifiable.
- *
+ *
* @return Value of property modifiable.
*/
public boolean isModifiable() {
@@ -371,7 +371,7 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
/**
* Setter for property modifiable.
- *
+ *
* @param modifiable New value of property modifiable.
*/
public void setModifiable(boolean modifiable) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Support.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Support.java
index a883706..050ccb5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Support.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Support.java
@@ -15,8 +15,8 @@
package org.apache.geode.cache.query.internal;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.InternalGemFireError;
+import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
index 76a0325..afd5e6c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.query.internal;
import java.io.*;
+
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
@@ -25,9 +26,9 @@ import org.apache.geode.internal.Version;
* access an attribute that has an explicit value of null, then it is not undefined. For example, if
* a query accesses the attribute address.city and address is null, then the result is undefined. If
* the query accesses address, then the result is not undefined, it is null.
- *
+ *
* @version $Revision: 1.1 $
- *
+ *
*/
public class Undefined implements DataSerializableFixedID, Comparable, Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AbstractAggregator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AbstractAggregator.java
index 7daa13a..c7a3c5f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AbstractAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AbstractAggregator.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.query.Aggregator;
/**
* Abstract Aggregator class providing support for downcasting the result
- *
+ *
*
*/
public abstract class AbstractAggregator implements Aggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Avg.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Avg.java
index ef73d98..9b325e8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Avg.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Avg.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* Computes the non distinct average for replicated region based queries
- *
+ *
*
*/
public class Avg extends Sum {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgBucketNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgBucketNode.java
index 07bdd35..f4cb923 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgBucketNode.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgBucketNode.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* The aggregator for compuing average which is used on the bucket node for partitioned region based
* queries.
- *
+ *
*
*/
public class AvgBucketNode extends Sum {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinct.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinct.java
index 9b65726..a6d0d43 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinct.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinct.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* Computes the average of distinct values for replicated region based queries.
- *
+ *
*
*/
public class AvgDistinct extends SumDistinct {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinctPRQueryNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinctPRQueryNode.java
index 84ced10..cea3dd1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinctPRQueryNode.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgDistinctPRQueryNode.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.query.internal.aggregate;
/**
* Computes the final average of distinct values for the partitioned region based queries. This
* aggregator is initialized on the PR query node & acts on the results obtained from bucket nodes.
- *
+ *
*
*/
public class AvgDistinctPRQueryNode extends SumDistinctPRQueryNode {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgPRQueryNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgPRQueryNode.java
index 7d1650b..6a52818 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgPRQueryNode.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/AvgPRQueryNode.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.query.internal.aggregate;
/**
* Computes the final non distinct average for a partitioned region based query. This aggregator is
* instantiated on the PR query node.
- *
+ *
*
*/
public class AvgPRQueryNode extends Sum {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Count.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Count.java
index a535e10..38a2aba 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Count.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Count.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* Computes the count of the non distinct rows for replicated & PR based queries.
- *
+ *
*
*/
public class Count implements Aggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinct.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinct.java
index 15d67ed..792d98b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinct.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinct.java
@@ -15,9 +15,9 @@
package org.apache.geode.cache.query.internal.aggregate;
/**
- *
+ *
* Computes the count of the distinct rows for replicated region based queries.
- *
+ *
*/
public class CountDistinct extends DistinctAggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinctPRQueryNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinctPRQueryNode.java
index e5dc922..d4fe2e1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinctPRQueryNode.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountDistinctPRQueryNode.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* Computes the count of the distinct rows on the PR query node.
- *
+ *
*
*/
public class CountDistinctPRQueryNode extends DistinctAggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java
index 7611631..a3fbead 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.query.Aggregator;
/**
* Computes the count of the rows on the PR query node
- *
+ *
*
*/
public class CountPRQueryNode implements Aggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java
index d847110..f44768d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* The class used to hold the distinct values. This will get instantiated on the bucket node as part
* of distinct queries for sum, count, average.
- *
+ *
*
*/
public class DistinctAggregator extends AbstractAggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java
index 99fe106..863aff4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* Computes the Max or Min
- *
+ *
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java
index d6503b7..4a0dc62 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.query.QueryService;
/**
* Computes the sum for replicated & PR based queries.
- *
+ *
*
*/
public class Sum extends AbstractAggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinctPRQueryNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinctPRQueryNode.java
index a7b448b..05ffcaa 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinctPRQueryNode.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinctPRQueryNode.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* Computes the sum of distinct values on the PR query node.
- *
+ *
*
*/
public class SumDistinctPRQueryNode extends DistinctAggregator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
index e017c3c..8ade3ba 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
@@ -25,7 +25,7 @@ public interface ClientCQ extends InternalCqQuery {
/**
* Closes the Query. On Client side, sends the cq close request to server. On Server side, takes
* care of repository cleanup.
- *
+ *
* @param sendRequestToServer true to send the request to server.
* @throws CqException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java
index 72e0d84..871a150 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java
@@ -20,6 +20,8 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheCallback;
import org.apache.geode.cache.query.CqAttributes;
@@ -29,8 +31,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Cloneable {
private static final Logger logger = LogService.getLogger();
@@ -45,7 +45,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon
/**
* Returns the CqListeners set with the CQ
- *
+ *
* @return CqListener[]
*/
public CqListener[] getCqListeners() {
@@ -65,7 +65,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon
/**
* Returns the CqListener set with the CQ
- *
+ *
* @return CqListener
*/
public CqListener getCqListener() {
@@ -98,7 +98,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon
/**
* Adds a Cqlistener to the end of the list of Cqlisteners on this CqQuery.
- *
+ *
* @param cql the user defined cq listener to add to the CqQuery.
* @throws IllegalArgumentException if <code>aListener</code> is null
*/
@@ -125,7 +125,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon
/**
* Removes all Cqlisteners, calling on each of them, and then adds each listener in the specified
* array.
- *
+ *
* @param addedListeners a possibly null or empty array of listeners to add to this CqQuery.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
*/
@@ -187,7 +187,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon
* Removes a Cqlistener from the list of Cqlisteners on this CqQuery. Does nothing if the
* specified listener has not been added. If the specified listener has been added then
* {@link CacheCallback#close()} will be called on it; otherwise does nothing.
- *
+ *
* @param cql the Cqlistener to remove from the CqQuery.
* @throws IllegalArgumentException if <code>cl</code> is null
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
index 8d7096b..cebefd8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
@@ -67,7 +67,7 @@ public interface CqService {
/**
* Retrieve a cq by client cq name from server
- *
+ *
* @return the CqQuery or null if not found
*/
public abstract CqQuery getClientCqFromServer(ClientProxyMembershipID clientProxyId,
@@ -75,7 +75,7 @@ public interface CqService {
/**
* Retrieve a CqQuery by name.
- *
+ *
* @return the CqQuery or null if not found
*/
public abstract InternalCqQuery getCq(String cqName);
@@ -87,7 +87,7 @@ public interface CqService {
/**
* Retruns all the cqs on a given region.
- *
+ *
*/
public abstract Collection<? extends InternalCqQuery> getAllCqs(String regionName)
throws CqException;
@@ -129,7 +129,7 @@ public interface CqService {
/**
* Called directly on server side.
- *
+ *
* @param cqName
* @param clientProxyId
* @throws CqException
@@ -144,14 +144,14 @@ public interface CqService {
/**
* Get statistics information for all CQs
- *
+ *
* @return the CqServiceStatistics
*/
public abstract CqServiceStatistics getCqStatistics();
/**
* Server side method.
- *
+ *
* @param clientProxyId
* @throws CqException
*/
@@ -159,7 +159,7 @@ public interface CqService {
/**
* Returns all the CQs registered by the client.
- *
+ *
* @param clientProxyId
* @return CQs registered by the client.
*/
@@ -167,7 +167,7 @@ public interface CqService {
/**
* Returns all the durable client CQs registered by the client.
- *
+ *
* @param clientProxyId
* @return CQs registered by the client.
*/
@@ -176,7 +176,7 @@ public interface CqService {
/**
* Invokes the CqListeners for the given CQs.
- *
+ *
* @param cqs list of cqs with the cq operation from the Server.
* @param messageType base operation
* @param key
@@ -209,7 +209,7 @@ public interface CqService {
/**
* Called directly on server side.
- *
+ *
* @param cqName
* @param clientId
* @throws CqException
@@ -218,7 +218,7 @@ public interface CqService {
/**
* Called directly on the server side.
- *
+ *
* @param cqState new state
* @param cQuery
*/
@@ -231,7 +231,7 @@ public interface CqService {
/**
* Executes the given CqQuery, if the CqQuery for that name is not there it registers the one and
* executes. This is called on the Server.
- *
+ *
* @param cqName
* @param queryString
* @param cqState
@@ -251,7 +251,7 @@ public interface CqService {
/**
* Server side method. Closes non-durable CQs for the given client proxy id.
- *
+ *
* @param clientProxyId
* @throws CqException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
index 90fbf4b..4e39d35 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceProvider.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.cache.query.internal.cq;
-import org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.InternalCache;
-
import java.io.DataInput;
import java.io.IOException;
import java.util.Iterator;
import java.util.ServiceLoader;
+import org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.InternalCache;
+
public class CqServiceProvider {
private static final CqServiceFactory factory;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
index af03d9f..9d6c101 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
@@ -34,7 +34,7 @@ public interface InternalCqQuery extends CqQuery {
/**
* Closes the Query. On Client side, sends the cq close request to server. On Server side, takes
* care of repository cleanup.
- *
+ *
* @param sendRequestToServer true to send the request to server.
* @throws CqException
*/
@@ -62,7 +62,7 @@ public interface InternalCqQuery extends CqQuery {
/**
* Returns a reference to VSD stats of the CQ
- *
+ *
* @return VSD stats of the CQ
*/
public CqQueryVsdStats getVsdStats();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
index d0485e9..d780f37 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
@@ -34,7 +34,7 @@ public interface ServerCQ extends InternalCqQuery {
/**
* Register the Query on server.
- *
+ *
* @param p_clientProxyId
* @param p_ccn
* @throws CqException
@@ -44,14 +44,14 @@ public interface ServerCQ extends InternalCqQuery {
/**
* Adds into the CQ Results key cache.
- *
+ *
* @param key
*/
public abstract void addToCqResultKeys(Object key);
/**
* Removes the key from CQ Results key cache.
- *
+ *
* @param key
* @param isTokenMode if true removes the key if its in destroy token mode if false removes the
* key without any check.
@@ -71,7 +71,7 @@ public interface ServerCQ extends InternalCqQuery {
/**
* Closes the Query. On Client side, sends the cq close request to server. On Server side, takes
* care of repository cleanup.
- *
+ *
* @param sendRequestToServer true to send the request to server.
* @throws CqException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java
index a59b049..4c5183d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java
@@ -232,7 +232,7 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* The Region this index is on
- *
+ *
* @return the Region for this index
*/
@Override
@@ -427,7 +427,7 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* Get the projectionAttributes for this expression.
- *
+ *
* @return the projectionAttributes, or "*" if there were none specified at index creation.
*/
@Override
@@ -437,7 +437,7 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* Get the projectionAttributes for this expression.
- *
+ *
* @return the projectionAttributes, or "*" if there were none specified at index creation.
*/
@Override
@@ -1296,7 +1296,7 @@ public abstract class AbstractIndex implements IndexProtocol {
* Checks the limit for the resultset for distinct and non-distinct queries separately. In case of
* non-distinct distinct elements size of result-set is matched against limit passed in as an
* argument.
- *
+ *
* @return true if limit is satisfied.
*/
boolean verifyLimit(Collection result, int limit) {
@@ -1306,21 +1306,21 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* This will verify the consistency between RegionEntry and IndexEntry. RangeIndex has following
* entry structure,
- *
+ *
* IndexKey --> [RegionEntry, [Iterator1, Iterator2....., IteratorN]]
*
* Where Iterator1 to IteratorN are iterators defined in index from clause.
*
* For example: "/portfolio p, p.positions.values pos" from clause has two iterators where p is
* independent iterator and pos is dependent iterator.
- *
+ *
* Query iterators can be a subset, superset or exact match of index iterators. But we take query
* iterators which are matching with index iterators to evaluate RegionEntry for new value and
* compare it with index value which could be a plain object or a Struct.
*
* Note: Struct evaluated from RegionEntry can NOT have more field values than Index Value Struct
* as we filter out iterators in query context before evaluating Struct from RegionEntry.
- *
+ *
* @return True if Region and Index entries are consistent.
*/
// package-private to avoid synthetic accessor
@@ -1477,7 +1477,7 @@ public abstract class AbstractIndex implements IndexProtocol {
* Note: This Index contains its own from clause definition which corresponds to a region
* collection reference in given context and must be contained at 0th index in
* {@link AbstractIndex#canonicalizedDefinitions}.
- *
+ *
* @return {@link RuntimeIterator} this should not be null ever.
*/
RuntimeIterator getRuntimeIteratorForThisIndex(ExecutionContext context) {
@@ -1499,7 +1499,7 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* Similar to {@link #getRuntimeIteratorForThisIndex(ExecutionContext)} except that this one also
* matches the iterator name if present with alias used in the {@link IndexInfo}
- *
+ *
* @return {@link RuntimeIterator}
*/
RuntimeIterator getRuntimeIteratorForThisIndex(ExecutionContext context, IndexInfo info) {
@@ -1568,7 +1568,7 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* This map is not thread-safe. We rely on the fact that every thread which is trying to update
* this kind of map (In Indexes), must have RegionEntry lock before adding OR removing elements.
- *
+ *
* This map does NOT provide an iterator. To iterate over its element caller has to get inside the
* map itself through addValuesToCollection() calls.
*/
@@ -2017,7 +2017,7 @@ public abstract class AbstractIndex implements IndexProtocol {
/**
* Converts Strings to PdxStrings and vice-versa based on the isIndexedPdxKeys flag
- *
+ *
* @return PdxString or String based on isIndexedPdxKeys flag
*/
Object getPdxStringForIndexedPdxKeys(Object key) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java
index e6fd743..ca6c420 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java
@@ -77,11 +77,11 @@ import org.apache.geode.pdx.internal.PdxString;
* at the expense of doing extra work at index maintenance. It is selected as the index
* implementation when the indexed expression is a path expression and the from clause has only one
* iterator. This implies there is only one value in the index for each region entry.
- *
+ *
* This index does not support the storage of projection attributes.
- *
+ *
* Currently this implementation only supports an index on a region path.
- *
+ *
* @since GemFire 6.0
*/
public class CompactRangeIndex extends AbstractIndex {
@@ -114,7 +114,7 @@ public class CompactRangeIndex extends AbstractIndex {
/**
* Get the index type
- *
+ *
* @return the type of index
*/
public IndexType getType() {
@@ -266,9 +266,9 @@ public class CompactRangeIndex extends AbstractIndex {
* used. Like, if condition is "p.ID = e.ID", {@link IndexInfo} will contain Left as p.ID, Right
* as e.ID and operator as TOK_EQ. This method will evaluate p.ID OR e.ID based on if it is inner
* or outer RegionEntry, and verify the p.ID = e.ID.
- *
+ *
* This method is called only for Memory indexstore
- *
+ *
* @return true if entry value and index value are consistent.
*/
protected boolean verifyInnerAndOuterEntryValues(IndexStoreEntry entry, ExecutionContext context,
@@ -682,9 +682,9 @@ public class CompactRangeIndex extends AbstractIndex {
}
/*
- *
+ *
* @param lowerBoundKey the index key to match on
- *
+ *
* @param lowerBoundOperator the operator to use to determine a match
*/
private void addToResultsFromEntries(Object lowerBoundKey, int lowerBoundOperator,
@@ -698,15 +698,15 @@ public class CompactRangeIndex extends AbstractIndex {
}
/*
- *
+ *
* @param lowerBoundKey the index key to match on for a lower bound on a ranged query, otherwise
* the key to match on
- *
+ *
* @param upperBoundKey the index key to match on for an upper bound on a ranged query, otherwise
* null
- *
+ *
* @param lowerBoundOperator the operator to use to determine a match against the lower bound
- *
+ *
* @param upperBoundOperator the operator to use to determine a match against the upper bound
*/
private void addToResultsFromEntries(Object lowerBoundKey, Object upperBoundKey,
@@ -855,10 +855,10 @@ public class CompactRangeIndex extends AbstractIndex {
* This evaluates the left and right side of a where condition for which this Index was used.
* Like, if condition is "ID > 1", {@link IndexInfo} will contain Left as ID, Right as '1' and
* operator as TOK_GT. This method will evaluate ID from region entry value and verify the ID > 1.
- *
+ *
* Note: IndexInfo is created for each query separately based on the condition being evaluated
* using the Index.
- *
+ *
* @return true if RegionEntry value satisfies the where condition (contained in IndexInfo).
*/
protected boolean evaluateEntry(IndexInfo indexInfo, ExecutionContext context, Object keyVal)
@@ -1437,7 +1437,7 @@ public class CompactRangeIndex extends AbstractIndex {
* the additional projection attribute. If the boolean isFirstItrOnEntry is tru e& additional
* projection attribute is null, then teh 0th iterator itself will evaluate to Region.Entry
* Object.
- *
+ *
* The 2nd element of Object Array contains the Struct object ( tuple) created. If the boolean
* isFirstItrOnEntry is false, then the first attribute of the Struct object is obtained by
* evaluating the additional projection attribute.
@@ -1648,5 +1648,3 @@ public class CompactRangeIndex extends AbstractIndex {
}
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java
index f032bab..d38abee 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java
@@ -1142,7 +1142,7 @@ public class HashIndex extends AbstractIndex {
* the additional projection attribute. If the boolean isFirstItrOnEntry is tru e& additional
* projection attribute is null, then teh 0th iterator itself will evaluate to Region.Entry
* Object.
- *
+ *
* The 2nd element of Object Array contains the Struct object ( tuple) created. If the boolean
* isFirstItrOnEntry is false, then the first attribute of the Struct object is obtained by
* evaluating the additional projection attribute.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
index 361690a..7e60234 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
@@ -21,7 +21,6 @@
package org.apache.geode.cache.query.internal.index;
import static it.unimi.dsi.fastutil.HashCommon.arraySize;
-import it.unimi.dsi.fastutil.HashCommon;
import java.util.Collection;
import java.util.Collections;
@@ -29,6 +28,8 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Set;
+import it.unimi.dsi.fastutil.HashCommon;
+
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.TypeUtils;
@@ -48,9 +49,9 @@ public class HashIndexSet implements Set {
*/
class HashIndexSetProperties {
/** the set of Objects */
- final protected transient Object[] set;
+ protected final transient Object[] set;
/** used for hashing into the table **/
- final protected int mask;
+ protected final int mask;
/** the current number of entries in the set */
protected transient int size = 0;
@@ -120,7 +121,7 @@ public class HashIndexSet implements Set {
/**
* Creates a new <code>HashIndexSet</code> instance with a prime capacity equal to or greater than
* <tt>initialCapacity</tt> and with the specified load factor.
- *
+ *
* @param initialCapacity an <code>int</code> value
* @param loadFactor a <code>float</code> value
*/
@@ -142,7 +143,7 @@ public class HashIndexSet implements Set {
/**
* Searches the set for <tt>obj</tt>
- *
+ *
* @param obj an <code>Object</code> value
* @return a <code>boolean</code> value
*/
@@ -161,7 +162,7 @@ public class HashIndexSet implements Set {
/**
* Locates the index of <tt>obj</tt>.
- *
+ *
* @param obj an <code>Object</code> value, expected to be the value object
* @return the index of <tt>obj</tt> or -1 if it isn't in the set.
*/
@@ -175,7 +176,7 @@ public class HashIndexSet implements Set {
/**
* Locates index slot of object using the provided key (in this case we are passing in old key)
- *
+ *
* @param key
* @param obj
* @return the indexSlot of the given key/object combination
@@ -191,10 +192,10 @@ public class HashIndexSet implements Set {
/*
* Code originated from fastutils Copyright (C) 2002-2014 Sebastiano Vigna
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*/
if (!((curr = set[pos = (it.unimi.dsi.fastutil.HashCommon.mix(hash)) & mask]) == null
@@ -219,7 +220,7 @@ public class HashIndexSet implements Set {
/**
* Locates the index of <tt>obj</tt>.
- *
+ *
* @param indexKey an <code>Object</code> value that represents the index key
* @return Iterator over a collection of objects that match the key
*/
@@ -228,7 +229,7 @@ public class HashIndexSet implements Set {
}
/**
- *
+ *
* @param set represents the array that all elements are stored in
* @param index the array index location to store the object. This should be calculated by one of
* the insertionIndex methods
@@ -259,7 +260,7 @@ public class HashIndexSet implements Set {
/**
* Add an object using the hash value of the provided indexKey
- *
+ *
* @param indexKey
* @param obj the object to add
* @return true if object has been added
@@ -300,7 +301,7 @@ public class HashIndexSet implements Set {
/**
* Locates the next available insertion index for the provided indexKey and set
- *
+ *
* @return the index of an open or resused position
*/
protected int insertionIndex(Object indexKey, HashIndexSetProperties metaData) {
@@ -319,10 +320,10 @@ public class HashIndexSet implements Set {
try {
/*
* Code originated from fastutils Copyright (C) 2002-2014 Sebastiano Vigna
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*/
if (!((curr = array[pos = (it.unimi.dsi.fastutil.HashCommon.mix(hash)) & mask]) == null
@@ -364,7 +365,7 @@ public class HashIndexSet implements Set {
/**
* Expands or contracts a set to the new specified n.
- *
+ *
* @param newN the expected size
*/
protected void rehash(int newN) {
@@ -407,7 +408,7 @@ public class HashIndexSet implements Set {
/**
* Unsupported as the hash index does not use this method call
- *
+ *
* @return an <code>Object[]</code> value
*/
public Object[] toArray() {
@@ -416,7 +417,7 @@ public class HashIndexSet implements Set {
/**
* Unsupported as the hash index does not use this method call
- *
+ *
* @param a an <code>Object[]</code> value
* @return an <code>Object[]</code> value
*/
@@ -453,7 +454,7 @@ public class HashIndexSet implements Set {
}
/**
- *
+ *
* @param key assumed to not be null, rather needs to be NULL token
* @param obj
* @param newIndexSlot if inplace modification occurs with out having a reversemap we end up
@@ -497,7 +498,7 @@ public class HashIndexSet implements Set {
/**
* Creates an iterator over the values of the set. The iterator supports element deletion.
- *
+ *
* @return an <code>Iterator</code> value
*/
public Iterator iterator() {
@@ -506,7 +507,7 @@ public class HashIndexSet implements Set {
/**
* Determine if all of the elements in <tt>collection</tt> are present.
- *
+ *
* @param collection a <code>Collection</code> value
* @return true if all elements are present.
*/
@@ -528,7 +529,7 @@ public class HashIndexSet implements Set {
/**
* Removes all of the elements in <tt>collection</tt> from the set.
- *
+ *
* @param collection a <code>Collection</code> value
* @return true if the set was modified by the remove all operation.
*/
@@ -547,7 +548,7 @@ public class HashIndexSet implements Set {
/**
* Removes any values in the set which are not contained in <tt>collection</tt>.
- *
+ *
* @param collection a <code>Collection</code> value
* @return true if the set was modified by the retain all operation
*/
@@ -577,7 +578,7 @@ public class HashIndexSet implements Set {
/**
* Returns the number of positions used in the backing array Is not a true representation of the
* number of elements in the array as the array may contain REMOVED tokens
- *
+ *
* @return an <code>int</code> value
*/
public int size() {
@@ -613,7 +614,7 @@ public class HashIndexSet implements Set {
/**
* Remove the object at <tt>index</tt>.
- *
+ *
* @param index an <code>int</code> value
*/
protected boolean removeAt(int index) {
@@ -810,4 +811,3 @@ public class HashIndexSet implements Set {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IMQException.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IMQException.java
index 76dc714..81e06c4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IMQException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IMQException.java
@@ -30,7 +30,7 @@ public class IMQException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -40,7 +40,7 @@ public class IMQException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param msg the error message
*/
public IMQException(String msg) {
@@ -49,7 +49,7 @@ public class IMQException extends QueryException {
/**
* Constructor used by concrete subclasses
- *
+ *
* @param cause a Throwable cause of this exception
*/
public IMQException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexConcurrentHashSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexConcurrentHashSet.java
index d823c7a..b5c5799 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexConcurrentHashSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexConcurrentHashSet.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
@@ -25,7 +25,7 @@ import org.apache.geode.internal.concurrent.CompactConcurrentHashSet2;
* This class overrides the size method to make it non-blocking for our query engine. size() is only
* called index size estimation for selecting best index for a query which can be approximate so it
* does NOT have to lock internal segments for accurate count.
- *
+ *
* @param <E>
* @since GemFire 7.0
*/
@@ -55,9 +55,9 @@ public class IndexConcurrentHashSet<E> extends CompactConcurrentHashSet2<E> {
/*
* Returns the number of values in this set. If the set contains more than
* <tt>Integer.MAX_VALUE</tt> elements, returns <tt>Integer.MAX_VALUE</tt>.
- *
+ *
* @return the number of values in this set
- *
+ *
* Note: This has been modified for GemFire Indexes.
*/
// @Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
index 89ba3c7..d13ce49 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
@@ -15,7 +15,7 @@
/*
* Created on Apr 18, 2005
*
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
@@ -29,7 +29,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
/**
- *
+ *
* This class contains the information needed to create an index It will contain the callback data
* between <index></index> invocation
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexData.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexData.java
index e5c516f..f436a3c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexData.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexData.java
@@ -15,8 +15,8 @@
package org.apache.geode.cache.query.internal.index;
/**
- *
- *
+ *
+ *
* Object of this class contains information of various attributes of Range Index for a filter
* evaluatable condition , from the perspective of the query from clause. It identifies the match
* level & the maping of Iterators of the Group to the index result fields.
@@ -42,7 +42,7 @@ public class IndexData {
* example the second Iterator of the group ( 0 indxe based , hence 1 ) will map to the field
* position in the Index Result given by the value maping[1]. If an iterator has no mapping , the
* value will be 0. *
- *
+ *
*/
int[] mapping = null;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexElemArray.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexElemArray.java
index 1a57314..0772b10 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexElemArray.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexElemArray.java
@@ -22,7 +22,7 @@ import java.util.NoSuchElementException;
/**
* A wrapper around an object array for storing values in index data structure with minimal set of
* operations supported and the maximum size of 128 elements
- *
+ *
* @since GemFire 7.0
*/
public class IndexElemArray implements Iterable, Collection {
@@ -50,7 +50,7 @@ public class IndexElemArray implements Iterable, Collection {
/**
* Increases the capacity of this <tt>ArrayList</tt> instance, if necessary, to ensure that it can
* hold at least the number of elements specified by the minimum capacity argument.
- *
+ *
* @param minCapacity the desired minimum capacity
*/
private void ensureCapacity(int minCapacity) {
@@ -70,7 +70,7 @@ public class IndexElemArray implements Iterable, Collection {
/**
* Returns the number of elements in this list. (Warning: May not return correct size always, as
* remove operation is not atomic)
- *
+ *
* @return the number of elements in this list
*/
public int size() {
@@ -79,7 +79,7 @@ public class IndexElemArray implements Iterable, Collection {
/**
* Returns <tt>true</tt> if this list contains no elements.
- *
+ *
* @return <tt>true</tt> if this list contains no elements
*/
public boolean isEmpty() {
@@ -90,7 +90,7 @@ public class IndexElemArray implements Iterable, Collection {
* Returns <tt>true</tt> if this list contains the specified element. More formally, returns
* <tt>true</tt> if and only if this list contains at least one element <tt>e</tt> such that
* <tt>(o==null ? e==null : o.equals(e))</tt>.
- *
+ *
* @param o element whose presence in this list is to be tested
* @return <tt>true</tt> if this list contains the specified element
*/
@@ -121,11 +121,11 @@ public class IndexElemArray implements Iterable, Collection {
/**
* Returns the element at the specified position in this list.
- *
+ *
* @param index index of the element to return
* @return the element at the specified position in this list
* @throws IndexOutOfBoundsException
- *
+ *
*/
public Object get(int index) {
synchronized (lock) {
@@ -136,12 +136,12 @@ public class IndexElemArray implements Iterable, Collection {
/**
* Replaces the element at the specified position in this list with the specified element.
- *
+ *
* @param index index of the element to replace
* @param element element to be stored at the specified position
* @return the element previously at the specified position
* @throws IndexOutOfBoundsException
- *
+ *
*/
public Object set(int index, Object element) {
synchronized (lock) {
@@ -156,7 +156,7 @@ public class IndexElemArray implements Iterable, Collection {
/**
* Appends the specified element to the end of this array. If the array is full, creates a new
* array with new capacity = old capacity + 5
- *
+ *
* @param e element to be appended to this list
* @return <tt>true</tt> (as specified by {@link Collection#add})
* @throws ArrayIndexOutOfBoundsException
@@ -177,7 +177,7 @@ public class IndexElemArray implements Iterable, Collection {
* <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt> (if such an element
* exists). Returns <tt>true</tt> if this list contained the specified element (or equivalently,
* if this list changed as a result of the call).
- *
+ *
* @param o element to be removed from this list, if present
* @return <tt>true</tt> if this list contained the specified element
*/
@@ -278,7 +278,7 @@ public class IndexElemArray implements Iterable, Collection {
* Checks if the array has next element, stores reference to the current element and increments
* cursor. This is required since an element may be removed between hasNext() and next() method
* calls
- *
+ *
*/
@Override
public boolean hasNext() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index c61a497..386047e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -144,7 +144,7 @@ public class IndexManager {
Integer.parseInt(System.getProperty(INDEX_ELEMARRAY_THRESHOLD_PROP, "100"));
public static final int INDEX_ELEMARRAY_SIZE =
Integer.parseInt(System.getProperty(INDEX_ELEMARRAY_SIZE_PROP, "5"));
- public final static AtomicLong SAFE_QUERY_TIME = new AtomicLong(0);
+ public static final AtomicLong SAFE_QUERY_TIME = new AtomicLong(0);
public static boolean ENABLE_UPDATE_IN_PROGRESS_INDEX_CALCULATION = true;
/** The NULL constant */
public static final Object NULL = new NullToken();
@@ -179,7 +179,7 @@ public class IndexManager {
* timings, this allows us to calculate the correct results for a query but, reevaluate more
* aggressively. But the large hiccup will eventually be rolled off as time is always increasing
* This is a fix for #47475
- *
+ *
* @param operationTime the last modified time from version tag
*/
public static boolean setIndexBufferTime(long operationTime, long currentCacheTime) {
@@ -208,7 +208,7 @@ public class IndexManager {
* This is to fix bug 47475, where references to region entries can be held by the executing query
* either directly or indirectly (iterators can hold references for next) but the values
* underneath could change.
- *
+ *
* Small amounts of false positives are ok as it will have a slight impact on performance
*/
public static boolean needsRecalculation(long queryStartTime, long lastModifiedTime) {
@@ -236,7 +236,7 @@ public class IndexManager {
/**
* The Region this IndexManager is associated with
- *
+ *
* @return the Region for this IndexManager
*/
public Region getRegion() {
@@ -253,7 +253,7 @@ public class IndexManager {
// @todo need more specific list of exceptions
/**
* Create an index that can be used when executing queries.
- *
+ *
* @param indexName the name of this index, used for statistics collection
* @param indexType the type of index
* @param origIndexedExpression the expression to index on, a function dependent on region entries
@@ -522,7 +522,7 @@ public class IndexManager {
* synchronization is needed while obtaining Array of Indexes as similar to what we have used
* during index updates. This function will get the exact index , if available, else will return
* null
- *
+ *
* @param indexType the type of index
* @param definitions the String array containing the required defintions of the fromClause of the
* index
@@ -580,10 +580,10 @@ public class IndexManager {
/**
* Asif : Returns the best available Index based on the available iterators in the Group
- *
+ *
* TODO: Asif :Check if synchronization is needed while obtaining Array of Indexes as similar to
* what we have used during index updates
- *
+ *
* @param indexType Primary or Range Index
* @param definitions String array containing the canonicalized definitions of the Iterators of
* the Group
@@ -786,7 +786,7 @@ public class IndexManager {
/**
* Get a collection of all the indexes. If the IndexType is specified returns only the matching
* indexes.
- *
+ *
* @param indexType the type of indexes to get. Currently must be Indexable.FUNCTIONAL_SORTED
* @return the collection of indexes for the specified region and type
*/
@@ -813,7 +813,7 @@ public class IndexManager {
/**
* Get a collection of all the indexes managed by IndexManager
- *
+ *
* @return the collection of indexes on the specified region
*/
public Collection getIndexes() {
@@ -822,7 +822,7 @@ public class IndexManager {
/**
* Remove the specified index.
- *
+ *
* @param index the Index to remove
*/
public void removeIndex(Index index) {
@@ -971,7 +971,7 @@ public class IndexManager {
/**
* Callback for IndexManager to update indexes Called from AbstractRegionMap.
- *
+ *
* @param entry the RegionEntry being updated
* @param action action to be taken (IndexManager.ADD_ENTRY, IndexManager.UPDATE_ENTRY,
* IndexManager.REMOVE_ENTRY)
@@ -1218,7 +1218,7 @@ public class IndexManager {
* recreate is in progress. This is required as recreate does NOT lock region entries before index
* update and hence might cause inconsistencies in index if concurrent region entry operations are
* going on.
- *
+ *
*/
private void recreateAllIndexesForRegion() {
@@ -1252,7 +1252,7 @@ public class IndexManager {
/**
* Wait for index initialization before entry create, update, invalidate or destroy operation.
- *
+ *
* Note: If the region has a disk region then we should wait for index initialization before
* getting region entry lock to avoid deadlock (#44431).
*/
@@ -1309,7 +1309,7 @@ public class IndexManager {
/**
* Removes indexes for a destroyed bucket region from the list of bucket indexes in the
* {@link PartitionedIndex}.
- *
+ *
* @param prRegion the partition region that this bucket belongs to
*/
public void removeBucketIndexes(PartitionedRegion prRegion) throws QueryException {
@@ -1362,7 +1362,7 @@ public class IndexManager {
* Asif : This function is used exclusively by Index Manager. It gets the unique Iterator name for
* a Iterator definition, if it already exists, else creates a unqiue name & also stores it in a
* map for subsequent use
- *
+ *
* @param definition String containing definition of the iterator
* @return String containing the name of the Iterator
*/
@@ -1394,7 +1394,7 @@ public class IndexManager {
/**
* Asif : Given a definition returns the canonicalized iterator name for the definition. If the
* definition does not exist , null is returned
- *
+ *
* @return String
*/
public String getCanonicalizedIteratorName(String definition) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
index a444387..c32f4e9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.cache.query.internal.index;
-// import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.FunctionDomainException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import java.util.*;
+
import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryException;
@@ -29,7 +29,7 @@ import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.RuntimeIterator;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.RegionEntry;
-import java.util.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
public interface IndexProtocol extends Index {
/**
@@ -57,7 +57,7 @@ public interface IndexProtocol extends Index {
* This method gets invoked only if the where clause contains multiple 'NOT EQUAL' conditions only
* , for a given index expression ( i.e something like a != 5 and a != 7 ). This will be invoked
* only from RangeJunction.NotEqualConditionEvaluator
- *
+ *
* @param results The Collection object used for fetching the index results
* @param keysToRemove Set containing Index key which should not be included in the results being
* fetched
@@ -71,7 +71,7 @@ public interface IndexProtocol extends Index {
/**
* This can be invoked only from RangeJunction.SingleCondnEvaluator
- *
+ *
* @param key Index Key Object for which the Index results need to be fetched
* @param operator Integer specifying the criteria relative to the key , which defines the index
* resultset
@@ -89,7 +89,7 @@ public interface IndexProtocol extends Index {
NameResolutionException, QueryInvocationTargetException;
/**
- *
+ *
* @param key Index Key Object for which the Index results need to be fetched
* @param operator Integer specifying the criteria relative to the key , which defines the index
* resultset
@@ -102,7 +102,7 @@ public interface IndexProtocol extends Index {
QueryInvocationTargetException;
/**
- *
+ *
* @param key
* @param operator
* @param results
@@ -121,7 +121,7 @@ public interface IndexProtocol extends Index {
/**
* This will be queried from RangeJunction.DoubleCondnRangeJunctionEvaluator
- *
+ *
* @param lowerBoundKey Object representing the lower Bound Key
* @param lowerBoundOperator integer identifying the lower bound ( > or >= )
* @param upperBoundKey Object representing the Upper Bound Key
@@ -141,7 +141,7 @@ public interface IndexProtocol extends Index {
* Asif: Gets the data for an equi join condition across the region. The function iterates over
* this Range Index's keys & also runs an inner iteration for the Range Index passed as parameter.
* If the two keys match the resultant data of both the indexes is collected.
- *
+ *
* @param index RangeIndex object for the other operand
* @param context TODO
* @return A List object whose elements are a two dimensional Object Array. Each element of the
@@ -168,7 +168,7 @@ public interface IndexProtocol extends Index {
/**
* Asif : This function returns the canonicalized definitions of the from clauses used in Index
* creation
- *
+ *
* @return String array containing canonicalized definitions
*/
public String[] getCanonicalizedIteratorDefinitions();
@@ -176,7 +176,7 @@ public interface IndexProtocol extends Index {
/**
* Asif: Object type of the data ( tuple ) contained in the Index Results . It will be either of
* type ObjectType or StructType
- *
+ *
* @return ObjectType
*/
public ObjectType getResultSetType();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStats.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStats.java
index e1f4fa7..4fc68db 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStats.java
@@ -203,7 +203,7 @@ public class IndexStats {
/**
* Returns the Statistics instance that stores the cache perf stats.
- *
+ *
* @since GemFire 3.5
*/
public Statistics getStats() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
index ba94485..17bb227 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
@@ -20,14 +20,14 @@ import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
/**
- *
+ *
* @since GemFire 8.0
*/
public interface IndexStore {
/**
* Add a mapping to the index store
- *
+ *
* @param indexKey
* @param re
*/
@@ -36,7 +36,7 @@ public interface IndexStore {
/**
* Remove a mapping from the index store If entry at indexKey is not found, we must crawl the
* index to be sure the region entry does not exist
- *
+ *
* @param indexKey
* @param re
*/
@@ -44,7 +44,7 @@ public interface IndexStore {
/**
* Update a mapping in the index store. This method adds a new mapping and removes the old mapping
- *
+ *
* @param indexKey
* @param oldKey
* @param re
@@ -123,7 +123,7 @@ public interface IndexStore {
Object getDeserializedRegionKey();
/**
- *
+ *
* @return true if the RegionEntry is under update
* @see RegionEntry#isUpdateInProgress() isUpdateInProgress
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
index c367c8a..2e975a5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
@@ -26,7 +26,7 @@ import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.RegionEntry;
/**
- *
+ *
*/
public interface IndexedExpressionEvaluator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MapRangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MapRangeIndex.java
index ddfd38d..2ec8ff4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MapRangeIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MapRangeIndex.java
@@ -16,6 +16,7 @@ package org.apache.geode.cache.query.internal.index;
import java.util.Collection;
import java.util.Iterator;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.IndexStatistics;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
index 91dbfc4..21f5a16 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
/**
* The in-memory index storage
- *
+ *
* @since GemFire 8.0
*/
public class MemoryIndexStore implements IndexStore {
@@ -251,7 +251,7 @@ public class MemoryIndexStore implements IndexStore {
/**
* Find the old key by traversing the forward map in case of in-place update modification If not
* found it means the value object was modified with same value. So oldKey is same as newKey.
- *
+ *
* @return oldKey
*/
private Object getOldKey(Object newKey, RegionEntry entry) throws TypeMismatchException {
@@ -566,7 +566,7 @@ public class MemoryIndexStore implements IndexStore {
private class MemoryIndexStoreKeyIterator implements Iterator<IndexStoreEntry> {
- final private Map valuesToEntriesMap;
+ private final Map valuesToEntriesMap;
private Object currKey;
private Iterator<Map.Entry> mapIterator;
@@ -845,4 +845,3 @@ public class MemoryIndexStore implements IndexStore {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
index b8e7938..ab0ec14 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* This class implements a Partitioned index over a group of partitioned region buckets.
- *
+ *
* @since GemFire 5.1
*/
@@ -60,7 +60,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Type on index represented by this partitioned index.
- *
+ *
* @see IndexType#FUNCTIONAL
* @see IndexType#PRIMARY_KEY
* @see IndexType#HASH
@@ -104,7 +104,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Adds an index on a bucket to the list of already indexed buckets in the partitioned region.
- *
+ *
* @param index bucket index to be added to the list.
*/
public void addToBucketIndexes(Region r, Index index) {
@@ -132,7 +132,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Returns the number of locally indexed buckets.
- *
+ *
* @return int number of buckets.
*/
public int getNumberOfIndexedBuckets() {
@@ -147,7 +147,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Gets a collection of all the bucket indexes created so far.
- *
+ *
* @return bucketIndexes collection of all the bucket indexes.
*/
public List getBucketIndexes() {
@@ -199,7 +199,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Returns the type of index this partitioned index represents.
- *
+ *
* @return indexType type of partitioned index.
*/
public IndexType getType() {
@@ -209,7 +209,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Returns the index for the bucket.
*/
- static public AbstractIndex getBucketIndex(PartitionedRegion pr, String indexName, Integer bId)
+ public static AbstractIndex getBucketIndex(PartitionedRegion pr, String indexName, Integer bId)
throws QueryInvocationTargetException {
try {
pr.checkReadiness();
@@ -283,7 +283,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Set the number of remotely indexed buckets when this partitioned index was created.
- *
+ *
* @param remoteBucketsIndexed int representing number of remote buckets.
*/
public void setRemoteBucketesIndexed(int remoteBucketsIndexed) {
@@ -292,7 +292,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Returns the number of remotely indexed buckets by this partitioned index.
- *
+ *
* @return int number of remote indexed buckets.
*/
public int getNumRemoteBucketsIndexed() {
@@ -301,7 +301,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* The Region this index is on.
- *
+ *
* @return the Region for this index
*/
@Override
@@ -391,7 +391,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* String representing the state.
- *
+ *
* @return string representing all the relevant information.
*/
public String toString() {
@@ -409,7 +409,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* This will create extra {@link IndexStatistics} statistics for MapType PartitionedIndex.
- *
+ *
* @param indexName
* @return new PartitionedIndexStatistics
*/
@@ -419,7 +419,7 @@ public class PartitionedIndex extends AbstractIndex {
/**
* Internal class for partitioned index statistics. Statistics are not supported right now.
- *
+ *
*/
class PartitionedIndexStatistics extends InternalIndexStatistics {
private IndexStats vsdStats;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
index b86caa4..1458b74 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
@@ -16,8 +16,6 @@ package org.apache.geode.cache.query.internal.index;
import static java.lang.Integer.*;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -29,6 +27,8 @@ import java.util.SortedMap;
import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.FunctionDomainException;
@@ -67,7 +67,7 @@ public class RangeIndex extends AbstractIndex {
new ConcurrentSkipListMap(TypeUtils.getExtendedNumericComparator());
// Map for RegionEntries=>value of indexedExpression (reverse map)
- final private RegionEntryToValuesMap entryToValuesMap;
+ private final RegionEntryToValuesMap entryToValuesMap;
// Map for RegionEntries=>values when indexedExpression evaluates to null
protected RegionEntryToValuesMap nullMappedEntries;
@@ -86,7 +86,7 @@ public class RangeIndex extends AbstractIndex {
// TODO: need more specific list of exceptions
/**
* Create an Range Index that can be used when executing queries.
- *
+ *
* @param indexName the name of this index, used for statistics collection
* @param indexedExpression the expression to index on, a function dependent on region entries
* individually.
@@ -435,7 +435,7 @@ public class RangeIndex extends AbstractIndex {
/**
* Get the index type
- *
+ *
* @return the type of index
*/
public IndexType getType() {
@@ -979,7 +979,7 @@ public class RangeIndex extends AbstractIndex {
}
/**
- *
+ *
* @param entriesMap SortedMap object containing the indexed key as the key & the value being
* RegionEntryToValues Map object containing the indexed results
* @param result Index Results holder Collection used for fetching the index results
@@ -1034,7 +1034,7 @@ public class RangeIndex extends AbstractIndex {
/**
- *
+ *
* @param entriesMap SortedMap object containing the indexed key as the key & the value being
* RegionEntryToValues Map object containing the indexed results
* @param result Index Results holder Collection used for fetching the index results
@@ -1132,7 +1132,7 @@ public class RangeIndex extends AbstractIndex {
* RegionEntryToValuesMap) { RegionEntryToValuesMap rvMap = (RegionEntryToValuesMap) entriesMap;
* rvMap.removeValuesFromCollection(result); } else { throw new
* RuntimeException(LocalizedStrings.RangeIndex_PROBLEM_IN_INDEX_QUERY.toLocalizedString()); } }
- *
+ *
* private void removeValuesFromResult(Object entriesMap, Collection result,CompiledValue iterOps,
* RuntimeIterator runtimeItr, ExecutionContext context, List projAttrib, SelectResults
* intermediateResults, boolean isIntersection) throws FunctionDomainException,
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
index 4263726..03eb981 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.query.internal.CompiledValue;
import org.apache.geode.cache.query.internal.QCompiler;
/**
- *
+ *
*
*/
public class ASTAggregateFunc extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
index 96c6979..ebb6472 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTAnd extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
index be84a3f..b830bd5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
index 660c379..d5dc3b7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTCompareOp extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
index 3ee9e22..afd3275 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.*;
import org.apache.geode.internal.Assert;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
index b17c531..803e3b8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTConversionExpr extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
index 4cd9237..0e0d453 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
@@ -15,10 +15,11 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
- *
+ *
*
*/
public class ASTGroupBy extends GemFireAST {
@@ -38,4 +39,3 @@ public class ASTGroupBy extends GemFireAST {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
index 733b0b0..8e36a9b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.parse;
@@ -22,7 +22,7 @@ import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
/**
- *
+ *
* @since GemFire 8.1
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
index b3b454f..93f9db4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.parse;
@@ -22,7 +22,7 @@ import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
/**
- *
+ *
* @since GemFire 8.1
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
index dcb18a8..ce91520 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
index a7a1f3d..1c814c3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
@@ -18,6 +18,7 @@ package org.apache.geode.cache.query.internal.parse;
import antlr.*;
import antlr.collections.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTImport extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
index ff35a16..e5a1135 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTIn extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
index d1cbfa7..4af8ee8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
@@ -16,9 +16,9 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
-// import antlr.collections.*;
-import org.apache.geode.internal.Assert;
+
import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.internal.Assert;
/**
*
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
index a589db0..ac9de3d 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.parse;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
index 2eb27d1..576976b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
@@ -15,6 +15,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
index d6331ed..c59c589 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
@@ -16,9 +16,11 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
-import java.util.*;
import java.sql.*;
+import java.util.*;
+
+import antlr.*;
+
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
index 966592f..7b0f7fd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
@@ -16,9 +16,8 @@
package org.apache.geode.cache.query.internal.parse;
-import org.apache.logging.log4j.Logger;
-
import antlr.*;
+import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
index fd2db46..7694949 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTOr extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
index 460353c..13d841d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
@@ -15,10 +15,11 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
- *
+ *
*
*/
public class ASTOrderBy extends GemFireAST {
@@ -38,4 +39,3 @@ public class ASTOrderBy extends GemFireAST {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
index d9748c6..2d03eee 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
index 2d3cbba..a7a2ff4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
@@ -18,6 +18,7 @@ package org.apache.geode.cache.query.internal.parse;
import antlr.*;
import antlr.collections.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
index ae3db57..c252cb9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
index be81361..be4e80b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
index 8eda072..f75b118 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
@@ -22,8 +22,8 @@ import java.util.Map;
import antlr.*;
import antlr.collections.*;
-import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.QCompiler;
public class ASTSelect extends GemFireAST {
private static final long serialVersionUID = 1389351692304773456L;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
index 5fb97dc..e44e093 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
@@ -16,6 +16,7 @@ package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
index 1dad11d..fee80d6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
@@ -13,14 +13,14 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.parse;
import org.apache.geode.cache.query.internal.QCompiler;
/**
- *
+ *
* @since GemFire 6.6.2
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
index 4dbf11d..5243895 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.Assert;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
index 4806bde..4c86f59 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
index 9885891..04bfe7a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
@@ -20,14 +20,14 @@ import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.internal.Support;
/**
- *
+ *
*
*/
public class ASTUnary extends GemFireAST {
private static final long serialVersionUID = -3906821390970046083L;
/**
- *
+ *
* @param t
*/
public ASTUnary(Token t) {
@@ -35,7 +35,7 @@ public class ASTUnary extends GemFireAST {
}
/**
- *
+ *
*
*/
public ASTUnary() {}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
index 058fe9a..5a0f312 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
@@ -17,6 +17,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
index 124e894..c24eed9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
index a373693..09535d5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
@@ -16,8 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
import antlr.*;
-// import antlr.collections.*;
-// import org.apache.geode.cache.query.*;
+
import org.apache.geode.cache.query.internal.QCompiler;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
index f44fbfd..08b7469 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
@@ -20,10 +20,11 @@
package org.apache.geode.cache.query.internal.parse;
+import java.io.*;
+
import antlr.*;
import antlr.collections.*;
import antlr.debug.misc.ASTFrame;
-import java.io.*;
/**
*
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
index 3d58e50..9fdbbcf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
@@ -32,7 +32,7 @@ import org.apache.geode.cache.query.types.*;
/**
* Implementation of CollectionType
- *
+ *
* @since GemFire 4.0
*/
public class CollectionTypeImpl extends ObjectTypeImpl implements CollectionType {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
index 43b58c8..797d425 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.query.internal.Undefined;
/**
* A general comparator that will let us compare different numeric types for equality
- *
+ *
*/
public class ExtendedNumericComparator extends NumericComparator implements Comparator {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
index 1f66f0d..63e72e0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
@@ -16,13 +16,14 @@
package org.apache.geode.cache.query.internal.types;
import java.io.*;
-import org.apache.geode.cache.query.types.*;
+
import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.query.types.*;
/**
* Implementation of CollectionType
- *
+ *
* @since GemFire 4.0
*/
public class MapTypeImpl extends CollectionTypeImpl implements MapType {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
index 65e4214..84da972 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
@@ -82,5 +82,3 @@ class NumericComparator implements Comparator {
return i1 == i2 ? 0 : (i1 < i2 ? -1 : 1);
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
index 040e227..1a710ec 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
@@ -21,14 +21,14 @@ import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
/**
* Implementation of ObjectType
- *
+ *
* @since GemFire 4.0
*/
public class ObjectTypeImpl implements ObjectType, DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
index cef2009..a93f7dd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
@@ -22,14 +22,13 @@ import java.util.*;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.types.*;
-
import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.cache.query.types.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Implementation of StructType
- *
+ *
* @since GemFire 4.0
*/
public class StructTypeImpl extends ObjectTypeImpl implements StructType {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
index c7f7ee1..dd64769 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
@@ -63,5 +63,3 @@ class TemporalComparator implements Comparator {
return extraNanos1 == extraNanos2 ? 0 : (extraNanos1 < extraNanos2 ? -1 : 1);
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
index 6c2399a..87beda4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
@@ -62,7 +62,7 @@ public class TypeUtils implements OQLLexerTokenTypes {
/**
* Verify that type-cast will work, or else throw an informative exception.
- *
+ *
* @return the castTarget
* @throws InternalGemFireError if cast will fail
*/
@@ -85,35 +85,35 @@ public class TypeUtils implements OQLLexerTokenTypes {
/*
* public static Object convert(Object obj, Class toType) throws TypeMismatchException { // if obj
* is null, just leave it alone if (obj == null) return null;
- *
- *
+ *
+ *
* if (toType.isInstance(obj)) return obj;
- *
+ *
* if (Float.class.isAssignableFrom(toType) && obj instanceof Double) return new
* Float(((Double)obj).floatValue());
- *
+ *
* if (Double.class.isAssignableFrom(toType) && obj instanceof Float) return
* Double.valueOf(((Float)obj).doubleValue());
- *
+ *
* if (Long.class.isAssignableFrom(toType) && obj instanceof Byte || obj instanceof Short || obj
* instanceof Integer) return Long.valueOf(((Number)obj).longValue());
- *
+ *
* if (Integer.class.isAssignableFrom(toType) && obj instanceof Byte || obj instanceof Short ||
* obj instanceof Long) { int newInt = ((Number)obj).intValue(); if (!(obj instanceof Long) ||
* (long)newInt == ((Long)obj).longValue()) return Integer.valueOf(newInt); }
- *
+ *
* if (Short.class.isAssignableFrom(toType) && obj instanceof Byte || obj instanceof Integer ||
* obj instanceof Long) { short newShort = ((Number)obj).shortValue(); if (obj instanceof Byte ||
* (obj instanceof Long && (long)newShort == ((Long)obj).longValue()) || (obj instanceof Integer
* && (int)newShort == ((Integer)obj).intValue())) return new Short(newShort); }
- *
+ *
* throw new
* TypeMismatchException(LocalizedStrings.TypeUtils_UNABLE_TO_CONVERT_0_TO_1.toLocalizedString(new
* Object[] {obj, toType})); }
*/
/**
* Compares two objects using the operator
- *
+ *
* @param obj1
* @param obj2
* @param compOp
@@ -280,7 +280,7 @@ public class TypeUtils implements OQLLexerTokenTypes {
// plus Strings, and temporals
/**
* Return the type of the keys for a given path type.
- *
+ *
* @param pathType the Class of the last attribute in the path
* @return the Class of the index keys
* @throws TypeMismatchException if indexes are not allowed on this type
@@ -459,4 +459,3 @@ public class TypeUtils implements OQLLexerTokenTypes {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
index 2752b7a..13ce5a9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
@@ -30,14 +30,14 @@ public interface CollectionType extends ObjectType {
/**
* Return whether duplicates are kept in this type of collection. Duplicates are two objects are
* equal to each other as defined by the <code>equals</code> method.
- *
+ *
* @return true if duplicates have been retained, false if duplicates have been eliminated
*/
public boolean allowsDuplicates();
/**
* Return whether this collection type has ordered elements.
- *
+ *
* @return true if this collection type is ordered, false if not
*/
public boolean isOrdered();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
index 519d42a..8bfc987 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
@@ -26,7 +26,7 @@ public interface MapType extends CollectionType {
/**
* Return the type of the keys in this type of map.
- *
+ *
* @return the ObjectType of the keys in this type of map.
*/
public ObjectType getKeyType();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
index 30aa957..02a0517 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
@@ -26,14 +26,14 @@ public interface StructType extends ObjectType {
/**
* The the types of the fields for this struct
- *
+ *
* @return the array of Class for the fields
*/
ObjectType[] getFieldTypes();
/**
* Get the names of the fields for this struct
- *
+ *
* @return the array of field names
*/
String[] getFieldNames();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
index bd00170..60b2990 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
@@ -42,7 +42,7 @@ public interface CacheServer {
/**
* The default number of sockets accepted by a CacheServer. When the maximum is reached the cache
* server will stop accepting new connections. Current value: 800
- *
+ *
* @since GemFire 5.7
*/
public static final int DEFAULT_MAX_CONNECTIONS = 800;
@@ -55,7 +55,7 @@ public interface CacheServer {
* them to the thread pool. The default of <code>0</code> causes a thread to be bound to every
* connection and to be dedicated to detecting client requests on that connection. A selector is
* not used in this default mode. Current value: 0
- *
+ *
* @since GemFire 5.7
*/
public static final int DEFAULT_MAX_THREADS = 0;
@@ -91,7 +91,7 @@ public interface CacheServer {
/**
* The default list of server groups a cache server belongs to. The current default is an empty
* list.
- *
+ *
* @since GemFire 5.7
* @deprecated as of 7.0 use the groups gemfire property
*/
@@ -100,16 +100,16 @@ public interface CacheServer {
/**
* The default load balancing probe. The default load balancing probe reports the connections
* counts of this cache server.
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public static final ServerLoadProbe DEFAULT_LOAD_PROBE = new ConnectionCountProbe();
/**
* The default frequency at which to poll the load probe for the load on this cache server.
* Defaults to 5000 (5 seconds).
- *
+ *
* @since GemFire 5.7
*/
public static final long DEFAULT_LOAD_POLL_INTERVAL = 5000;
@@ -117,7 +117,7 @@ public interface CacheServer {
/**
* The default ip address or host name that the cache server's socket will listen on for client
* connections. The current default is an empty string.
- *
+ *
* @since GemFire 5.7
*/
public static final String DEFAULT_BIND_ADDRESS = "";
@@ -125,7 +125,7 @@ public interface CacheServer {
/**
* The default ip address or host name that will be given to clients as the host this cache server
* is listening on. The current default is an empty string.
- *
+ *
* @since GemFire 5.7
*/
public static final String DEFAULT_HOSTNAME_FOR_CLIENTS = "";
@@ -150,7 +150,7 @@ public interface CacheServer {
/**
* Returns a string representing the ip address or host name that this cache server will listen
* on.
- *
+ *
* @return the ip address or host name that this cache server is to listen on
* @see #DEFAULT_BIND_ADDRESS
* @since GemFire 5.7
@@ -171,7 +171,7 @@ public interface CacheServer {
* all local addresses then use this bind address <code>"0.0.0.0"</code>.
* <p>
* A <code>null</code> value will be treated the same as the default <code>""</code>.
- *
+ *
* @param address the ip address or host name that this cache server is to listen on
* @see #DEFAULT_BIND_ADDRESS
* @since GemFire 5.7
@@ -181,7 +181,7 @@ public interface CacheServer {
/**
* Returns a string representing the ip address or host name that server locators will tell
* clients that this cache server is listening on.
- *
+ *
* @return the ip address or host name to give to clients so they can connect to this cache server
* @see #DEFAULT_HOSTNAME_FOR_CLIENTS
* @since GemFire 5.7
@@ -199,7 +199,7 @@ public interface CacheServer {
* The value <code>""</code> causes the <code>bind-address</code> to be given to clients.
* <p>
* A <code>null</code> value will be treated the same as the default <code>""</code>.
- *
+ *
* @param name the ip address or host name that will be given to clients so they can connect to
* this cache server
* @see #DEFAULT_HOSTNAME_FOR_CLIENTS
@@ -250,7 +250,7 @@ public interface CacheServer {
/**
* Returns the configured buffer size of the socket connection for this <code>CacheServer</code>.
* The default is 32768 bytes.
- *
+ *
* @return the configured buffer size of the socket connection for this <code>CacheServer</code>
*
* @since GemFire 4.2.1
@@ -272,7 +272,7 @@ public interface CacheServer {
* Returns the maximum amount of time between client pings. This value is used by the
* <code>ClientHealthMonitor</code> to determine the health of this <code>CacheServer</code>'s
* clients. The default is 60000 ms.
- *
+ *
* @return the maximum amount of time between client pings.
*
* @since GemFire 4.2.3
@@ -306,7 +306,7 @@ public interface CacheServer {
/**
* Sets the maxium number of client connections allowed. When the maximum is reached the cache
* server will stop accepting connections.
- *
+ *
* @see #DEFAULT_MAX_CONNECTIONS
*/
public void setMaxConnections(int maxCons);
@@ -315,7 +315,7 @@ public interface CacheServer {
* Returns the maxium number of threads allowed in this cache server to service client requests.
* The default of <code>0</code> causes the cache server to dedicate a thread for every client
* connection.
- *
+ *
* @since GemFire 5.1
*/
public int getMaxThreads();
@@ -324,7 +324,7 @@ public interface CacheServer {
* Sets the maxium number of threads allowed in this cache server to service client requests. The
* default of <code>0</code> causes the cache server to dedicate a thread for every client
* connection.
- *
+ *
* @see #DEFAULT_MAX_THREADS
* @since GemFire 5.1
*/
@@ -337,7 +337,7 @@ public interface CacheServer {
/**
* Sets maximum number of messages that can be enqueued in a client-queue.
- *
+ *
* @see #DEFAULT_MAXIMUM_MESSAGE_COUNT
*/
public void setMaximumMessageCount(int maxMessageCount);
@@ -349,7 +349,7 @@ public interface CacheServer {
/**
* Sets the time (in seconds ) after which a message in the client queue will expire.
- *
+ *
* @see #DEFAULT_MESSAGE_TIME_TO_LIVE
*/
public void setMessageTimeToLive(int messageTimeToLive);
@@ -357,7 +357,7 @@ public interface CacheServer {
/**
* Sets the list of server groups this cache server will belong to. By default cache servers
* belong to the default global server group which all cache servers always belong to.
- *
+ *
* @param groups possibly empty array of <code>String</code> where each string is a server groups
* that this cache server will be a member of.
* @see #DEFAULT_GROUPS
@@ -368,7 +368,7 @@ public interface CacheServer {
/**
* Returns the list of server groups that this cache server belongs to.
- *
+ *
* @return a possibly empty array of <code>String</code>s where each string is a server group.
* Modifying this array will not change the server groups that this cache server belongs
* to.
@@ -380,7 +380,7 @@ public interface CacheServer {
/**
* Get the load probe for this cache server. See {@link ServerLoadProbe} for details on the load
* probe.
- *
+ *
* @return the load probe used by this cache server.
* @since GemFire 5.7
*/
@@ -389,7 +389,7 @@ public interface CacheServer {
/**
* Set the load probe for this cache server. See {@link ServerLoadProbe} for details on how to
* implement a load probe.
- *
+ *
* @param loadProbe the load probe to use for this cache server.
* @since GemFire 5.7
*/
@@ -397,14 +397,14 @@ public interface CacheServer {
/**
* Get the frequency in milliseconds to poll the load probe on this cache server.
- *
+ *
* @return the frequency in milliseconds that we will poll the load probe.
*/
public long getLoadPollInterval();
/**
* Set the frequency in milliseconds to poll the load probe on this cache server
- *
+ *
* @param loadPollInterval the frequency in milliseconds to poll the load probe. Must be greater
* than 0.
*/
@@ -414,7 +414,7 @@ public interface CacheServer {
* Get the outgoing connection tcp-no-delay setting. If it is set to true (the default) this cache
* server is configured to enable tcp-no-delay on outgoing tcp/ip sockets. If it is set to false
* this cache server is configured to disable tcp-no-delay on outgoing sockets.
- *
+ *
* @return the tcp-no-delay setting
*/
public boolean getTcpNoDelay();
@@ -422,7 +422,7 @@ public interface CacheServer {
/**
* Configures the tcpNoDelay setting of sockets used to send messages to clients. TcpNoDelay is
* enabled by default.
- *
+ *
* @param noDelay if false, sets tcp-no-delay to false on out-going connections
*/
public void setTcpNoDelay(boolean noDelay);
@@ -430,7 +430,7 @@ public interface CacheServer {
/**
* Get the ClientSubscriptionConfig for this cache server. See {@link ClientSubscriptionConfig}
* for details on the client subscription configuration.
- *
+ *
* @return ClientSubscriptionConfig
* @since GemFire 5.7
*/
@@ -438,7 +438,7 @@ public interface CacheServer {
/**
* Returns the <code>ClientSession</code> associated with the <code>DistributedMember</code>
- *
+ *
* @return the <code>ClientSession</code> associated with the <code>DistributedMember</code>
* @since GemFire 6.0
*/
@@ -446,7 +446,7 @@ public interface CacheServer {
/**
* Returns the <code>ClientSession</code> associated with the durable client id
- *
+ *
* @return the <code>ClientSession</code> associated with the durable
* @since GemFire 6.0
*/
@@ -454,7 +454,7 @@ public interface CacheServer {
/**
* Returns a set of all <code>ClientSession</code>s
- *
+ *
* @return a set of all <code>ClientSession</code>s
* @since GemFire 6.0
*/
@@ -463,9 +463,9 @@ public interface CacheServer {
/**
* Registers a new <code>InterestRegistrationListener</code> with the set of
* <code>InterestRegistrationListener</code>s.
- *
+ *
* @param listener The <code>InterestRegistrationListener</code> to register
- *
+ *
* @since GemFire 6.0
*/
public void registerInterestRegistrationListener(InterestRegistrationListener listener);
@@ -473,9 +473,9 @@ public interface CacheServer {
/**
* Unregisters an existing <code>InterestRegistrationListener</code> from the set of
* <code>InterestRegistrationListener</code>s.
- *
+ *
* @param listener The <code>InterestRegistrationListener</code> to unregister
- *
+ *
* @since GemFire 6.0
*/
public void unregisterInterestRegistrationListener(InterestRegistrationListener listener);
@@ -483,10 +483,10 @@ public interface CacheServer {
/**
* Returns a read-only set of <code>InterestRegistrationListener</code>s registered with this
* notifier.
- *
+ *
* @return a read-only set of <code>InterestRegistrationListener</code>s registered with this
* notifier
- *
+ *
* @since GemFire 6.0
*/
public Set<InterestRegistrationListener> getInterestRegistrationListeners();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java b/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
index 1cd99a1..bdd147e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
@@ -27,10 +27,10 @@ package org.apache.geode.cache.server;
* defined by <b>capacity</b></LI>
* </UL>
* <br/>
- *
+ *
* The capacity limits the total amount of memory or entries for all client queues on held on this
* server. If this server hosts multiple client queues, they will all share the same capacity.
- *
+ *
* <p>
* <b>Configuration: </b>
* <p>
@@ -41,7 +41,7 @@ package org.apache.geode.cache.server;
* <code>ClientSubscriptionConfig</code> object and modify each desired parameter and value.
* <p>
* <p>
- *
+ *
* If you are using a <code>cache.xml</code> file to create a <code>CacheServer</code>
* declaratively, you can do the following to configure <code>ClientSubscriptionConfig</code> and to
* have <b>none</b> eviction policy no need to specify client-subscription tag as it is a default
@@ -55,11 +55,11 @@ package org.apache.geode.cache.server;
* </cache-server>
* </code>
* </pre>
- *
+ *
* @see #getEvictionPolicy
* @see #getCapacity
- *
- *
+ *
+ *
* @since GemFire 5.7
*/
@@ -83,7 +83,7 @@ public interface ClientSubscriptionConfig {
/**
* Returns the capacity of the client queue. will be in MB for eviction-policy <b>mem</b> else
* number of entries
- *
+ *
* @see #DEFAULT_CAPACITY
* @since GemFire 5.7
*/
@@ -92,7 +92,7 @@ public interface ClientSubscriptionConfig {
/**
* Sets the capacity of the client queue. will be in MB for eviction-policy <b>mem</b> else number
* of entries
- *
+ *
* @see #DEFAULT_CAPACITY
* @since GemFire 5.7
*/
@@ -100,7 +100,7 @@ public interface ClientSubscriptionConfig {
/**
* Returns the eviction policy that is executed when capacity of the client queue is reached.
- *
+ *
* @see #DEFAULT_EVICTION_POLICY
* @since GemFire 5.7
*/
@@ -108,7 +108,7 @@ public interface ClientSubscriptionConfig {
/**
* Sets the eviction policy that is executed when capacity of the client queue is reached.
- *
+ *
* @see #DEFAULT_EVICTION_POLICY
* @since GemFire 5.7
*/
@@ -116,7 +116,7 @@ public interface ClientSubscriptionConfig {
/**
* Sets the overflow directory for a client queue
- *
+ *
* @param overflowDirectory the overflow directory for a client queue's overflowed entries
* @since GemFire 5.7
* @deprecated as of 6.5 use {@link #setDiskStoreName(String)} instead
@@ -125,7 +125,7 @@ public interface ClientSubscriptionConfig {
/**
* Answers the overflow directory for a client queue's overflowed client queue entries.
- *
+ *
* @return the overflow directory for a client queue's overflowed entries
* @since GemFire 5.7
* @deprecated as of 6.5 use {@link #getDiskStoreName} instead
@@ -134,7 +134,7 @@ public interface ClientSubscriptionConfig {
/**
* Sets the disk store name for overflow
- *
+ *
* @param diskStoreName
* @since GemFire 6.5
*/
@@ -142,7 +142,7 @@ public interface ClientSubscriptionConfig {
/**
* get the diskStoreName for overflow
- *
+ *
* @since GemFire 6.5
*/
public String getDiskStoreName();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
index 560c1b7..3f9064c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
@@ -24,18 +24,18 @@ import org.apache.geode.DataSerializable;
/**
* A data object containing the load information for a cache server. This object is returned from
* {@link ServerLoadProbe#getLoad(ServerMetrics)} and indicates how heavily loaded the server is.
- *
+ *
* The values returned by {@link #getConnectionLoad()} and {@link #getSubscriptionConnectionLoad()}
* can be any number greater than 0. A larger load value means that the server has more load.
- *
+ *
* The values returned by getLoadPerConnection() and getLoadPerSubscriptionConnection are used to
* estimate the effect of new connections before the connects are actually made to this server. The
- * load is estimated as <code>
+ * load is estimated as <code>
* load + loadPerConnection*numAdditionalConnections.
* </code>
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public final class ServerLoad implements DataSerializable {
private static final long serialVersionUID = -4498005291184650907L;
@@ -60,7 +60,7 @@ public final class ServerLoad implements DataSerializable {
/**
* Get the load on the server due to client to server connections.
- *
+ *
* @return a float greater than or equals to 0
*/
public float getConnectionLoad() {
@@ -71,7 +71,7 @@ public final class ServerLoad implements DataSerializable {
* Get an estimate of the how much load each new connection will add to this server. The locator
* uses this information to estimate the load on the server before it receives a new load
* snapshot.
- *
+ *
* @return a float greater than or equals to 0
*/
public float getLoadPerConnection() {
@@ -80,7 +80,7 @@ public final class ServerLoad implements DataSerializable {
/**
* Get the load on the server due to subscription connections.
- *
+ *
* @return a float greater than or equals to 0
*/
public float getSubscriptionConnectionLoad() {
@@ -91,7 +91,7 @@ public final class ServerLoad implements DataSerializable {
* Get an estimate of the how much load each new subscriber will add to this server. The locator
* uses this information to estimate the load on the server before it receives a new load
* snapshot.
- *
+ *
* @return a float greater than or equals to 0
*/
public float getLoadPerSubscriptionConnection() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
index 7397571..bc4a02b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.CacheCallback;
/**
* A load probe is installed in a cache server to measure the load on the cache server for balancing
* load between multiple cache servers.
- *
+ *
* <p>
* The getLoad method will be called once per poll interval see
* {@link CacheServer#setLoadPollInterval(long)} The {@link ServerLoad} object returned by the
@@ -43,14 +43,14 @@ import org.apache.geode.cache.CacheCallback;
* this callback can be called several times. If the same callback object is installed on multiple
* cache servers, open and close will be called once for each cache server.
* </p>
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public interface ServerLoadProbe extends CacheCallback {
/**
* Get the load on this server. This method will be called once every pool interval.
- *
+ *
* @return The current load on this server.
*/
ServerLoad getLoad(ServerMetrics metrics);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
index 959ccdf..75c44ac 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
@@ -19,9 +19,9 @@ package org.apache.geode.cache.server;
* Utility class that implements all methods in {@link ServerLoadProbe} with empty implementations
* for open and close. Applications can subclass this class and only override the methods for the
* events of interest.
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public abstract class ServerLoadProbeAdapter implements ServerLoadProbe {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
index 97b9883..24d8016 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
@@ -18,7 +18,7 @@ package org.apache.geode.cache.server;
/**
* Metrics about the resource usage for a cache server. These metrics are provided to the
* {@link ServerLoadProbe} for use in calculating the load on the server.
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
index 096b975..30c306d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
@@ -27,16 +27,16 @@ import org.apache.geode.internal.cache.xmlcache.Declarable2;
/**
* A load probe which returns load as a function of the number of connections to the bridge server.
- *
+ *
* The Load object returned by this probe reports the connection load as the number of connections
* to this server divided by the max connections for this server. This means that servers with a
* lower max connections will receive fewer connections than servers with a higher max connections.
* The load therefore is a number between 0 and 1, where 0 means there are are no connections, and 1
* means the server at max connections.
- *
+ *
* The queue load is reported simply as the number of queues hosted by this bridge server.
- *
- *
+ *
+ *
* @since GemFire 5.7
*/
public class ConnectionCountProbe extends ServerLoadProbeAdapter
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java b/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
index 92be55a..f0b50e8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* A class which monitors the load on a bridge server and periodically sends updates to the locator.
- *
+ *
* @since GemFire 5.7
*
*/
@@ -113,7 +113,7 @@ public class LoadMonitor implements ConnectionListener {
/**
* Keeps track of the clients that have added a queue since the last load was sent to the
* server-locator.
- *
+ *
* @since GemFire 5.7
*/
protected final ArrayList clientIds = new ArrayList();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
index 1cdc9b3..6baa71c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.server.ServerMetrics;
/**
* Metrics describing the load on a bridge server.
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
index 131c265..89320df 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
@@ -30,19 +30,19 @@ import org.apache.geode.pdx.PdxSerializer;
* <pre>
* // obtain a snapshot
* CacheSnapshotService snapshot = cache.getSnapshotService();
- *
+ *
* // export the snapshot, every region in the cache will be exported
* snapshot.save(new File("."), SnapshotFormat.GEMFIRE);
- *
+ *
* // import the snapshot files, updates any existing entries in the cache
* snapshot.load(new File("."), SnapshotFormat.GEMFIRE);
* </pre>
- *
+ *
* The default behavior is to perform all I/O operations on the node where the snapshot operations
* are invoked. This will involve either collecting or dispersing data over the network if the cache
* contains a partitioned region. The snapshot behavior can be changed using
* {@link SnapshotOptions}. For example:
- *
+ *
* <pre>
* CacheSnapshotService snapshot = cache.getSnapshotService();
* SnapshotFilter filter = new SnapshotFilter() {
@@ -53,23 +53,23 @@ import org.apache.geode.pdx.PdxSerializer;
*
* SnapshotOptions<Object, Object> options = snapshot.createOptions();
* options.setFilter(filter);
- *
+ *
* snapshot.save(new File("."), SnapshotFormat.GEMFIRE, options);
* </pre>
- *
+ *
* Note that the snapshot does not provide a consistency guarantee. Updates to data during the
* course of import/export operations could result data inconsistencies.
- *
+ *
* @see Cache#getSnapshotService()
* @see SnapshotOptions
- *
+ *
* @since GemFire 7.0
*/
public interface CacheSnapshotService {
/**
* Creates a <code>SnapshotOptions</code> object configured with default settings. The options can
* be used to configure snapshot behavior.
- *
+ *
* @return the default options
*/
SnapshotOptions<Object, Object> createOptions();
@@ -77,10 +77,10 @@ public interface CacheSnapshotService {
/**
* Exports all regions in the cache to the specified directory. The cache entries in each region
* will be written to a separate file.
- *
+ *
* @param dir the directory for writing the snapshots, will be created if necessary
* @param format the snapshot format
- *
+ *
* @throws IOException error writing snapshot
*/
void save(File dir, SnapshotFormat format) throws IOException;
@@ -88,11 +88,11 @@ public interface CacheSnapshotService {
/**
* Exports all regions in the cache to the specified directory by applying user-configured
* options. The cache entries in each region will be written to a separate file.
- *
+ *
* @param dir the directory for writing the snapshots, will be created if necessary
* @param format the snapshot format
* @param options the snapshot options
- *
+ *
* @throws IOException error writing snapshot
*/
void save(File dir, SnapshotFormat format, SnapshotOptions<Object, Object> options)
@@ -107,10 +107,10 @@ public interface CacheSnapshotService {
* Prior to loading data, all regions should have been created and any necessary serializers
* (either {@link DataSerializer} or {@link PdxSerializer}) and {@link Instantiator}s should have
* been registered.
- *
+ *
* @param dir the directory containing the snapshot files
* @param format the snapshot file format
- *
+ *
* @throws IOException Unable to import data
* @throws ClassNotFoundException Unable to import data
*/
@@ -125,7 +125,7 @@ public interface CacheSnapshotService {
* Prior to loading data, all regions should have been created and any necessary serializers
* (either {@link DataSerializer} or {@link PdxSerializer}) and {@link Instantiator}s should have
* been registered.
- *
+ *
* @param snapshots the snapshot files
* @param format the snapshot file format
* @param options the snapshot options
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
index 48d85dc..c066786 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
@@ -29,10 +29,10 @@ import org.apache.geode.pdx.PdxSerializer;
* <pre>
* // obtain a snapshot
* RegionSnapshot snapshot = region.getSnapshotService();
- *
+ *
* // export the snapshot, every region in the cache will be exported
* snapshot.save(new File("snapshot.gfd"), SnapshotOptions.GEMFIRE);
- *
+ *
* // import the snapshot file, updates any existing entries in the region
* snapshot.load(new File("snapshot.gfd"), SnapshotOptions.GEMFIRE);
* </pre>
@@ -43,17 +43,17 @@ import org.apache.geode.pdx.PdxSerializer;
* creation of multiple files with the format "snapshot-unique_id.gfd". When loading files from a
* parallel export, a directory can be given instead of a single file and all snapshot files in that
* directory will be loaded.
- *
+ *
* <pre>
* // import directory of snapshot files
* snapshot.load(new File("snapshotDir"), SnapshotOptions.GEMFIRE);
* </pre>
- *
+ *
* The default behavior is to perform all I/O operations on the node where the snapshot operations
* are invoked. This will involve either collecting or dispersing data over the network if the
* region is a partitioned region. The snapshot behavior can be changed using
* {@link SnapshotOptions}. For example:
- *
+ *
* <pre>
* RegionSnapshotService snapshot = region.getSnapshotService();
* SnapshotFilter filter = new SnapshotFilter() {
@@ -61,22 +61,22 @@ import org.apache.geode.pdx.PdxSerializer;
* return true;
* }
* };
- *
+ *
* SnapshotOptions<Object, Object> options = snapshot.createOptions();
* options.setFilter(filter);
- *
+ *
* snapshot.save(new File("snapshot.gfd"), SnapshotFormat.GEMFIRE, options);
* </pre>
- *
+ *
* Note that the snapshot does not provide a consistency guarantee. Updates to data during the
* course of import/export operations could result data inconsistencies.
- *
+ *
* @param <K> the cache entry key type
* @param <V> the cache entry value type
- *
+ *
* @see Region#getSnapshotService()
* @see SnapshotOptions
- *
+ *
* @since GemFire 7.0
*/
public interface RegionSnapshotService<K, V> {
@@ -89,28 +89,28 @@ public interface RegionSnapshotService<K, V> {
/**
* Creates a <code>SnapshotOptions</code> object configured with default settings. The options can
* be used to configure snapshot behavior.
- *
+ *
* @return the default options
*/
SnapshotOptions<K, V> createOptions();
/**
* Exports the region data into the snapshot file.
- *
+ *
* @param snapshot the snapshot file (must end in .gfd)
* @param format the snapshot format
- *
+ *
* @throws IOException error writing snapshot
*/
void save(File snapshot, SnapshotFormat format) throws IOException;
/**
* Exports the region data into the snapshot file by applying user-configured options.
- *
+ *
* @param snapshot the snapshot file (must end in .gfd)
* @param format the snapshot format
* @param options the snapshot options
- *
+ *
* @throws IOException error writing snapshot
*/
void save(File snapshot, SnapshotFormat format, SnapshotOptions<K, V> options) throws IOException;
@@ -124,10 +124,10 @@ public interface RegionSnapshotService<K, V> {
* Prior to loading data, the region should have been created and any necessary serializers
* (either {@link DataSerializer} or {@link PdxSerializer}) and {@link Instantiator}s should have
* been registered.
- *
+ *
* @param snapshot the snapshot file (ending in .gfd) or a directory of .gfd snapshot files
* @param format the snapshot file format
- *
+ *
* @throws IOException Unable to import data
* @throws ClassNotFoundException Unable to import data
*/
@@ -142,11 +142,11 @@ public interface RegionSnapshotService<K, V> {
* Prior to loading data, the region should have been created and any necessary serializers
* (either {@link DataSerializer} or {@link PdxSerializer}) and {@link Instantiator}s should have
* been registered.
- *
+ *
* @param snapshot the snapshot file (ending in .gfd) or a directory of .gfd snapshot files
* @param format the snapshot file format
* @param options the snapshot options
- *
+ *
* @throws IOException Unable to import data
* @throws ClassNotFoundException Unable to import data
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
index 8f5ae26..2e9e1e6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
@@ -19,23 +19,22 @@ import java.util.Map.Entry;
/**
* Filters region entries for inclusion into a snapshot.
- *
+ *
* @param <K> the key type
* @param <V> the value type
- *
+ *
* @see CacheSnapshotService
* @see RegionSnapshotService
- *
+ *
* @since GemFire 7.0
*/
public interface SnapshotFilter<K, V> extends Serializable {
/**
* Returns true if the entry passes the filter criteria; false otherwise. Invoking
* <code>Entry.getValue</code> may incur additional overhead to deserialize the entry value.
- *
+ *
* @param entry the cache entry to evaluate
* @return true if the entry is accepted by the filter
*/
boolean accept(Entry<K, V> entry);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
index 7022531..96a5361 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
@@ -15,26 +15,26 @@
package org.apache.geode.cache.snapshot;
import java.io.IOException;
-import java.util.NoSuchElementException;
import java.util.Map.Entry;
+import java.util.NoSuchElementException;
/**
* Iterates over the entries in a region snapshot. Holds resources that must be freed via
* {@link #close()}.
- *
+ *
* @param <K> the key type of the snapshot region
* @param <V> the value type the snapshot region
- *
+ *
* @see SnapshotReader
- *
+ *
* @since GemFire 7.0
*/
public interface SnapshotIterator<K, V> extends AutoCloseable {
/**
* Returns true if there are more elements in the iteration.
- *
+ *
* @return true if the iterator has more elements.
- *
+ *
* @throws IOException error reading the snapshot
* @throws ClassNotFoundException error deserializing the snapshot element
*/
@@ -42,9 +42,9 @@ public interface SnapshotIterator<K, V> extends AutoCloseable {
/**
* Returns the next element in the iteration.
- *
+ *
* @return the next element
- *
+ *
* @throws NoSuchElementException there are no further elements
* @throws IOException error reading the snapshot
* @throws ClassNotFoundException error deserializing the snapshot element
@@ -53,7 +53,7 @@ public interface SnapshotIterator<K, V> extends AutoCloseable {
/**
* Closes the iterator and its underlying resources.
- *
+ *
* @throws IOException error closing the iterator
*/
void close() throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
index 3e0b5cb..8ab7f14 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
@@ -24,16 +24,16 @@ import org.apache.geode.internal.cache.snapshot.SnapshotFileMapper;
* <dt>filter</dt>
* <dd>null</dd>
* </dl>
- *
+ *
* @param <K> the cache entry key type
* @param <V> the cache entry value type
- *
+ *
* @since GemFire 7.0
*/
public interface SnapshotOptions<K, V> extends Serializable {
/**
* Defines the available snapshot file formats.
- *
+ *
* @since GemFire 7.0
*/
enum SnapshotFormat {
@@ -44,7 +44,7 @@ public interface SnapshotOptions<K, V> extends Serializable {
/**
* Sets a filter to apply to snapshot entries. Entries that are accepted by the filter will be
* included in import and export operations.
- *
+ *
* @param filter the filter to apply, or null to remove the filter
* @return the snapshot options
*/
@@ -53,7 +53,7 @@ public interface SnapshotOptions<K, V> extends Serializable {
/**
* Returns the filter to be applied to snapshot entries. Entries that are accepted by the filter
* will be included in import and export operations.
- *
+ *
* @return the filter, or null if the filter is not set
*/
SnapshotFilter<K, V> getFilter();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
index 6f80783..be92716 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
@@ -24,7 +24,7 @@ import org.apache.geode.pdx.PdxSerializer;
/**
* Provides utilities for reading cache data.
- *
+ *
* @since GemFire 7.0
*/
public class SnapshotReader {
@@ -35,13 +35,13 @@ public class SnapshotReader {
* <p>
* Prior to invoking <code>read</code> all necessary serializers (either {@link DataSerializer} or
* {@link PdxSerializer}) and any {@link Instantiator} should have been registered.
- *
+ *
* @param <K> the key type
* @param <V> the value type
- *
+ *
* @param snapshot the snapshot file
* @return the snapshot iterator
- *
+ *
* @throws IOException error reading the snapshot file
* @throws ClassNotFoundException unable deserialize entry
*/
@@ -50,4 +50,3 @@ public class SnapshotReader {
return GFSnapshot.read(snapshot);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
index bd9513f..7d63cc8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
@@ -25,12 +25,12 @@ import org.apache.geode.cache.RegionEvent;
* implementations. Applications can subclass this class and only override the methods for the
* events of interest.
* <p>
- *
+ *
* <p>
* Subclasses declared in a Cache XML file, it must also implement {@link Declarable}
* </p>
- *
- *
+ *
+ *
* @since GemFire 3.0
*/
public abstract class CacheListenerAdapter<K, V> implements CacheListener<K, V> {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
index 9263c7f..2e3a2eb 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
@@ -23,8 +23,8 @@ package org.apache.geode.cache.util;
* @since GemFire 5.1
*/
-import org.apache.geode.cache.query.CqListener;
import org.apache.geode.cache.query.CqEvent;
+import org.apache.geode.cache.query.CqListener;
public abstract class CqListenerAdapter implements CqListener {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java b/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
index b8662cd..c783654 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
@@ -15,12 +15,12 @@
package org.apache.geode.cache.util;
/**
- *
+ *
* From 9.0 old wan support is removed. Ideally Gateway (used for old wan) should be removed but it
* it there for rolling upgrade support when GatewaySenderProfile update request comes from or sent
* to old member. Old member uses Gateway$OrderPolicy while latest members uses
* GatewaySender#OrderPolicy
- *
+ *
* @since Geode 1.0
*
*/
@@ -28,7 +28,7 @@ public class Gateway {
/**
* The order policy. This enum is applicable only when concurrency-level is > 1.
- *
+ *
* @since GemFire 6.5.1
*/
public enum OrderPolicy {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
index a73cc51..30c6880 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.util;
/**
* GatewayConflictHelper is used by an GatewayConflictResolver to decide what to do with an event
* received from another distributed system that is going to overwrite the current cache state.
- *
+ *
* @since GemFire 7.0
*/
public interface GatewayConflictHelper {
@@ -27,5 +27,3 @@ public interface GatewayConflictHelper {
/** modify the value stored in the cache */
public void changeEventValue(Object value);
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
index 4c9fee7..b4e9616 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
@@ -23,7 +23,7 @@ package org.apache.geode.cache.util;
* different distributed system (with a different distributed-system-id) than an event that is
* attempting to modify the entry. It is not invoked if the event has the same distributed system ID
* as the event that last changed the entry.
- *
+ *
* @since GemFire 7.0
*/
public interface GatewayConflictResolver {
@@ -42,7 +42,7 @@ public interface GatewayConflictResolver {
* of the conflict in order to maintain consistency. They must do so regardless of the order of
* the events.
* </p>
- *
+ *
* @param event the event that is in conflict with the current cache state
* @param helper an object to be used in modifying the course of action for this event
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
index c797e88..da6748f 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
@@ -23,74 +23,74 @@ import org.apache.geode.cache.Region;
* <code>Gateway</code>s.
*
* @since GemFire 5.1
- *
+ *
* @deprecated as of GemFire 8.0. Use {@link org.apache.geode.cache.wan.GatewayQueueEvent} instead
- *
+ *
*/
@Deprecated
public interface GatewayEvent {
/**
* Returns the <code>Region</code> associated with this <code>GatewayEvent</code>.
- *
+ *
* @return the <code>Region</code> associated with this <code>GatewayEvent</code>
*/
public Region<?, ?> getRegion();
/**
* Returns the <code>Operation</code> that triggered this event.
- *
+ *
* @return the <code>Operation</code> that triggered this event
*/
public Operation getOperation();
/**
* Returns the callbackArgument associated with this event.
- *
+ *
* @return the callbackArgument associated with this event
*/
public Object getCallbackArgument();
/**
* Returns the key associated with this event.
- *
+ *
* @return the key associated with this event
*/
public Object getKey();
/**
* Returns the deserialized value associated with this event.
- *
+ *
* @return the deserialized value associated with this event
*/
public Object getDeserializedValue();
/**
* Returns the serialized form of the value associated with this event.
- *
+ *
* @return the serialized form of the value associated with this event
*/
public byte[] getSerializedValue();
/**
* Sets whether this event is a possible duplicate.
- *
+ *
* @param possibleDuplicate whether this event is a possible duplicate
*/
public void setPossibleDuplicate(boolean possibleDuplicate);
/**
* Returns whether this event is a possible duplicate.
- *
+ *
* @return whether this event is a possible duplicate
*/
public boolean getPossibleDuplicate();
/**
* Returns the creation timestamp in milliseconds.
- *
+ *
* @return the creation timestamp in milliseconds
- *
+ *
* @since GemFire 6.0
*/
public long getCreationTime();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
index 0799863..d633195 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
@@ -22,13 +22,13 @@ import org.apache.geode.internal.size.SizeClassOnceObjectSizer;
* The sizer interface defines a method that when called returns the size of the object passed in.
* Implementations may return hardcoded values for object size if the implementation knows the
* object size for all objects that are likely to be cached.
- *
+ *
* You should use a sizer with a {@link EvictionAttributes#createLRUHeapAttributes(ObjectSizer)} or
* {@link EvictionAttributes#createLRUMemoryAttributes(ObjectSizer)} if you want to use a faster or
* more accurate method of sizing than provided by the default object sizer, which is {#link
* {@link #SIZE_CLASS_ONCE}
- *
- *
+ *
+ *
* @since GemFire 3.0
*/
public interface ObjectSizer {
@@ -37,14 +37,14 @@ public interface ObjectSizer {
* An implementation of {@link ObjectSizer} that calculates an accurate size of the first instance
* of each class that is put in the cache. After the first instance, it will return the same size
* for every instance of that class.
- *
+ *
* This sizer is a compromise between generating accurate sizes for every object and performance.
* It should work well if the keys and values in the region don't vary greatly in size. For
* accurate sizing of every instance use {@link #REFLECTION_SIZE} instead.
- *
+ *
* This sizer does generate an accurate size for strings and byte arrays every time, because there
* is very little performance impact from sizing these objects.
- *
+ *
* @since GemFire 6.5
*/
public static final ObjectSizer SIZE_CLASS_ONCE = SizeClassOnceObjectSizer.getInstance();
@@ -52,13 +52,13 @@ public interface ObjectSizer {
/**
* An implementation of {@link ObjectSizer} that calculates an accurate size for each object that
* it sizes.
- *
+ *
* This sizer will add up the sizes of all objects that are reachable from the keys and values in
* your region by non-static fields.
- *
+ *
* For objects that are all approximately the same size, consider using {@link #SIZE_CLASS_ONCE}.
* It will have much better performance.
- *
+ *
* @since GemFire 6.5
*/
public static final ObjectSizer REFLECTION_SIZE = ReflectionObjectSizer.getInstance();
@@ -66,7 +66,7 @@ public interface ObjectSizer {
/**
* The default object sizer, currently {@link #SIZE_CLASS_ONCE}
- *
+ *
* @since GemFire 6.5
*/
public static final ObjectSizer DEFAULT = SIZE_CLASS_ONCE;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
index d38d026..50d9718 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
@@ -23,8 +23,8 @@ import org.apache.geode.distributed.DistributedMember;
* Utility class that implements all methods in <code>RegionMembershipListener</code> with empty
* implementations. Applications can subclass this class and only override the methods for the
* events of interest.
- *
- *
+ *
+ *
* @since GemFire 5.0
*/
public abstract class RegionMembershipListenerAdapter<K, V> extends CacheListenerAdapter<K, V>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
index 3c93afc..6b2d2cf 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.RoleEvent;
* Utility class that implements all methods in <code>RegionRoleListener</code> with empty
* implementations. Applications can subclass this class and only override the methods for the
* events of interest.
- *
+ *
* @deprecated this feature is scheduled to be removed
*/
public abstract class RegionRoleListenerAdapter<K, V> extends RegionMembershipListenerAdapter<K, V>
@@ -32,4 +32,3 @@ public abstract class RegionRoleListenerAdapter<K, V> extends RegionMembershipLi
public void afterRoleLoss(RoleEvent<K, V> event) {}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/StringPrefixPartitionResolver.java b/geode-core/src/main/java/org/apache/geode/cache/util/StringPrefixPartitionResolver.java
index 6a2d037..4b05938 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/StringPrefixPartitionResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/StringPrefixPartitionResolver.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.PartitionResolver;
* This partition resolver requires every key of the partitioned region to be an instance of String
* and to contain at least one "|" delimiter. The prefix, the substring of the key that precedes the
* first delimiter, is returned by getRoutingObject.
- *
+ *
* @since Geode 1.2.0
*/
public class StringPrefixPartitionResolver implements PartitionResolver<String, Object> {
@@ -39,7 +39,7 @@ public class StringPrefixPartitionResolver implements PartitionResolver<String,
/**
* Returns the prefix of the String key that precedes the first "|" in the key.
- *
+ *
* @throws ClassCastException if the key is not an instance of String
* @throws IllegalArgumentException if the key does not contain at least one "|".
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
index a4baa64..9bedbc3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
@@ -19,7 +19,7 @@ package org.apache.geode.cache.util;
* GatewayConflictResolver plugins. It holds the low 4 bytes of the millisecond clock value from the
* point of origin of the event and the distributed system ID of the system that caused the change.
* It also has this information for the previous change to the entry.
- *
+ *
* @since GemFire 7.0
*/
public interface TimestampedEntryEvent extends org.apache.geode.cache.EntryEvent {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
index 3d10c9b..c6c27b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.cache.util;
-import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionEvent;
+import org.apache.geode.cache.TransactionListener;
/**
* Utility class that implements all methods in <code>TransactionListener</code> with empty
* implementations. Applications can subclass this class and only override the methods for the
* events of interest.
- *
- *
+ *
+ *
* @since GemFire 5.0
*/
public abstract class TransactionListenerAdapter implements TransactionListener {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
index 2375ae4..1ed4dc7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
@@ -18,8 +18,8 @@ import org.apache.geode.cache.CacheCallback;
/**
* Callback for users to filter out events before dispatching to remote distributed system
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface GatewayEventFilter extends CacheCallback {
@@ -28,7 +28,7 @@ public interface GatewayEventFilter extends CacheCallback {
* It will be invoked before enqueuing event into GatewaySender's queue. <br>
* This callback is synchronous with the thread which is enqueuing the event into GatewaySender's
* queue.
- *
+ *
* @param event
* @return true if event should be enqueued otherwise return false.
*/
@@ -40,7 +40,7 @@ public interface GatewayEventFilter extends CacheCallback {
* queue.<br>
* This callback will always be called from the thread which is dispatching events to remote
* distributed systems
- *
+ *
* @param event
* @return true if event should be dispatched otherwise return false.
*/
@@ -50,7 +50,7 @@ public interface GatewayEventFilter extends CacheCallback {
* It will be invoked once GatewaySender receives an ack from remote GatewayReceiver <br>
* This callback will always be called from the thread which is dispatching events to remote
* distributed systems
- *
+ *
* @param event
*/
public void afterAcknowledgement(GatewayQueueEvent event);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
index 2d75326..bfbff85 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
@@ -27,7 +27,7 @@ public interface GatewayEventSubstitutionFilter<K, V> extends CacheCallback {
/**
* Return the substitute value to be stored in the <code>GatewayQueueEvent</code> and enqueued in
* the <code>RegionQueue</code>
- *
+ *
* @param event The originating <code>EntryEvent</code>
* @return the substitute value to be stored in the <code>GatewayQueueEvent</code> and enqueued in
* the <code>RegionQueue</code>
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
index b441fad..7f7820c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
@@ -20,14 +20,14 @@ import org.apache.geode.cache.asyncqueue.AsyncEventListener;
/**
* Represents <code>Cache</code> events going through <code>GatewaySender</code>s.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface GatewayQueueEvent<K, V> {
/**
* Returns the <code>Region</code> associated with this AsyncEvent
- *
+ *
* @return the <code>Region</code> associated with this AsyncEvent OR null if <code>Region</code>
* not found (e.g. this can happen if it is destroyed).
*/
@@ -35,30 +35,30 @@ public interface GatewayQueueEvent<K, V> {
/**
* Returns the <code>Operation</code> that triggered this event.
- *
+ *
* @return the <code>Operation</code> that triggered this event
*/
public Operation getOperation();
/**
* Returns the callbackArgument associated with this event.
- *
+ *
* @return the callbackArgument associated with this event
*/
public Object getCallbackArgument();
/**
* Returns the key associated with this event.
- *
+ *
* @return the key associated with this event
*/
public K getKey();
/**
* Returns the deserialized value associated with this event.
- *
+ *
* @return the deserialized value associated with this event
- *
+ *
* @throws IllegalStateException may be thrown if the event's value was stored off-heap and
* {@link AsyncEventListener#processEvents(java.util.List)} has already returned.
*/
@@ -66,9 +66,9 @@ public interface GatewayQueueEvent<K, V> {
/**
* Returns the serialized form of the value associated with this event.
- *
+ *
* @return the serialized form of the value associated with this event
- *
+ *
* @throws IllegalStateException may be thrown if the event's value was stored off-heap and
* {@link AsyncEventListener#processEvents(java.util.List)} has already returned.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
index 4e238a5..45266f7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
@@ -14,19 +14,19 @@
*/
package org.apache.geode.cache.wan;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.io.IOException;
import java.util.List;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
* A GatewayReceiver that receives the events from a <code>GatewaySender</code>. GatewayReceiver is
* used in conjunction with a {@link GatewaySender} to connect two distributed-systems. This
* GatewayReceiver will receive all the events originating in distributed-systems that has a
* <code>GatewaySender<code> connected to this distributed-system.
- *
- *
+ *
+ *
*/
public interface GatewayReceiver {
@@ -65,7 +65,7 @@ public interface GatewayReceiver {
/**
* The default value for manually starting a <code>GatewayReceiver</code>.
- *
+ *
* @since GemFire 8.1
*/
public static final boolean DEFAULT_MANUAL_START = false;
@@ -79,7 +79,7 @@ public interface GatewayReceiver {
/**
* Starts this receiver. Once the receiver is running, its configuration cannot be changed.
- *
+ *
* @throws IOException If an error occurs while starting the receiver
*/
public void start() throws IOException;
@@ -97,7 +97,7 @@ public interface GatewayReceiver {
/**
* Returns the list of <code>GatewayTransportFilter</code> added to this GatewayReceiver.
- *
+ *
* @return the list of <code>GatewayTransportFilter</code> added to this GatewayReceiver.
*/
public List<GatewayTransportFilter> getGatewayTransportFilters();
@@ -106,7 +106,7 @@ public interface GatewayReceiver {
* Returns the maximum amount of time between client pings. This value is used by the
* <code>ClientHealthMonitor</code> to determine the health of this <code>GatewayReceiver</code>'s
* clients (i.e. the GatewaySenders). The default is 60000 ms.
- *
+ *
* @return the maximum amount of time between client pings.
*/
public int getMaximumTimeBetweenPings();
@@ -131,7 +131,7 @@ public interface GatewayReceiver {
/**
* Returns a string representing the ip address or host name that server locators will tell
* clients (<code>GatewaySender</code>s in this case) that this receiver is listening on.
- *
+ *
* @return the ip address or host name to give to clients so they can connect to this receiver
*/
public String getHost();
@@ -144,7 +144,7 @@ public interface GatewayReceiver {
/**
* Returns the configured buffer size of the socket connection for this
* <code>GatewayReceiver</code>. The default is 524288 bytes.
- *
+ *
* @return the configured buffer size of the socket connection for this
* <code>GatewayReceiver</code>
*/
@@ -152,7 +152,7 @@ public interface GatewayReceiver {
/**
* Returns a string representing the ip address or host name that this server will listen on.
- *
+ *
* @return the ip address or host name that this server is to listen on
* @see #DEFAULT_BIND_ADDRESS
*/
@@ -161,9 +161,9 @@ public interface GatewayReceiver {
/**
* Returns the manual start boolean property for this GatewayReceiver. Default is true i.e. the
* GatewayReceiver will not automatically start once created.
- *
+ *
* @return the manual start boolean property for this GatewayReceiver
- *
+ *
*/
public boolean isManualStart();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
index a2d4793..038bbb1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
@@ -16,14 +16,14 @@
package org.apache.geode.cache.wan;
/**
- *
+ *
* @since GemFire 7.0
*/
public interface GatewayReceiverFactory {
/**
* Sets the start port for the <code>GatewayReceiver</code>. If set the GatewayReceiver will start
* at one of the port between startPort and endPort. The default startPort 50505.
- *
+ *
* @param startPort
*/
public GatewayReceiverFactory setStartPort(int startPort);
@@ -31,7 +31,7 @@ public interface GatewayReceiverFactory {
/**
* Sets the end port for the GatewayReceiver. If set the GatewayReceiver will start at one of the
* port between startPort and endPort. The default endPort 50605.
- *
+ *
* @param endPort
*/
public GatewayReceiverFactory setEndPort(int endPort);
@@ -39,7 +39,7 @@ public interface GatewayReceiverFactory {
/**
* Sets the buffer size in bytes of the socket connection for this <code>GatewayReceiver</code>.
* The default is 32768 bytes.
- *
+ *
* @param socketBufferSize The size in bytes of the socket buffer
*/
public GatewayReceiverFactory setSocketBufferSize(int socketBufferSize);
@@ -47,28 +47,28 @@ public interface GatewayReceiverFactory {
/**
* Sets the ip address or host name that this <code>GatewayReceiver</code> is to listen on for
* GatewaySender Connection
- *
+ *
* @param address String representing ip address or host name
*/
public GatewayReceiverFactory setBindAddress(String address);
/**
* Adds a <code>GatewayTransportFilter</code>
- *
+ *
* @param filter GatewayTransportFilter
*/
public GatewayReceiverFactory addGatewayTransportFilter(GatewayTransportFilter filter);
/**
* Removes a <code>GatewayTransportFilter</code>
- *
+ *
* @param filter GatewayTransportFilter
*/
public GatewayReceiverFactory removeGatewayTransportFilter(GatewayTransportFilter filter);
/**
* Sets the maximum amount of time between client pings.The default is 60000 ms.
- *
+ *
* @param time The maximum amount of time between client pings
*/
public GatewayReceiverFactory setMaximumTimeBetweenPings(int time);
@@ -76,26 +76,26 @@ public interface GatewayReceiverFactory {
/**
* Sets the ip address or host name that server locators will tell GatewaySenders that this
* GatewayReceiver is listening on.
- *
+ *
* @param address String representing ip address or host name
*/
public GatewayReceiverFactory setHostnameForSenders(String address);
/**
* Sets the manual start boolean property for this <code>GatewayReceiver</code>.
- *
+ *
* @since GemFire 8.1 Default is true i.e. the <code>GatewayReceiver</code> will not start
* automatically once created. Ideal default value should be false to match with
* GatewaySender counterpart. But to not to break the existing functionality default value
* is set to true. For next major releases, default value will be changed to false.
- *
+ *
* @param start the manual start boolean property for this <code>GatewayReceiver</code>
*/
public GatewayReceiverFactory setManualStart(boolean start);
/**
* Creates and returns an instance of <code>GatewayReceiver</code>
- *
+ *
* @return instance of GatewayReceiver
*/
public GatewayReceiver create();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
index 9bbbfbf..a7e3684 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.cache.wan;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.util.List;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface GatewaySender {
/**
* The default value (false) for manually starting a <code>GatewaySender</code>.
- *
+ *
* @deprecated - Manual start of senders is deprecated and will be removed in a later release.
*/
@Deprecated
@@ -60,7 +60,7 @@ public interface GatewaySender {
/**
* Size of the oplog file used for the persistent queue in bytes
*/
- static public final int QUEUE_OPLOG_SIZE =
+ public static final int QUEUE_OPLOG_SIZE =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "cache.gatewaySender.queueOpLogSize",
1024 * 1024 * 100).intValue();
@@ -154,7 +154,7 @@ public interface GatewaySender {
/**
* The order policy. This enum is applicable only when concurrency-level is > 1.
- *
+ *
* @since GemFire 6.5.1
*/
public enum OrderPolicy {
@@ -185,11 +185,11 @@ public interface GatewaySender {
* the GatewaySender is parallel, the GatewaySender will be stopped on individual node where this
* API is called. If the GatewaySender is not parallel, then the GatewaySender will stop on this
* VM and the secondary GatewaySender will become primary and start dispatching events.
- *
+ *
* The GatewaySender will wait for GatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME seconds before
* stopping itself. If the system property is set to -1 then it will wait until all the events are
* dispatched from the queue.
- *
+ *
* @see GatewaySender#isParallel()
*/
public void stop();
@@ -202,11 +202,11 @@ public interface GatewaySender {
* dispatch events. In case the GatewaySender is not parallel, and the running GatewaySender on
* which this API is invoked is not primary then PRIMARY GatewaySender will still continue
* dispatching events.
- *
+ *
* The batch of events that are in the process of being dispatched are dispatched irrespective of
* the state of pause operation. We can expect maximum of one batch of events being received at
* the GatewayReceiver even after the GatewaySenders were paused.
- *
+ *
* @see GatewaySender#isParallel()
* @see GatewaySender#getBatchSize()
* @see GatewaySender#resume()
@@ -230,41 +230,41 @@ public interface GatewaySender {
/**
* Returns whether or not this GatewaySender is paused.
- *
+ *
*/
public boolean isPaused();
/**
* Adds the provided <code>GatewayEventFilter</code> to this GatewaySender.
- *
+ *
* @param filter
*/
public void addGatewayEventFilter(GatewayEventFilter filter);
/**
* Removes the provided <code>GatewayEventFilter</code> from this GatewaySender.
- *
+ *
* @param filter
*/
public void removeGatewayEventFilter(GatewayEventFilter filter);
/**
* Returns this <code>GatewaySender's</code> <code>GatewayEventSubstitutionFilter</code>.
- *
+ *
* @return this <code>GatewaySender's</code> <code>GatewayEventSubstitutionFilter</code>
*/
public GatewayEventSubstitutionFilter getGatewayEventSubstitutionFilter();
/**
* Returns the id of this GatewaySender.
- *
+ *
* @return the id of this GatewaySender.
*/
public String getId();
/**
* Returns the id of the remote <code>GatewayReceiver</code>'s DistributedSystem.
- *
+ *
* @return the id of the remote <code>GatewayReceiver</code>'s DistributedSystem.
*/
public int getRemoteDSId();
@@ -272,7 +272,7 @@ public interface GatewaySender {
/**
* Returns the configured buffer size of the socket connection between this GatewaySender and its
* receiving <code>GatewayReceiver</code>. The default is 32768 bytes.
- *
+ *
* @return the configured buffer size of the socket connection between this GatewaySender and its
* receiving <code>GatewayReceiver</code>
*/
@@ -282,7 +282,7 @@ public interface GatewaySender {
* Returns the amount of time in milliseconds that a socket read between a sending GatewaySender
* and its receiving <code>GatewayReceiver</code> will block. The default value is 0 which is
* interpreted as infinite timeout.
- *
+ *
* @return the amount of time in milliseconds that a socket read between a sending GatewaySender
* and its receiving <code>GatewayReceiver</code> will block
*/
@@ -290,21 +290,21 @@ public interface GatewaySender {
/**
* Gets the disk store name for overflow or persistence.
- *
+ *
* @return disk store name
*/
public String getDiskStoreName();
/**
* Returns the maximum amount of memory (in MB) for a GatewaySender's queue. The default is 100.
- *
+ *
* @return maximum amount of memory (in MB) for a GatewaySender's queue
*/
public int getMaximumQueueMemory();
/**
* Returns the batch size for this GatewaySender. Default batchSize is 100.
- *
+ *
* @return the batch size for this GatewaySender.
*/
public int getBatchSize();
@@ -312,7 +312,7 @@ public interface GatewaySender {
/**
* Returns the batch time interval for this GatewaySender. Default value of batchTimeInterval is
* 1000.
- *
+ *
* @return the batch time interval for this GatewaySender
*/
public int getBatchTimeInterval();
@@ -320,7 +320,7 @@ public interface GatewaySender {
/**
* Answers whether to enable batch conflation for a GatewaySender 's queue. The default value is
* false.
- *
+ *
* @return whether to enable batch conflation for batches sent from a GatewaySender to its
* corresponding <code>GatewayReceiver</code>.
*/
@@ -329,7 +329,7 @@ public interface GatewaySender {
/**
* Returns true if persistence is enabled for this GatewaySender, otherwise returns false. Default
* is false if not set explicitly.
- *
+ *
* @return true if persistence is enabled for this GatewaySender
*/
public boolean isPersistenceEnabled();
@@ -337,22 +337,22 @@ public interface GatewaySender {
/**
* Returns the alert threshold in milliseconds for entries in a GatewaySender's queue. Default
* value is 0.
- *
+ *
* @return the alert threshold for entries in a GatewaySender's queue
- *
+ *
*/
public int getAlertThreshold();
/**
* Returns the list of <code>GatewayEventFilter</code> added to this GatewaySender.
- *
+ *
* @return the list of <code>GatewayEventFilter</code> added to this GatewaySender.
*/
public List<GatewayEventFilter> getGatewayEventFilters();
/**
* Returns the list of <code>GatewayTransportFilter</code> added to this GatewaySender.
- *
+ *
* @return the list of <code>GatewayTransportFilter</code> added to this GatewaySender.
*/
@@ -360,16 +360,16 @@ public interface GatewaySender {
/**
* Returns isDiskSynchronous boolean property for this GatewaySender. Default value is true.
- *
+ *
* @return isDiskSynchronous boolean property for this GatewaySender
- *
+ *
*/
public boolean isDiskSynchronous();
/**
* Returns the manual start boolean property for this GatewaySender. Default is false i.e. the
* GatewaySender will automatically start once created.
- *
+ *
* @return the manual start boolean property for this GatewaySender
*
* @deprecated - Manual start of senders is deprecated and will be removed in a later release.
@@ -379,9 +379,9 @@ public interface GatewaySender {
/**
* Returns isParallel boolean property for this GatewaySender.
- *
+ *
* @return isParallel boolean property for this GatewaySender
- *
+ *
*/
public boolean isParallel();
@@ -389,7 +389,7 @@ public interface GatewaySender {
/**
* Returns the number of dispatcher threads working for this <code>GatewaySender</code>. Default
* number of dispatcher threads is 5.
- *
+ *
* @return the number of dispatcher threads working for this <code>GatewaySender</code>
*/
public int getDispatcherThreads();
@@ -397,7 +397,7 @@ public interface GatewaySender {
/**
* Returns the order policy followed while dispatching the events to remote ds. Order policy is
* set only when dispatcher threads are > 1. Default value of order policy is KEY.
- *
+ *
* @return the order policy followed while dispatching the events to remote ds.
*/
@@ -411,7 +411,7 @@ public interface GatewaySender {
* <p>
* In case of ParallelGatewaySender, the destroy operation does distributed destroy of the Queue
* Region. In case of SerialGatewaySender, the Queue Region is destroyed locally.
- *
+ *
* @since Geode 1.1
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
index 2967229..5e7e49a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
@@ -19,11 +19,11 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
/**
* Factory to create SerialGatewaySender
- *
- *
+ *
+ *
* @since GemFire 7.0
* @see GatewaySender
- *
+ *
*/
public interface GatewaySenderFactory {
@@ -37,14 +37,14 @@ public interface GatewaySenderFactory {
/**
* Adds a <code>GatewayEventFilter</code>
- *
+ *
* @param filter GatewayEventFilter
*/
public GatewaySenderFactory addGatewayEventFilter(GatewayEventFilter filter);
/**
* Adds a <code>GatewayTransportFilter</code>
- *
+ *
* @param filter GatewayTransportFilter
*/
public GatewaySenderFactory addGatewayTransportFilter(GatewayTransportFilter filter);
@@ -52,7 +52,7 @@ public interface GatewaySenderFactory {
/**
* Sets the buffer size in bytes of the socket connection for this <code>GatewaySender</code>. The
* default is 32768 bytes.
- *
+ *
* @param size The size in bytes of the socket buffer
*/
public GatewaySenderFactory setSocketBufferSize(int size);
@@ -61,7 +61,7 @@ public interface GatewaySenderFactory {
* Sets the number of milliseconds to wait for a response from a <code>GatewayReceiver</code>
* before timing out the operation and trying another <code>GatewayReceiver</code> (if any are
* available). Default is 0 which means infinite timeout.
- *
+ *
* @param timeout number of milliseconds to wait for a response from a GatewayReceiver
* @throws IllegalArgumentException if <code>timeout</code> is less than <code>0</code>.
*/
@@ -69,21 +69,21 @@ public interface GatewaySenderFactory {
/**
* Sets the disk store name for overflow or persistence
- *
+ *
* @param name
*/
public GatewaySenderFactory setDiskStoreName(String name);
/**
* Sets the number of dispatcher thread. Default number of dispatcher threads is 5.
- *
+ *
* @param numThreads
*/
public GatewaySenderFactory setDispatcherThreads(int numThreads);
/**
* Sets <code>OrderPolicy</code> for this GatewaySender. Default order policy is KEY.
- *
+ *
* @param policy
*/
public GatewaySenderFactory setOrderPolicy(OrderPolicy policy);
@@ -91,7 +91,7 @@ public interface GatewaySenderFactory {
/**
* Sets the maximum amount of memory (in MB) for a <code>GatewaySender</code>'s queue. Default is
* 100.
- *
+ *
* @param maxQueueMemory The maximum amount of memory (in MB) for a <code>GatewaySender</code>'s
* queue.
*/
@@ -100,7 +100,7 @@ public interface GatewaySenderFactory {
/**
* Sets the batch size to be picked at the time of dispatching from a <code>GatewaySender</code>'s
* queue. Default batchSize is 100.
- *
+ *
* @param size The size of batches sent from a <code>GatewaySender</code> to its corresponding
* <code>GatewayReceiver</code>.
*/
@@ -109,7 +109,7 @@ public interface GatewaySenderFactory {
/**
* Sets a time interval in milliseconds to wait to form a batch to be dispatched from a
* <code>GatewaySender</code>'s queue. Default is 1000.
- *
+ *
* @param interval The maximum time interval (in milliseconds) that can elapse before a partial
* batch is sent from a <code>GatewaySender</code> to its corresponding
* <code>GatewayReceiver</code>.
@@ -119,7 +119,7 @@ public interface GatewaySenderFactory {
/**
* Sets whether to enable batch conflation for a <code>GatewaySender</code>'s queue. Default is
* false.
- *
+ *
* @param isConflation Whether or not to enable batch conflation for batches sent from a
* <code>GatewaySender</code> to its corresponding <code>GatewayReceiver</code>.
*/
@@ -127,7 +127,7 @@ public interface GatewaySenderFactory {
/**
* Sets whether to enable persistence for a <code>GatewaySender</code>'s queue. Default is false.
- *
+ *
* @param isPersistence Whether to enable persistence for a <code>GatewaySender</code>'s queue
*/
public GatewaySenderFactory setPersistenceEnabled(boolean isPersistence);
@@ -135,7 +135,7 @@ public interface GatewaySenderFactory {
/**
* Sets the alert threshold in milliseconds for entries in a <code>GatewaySender</code> 's queue.
* Default value is 0.
- *
+ *
* @param threshold the alert threshold for entries in a <code>GatewaySender</code>'s queue
*/
public GatewaySenderFactory setAlertThreshold(int threshold);
@@ -143,7 +143,7 @@ public interface GatewaySenderFactory {
/**
* Sets the manual start boolean property for this <code>GatewaySender</code>. Default is false
* i.e. the <code>GatewaySender</code> will automatically start once created.
- *
+ *
* @param start the manual start boolean property for this <code>GatewaySender</code>
* @deprecated - Manual start of senders is deprecated and will be removed in a later release.
*/
@@ -152,22 +152,22 @@ public interface GatewaySenderFactory {
/**
* Sets whether or not the writing to the disk is synchronous. Default is true.
- *
+ *
* @param isSynchronous boolean if true indicates synchronous writes
- *
+ *
*/
public GatewaySenderFactory setDiskSynchronous(boolean isSynchronous);
/**
* Removes the provided <code>GatewayEventFilter</code> from this GatewaySender.
- *
+ *
* @param filter
*/
public GatewaySenderFactory removeGatewayEventFilter(GatewayEventFilter filter);
/**
* Removes the provided <code>GatewayTransportFilter</code> from this GatewaySender.
- *
+ *
* @param filter
*/
public GatewaySenderFactory removeGatewayTransportFilter(GatewayTransportFilter filter);
@@ -176,7 +176,7 @@ public interface GatewaySenderFactory {
/**
* Sets the provided <code>GatewayEventSubstitutionFilter</code> in this GatewaySenderFactory.
- *
+ *
* @param filter The <code>GatewayEventSubstitutionFilter</code>
*/
public GatewaySenderFactory setGatewayEventSubstitutionFilter(
@@ -184,7 +184,7 @@ public interface GatewaySenderFactory {
/**
* Creates a <code>GatewaySender</code> to communicate with remote distributed system
- *
+ *
* @param id unique id for this SerialGatewaySender
* @param remoteDSId unique id representing the remote distributed system
* @return instance of SerialGatewaySender
diff --git a/geode-core/src/main/java/org/apache/geode/compression/CompressionException.java b/geode-core/src/main/java/org/apache/geode/compression/CompressionException.java
index 8f9095a..ab590e2 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/CompressionException.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/CompressionException.java
@@ -19,7 +19,7 @@ import org.apache.geode.GemFireException;
/**
* Wraps specific compression errors for {@link Compressor compressors}.
- *
+ *
*/
public class CompressionException extends GemFireException {
diff --git a/geode-core/src/main/java/org/apache/geode/compression/Compressor.java b/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
index 114433b..f57384a 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
@@ -17,28 +17,28 @@ package org.apache.geode.compression;
/**
* Interface for a compression codec.
- *
+ *
*/
public interface Compressor {
/**
* Compresses the input byte array.
- *
+ *
* @param input The data to be compressed.
- *
+ *
* @return A compressed version of the input parameter.
- *
+ *
* @throws CompressionException
*/
public byte[] compress(byte[] input);
/**
* Decompresses a compressed byte array.
- *
+ *
* @param input A compressed byte array.
- *
+ *
* @return an uncompressed version of compressed input byte array data.
- *
+ *
* @throws CompressionException
*/
public byte[] decompress(byte[] input);
diff --git a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
index 3e56801..447fba9 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
@@ -23,7 +23,7 @@ import org.iq80.snappy.Snappy;
/**
* An implementation of {@link Compressor} for Google's Snappy compression codec. Utilizes the
* java-snappy wrapper.
- *
+ *
* @since GemFire 8.0
*/
public class SnappyCompressor implements Compressor, Serializable {
@@ -36,7 +36,7 @@ public class SnappyCompressor implements Compressor, Serializable {
/**
* Get the single, default instance of the SnappyCompressor.
- *
+ *
* @deprecated As of Geode 1.0, getDefaultInstance is deprecated. Use constructor instead.
*/
public static SnappyCompressor getDefaultInstance() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
index 952afa8..ee1656c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
@@ -443,7 +443,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
* given moment in time. The ServiceState associates the Locator with it's state at the exact
* moment an instance of this class is constructed.
*/
- public static abstract class ServiceState<T extends Comparable<T>> {
+ public abstract static class ServiceState<T extends Comparable<T>> {
protected static final String JSON_CLASSPATH = "classpath";
protected static final String JSON_GEMFIREVERSION = "gemFireVersion";
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
index fc7b7d7..d6cefa8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
@@ -22,19 +22,19 @@ import java.net.Socket;
* Interface <code>ClientSocketFactory</code> is used to create non-default client sockets. Set the
* system property gemfire.clientSocketFactory to the full name of your factory implementation, and
* GemFire will use your factory to manufacture sockets when it connects to server caches.
- *
- *
+ *
+ *
* @since GemFire 6.5
- *
+ *
*/
public interface ClientSocketFactory {
/**
* Creates a <code>Socket</code> for the input address and port
- *
+ *
* @param address The <code>InetAddress</code> of the server
* @param port The port of the server
- *
+ *
* @return a <code>Socket</code> for the input address and port
*/
public Socket createSocket(InetAddress address, int port) throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
index aae7d8a..649bfad 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
@@ -194,7 +194,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: "any"
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_CIPHERS}
*/
String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
@@ -208,7 +208,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: "false"
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 see {@link #SSL_ENABLED_COMPONENTS}
*/
String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
@@ -221,7 +221,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE}
*/
String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
@@ -235,7 +235,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_PASSWORD}
*/
String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
@@ -248,7 +248,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_TYPE}
*/
String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
@@ -262,7 +262,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: "any"
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_PROTOCOLS}
*/
String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
@@ -276,7 +276,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: "true"
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_REQUIRE_AUTHENTICATION}
*/
String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
@@ -290,7 +290,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE}
*/
String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
@@ -304,7 +304,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE_PASSWORD}
*/
String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
@@ -509,7 +509,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_CIPHERS}
*/
@Deprecated
@@ -525,7 +525,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>false</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with the optional
* {@link #SSL_GATEWAY_ALIAS}
*/
@@ -540,7 +540,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE}
*/
@Deprecated
@@ -555,7 +555,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -569,7 +569,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -584,7 +584,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_PROTOCOLS}
*/
@Deprecated
@@ -599,7 +599,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -614,7 +614,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE}
*/
@Deprecated
@@ -629,7 +629,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -701,7 +701,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_CIPHERS}
*/
@Deprecated
@@ -718,7 +718,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>false</code>
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with optional
* {@link #SSL_WEB_ALIAS}
*/
@@ -733,7 +733,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE}
*/
@Deprecated
@@ -748,7 +748,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -762,7 +762,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -777,7 +777,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_PROTOCOLS}
*/
@Deprecated
@@ -792,7 +792,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>false</code>
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -807,7 +807,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE}
*/
@Deprecated
@@ -822,7 +822,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.1
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -835,7 +835,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: Optional
* </p>
- *
+ *
* @deprecated Since Geode1.0, use ssl-* properties and ssl-enabled-components
*/
@Deprecated
@@ -905,7 +905,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Deprecated</U>: as of GemFire8.0 use
* <a href="#http-service-port"><code>http-service-port</code></a> instead.
- *
+ *
* @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead.
*/
String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
@@ -978,7 +978,7 @@ public interface ConfigurationProperties {
* must be supported by the available providers.
* </p>
* <U>Default</U>: "any"
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_CIPHERS}
*/
@Deprecated
@@ -994,7 +994,7 @@ public interface ConfigurationProperties {
* false.
* </p>
* <U>Default</U>: "false"
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with optional
* {@link #SSL_JMX_ALIAS}
*/
@@ -1009,7 +1009,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE}
*/
@Deprecated
@@ -1024,7 +1024,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -1038,7 +1038,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -1051,7 +1051,7 @@ public interface ConfigurationProperties {
* supported by the available providers.
* </p>
* <U>Default</U>: "any"
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_PROTOCOLS}
*/
@Deprecated
@@ -1064,7 +1064,7 @@ public interface ConfigurationProperties {
* connection to be authenticated.
* </p>
* <U>Default</U>: "true"
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -1079,7 +1079,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE}
*/
@Deprecated
@@ -1094,7 +1094,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -1431,7 +1431,7 @@ public interface ConfigurationProperties {
* <U>Since</U>: GemFire 5.0
* </p>
* <U>Deprecated</U>: This feature is scheduled to be removed.
- *
+ *
* @deprecated : This feature is scheduled to be removed.
*/
String ROLES = "roles";
@@ -1475,14 +1475,14 @@ public interface ConfigurationProperties {
String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
/**
* The static String definition of the <i>"security-manager"</i> property
- *
+ *
* @since Geode 1.0
*/
String SECURITY_MANAGER = SECURITY_PREFIX + "manager";
/**
* The static String definition of the <i>"security-post-processor"</i> property
- *
+ *
* @since Geode 1.0
*/
String SECURITY_POST_PROCESSOR = SECURITY_PREFIX + "post-processor";
@@ -1561,7 +1561,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_CIPHERS}
*/
@Deprecated
@@ -1577,7 +1577,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>false</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with optional
* {@link #SSL_SERVER_ALIAS}
*/
@@ -1592,7 +1592,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE}
*/
@Deprecated
@@ -1607,7 +1607,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -1621,7 +1621,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -1636,7 +1636,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_PROTOCOLS}
*/
@Deprecated
@@ -1651,7 +1651,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: <code>any</code>
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -1666,7 +1666,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE}
*/
@Deprecated
@@ -1681,7 +1681,7 @@ public interface ConfigurationProperties {
* <U>Default</U>: ""
* </p>
* <U>Since</U>: GemFire 8.0
- *
+ *
* @deprecated Since Geode 1.0 use {@link #SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
index cc481e7..3ecf8c7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
@@ -15,8 +15,8 @@
package org.apache.geode.distributed;
-import org.apache.geode.distributed.internal.locks.*;
import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.locks.*;
/**
* <p>
@@ -36,12 +36,12 @@ public abstract class DistributedLockService {
* This DistributedLockService will continue to manage locks until <code>{@link #destroy}</code>
* is called, or <code>ds</code> is disconnected, at which point any locks that were held by this
* instance are released.
- *
+ *
* @param serviceName the name of the DistributedLockService to create.
*
* @param ds the <code>DistributedSystem</code> for the new service instance to use for
* distributed lock messaging.
- *
+ *
* @throws IllegalArgumentException if serviceName is an illegal name or this process has already
* created a DistributedLockService with the given <code>serviceName</code>.
*
@@ -58,7 +58,7 @@ public abstract class DistributedLockService {
/**
* Look up and return the DistributedLockService with the given name, if it has been created in
* this VM. If it has not been created, return null.
- *
+ *
* @param serviceName the name of the DistributedLockService to look up
*
* @return the DistributedLockService with the given name, or null if it hasn't been created in
@@ -73,10 +73,10 @@ public abstract class DistributedLockService {
* Any locks currently held in this DistributedLockService by this process are released. Attempts
* to access a destroyed lock service will result in a {@link LockServiceDestroyedException} being
* thrown.
- *
+ *
* @param serviceName the name of the instance to destroy, previously supplied in the
* <code>create(String, DistributedSystem)</code> invocation.
- *
+ *
* @throws IllegalArgumentException if this process hasn't created a DistributedLockService with
* the given <code>serviceName</code> and <code>dm</code>.
*/
@@ -99,7 +99,7 @@ public abstract class DistributedLockService {
* <code>unlock(Object name)</code> is invoked, or until <code>leaseTimeMillis</code> milliseconds
* have passed since the lock was granted - whichever comes first.
* </p>
- *
+ *
* <p>
* Locks are reentrant. If a thread invokes this method n times on the same instance, specifying
* the same <code>name</code>, without an intervening release or lease expiration expiration on
@@ -108,16 +108,16 @@ public abstract class DistributedLockService {
* already acquired, the lease time will be set to the maximum of the remaining least time from
* the previous invocation, or <code>leaseTimeMillis</code>
* </p>
- *
+ *
* @param name the name of the lock to acquire in this service. This object must conform to the
* general contract of <code>equals(Object)</code> and <code>hashCode()</code> as described
* in {@link java.lang.Object#hashCode()}.
- *
+ *
* @param waitTimeMillis the number of milliseconds to try to acquire the lock before giving up
* and returning false. A value of -1 causes this method to block until the lock is
* acquired. A value of 0 causes this method to return false without waiting for the lock
* if the lock is held by another member or thread.
- *
+ *
* @param leaseTimeMillis the number of milliseconds to hold the lock after granting it, before
* automatically releasing it if it hasn't already been released by invoking
* {@link #unlock(Object)}. If <code>leaseTimeMillis</code> is -1, hold the lock until
@@ -140,7 +140,7 @@ public abstract class DistributedLockService {
* <code>unlock(Object name)</code> is invoked, or until <code>leaseTimeMillis</code> milliseconds
* have passed since the lock was granted - whichever comes first.
* </p>
- *
+ *
* <p>
* Locks are reentrant. If a thread invokes this method n times on the same instance, specifying
* the same <code>name</code>, without an intervening release or lease expiration expiration on
@@ -149,27 +149,27 @@ public abstract class DistributedLockService {
* already acquired, the lease time will be set to the maximum of the remaining least time from
* the previous invocation, or <code>leaseTimeMillis</code>
* </p>
- *
+ *
* @param name the name of the lock to acquire in this service. This object must conform to the
* general contract of <code>equals(Object)</code> and <code>hashCode()</code> as described
* in {@link java.lang.Object#hashCode()}.
- *
+ *
* @param waitTimeMillis the number of milliseconds to try to acquire the lock before giving up
* and returning false. A value of -1 causes this method to block until the lock is
* acquired.
- *
+ *
* @param leaseTimeMillis the number of milliseconds to hold the lock after granting it, before
* automatically releasing it if it hasn't already been released by invoking
* {@link #unlock(Object)}. If <code>leaseTimeMillis</code> is -1, hold the lock until
* explicitly unlocked.
- *
+ *
* @return true if the lock was acquired, false if the timeout <code>waitTimeMillis</code> passed
* without acquiring the lock.
- *
+ *
* @throws InterruptedException if the thread is interrupted before or during this method.
*
* @throws LockServiceDestroyedException if this lock service has been destroyed
- *
+ *
* @deprecated as of GemFire 5.1, use {@link #lock(Object, long, long)} with waitTimeMillis
* instead
*/
@@ -179,9 +179,9 @@ public abstract class DistributedLockService {
/**
* Release the lock previously granted for the given <code>name</code>.
- *
+ *
* @param name the object to unlock in this service.
- *
+ *
* @throws LockNotHeldException if the current thread is not the owner of this lock
*
* @throws LeaseExpiredException if the current thread was the owner of this lock, but it's lease
@@ -223,7 +223,7 @@ public abstract class DistributedLockService {
* @throws InterruptedException if the current thread is interrupted.
*
* @throws LockServiceDestroyedException if the service has been destroyed
- *
+ *
* @deprecated as of GemFire 5.1, use {@link #suspendLocking(long)} with waitTimeMillis instead
*/
@Deprecated
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
index f8325df..f429438 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
@@ -20,7 +20,7 @@ import java.util.Set;
/**
* This is the fundamental representation of a member in a GemFire distributed system. A process
* becomes a member by calling {@link DistributedSystem#connect}.
- *
+ *
* @since GemFire 5.0
*/
public interface DistributedMember extends Comparable<DistributedMember> {
@@ -28,7 +28,7 @@ public interface DistributedMember extends Comparable<DistributedMember> {
/**
* Returns this member's name. The member name is set using the "name" gemfire property. Returns
* "" if the member does not have a name.
- *
+ *
* @since GemFire 7.0
*/
public String getName();
@@ -41,7 +41,7 @@ public interface DistributedMember extends Comparable<DistributedMember> {
/**
* Returns the Roles that this member performs in the system. Note that the result will contain
* both groups and roles.
- *
+ *
* @deprecated Roles is scheduled to be removed
*/
public Set<Role> getRoles();
@@ -50,7 +50,7 @@ public interface DistributedMember extends Comparable<DistributedMember> {
* Returns the groups this member belongs to. A member defines the groups it is in using the
* "groups" gemfire property. Note that the deprecated "roles" gemfire property are also treated
* as groups so this result will contain both groups and roles.
- *
+ *
* @return a list of groups that this member belongs to.
*/
public List<String> getGroups();
@@ -72,5 +72,3 @@ public interface DistributedMember extends Comparable<DistributedMember> {
public DurableClientAttributes getDurableClientAttributes();
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java
index 13a1721..d740bd3 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java
@@ -16,6 +16,18 @@ package org.apache.geode.distributed;
import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS;
+import java.io.File;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.LogWriter;
import org.apache.geode.StatisticsFactory;
@@ -32,18 +44,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.internal.util.IOUtils;
-import java.io.File;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
/**
* A "connection" to a GemFire distributed system. A <code>DistributedSystem</code> is created by
* invoking the {@link #connect} method with a configuration as described
@@ -86,7 +86,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
protected static volatile List existingSystems = Collections.EMPTY_LIST;
/**
* This lock must be changed to add or remove a system. It is notified when a system is removed.
- *
+ *
* @see #existingSystems
*/
protected static final Object existingSystemsLock = new Object();
@@ -243,7 +243,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Sets the calling thread's socket policy. This value will override that default set by the
* <code>conserve-sockets</code> configuration property.
- *
+ *
* @param conserveSockets If <code>true</code> then calling thread will share socket connections
* with other threads. If <code>false</code> then calling thread will have its own sockets.
* @since GemFire 4.1
@@ -260,7 +260,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Frees up any socket resources owned by the calling thread.
- *
+ *
* @since GemFire 4.1
*/
public static void releaseThreadsSockets() {
@@ -313,7 +313,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* see {@link org.apache.geode.admin.AdminDistributedSystemFactory}
- *
+ *
* @since GemFire 5.7
*/
protected static void setEnableAdministrationOnly(boolean adminOnly) {
@@ -373,7 +373,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns the <code>LogWriter</code> used for logging security related information. See
* <A href="#logFile">logFile</A>.
- *
+ *
* @throws IllegalStateException This VM has {@linkplain #disconnect() disconnected} from the
* distributed system.
* @since GemFire 5.5
@@ -382,21 +382,21 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns the configuration properties.
- *
+ *
* @return the configuration Properties
*/
public abstract Properties getProperties();
/**
* Returns the security specific configuration properties.
- *
+ *
* @return the configuration Properties
* @since GemFire 5.5
*/
public abstract Properties getSecurityProperties();
/**
- *
+ *
* @return the cancel criterion for this system
*/
public abstract CancelCriterion getCancelCriterion();
@@ -411,7 +411,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
*
* Attempts to access a distributed system after a VM has disconnected from it will result in an
* {@link IllegalStateException} being thrown.
- *
+ *
* @deprecated as of 6.5 use {@link Cache#close} or {@link ClientCache#close} instead.
*/
public abstract void disconnect();
@@ -447,7 +447,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns the {@link DistributedMember} that identifies this connection to the distributed
* system.
- *
+ *
* @return the member that represents this distributed system connection.
* @since GemFire 5.0
*/
@@ -455,7 +455,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns a set of all the other members in this distributed system.
- *
+ *
* @return returns a set of all the other members in this distributed system.
* @since GemFire 7.0
*/
@@ -464,7 +464,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns a set of all the members in the given group. Members join a group be setting the
* "groups" gemfire property.
- *
+ *
* @return returns a set of all the member in a group.
* @since GemFire 7.0
*/
@@ -473,20 +473,20 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Find the set of distributed members running on a given address
- *
+ *
* @return a set of all DistributedMembers that have any interfaces that match the given IP
* address. May be empty if there are no members.
- *
+ *
* @since GemFire 7.1
*/
public abstract Set<DistributedMember> findDistributedMembers(InetAddress address);
/**
* Find the distributed member with the given name
- *
+ *
* @return the distributed member that has the given name, or null if no member is currently
* running with the given name.
- *
+ *
* @since GemFire 7.1
*/
public abstract DistributedMember findDistributedMember(String name);
@@ -512,7 +512,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* <code>PROPERTIES_FILE_PROPERTY</code> is set then its value will be used instead of the
* default. If this value is a relative file system path then the above search is done. If it is
* an absolute file system path then that file must exist; no search for it is done.
- *
+ *
* @see #PROPERTIES_FILE_DEFAULT
* @see #getPropertiesFile()
* @since Geode 1.0
@@ -523,7 +523,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* The default value of <code>PROPERTIES_FILE_PROPERTY</code> is
* <code>"gemfire.properties"</code>. The location of the file will be resolved during connect as
* described for {@link #PROPERTIES_FILE_PROPERTY}.
- *
+ *
* @see #PROPERTIES_FILE_PROPERTY
* @see #getPropertiesFile()
* @since Geode 1.0
@@ -534,7 +534,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns the current value of {@link #PROPERTIES_FILE_PROPERTY} system property if set or the
* default value {@link #PROPERTIES_FILE_DEFAULT}.
- *
+ *
* @see #PROPERTIES_FILE_PROPERTY
* @see #PROPERTIES_FILE_DEFAULT
* @since Geode 1.0
@@ -558,7 +558,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* "gemfirePropertyFile" system property is set then its value is the value of PROPERTY_FILE. If
* this value is a relative file system path then the above search is done. If it is an absolute
* file system path then that file must exist; no search for it is done.
- *
+ *
* @see #getPropertiesFile()
* @since GemFire 5.0
* @deprecated As of 9.0, please use {@link #getPropertiesFile()} instead.
@@ -581,7 +581,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* <code>SECURITY_PROPERTIES_FILE_PROPERTY</code> is set then its value will be used instead of
* the default. If this value is a relative file system path then the above search is done. If it
* is an absolute file system path then that file must exist; no search for it is done.
- *
+ *
* @see #SECURITY_PROPERTIES_FILE_DEFAULT
* @see #getSecurityPropertiesFile()
* @since Geode 1.0
@@ -592,7 +592,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* The default value of <code>SECURITY_PROPERTIES_FILE_PROPERTY</code> is
* <code>"gfsecurity.properties"</code>. The location of the file will be resolved during connect
* as described for {@link #SECURITY_PROPERTIES_FILE_PROPERTY}.
- *
+ *
* @see #SECURITY_PROPERTIES_FILE_PROPERTY
* @see #getSecurityPropertiesFile()
* @since Geode 1.0
@@ -602,7 +602,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Returns the current value of {@link #SECURITY_PROPERTIES_FILE_PROPERTY} system property if set
* or the default value {@link #SECURITY_PROPERTIES_FILE_DEFAULT}.
- *
+ *
* @see #SECURITY_PROPERTIES_FILE_PROPERTY
* @see #SECURITY_PROPERTIES_FILE_DEFAULT
* @since Geode 1.0
@@ -627,7 +627,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* SECURITY_PROPERTY_FILE. If this value is a relative file system path then the above search is
* done. If it is an absolute file system path then that file must exist; no search for it is
* done.
- *
+ *
* @see #getSecurityPropertiesFile()
* @since GemFire 6.6.2
* @deprecated As of 9.0, please use {@link #getSecurityPropertiesFile()} instead.
@@ -640,7 +640,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* <p>
* See {@link #PROPERTIES_FILE_PROPERTY} for information on the name of the properties file and
* what locations it will be looked for in.
- *
+ *
* @return a <code>URL</code> that names the GemFire property file. Null is returned if no
* property file was found.
* @see #PROPERTIES_FILE_PROPERTY
@@ -658,7 +658,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* <p>
* See {@link #PROPERTIES_FILE_PROPERTY} for information on the name of the property file and what
* locations it will be looked for in.
- *
+ *
* @return a <code>URL</code> that names the GemFire property file. Null is returned if no
* property file was found.
* @see #getPropertiesFileURL()
@@ -675,7 +675,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
* <p>
* See {@link #SECURITY_PROPERTIES_FILE_PROPERTY} for information on the name of the properties
* file and what locations it will be looked for in.
- *
+ *
* @return a <code>URL</code> that names the GemFire security properties file. Null is returned if
* no properties file was found.
* @see #SECURITY_PROPERTIES_FILE_PROPERTY
@@ -717,32 +717,32 @@ public abstract class DistributedSystem implements StatisticsFactory {
* This will also return true if the DistributedSystem has finished reconnecting. When reconnect
* has completed you can use {@link DistributedSystem#getReconnectedSystem} to retrieve the new
* distributed system.
- *
+ *
* @return true if the DistributedSystem is attempting to reconnect or has finished reconnecting
*/
- abstract public boolean isReconnecting();
+ public abstract boolean isReconnecting();
/**
* Wait for the DistributedSystem to finish reconnecting to the system and recreate the cache.
- *
+ *
* @param time amount of time to wait, or -1 to wait forever
* @param units
* @return true if the system was reconnected
* @throws InterruptedException if the thread is interrupted while waiting
*/
- abstract public boolean waitUntilReconnected(long time, TimeUnit units)
+ public abstract boolean waitUntilReconnected(long time, TimeUnit units)
throws InterruptedException;
/**
* Force the DistributedSystem to stop reconnecting. If the DistributedSystem is currently
* connected this will disconnect it and close the cache.
- *
+ *
*/
- abstract public void stopReconnecting();
+ public abstract void stopReconnecting();
/**
* Returns the new DistributedSystem if there was an auto-reconnect
*/
- abstract public DistributedSystem getReconnectedSystem();
+ public abstract DistributedSystem getReconnectedSystem();
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystemDisconnectedException.java b/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystemDisconnectedException.java
index a81d940..4038c50 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystemDisconnectedException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystemDisconnectedException.java
@@ -18,7 +18,7 @@ import org.apache.geode.CancelException;
/**
* Thrown when a GemFire distributed system has been terminated.
- *
+ *
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DurableClientAttributes.java b/geode-core/src/main/java/org/apache/geode/distributed/DurableClientAttributes.java
index 0dae61c..6f805b7 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/DurableClientAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/DurableClientAttributes.java
@@ -43,7 +43,7 @@ public class DurableClientAttributes {
/**
* Constructor.
- *
+ *
* @param id The id of the durable client.
* @param timeout The timeout period of the durable client.
*/
@@ -61,7 +61,7 @@ public class DurableClientAttributes {
/**
* Returns the durable client's id.
- *
+ *
* @return the durable client's id
*/
public String getId() {
@@ -81,7 +81,7 @@ public class DurableClientAttributes {
/**
* Returns the durable client's timeout.
- *
+ *
* @return the durable client's timeout
*/
public int getTimeout() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/FutureCancelledException.java b/geode-core/src/main/java/org/apache/geode/distributed/FutureCancelledException.java
index d330f1c..6a1b3b0 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/FutureCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/FutureCancelledException.java
@@ -15,11 +15,12 @@
package org.apache.geode.distributed;
import java.util.concurrent.Future;
+
import org.apache.geode.CancelException;
/**
* Thrown when a {@link Future} has been cancelled.
- *
+ *
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/GatewayCancelledException.java b/geode-core/src/main/java/org/apache/geode/distributed/GatewayCancelledException.java
index 3c3c786..35414e2 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/GatewayCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/GatewayCancelledException.java
@@ -18,7 +18,7 @@ import org.apache.geode.CancelException;
/**
* Thrown when a GemFire WAN gateway has been terminated.
- *
+ *
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/Locator.java b/geode-core/src/main/java/org/apache/geode/distributed/Locator.java
index 645b261..cbce969 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/Locator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/Locator.java
@@ -14,10 +14,6 @@
*/
package org.apache.geode.distributed;
-import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.net.SocketCreator;
-
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
@@ -25,26 +21,30 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.net.SocketCreator;
+
/**
* Represents a distribution locator server that provides discovery information to members and
* clients of a GemFire distributed system. In most GemFire distributed cache architectures,
* distribution locators are run in their own process. A stand-alone locator process is managed
* using gfsh command line utility.
- *
+ *
* The stand-alone locator configuration provides high-availability of membership information.
- *
+ *
* <P>
- *
+ *
* This class allows a GemFire application VM to host a distribution locator. Such a configuration
* minimizes the number of processes that are required to run GemFire. However, hosting distribution
* locators is not generally recommended because if the application VM exits it would not be
* possible for new applications to connect to the distributed system until it is restarted.
- *
+ *
* <P>
* Locators persist membership information in a locatorXXXview.dat file. This file is used to
* recover information about the cluster when a locator starts if there are no other currently
* running locators. It allows the restarted locator to rejoin the cluster.
- *
+ *
* <P>
* <b>NOTE:</b> In this release of the product locators log membership views and cache server status
* in a locatorXXXviews.log file, where XXX is the locator's port. This is a rolling log capped in
@@ -53,8 +53,8 @@ import java.util.Properties;
* DistributedSystem. This means that it is not possible in this release to use APIs to start a
* locator and <i>then</i> start a DistributedSystem.
* <P>
- *
- *
+ *
+ *
* @since GemFire 4.0
*/
public abstract class Locator {
@@ -69,7 +69,7 @@ public abstract class Locator {
/**
* the hostname to give to clients so they can connect to this locator.
- *
+ *
* @since GemFire 5.7
*/
protected String hostnameForClients;
@@ -114,9 +114,9 @@ public abstract class Locator {
* The locator starts a AdminDistributedSystem configured with the given properties to provide the
* system with a long-running process that can be relied on for stable membership information. The
* locator will provide provide peer and cache server location services.
- *
+ *
* @since GemFire 5.0
- *
+ *
* @param port The port on which the locator will listen for membership information requests from
* new members
* @param logFile The file to which the locator logs information. The directory that contains the
@@ -126,7 +126,7 @@ public abstract class Locator {
* system. If there are multiple locators in the system, this should note them in the
* "locators" setting. If The distributed system is using multicast, the "mcast-port"
* should also be set.
- *
+ *
* @throws IllegalArgumentException If <code>port</code> is not in the range 0 to 65536
* @throws org.apache.geode.SystemIsRunningException If another locator is already running in
* <code>outputDir</code>
@@ -234,7 +234,7 @@ public abstract class Locator {
* @throws org.apache.geode.GemFireIOException If the directory containing the
* <code>logFile</code> does not exist or cannot be written to
* @throws IOException If the locator cannot be started
- *
+ *
* @since GemFire 5.7
*/
public static Locator startLocatorAndDS(int port, File logFile, InetAddress bindAddress,
@@ -268,7 +268,7 @@ public abstract class Locator {
/**
* Returns an unmodifiable <code>List</code> of all of the <code>Locator</code>s that are hosted
* by this VM.
- *
+ *
* @deprecated as of 7.0 use {@link #getLocator} instead
*/
public static List<Locator> getLocators() {
@@ -282,7 +282,7 @@ public abstract class Locator {
/**
* Returns the locator if it exists in this JVM. Otherwise returns null.
- *
+ *
* @return the locator that exists in this JVM; null if no locator.
* @since GemFire 7.0
*/
@@ -292,7 +292,7 @@ public abstract class Locator {
/**
* Examine the size of the collection of locators running in this VM
- *
+ *
* @return the number of locators running in this VM
* @deprecated as of 7.0 use {@link #hasLocator} instead.
*/
@@ -302,7 +302,7 @@ public abstract class Locator {
/**
* Returns true if a locator exists in this JVM.
- *
+ *
* @return true if a locator exists in this JVM.
* @since GemFire 7.0
*/
@@ -339,7 +339,7 @@ public abstract class Locator {
/**
* Returns the hostname that will be given to clients so that they can connect to this locator.
* Returns <code>null</code> if clients should use the bind address.
- *
+ *
* @since GemFire 5.7
*/
public String getHostnameForClients() {
@@ -352,14 +352,14 @@ public abstract class Locator {
/**
* Indicates whether the locator provides peer location services to members
- *
+ *
* @return if peer location is enabled
*/
public abstract boolean isPeerLocator();
/**
* Indicates whether the locator provides server location services to clients
- *
+ *
* @return if server location is enabled
*/
public abstract boolean isServerLocator();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
index d99a1a3..7d5d936 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
@@ -145,7 +145,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
private static final AtomicReference<LocatorLauncher> INSTANCE = new AtomicReference<>();
- // private volatile transient boolean debug;
+ // private transient volatile boolean debug;
private final transient ControlNotificationHandler controlHandler;
@@ -167,7 +167,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
private final Integer pid;
private final Integer port;
- private volatile transient InternalLocator locator;
+ private transient volatile InternalLocator locator;
private final Properties distributedSystemProperties;
@@ -176,9 +176,9 @@ public class LocatorLauncher extends AbstractLauncher<String> {
private final String workingDirectory;
// NOTE in addition to debug and locator, the other shared, mutable state
- private volatile transient String statusMessage;
+ private transient volatile String statusMessage;
- private volatile transient ControllableProcess process;
+ private transient volatile ControllableProcess process;
private final transient LocatorControllerParameters controllerParameters;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LockNotHeldException.java b/geode-core/src/main/java/org/apache/geode/distributed/LockNotHeldException.java
index 567b309..c4d3d9c 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/LockNotHeldException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LockNotHeldException.java
@@ -44,4 +44,3 @@ public class LockNotHeldException extends IllegalStateException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LockServiceDestroyedException.java b/geode-core/src/main/java/org/apache/geode/distributed/LockServiceDestroyedException.java
index d6de00f..24cce9b 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/LockServiceDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LockServiceDestroyedException.java
@@ -44,4 +44,3 @@ public class LockServiceDestroyedException extends IllegalStateException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/OplogCancelledException.java b/geode-core/src/main/java/org/apache/geode/distributed/OplogCancelledException.java
index 0fd1e27..2a17738 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/OplogCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/OplogCancelledException.java
@@ -18,7 +18,7 @@ import org.apache.geode.CancelException;
/**
* Thrown when a GemFire operation log has been terminated.
- *
+ *
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/PoolCancelledException.java b/geode-core/src/main/java/org/apache/geode/distributed/PoolCancelledException.java
index 9eebd5c..7867194 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/PoolCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/PoolCancelledException.java
@@ -18,7 +18,7 @@ import org.apache.geode.CancelException;
/**
* Thrown when a GemFire connection pool has been terminated.
- *
+ *
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/Role.java b/geode-core/src/main/java/org/apache/geode/distributed/Role.java
index 66fe930..ba0c05f 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/Role.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/Role.java
@@ -49,4 +49,3 @@ public interface Role extends Comparable<Role> {
*/
public int getCount();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncherCacheProvider.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncherCacheProvider.java
index 29df15a..389c47a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncherCacheProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncherCacheProvider.java
@@ -21,8 +21,8 @@ import org.apache.geode.cache.Cache;
/**
* ServerLauncherCacheProvider is an extension point for overriding the behavior of a server started
* with {@link ServerLauncher} or the gfsh start server command.
- *
- *
+ *
+ *
*/
public interface ServerLauncherCacheProvider {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/TXManagerCancelledException.java b/geode-core/src/main/java/org/apache/geode/distributed/TXManagerCancelledException.java
index f362f6d..b3126e7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/TXManagerCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/TXManagerCancelledException.java
@@ -18,7 +18,7 @@ import org.apache.geode.CancelException;
/**
* Thrown when a GemFire transaction manager has been terminated.
- *
+ *
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
index bfc5e1d..43c5cb4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
@@ -229,7 +229,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
* <p>
* Starting in 5.1.0.4, we accept locators in the format "host@bind-address[port]" to allow use of
* numeric IPv6 addresses
- *
+ *
* @return The locator string in the traditional "host:bind-address[port]" format.
*
* @throws IllegalArgumentException If <code>value</code> is not a valid locator configuration
@@ -681,7 +681,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
/**
* child class can override this method to return a list of modifiable attributes no matter what
* the default is
- *
+ *
* @return an empty list
*/
public List<String> getModifiableAttributes() {
@@ -694,7 +694,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
/**
* child class can override this method to return a list of unModifiable attributes no matter what
* the default is
- *
+ *
* @return an empty list
*/
public List<String> getUnModifiableAttributes() {
@@ -1228,7 +1228,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
/**
* Used by unit tests.
*/
- static public String[] _getAttNames() {
+ public static String[] _getAttNames() {
return dcValidAttributeNames;
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalState.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalState.java
index 81f5384..b449f67 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalState.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalState.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLong;
* Care should be taken to ensure that the value can never become the special value accidentally.
* For example, a long that can never go negative with normal use could have a terminal state of
* Long.MIN_VALUE
- *
+ *
* @since GemFire 6.0
*/
public class AtomicLongWithTerminalState extends AtomicLong {
@@ -43,7 +43,7 @@ public class AtomicLongWithTerminalState extends AtomicLong {
/**
* Add and the the given delta to the long, unless the long has been set to the terminal state.
- *
+ *
* @param terminalState
* @param delta
* @return the new value of the field, or the terminalState if the field is already set to the
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
index 26fb8d3..56dc4b5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
@@ -20,7 +20,7 @@ package org.apache.geode.distributed.internal;
public interface CacheTime {
/**
* Returns the system millisecond clock time with adjustments from the distributed cache
- *
+ *
* @return the current time
*/
public long cacheTimeMillis();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
index 2eefb89..96ee2c9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
@@ -287,7 +287,7 @@ public class ClusterConfigurationService {
/**
* Add jar information into the shared configuration and save the jars in the file system used
* when deploying jars
- *
+ *
* @return true on success
*/
public boolean addJarsToThisLocator(String[] jarNames, byte[][] jarBytes, String[] groups) {
@@ -427,7 +427,7 @@ public class ClusterConfigurationService {
/**
* Creates the shared configuration service
- *
+ *
* @param loadSharedConfigFromDir when set to true, loads the configuration from the share_config
* directory
*/
@@ -527,7 +527,7 @@ public class ClusterConfigurationService {
/**
* Create a response containing the status of the Shared configuration and information about other
* locators containing newer shared configuration data (if at all)
- *
+ *
* @return {@link SharedConfigurationStatusResponse} containing the
* {@link SharedConfigurationStatus}
*/
@@ -576,7 +576,7 @@ public class ClusterConfigurationService {
/**
* Returns the path of Shared configuration directory
- *
+ *
* @return {@link String} path of the shared configuration directory
*/
public String getSharedConfigurationDirPath() {
@@ -586,7 +586,7 @@ public class ClusterConfigurationService {
/**
* Gets the current status of the ClusterConfigurationService If the status is started , it
* determines if the shared configuration is waiting for new configuration on other locators
- *
+ *
* @return {@link SharedConfigurationStatus}
*/
public SharedConfigurationStatus getStatus() {
@@ -688,7 +688,7 @@ public class ClusterConfigurationService {
* Gets the region containing the shared configuration data. The region is created , if it does
* not exist already. Note : this could block if this locator contains stale persistent
* configuration data.
- *
+ *
* @return {@link Region} ConfigurationRegion, this should never be null
*/
private Region<String, Configuration> getConfigurationRegion() {
@@ -742,7 +742,7 @@ public class ClusterConfigurationService {
/**
* Reads the configuration information from the shared configuration directory and returns a
* {@link Configuration} object
- *
+ *
* @return {@link Configuration}
*/
private Configuration readConfiguration(File groupConfigDir)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/CollectingReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/CollectingReplyProcessor.java
index bc717e0..f724ada 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/CollectingReplyProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/CollectingReplyProcessor.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.distributed.internal;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* This reply processor collects all of the exceptions/results from the ReplyMessages it receives
- *
+ *
*
*/
public class CollectingReplyProcessor<T> extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ConflationKey.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ConflationKey.java
index 07640df..2931302 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ConflationKey.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ConflationKey.java
@@ -19,7 +19,7 @@ import java.nio.ByteBuffer;
/**
* Used to uniquely identify a conflatable message. If two messages have keys that are equal then
* the latter message can replace (i.e. conflate) the earlier message.
- *
+ *
* @since GemFire 4.2.1
*/
public class ConflationKey {
@@ -79,4 +79,3 @@ public class ConflationKey {
return this.allowsConflation;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
index ca79c62..1ce7421 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
@@ -52,7 +52,7 @@ public interface DM extends ReplySender {
/**
* Get a set of all other members (both admin ones and normal).
- *
+ *
* @since GemFire 5.7
*/
public Set getAllOtherMembers();
@@ -66,7 +66,7 @@ public interface DM extends ReplySender {
/**
* removes members that have older versions from the given collection, typically a Set from a
* distribution advisor
- *
+ *
* @since GemFire 8.0
*/
public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
@@ -75,7 +75,7 @@ public interface DM extends ReplySender {
/**
* removes members that have the given version or later from the given collection, typically a Set
* from a distribution advisor
- *
+ *
* @since GemFire 8.0
*/
public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
@@ -96,7 +96,7 @@ public interface DM extends ReplySender {
/**
* Returns an unmodifiable set containing the identities of all of the known distribution managers
* including admin members.
- *
+ *
* @since GemFire 5.7
*/
public Set getDistributionManagerIdsIncludingAdmin();
@@ -119,7 +119,7 @@ public interface DM extends ReplySender {
/**
* Add a membership listener for all members and return other DistribtionManagerIds as an atomic
* operation
- *
+ *
* @since GemFire 5.7
*/
public Set addAllMembershipListenerAndGetAllIds(MembershipListener l);
@@ -138,9 +138,9 @@ public interface DM extends ReplySender {
/**
* Returns the identity of the oldest DM in this group.
- *
+ *
* Note that this method may return null (no valid elders exist).
- *
+ *
* @return the elder member, possibly null
* @since GemFire 4.0
*/
@@ -163,7 +163,7 @@ public interface DM extends ReplySender {
* <p>
* If useTryLock is true, then it will attempt to get a try-lock and throw IllegalStateException
* if another thread already holds the try-lock.
- *
+ *
* @param force if true then this DM must become the elder.
* @param useTryLock if true then a try-lock will be used
* @throws IllegalStateException if elder try lock fails
@@ -191,7 +191,7 @@ public interface DM extends ReplySender {
/**
* Sends a message, guaranteed to be serialized
- *
+ *
* @see #putOutgoingUserData(DistributionMessage)
* @param msg
* @return recipients who did not receive the message
@@ -231,7 +231,7 @@ public interface DM extends ReplySender {
/**
* Used to get the DistributionConfig so that Connection can figure out if it is configured for
* async comms.
- *
+ *
* @since GemFire 4.2.1
*/
public DistributionConfig getConfig();
@@ -283,7 +283,7 @@ public interface DM extends ReplySender {
/**
* Returns the oldest member in the given set of distribution managers. The current implementation
* may use n*n/2 comparisons, so use this judiciously
- *
+ *
* @return the oldest member of the given collection
* @throws NoSuchElementException when none of the given members is actually a member of the
* distributed system.
@@ -312,7 +312,7 @@ public interface DM extends ReplySender {
/**
* Remove given member from list of members who are pending a startup reply
- *
+ *
* @param m the member
* @param departed true if we're removing them due to membership
*/
@@ -322,35 +322,35 @@ public interface DM extends ReplySender {
/**
* Return the CancelCriterion for this DM.
- *
+ *
* @return CancelCriterion for this DM
*/
public CancelCriterion getCancelCriterion();
/**
* Return the membership manager for this DM
- *
+ *
* @return the membership manager
*/
public MembershipManager getMembershipManager();
/**
* Set the root cause for DM failure
- *
+ *
* @param t the underlying failure
*/
public void setRootCause(Throwable t);
/**
* Return the underlying root cause for DM failure, possibly null
- *
+ *
* @return the underlying root cause
*/
public Throwable getRootCause();
/**
* Return all members that are on the the this host
- *
+ *
* @return set of {@link InternalDistributedMember} including this VM
* @since GemFire 5.9
*/
@@ -379,7 +379,7 @@ public interface DM extends ReplySender {
/**
* Returns true is the two members are on the same equivalent host machine based on overlapping IP
* addresses collected for all NICs on each member's machine.
- *
+ *
* @param member1 First member
* @param member2 Second member
*/
@@ -396,10 +396,10 @@ public interface DM extends ReplySender {
* bind-addr[port].
* <p>
* This currently only tracks stand-alone/dedicated locators, not embedded locators.
- *
+ *
* @param isSharedConfigurationEnabled flag to determine if the locator has enabled shared
* configuration
- *
+ *
* @since GemFire 6.6.3
*/
public void addHostedLocators(InternalDistributedMember member, Collection<String> locators,
@@ -412,7 +412,7 @@ public interface DM extends ReplySender {
* bind-addr[port].
* <p>
* This currently only tracks stand-alone/dedicated locators, not embedded locators.
- *
+ *
* @since GemFire 6.6.3
*/
public Collection<String> getHostedLocators(InternalDistributedMember member);
@@ -425,7 +425,7 @@ public interface DM extends ReplySender {
*
* <p>
* This currently only tracks stand-alone/dedicated locators, not embedded locators.
- *
+ *
* @since GemFire 6.6.3
*/
public Map<InternalDistributedMember, Collection<String>> getAllHostedLocators();
@@ -436,14 +436,14 @@ public interface DM extends ReplySender {
* then the form is bind-addr[port].
* <p>
* This currently only tracks stand-alone/dedicated locators, not embedded locators.
- *
+ *
* @since GemFire 8.0
*/
public Map<InternalDistributedMember, Collection<String>> getAllHostedLocatorsWithSharedConfiguration();
/****
* Determines if the distributed system has the shared configuration service enabled or not.
- *
+ *
* @return true if the distributed system was started or had a locator with
* enable-cluster-configuration = true
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
index 6397c06..75f5000 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
@@ -178,7 +178,7 @@ public interface DMStats {
/**
* increments the number of unicast writes performed and the number of bytes written
- *
+ *
* @since GemFire 5.0
*/
public void incUcastWriteBytes(int bytesWritten);
@@ -319,14 +319,14 @@ public interface DMStats {
/**
* increment the number of unicast UDP retransmission requests received from other processes
- *
+ *
* @since GemFire 5.0
*/
public void incUcastRetransmits();
/**
* increment the number of multicast UDP retransmissions sent to other processes
- *
+ *
* @since GemFire 5.0
*/
public void incMcastRetransmits();
@@ -338,7 +338,7 @@ public interface DMStats {
/**
* increment the number of multicast UDP retransmission requests sent to other processes
- *
+ *
* @since GemFire 5.0
*/
public void incMcastRetransmitRequests();
@@ -560,7 +560,7 @@ public interface DMStats {
/**
* increment/decrement the number of thread-owned receivers with the given domino count
- *
+ *
* @param value
* @param dominoCount thread-owned connection chain count
*/
@@ -568,7 +568,7 @@ public interface DMStats {
/**
* Called when a new message is received.
- *
+ *
* @param newMsg true if a new message being received was detected; false if this is just
* additional data for a message already detected.
* @param bytes the number of bytes read, so far, for the message being received.
@@ -578,7 +578,7 @@ public interface DMStats {
/**
* Called when we finish processing a received message.
- *
+ *
* @param bytes the number of bytes read off the wire for the message we have finished with.
* @since GemFire 5.0.2
*/
@@ -588,7 +588,7 @@ public interface DMStats {
/**
* Returns 1 if the system elder is this member, else returns 0.
- *
+ *
* @return 1 if the system elder is this member, else returns 0
*/
public int getElders();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java
index 70bf2c2..13387dc 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.distributed.internal;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.SystemTimer.SystemTimerTask;
@@ -23,17 +28,13 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.DateFormatter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicLong;
/**
* DSClock tracks the system time. The most useful method is cacheTimeMillis(). The rest are for
* clock adjustments.
- *
+ *
* Clock adjustments can be turned off with gemfire.disable-distributed-clock
- *
+ *
*/
public class DSClock implements CacheTime {
@@ -46,7 +47,7 @@ public class DSClock implements CacheTime {
* Time shift received from server must be at least this far off in order for the cacheTimeMillis
* clock to be changed. Servers are much more aggressive about it.
*/
- private final static long MINIMUM_TIME_DIFF = 5000;
+ private static final long MINIMUM_TIME_DIFF = 5000;
/**
* cacheTimeMillis offset from System.currentTimeMillis
@@ -178,10 +179,10 @@ public class DSClock implements CacheTime {
/**
* This method is called by a timer task which takes control of cache time and increments the
* cache time at each call of this method.
- *
+ *
* The timer task must be called each millisecond. We need to revisit the method implementation if
* that condition is changed.
- *
+ *
* @param stw True if Stop the world for this cache for a while.
*/
private void suspendCacheTimeMillis(boolean stw) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java
index 47b502c..17dce55 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java
@@ -30,7 +30,7 @@ public class DirectReplyProcessor extends ReplyProcessor21 {
/**
* Creates a new <code>ReplyProcessor</code> that wants replies from a single member of a
* distributed system.
- *
+ *
* @param system the DistributedSystem connection
* @param member the member this processor wants a reply from
*/
@@ -41,7 +41,7 @@ public class DirectReplyProcessor extends ReplyProcessor21 {
/**
* Creates a new <code>ReplyProcessor</code> that wants replies from a single member of a
* distributed system.
- *
+ *
* @param system the DistributedSystem connection
* @param member the member this processor wants a reply from
* @param cancelCriterion optional CancelCriterion to use; will use the DistributionManager if
@@ -55,7 +55,7 @@ public class DirectReplyProcessor extends ReplyProcessor21 {
/**
* Creates a new <code>ReplyProcessor</code> that wants replies from a single member of a
* distributed system.
- *
+ *
* @param dm the DistributionManager to use for messaging and membership
* @param member the member this processor wants a reply from
*/
@@ -67,7 +67,7 @@ public class DirectReplyProcessor extends ReplyProcessor21 {
* Creates a new <code>ReplyProcessor</code> that wants replies from some number of members of a
* distributed system. Call this method with {@link DistributionManager#getDistributionManagerIds}
* if you want replies from all DMs including the one hosted in this VM.
- *
+ *
* @param dm the DistributionManager to use for messaging and membership
* @param initMembers the Set of members this processor wants replies from
*/
@@ -79,7 +79,7 @@ public class DirectReplyProcessor extends ReplyProcessor21 {
* Creates a new <code>ReplyProcessor</code> that wants replies from some number of members of a
* distributed system. Call this method with {@link DistributionManager#getDistributionManagerIds}
* if you want replies from all DMs including the one hosted in this VM.
- *
+ *
* @param system the DistributedSystem connection
* @param initMembers the Set of members this processor wants replies from
*/
@@ -91,7 +91,7 @@ public class DirectReplyProcessor extends ReplyProcessor21 {
* Creates a new <code>ReplyProcessor</code> that wants replies from some number of members of a
* distributed system. Call this method with {@link DistributionManager#getDistributionManagerIds}
* if you want replies from all DMs including the one hosted in this VM.
- *
+ *
* @param system the DistributedSystem connection
* @param initMembers the Set of members this processor wants replies from
* @param cancelCriterion optional CancelCriterion to use; will use the DistributedSystem's
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisee.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisee.java
index 764d3a9..ae3b1a7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisee.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisee.java
@@ -16,19 +16,19 @@ package org.apache.geode.distributed.internal;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
/**
* Resource which uses a {@link DistributionAdvisor}.
- *
+ *
* @since GemFire 5.7
*/
public interface DistributionAdvisee {
/**
* Returns the underlying <code>DistributionManager</code> used for messaging.
- *
+ *
* @return the underlying <code>DistributionManager</code>
*/
public DM getDistributionManager();
@@ -40,7 +40,7 @@ public interface DistributionAdvisee {
/**
* Returns the <code>DistributionAdvisor</code> that provides advice for this advisee.
- *
+ *
* @return the <code>DistributionAdvisor</code>
*/
public DistributionAdvisor getDistributionAdvisor();
@@ -48,42 +48,42 @@ public interface DistributionAdvisee {
/**
* Returns the <code>Profile</code> representing this member in the
* <code>DistributionAdvisor</code>.
- *
+ *
* @return the <code>Profile</code> representing this member
*/
public Profile getProfile();
/**
* Returns this advisees parent or null if no parent exists.
- *
+ *
* @return parent advisee
*/
public DistributionAdvisee getParentAdvisee();
/**
* Returns the underlying <code>InternalDistributedSystem</code> connection.
- *
+ *
* @return the underlying <code>InternalDistributedSystem</code>
*/
public InternalDistributedSystem getSystem();
/**
* Returns the simple name of this resource.
- *
+ *
* @return the simple name of this resource
*/
public String getName();
/**
* Returns the full path of this resource.
- *
+ *
* @return the full path of this resource.
*/
public String getFullPath();
/**
* Fill in the <code>Profile</code> with details from the advisee.
- *
+ *
* @param profile the <code>Profile</code> to fill in with details
*/
public void fillInProfile(Profile profile);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index 0acc6c2..e48d4df 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
@@ -14,6 +14,23 @@
*/
package org.apache.geode.distributed.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.GemFireIOException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -31,22 +48,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.util.ArrayUtils;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Provides advice on sending distribution messages. For a given operation, this advisor will
@@ -116,7 +117,7 @@ public class DistributionAdvisor {
/**
* Incrementing serial number used to identify order of region creation
- *
+ *
* @see Profile#getVersion()
*/
private final AtomicInteger profileVersionSequencer = new AtomicInteger(START_VERSION_NUMBER);
@@ -144,7 +145,7 @@ public class DistributionAdvisor {
/**
* the version of the profile set
- *
+ *
* @since GemFire 5.1
*/
private long membershipVersion;
@@ -258,7 +259,7 @@ public class DistributionAdvisor {
/**
* determine whether a delta-gii synchronization should be performed for this lost member
- *
+ *
* @param id
* @return true if a delta-gii should be performed
*/
@@ -347,7 +348,7 @@ public class DistributionAdvisor {
/**
* Increment and get next profile version from {@link #profileVersionSequencer}.
- *
+ *
* @return next profile version number
*/
protected int incrementAndGetVersion() {
@@ -383,7 +384,7 @@ public class DistributionAdvisor {
/**
* Free up resources used by this advisor once it is no longer being used.
- *
+ *
* @since GemFire 3.5
*/
public void close() {
@@ -434,7 +435,7 @@ public class DistributionAdvisor {
/**
* Remove listener from the list to receive notification when a provile is added or removed.
- *
+ *
* @return true if listener was in the list
*/
public boolean removeMembershipListener(MembershipListener listener) {
@@ -472,7 +473,7 @@ public class DistributionAdvisor {
/**
* Polls the isInitialized state. Unlike {@link #isInitialized} it will not wait for it to become
* initialized if it is in the middle of being initialized.
- *
+ *
* @since GemFire 5.7
*/
public boolean pollIsInitialized() {
@@ -481,7 +482,7 @@ public class DistributionAdvisor {
/**
* Dumps out all profiles in this advisor.
- *
+ *
* @param infoMsg prefix message to log
*/
@@ -512,7 +513,7 @@ public class DistributionAdvisor {
/**
* Create or update a profile for a remote counterpart.
- *
+ *
* @param profile the profile, referenced by this advisor after this method returns.
*/
public boolean putProfile(Profile profile) {
@@ -532,7 +533,7 @@ public class DistributionAdvisor {
/**
* Return true if the memberId on the specified Profile is a current member of the distributed
* system.
- *
+ *
* @since GemFire 5.7
*/
protected boolean isCurrentMember(Profile p) {
@@ -544,11 +545,11 @@ public class DistributionAdvisor {
* {@link DistributionAdvisor#getAdvisee()}. Profile information is versioned via
* {@link Profile#getVersion()} and may be ignored if an older version is received after newer
* versions.
- *
+ *
* @param newProfile the profile to add
* @param forceProfile true will force profile to be added even if member is not in distributed
* view (should only ever be true for tests that need to inject a bad profile)
- *
+ *
* @return true if the profile was applied, false if the profile was ignored
*/
private synchronized boolean doPutProfile(Profile newProfile, boolean forceProfile) {
@@ -640,7 +641,7 @@ public class DistributionAdvisor {
/**
* A callback to sub-classes for extra validation logic
- *
+ *
* @param oldProfile
* @param newProfile
* @return true if the change from old to new is valid
@@ -655,7 +656,7 @@ public class DistributionAdvisor {
* number being compared is above {@link #ROLLOVER_THRESHOLD_UPPER} and the new versioning number
* is below {@link #ROLLOVER_THRESHOLD_LOWER} then a rollover is assumed to have occurred, which
* means the new versioning number is newer.
- *
+ *
* @param newProfile the newer profile
* @param oldProfile the older profile
* @return true if newProfile is newer than oldProfile
@@ -693,12 +694,12 @@ public class DistributionAdvisor {
/**
* Compare two serial numbers
- *
+ *
* @param newSerialNumber
* @param oldSerialNumber
* @return return true if the first serial number (newSerialNumber) is more recent
*/
- static public boolean isNewerSerialNumber(int newSerialNumber, int oldSerialNumber) {
+ public static boolean isNewerSerialNumber(int newSerialNumber, int oldSerialNumber) {
boolean serialRolled =
oldSerialNumber > ROLLOVER_THRESHOLD_UPPER && newSerialNumber < ROLLOVER_THRESHOLD_LOWER;
return serialRolled || oldSerialNumber < newSerialNumber;
@@ -707,7 +708,7 @@ public class DistributionAdvisor {
/**
* Create a new version of the membership profile set. This is used in flushing state out of the
* VM for previous versions of the set.
- *
+ *
* @since GemFire 5.1
*/
public synchronized void forceNewMembershipVersion() {
@@ -733,7 +734,7 @@ public class DistributionAdvisor {
* this method must be invoked at the start of every operation that can modify the state of
* resource. The return value must be recorded and sent to the advisor in an endOperation message
* when messages for the operation have been put in the DistributionManager's outgoing "queue".
- *
+ *
* @return the current membership version for this advisor
* @since GemFire 5.1
*/
@@ -756,7 +757,7 @@ public class DistributionAdvisor {
/**
* This method must be invoked when messages for an operation have been put in the
* DistributionManager's outgoing queue.
- *
+ *
* @param version The membership version returned by startOperation
* @since GemFire 5.1
*/
@@ -788,7 +789,7 @@ public class DistributionAdvisor {
/**
* wait for the current operations being sent on views prior to the joining of the given member to
* be placed on communication channels before returning
- *
+ *
* @since GemFire 5.1
*/
public void waitForCurrentOperations(long timeout) {
@@ -845,10 +846,10 @@ public class DistributionAdvisor {
/**
* Bypass the distribution manager and ask the membership manager directly if a given member is
* still in the view.
- *
+ *
* We need this because we're asking membership questions from within listeners, and we don't know
* whether the DM's membership listener fires before or after our own.
- *
+ *
* @param id member we are asking about
* @return true if we are still in the JGroups view (must return false if id == null)
*/
@@ -864,10 +865,10 @@ public class DistributionAdvisor {
/**
* Given member is no longer pertinent to this advisor; remove it.
- *
+ *
* This is often overridden in subclasses, but they need to defer to their superclass at some
* point in their re-implementation.
- *
+ *
* @param memberId the member to remove
* @param crashed true if the member did not leave normally
* @return true if it was being tracked
@@ -898,7 +899,7 @@ public class DistributionAdvisor {
/**
* Removes the specified profile if it is registered with this advisor.
- *
+ *
* @return true if it was registered; false if not.
* @since GemFire 5.7
*/
@@ -908,7 +909,7 @@ public class DistributionAdvisor {
/**
* Removes the profile for the given member. This method is meant to be overriden by subclasses.
- *
+ *
* @param memberId the member whose profile should be removed
* @param crashed true if the member crashed
* @param destroyed
@@ -969,7 +970,7 @@ public class DistributionAdvisor {
/**
* Removes the profile for the specified member and serial number
- *
+ *
* @param memberId the member to remove the profile for
* @param serialNum specific serial number to remove
* @return true if a matching profile for the member was found
@@ -988,7 +989,7 @@ public class DistributionAdvisor {
/**
* Update the list of removed profiles based on given serial number, and ensure that the given
* member is no longer in the list of bucket owners.
- *
+ *
* @param memberId member to remove
* @param serialNum serial number
* @return true if this member was an owner
@@ -1075,7 +1076,7 @@ public class DistributionAdvisor {
/**
* Indicate whether given member is being tracked
- *
+ *
* @param memberId the member
* @return true if the member was being tracked
*/
@@ -1088,7 +1089,7 @@ public class DistributionAdvisor {
// * @since GemFire 5.1
// * @return the Profile or null
// */
- // synchronized public Profile getProfile(InternalDistributedMember memberId) {
+ // public synchronized Profile getProfile(InternalDistributedMember memberId) {
// int index = indexOfMemberId(memberId);
// if (index >= 0) {
// return profiles[index];
@@ -1148,7 +1149,7 @@ public class DistributionAdvisor {
/**
* Provide recipient information for any other operation. Returns the set of members that have
* remote counterparts.
- *
+ *
* @return Set of Serializable members; no reference to Set kept by advisor so caller is free to
* modify it
*/
@@ -1183,7 +1184,7 @@ public class DistributionAdvisor {
/**
* Returns a set of the members this advisor should distribute to by default
- *
+ *
* @since GemFire 5.7
*/
@SuppressWarnings("unchecked")
@@ -1251,7 +1252,7 @@ public class DistributionAdvisor {
/**
* Template method for sub-classes to override. Method is invoked after a new profile is
* created/added to profiles.
- *
+ *
* @param profile the created profile
*/
protected void profileCreated(Profile profile) {}
@@ -1259,7 +1260,7 @@ public class DistributionAdvisor {
/**
* Template method for sub-classes to override. Method is invoked after a profile is updated in
* profiles.
- *
+ *
* @param profile the updated profile
*/
protected void profileUpdated(Profile profile) {}
@@ -1267,7 +1268,7 @@ public class DistributionAdvisor {
/**
* Template method for sub-classes to override. Method is invoked after a profile is removed from
* profiles.
- *
+ *
* @param profile the removed profile
*/
protected void profileRemoved(Profile profile) {}
@@ -1301,7 +1302,7 @@ public class DistributionAdvisor {
/**
* This method calls filter->include on every profile until include returns true.
- *
+ *
* @return false if all filter->include calls returns false; otherwise true.
**/
protected boolean satisfiesFilter(Filter f) {
@@ -1333,13 +1334,13 @@ public class DistributionAdvisor {
/**
* Visit a given {@link Profile} accumulating the results in the given aggregate. Returns false
* when the visit has to be terminated.
- *
+ *
* @param advisor the DistributionAdvisor that invoked this visitor
* @param profile the profile being visited
* @param profileIndex the index of current profile
* @param numProfiles the total number of profiles being visited
* @param aggregate result aggregated so far, if any
- *
+ *
* @return false if the visit has to be terminated immediately and false otherwise
*/
boolean visit(DistributionAdvisor advisor, Profile profile, int profileIndex, int numProfiles,
@@ -1351,14 +1352,14 @@ public class DistributionAdvisor {
* {@link ProfileVisitor#visit} method returns false. Unlike the {@link #adviseFilter(Filter)}
* method this does assume the return type to be a Set of qualifying members rather allows for
* population of an arbitrary aggregator passed as the argument to this method.
- *
+ *
* @param <T> the type of object used for aggregation of results
* @param visitor the {@link ProfileVisitor} to use for the visit
* @param aggregate an aggregate object that will be used to for aggregation of results by the
* {@link ProfileVisitor#visit} method; this allows the {@link ProfileVisitor} to not
* maintain any state so that in many situations a global static object encapsulating the
* required behaviour will work
- *
+ *
* @return true if all the profiles were visited and false if the {@link ProfileVisitor#visit} cut
* it short by returning false
*/
@@ -1378,7 +1379,7 @@ public class DistributionAdvisor {
/**
* Get an unmodifiable list of the <code>Profile</code>s that match the given <code>Filter</code>.
- *
+ *
* @since GemFire 5.7
*/
protected List/* <Profile> */ fetchProfiles(Filter f) {
@@ -1409,7 +1410,7 @@ public class DistributionAdvisor {
/**
* Provide recipients for profile remove.
- *
+ *
* @since GemFire 5.7
*/
public Set adviseProfileRemove() {
@@ -1531,7 +1532,7 @@ public class DistributionAdvisor {
public int serialNumber = ILLEGAL_SERIAL;
/**
* The DistributionAdvisor's membership version where this member was added
- *
+ *
* @since GemFire 5.1
*/
public transient long initialMembershipVersion;
@@ -1550,7 +1551,7 @@ public class DistributionAdvisor {
/**
* Return object that uniquely identifies this profile.
- *
+ *
* @since GemFire 5.7
*/
public ProfileId getId() {
@@ -1583,7 +1584,7 @@ public class DistributionAdvisor {
/**
* Return the DistributedMember associated with this profile
- *
+ *
* @since GemFire 5.0
*/
public InternalDistributedMember getDistributedMember() {
@@ -1622,7 +1623,7 @@ public class DistributionAdvisor {
/**
* Attempts to process this message with the specified {@link DistributionAdvisee}. Also if
* exchange profiles then add the profile from {@link DistributionAdvisee} to reply.
- *
+ *
* @param advisee the CacheDistributionAdvisee to apply this profile to
* @param removeProfile true to remove profile else add profile
* @param exchangeProfiles true to add the profile to reply
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionChannel.java
index 712764d..89501db 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionChannel.java
@@ -40,7 +40,7 @@ public class DistributionChannel {
/**
* Constructor DistributionChannel for JGroups.
- *
+ *
* @param channel jgroups channel
*/
public DistributionChannel(MembershipManager channel) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
index 958ea15..eabe6cc 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
@@ -46,7 +46,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer;
* <p>
* <p>
* Descriptions of these properties can be found {@link ConfigurationProperties}.
- *
+ *
* @see org.apache.geode.internal.Config
* @since GemFire 2.1
*/
@@ -69,7 +69,7 @@ public interface DistributionConfig extends Config, LogConfig {
* by tools to help identify the member.
* <p>
* The default value is: {@link #DEFAULT_NAME}.
- *
+ *
* @return the system's name.
*/
@ConfigAttributeGetter(name = NAME)
@@ -79,7 +79,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Sets the member's name.
* <p>
* The name can not be changed while the system is running.
- *
+ *
* @throws IllegalArgumentException if the specified value is not acceptable.
* @throws org.apache.geode.UnmodifiableException if this attribute can not be modified.
* @throws org.apache.geode.GemFireIOException if the set failure is caused by an error when
@@ -293,7 +293,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the system's locator list. A locator list is optional and by default empty. Its used to by
* the system to locator other system nodes and to publish itself so it can be located by others.
- *
+ *
* @param value must be of the form <code>hostName[portNum]</code>. Multiple elements are allowed
* and must be seperated by a comma.
*
@@ -341,7 +341,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Sets the {@link ConfigurationProperties#START_LOCATOR} property. This is a string in the form
* bindAddress[port] and, if set, tells the distributed system to start a locator prior to
* connecting
- *
+ *
* @param value must be of the form <code>hostName[portNum]</code>
*/
@ConfigAttributeSetter(name = START_LOCATOR)
@@ -365,7 +365,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the system's deploy working directory.
- *
+ *
* @throws IllegalArgumentException if the specified value is not acceptable.
* @throws org.apache.geode.UnmodifiableException if this attribute can not be modified.
* @throws org.apache.geode.GemFireIOException if the set failure is caused by an error when
@@ -394,7 +394,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the system's user command path.
- *
+ *
* @throws IllegalArgumentException if the specified value is not acceptable.
* @throws org.apache.geode.UnmodifiableException if this attribute can not be modified.
* @throws org.apache.geode.GemFireIOException if the set failure is caused by an error when
@@ -416,7 +416,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#LOG_FILE} property
- *
+ *
* @return <code>null</code> if logging information goes to standard out
*/
@ConfigAttributeGetter(name = LOG_FILE)
@@ -428,7 +428,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Non-absolute log files are relative to the system directory.
* <p>
* The system log file can not be changed while the system is running.
- *
+ *
* @throws IllegalArgumentException if the specified value is not acceptable.
* @throws org.apache.geode.UnmodifiableException if this attribute can not be modified.
* @throws org.apache.geode.GemFireIOException if the set failure is caused by an error when
@@ -453,7 +453,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#LOG_LEVEL} property
- *
+ *
* @see org.apache.geode.internal.logging.LogWriterImpl
*/
@ConfigAttributeGetter(name = LOG_LEVEL)
@@ -461,7 +461,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#LOG_LEVEL} property
- *
+ *
* @see org.apache.geode.internal.logging.LogWriterImpl
*/
@ConfigAttributeSetter(name = LOG_LEVEL)
@@ -557,7 +557,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#STATISTIC_ARCHIVE_FILE} property.
- *
+ *
* @return <code>null</code> if no file was specified
*/
@ConfigAttributeGetter(name = STATISTIC_ARCHIVE_FILE)
@@ -1091,7 +1091,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of an internal property that specifies a {@link org.apache.geode.i18n.LogWriterI18n}
* instance to log to. Set this property with put(), not with setProperty()
- *
+ *
* @since GemFire 4.0
*/
String LOG_WRITER_NAME = "log-writer";
@@ -1099,7 +1099,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of an internal property that specifies a a DistributionConfigImpl that the locator is
* passing in to a ds connect. Set this property with put(), not with setProperty()
- *
+ *
* @since GemFire 7.0
*/
String DS_CONFIG_NAME = "ds-config";
@@ -1107,7 +1107,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of an internal property that specifies whether the distributed system is reconnecting
* after a forced- disconnect.
- *
+ *
* @since GemFire 8.1
*/
String DS_RECONNECTING_NAME = "ds-reconnecting";
@@ -1121,7 +1121,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of an internal property that specifies a {@link org.apache.geode.LogWriter} instance
* to log security messages to. Set this property with put(), not with setProperty()
- *
+ *
* @since GemFire 5.5
*/
String SECURITY_LOG_WRITER_NAME = "security-log-writer";
@@ -1130,7 +1130,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of an internal property that specifies a FileOutputStream associated with the internal
* property LOG_WRITER_NAME. If this property is set, the FileOutputStream will be closed when the
* distributed system disconnects. Set this property with put(), not with setProperty()
- *
+ *
* @since GemFire 5.0
*/
String LOG_OUTPUTSTREAM_NAME = "log-output-stream";
@@ -1139,7 +1139,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of an internal property that specifies a FileOutputStream associated with the internal
* property SECURITY_LOG_WRITER_NAME. If this property is set, the FileOutputStream will be closed
* when the distributed system disconnects. Set this property with put(), not with setProperty()
- *
+ *
* @since GemFire 5.5
*/
String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
@@ -1846,7 +1846,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#CONFLATE_EVENTS} property.
- *
+ *
* @since GemFire 5.7
*/
@ConfigAttributeGetter(name = CONFLATE_EVENTS)
@@ -1854,7 +1854,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#CONFLATE_EVENTS} property.
- *
+ *
* @since GemFire 5.7
*/
@ConfigAttributeSetter(name = CONFLATE_EVENTS)
@@ -2190,7 +2190,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Get the current log-level for {@link ConfigurationProperties#SECURITY_LOG_LEVEL}.
- *
+ *
* @return the current security log-level
*/
@ConfigAttributeGetter(name = SECURITY_LOG_LEVEL)
@@ -2198,7 +2198,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set the log-level for {@link ConfigurationProperties#SECURITY_LOG_LEVEL}.
- *
+ *
* @param level the new security log-level
*/
@ConfigAttributeSetter(name = SECURITY_LOG_LEVEL)
@@ -2215,7 +2215,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SECURITY_LOG_FILE} property
- *
+ *
* @return <code>null</code> if logging information goes to standard out
*/
@ConfigAttributeGetter(name = SECURITY_LOG_FILE)
@@ -2228,7 +2228,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Non-absolute log files are relative to the system directory.
* <p>
* The security log file can not be changed while the system is running.
- *
+ *
* @throws IllegalArgumentException if the specified value is not acceptable.
* @throws org.apache.geode.UnmodifiableException if this attribute can not be modified.
* @throws org.apache.geode.GemFireIOException if the set failure is caused by an error when
@@ -2256,7 +2256,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Get timeout for peer membership check when security is enabled.
- *
+ *
* @return Timeout in milliseconds.
*/
@ConfigAttributeGetter(name = SECURITY_PEER_VERIFY_MEMBER_TIMEOUT)
@@ -2265,7 +2265,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set timeout for peer membership check when security is enabled. The timeout must be less than
* peer handshake timeout.
- *
+ *
* @param attValue
*/
@ConfigAttributeSetter(name = SECURITY_PEER_VERIFY_MEMBER_TIMEOUT)
@@ -2354,7 +2354,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#REMOVE_UNRESPONSIVE_CLIENT} property.
- *
+ *
* @since GemFire 6.0
*/
@ConfigAttributeGetter(name = REMOVE_UNRESPONSIVE_CLIENT)
@@ -2362,7 +2362,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#REMOVE_UNRESPONSIVE_CLIENT} property.
- *
+ *
* @since GemFire 6.0
*/
@ConfigAttributeSetter(name = REMOVE_UNRESPONSIVE_CLIENT)
@@ -2378,7 +2378,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#DELTA_PROPAGATION} property.
- *
+ *
* @since GemFire 6.3
*/
@ConfigAttributeGetter(name = DELTA_PROPAGATION)
@@ -2386,7 +2386,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#DELTA_PROPAGATION} property.
- *
+ *
* @since GemFire 6.3
*/
@ConfigAttributeSetter(name = DELTA_PROPAGATION)
@@ -2474,7 +2474,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Returns the value of the {@link ConfigurationProperties#GROUPS} property
* <p>
* The default value is: {@link #DEFAULT_GROUPS}.
- *
+ *
* @return the value of the property
*
* @since GemFire 7.0
@@ -2486,7 +2486,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Sets the {@link ConfigurationProperties#GROUPS} property.
* <p>
* The groups can not be changed while the system is running.
- *
+ *
* @throws IllegalArgumentException if the specified value is not acceptable.
* @throws org.apache.geode.UnmodifiableException if this attribute can not be modified.
* @throws org.apache.geode.GemFireIOException if the set failure is caused by an error when
@@ -2498,7 +2498,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#GROUPS} property
- *
+ *
* @since GemFire 7.0
*/
@ConfigAttribute(type = String.class)
@@ -2507,7 +2507,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GROUPS}.
* <p>
* Actual value of this constant is <code>""</code>.
- *
+ *
* @since GemFire 7.0
*/
String DEFAULT_GROUPS = "";
@@ -2566,7 +2566,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@Deprecated
@@ -2577,7 +2577,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} state.
* <p>
* Actual value of this constant is <code>false</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
*/
@Deprecated
@@ -2585,7 +2585,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
@@ -2595,7 +2595,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
@Deprecated
@@ -2604,7 +2604,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = OFF_HEAP_MEMORY_SIZE)
@@ -2612,7 +2612,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = OFF_HEAP_MEMORY_SIZE)
@@ -2620,21 +2620,21 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String OFF_HEAP_MEMORY_SIZE_NAME = OFF_HEAP_MEMORY_SIZE;
/**
* The default {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE} value of <code>""</code>.
- *
+ *
* @since Geode 1.0
*/
String DEFAULT_OFF_HEAP_MEMORY_SIZE = "";
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@Deprecated
@@ -2643,7 +2643,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
*/
@Deprecated
@@ -2654,7 +2654,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
*/
@Deprecated
@@ -2663,7 +2663,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@@ -2673,7 +2673,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
*/
@Deprecated
@@ -2682,7 +2682,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
*/
@Deprecated
@@ -2693,7 +2693,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS}
*/
@Deprecated
@@ -2702,7 +2702,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
*/
@@ -2713,7 +2713,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
@Deprecated
@@ -2723,7 +2723,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
*/
@Deprecated
@@ -2734,7 +2734,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} value.
* <p>
* Actual value of this constant is <code>true</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -2744,7 +2744,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@@ -2754,7 +2754,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@Deprecated
@@ -2763,7 +2763,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@Deprecated
@@ -2774,7 +2774,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
*/
@Deprecated
@@ -2784,7 +2784,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@@ -2795,7 +2795,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@Deprecated
@@ -2804,7 +2804,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@Deprecated
@@ -2815,7 +2815,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -2826,7 +2826,7 @@ public interface DistributionConfig extends Config, LogConfig {
* of the
* {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@@ -2836,7 +2836,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@Deprecated
@@ -2846,7 +2846,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@Deprecated
@@ -2857,7 +2857,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -2868,7 +2868,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
* propery
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -2877,7 +2877,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@Deprecated
@@ -2886,7 +2886,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
@Deprecated
@@ -2897,7 +2897,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
*/
@Deprecated
@@ -2907,7 +2907,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@@ -2917,7 +2917,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@Deprecated
@@ -2927,7 +2927,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@Deprecated
@@ -2938,7 +2938,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -2949,7 +2949,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@@ -3002,7 +3002,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
- *
+ *
* @deprecated as of 8.0 use {@link #getHttpServicePort()} instead.
*/
@ConfigAttributeGetter(name = JMX_MANAGER_HTTP_PORT)
@@ -3013,7 +3013,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Set the {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for
* jmx-manager.
- *
+ *
* @param value the port number for jmx-manager HTTP service
*
* @deprecated as of 8.0 use {@link #setHttpServicePort(int)} instead.
@@ -3026,7 +3026,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
- *
+ *
* @deprecated as of 8.0 use {{@link #HTTP_SERVICE_PORT_NAME} instead.
*/
@ConfigAttribute(type = Integer.class, min = 0, max = 65535)
@@ -3035,7 +3035,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
* Current value is a <code>7070</code>
- *
+ *
* @deprecated as of 8.0 use {@link #DEFAULT_HTTP_SERVICE_PORT} instead.
*/
int DEFAULT_JMX_MANAGER_HTTP_PORT = 7070;
@@ -3058,7 +3058,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#MEMCACHED_PORT} property
- *
+ *
* @return the port on which GemFireMemcachedServer should be started
*
* @since GemFire 7.0
@@ -3078,7 +3078,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#MEMCACHED_PROTOCOL} property
- *
+ *
* @return the protocol for GemFireMemcachedServer
*
* @since GemFire 7.0
@@ -3098,7 +3098,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
- *
+ *
* @return the bind address for GemFireMemcachedServer
*
* @since GemFire 7.0
@@ -3115,7 +3115,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#REDIS_PORT} property
- *
+ *
* @return the port on which GeodeRedisServer should be started
*
* @since GemFire 8.0
@@ -3135,7 +3135,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#REDIS_BIND_ADDRESS} property
- *
+ *
* @return the bind address for GemFireRedisServer
*
* @since GemFire 8.0
@@ -3155,7 +3155,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#REDIS_PASSWORD} property
- *
+ *
* @return the authentication password for GemFireRedisServer
*
* @since GemFire 8.0
@@ -3177,7 +3177,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
- *
+ *
* @return the HTTP service port
*
* @since GemFire 8.0
@@ -3190,7 +3190,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Set the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP
* service.
- *
+ *
* @param value the port number for HTTP service
*
* @since GemFire 8.0
@@ -3203,7 +3203,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* The name of the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_PORT}
* property
- *
+ *
* @since GemFire 8.0
*/
@ConfigAttribute(type = Integer.class, min = 0, max = 65535)
@@ -3212,7 +3212,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property. Current
* value is a <code>7070</code>
- *
+ *
* @since GemFire 8.0
*/
int DEFAULT_HTTP_SERVICE_PORT = 7070;
@@ -3222,7 +3222,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
- *
+ *
* @return the bind-address for HTTP service
*
* @since GemFire 8.0
@@ -3235,7 +3235,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Set the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS}
* for HTTP service.
- *
+ *
* @param value the bind-address for HTTP service
*
* @since GemFire 8.0
@@ -3245,7 +3245,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
- *
+ *
* @since GemFire 8.0
*/
@ConfigAttribute(type = String.class)
@@ -3254,7 +3254,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property.
* Current value is an empty string <code>""</code>
- *
+ *
* @since GemFire 8.0
*/
String DEFAULT_HTTP_SERVICE_BIND_ADDRESS = "";
@@ -3263,7 +3263,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@Deprecated
@@ -3272,7 +3272,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
@Deprecated
@@ -3283,7 +3283,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} state.
* <p>
* Actual value of this constant is <code>false</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
*/
@Deprecated
@@ -3293,7 +3293,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
@@ -3304,7 +3304,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the
* {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
@Deprecated
@@ -3314,7 +3314,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
*/
@Deprecated
@@ -3325,7 +3325,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} value.
* <p>
* Actual value of this constant is <code>true</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -3336,7 +3336,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@@ -3346,7 +3346,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@Deprecated
@@ -3355,7 +3355,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
*/
@Deprecated
@@ -3366,7 +3366,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
*/
@Deprecated
@@ -3376,7 +3376,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@@ -3386,7 +3386,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
*/
@Deprecated
@@ -3395,7 +3395,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
*/
@Deprecated
@@ -3406,7 +3406,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS}
*/
@Deprecated
@@ -3416,7 +3416,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
*/
@@ -3426,7 +3426,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@Deprecated
@@ -3435,7 +3435,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@Deprecated
@@ -3446,7 +3446,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
*/
@Deprecated
@@ -3456,7 +3456,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@@ -3467,7 +3467,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@Deprecated
@@ -3477,7 +3477,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@Deprecated
@@ -3488,7 +3488,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -3499,7 +3499,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@@ -3510,7 +3510,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@Deprecated
@@ -3519,7 +3519,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE_TYPE)
@@ -3529,7 +3529,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -3540,7 +3540,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@@ -3550,7 +3550,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@Deprecated
@@ -3559,7 +3559,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
@Deprecated
@@ -3570,7 +3570,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
*/
@Deprecated
@@ -3580,7 +3580,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property The name
* of the {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@@ -3591,7 +3591,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@Deprecated
@@ -3601,7 +3601,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@Deprecated
@@ -3612,7 +3612,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -3623,7 +3623,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@@ -3644,7 +3644,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Returns the value of the
* {@link org.apache.geode.distributed.ConfigurationProperties#START_DEV_REST_API} property
- *
+ *
* @return the value of the property
*
* @since GemFire 8.0
@@ -3658,7 +3658,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* Set the {@link org.apache.geode.distributed.ConfigurationProperties#START_DEV_REST_API} for
* HTTP service.
- *
+ *
* @param value for the property
*
* @since GemFire 8.0
@@ -3671,7 +3671,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p>
* The name of the {@link org.apache.geode.distributed.ConfigurationProperties#START_DEV_REST_API}
* property
- *
+ *
* @since GemFire 8.0
*/
@ConfigAttribute(type = Boolean.class)
@@ -3680,14 +3680,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#START_DEV_REST_API} property. Current
* value is <code>"false"</code>
- *
+ *
* @since GemFire 8.0
*/
boolean DEFAULT_START_DEV_REST_API = false;
/**
* The name of the {@link ConfigurationProperties#DISABLE_AUTO_RECONNECT} property
- *
+ *
* @since GemFire 8.0
*/
@ConfigAttribute(type = Boolean.class)
@@ -3706,7 +3706,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of {@link ConfigurationProperties#DISABLE_AUTO_RECONNECT}
- *
+ *
* @param value the new setting
*/
@ConfigAttributeSetter(name = DISABLE_AUTO_RECONNECT)
@@ -3720,7 +3720,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@Deprecated
@@ -3731,7 +3731,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_ENABLED} state.
* <p>
* Actual value of this constant is <code>false</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
*/
@Deprecated
@@ -3739,7 +3739,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_ENABLED} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_ENABLED} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_ENABLED}
*/
@@ -3749,7 +3749,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
@Deprecated
@@ -3758,7 +3758,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@Deprecated
@@ -3775,7 +3775,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
*/
@Deprecated
@@ -3783,7 +3783,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@@ -3793,7 +3793,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}Â
*/
@Deprecated
@@ -3802,7 +3802,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}Â
*/
@Deprecated
@@ -3813,7 +3813,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_CIPHERS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS}Â
*/
@Deprecated
@@ -3821,7 +3821,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_CIPHERS} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}Â
*/
@@ -3832,7 +3832,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}Â
*/
@Deprecated
@@ -3842,7 +3842,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}Â
*/
@Deprecated
@@ -3853,7 +3853,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} value.
* <p>
* Actual value of this constant is <code>true</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -3863,7 +3863,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@@ -3873,7 +3873,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@Deprecated
@@ -3882,7 +3882,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@Deprecated
@@ -3893,7 +3893,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
*/
@Deprecated
@@ -3902,7 +3902,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@@ -3912,7 +3912,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@Deprecated
@@ -3921,7 +3921,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@Deprecated
@@ -3932,7 +3932,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -3942,7 +3942,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@@ -3952,7 +3952,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@Deprecated
@@ -3961,7 +3961,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@Deprecated
@@ -3972,7 +3972,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -3983,7 +3983,7 @@ public interface DistributionConfig extends Config, LogConfig {
* of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@@ -3993,7 +3993,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@Deprecated
@@ -4002,7 +4002,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setServerSSLTrustStore(String)}
*/
@Deprecated
@@ -4013,7 +4013,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
*/
String DEFAULT_SERVER_SSL_TRUSTSTORE = "";
@@ -4021,7 +4021,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@@ -4032,7 +4032,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@Deprecated
@@ -4041,7 +4041,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@Deprecated
@@ -4052,7 +4052,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -4063,7 +4063,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@@ -4073,7 +4073,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@Deprecated
@@ -4084,7 +4084,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} state.
* <p>
* Actual value of this constant is <code>false</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
*/
@Deprecated
@@ -4092,7 +4092,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_ENABLED} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
@@ -4102,7 +4102,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@Deprecated
@@ -4111,7 +4111,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@Deprecated
@@ -4120,7 +4120,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@Deprecated
@@ -4131,14 +4131,14 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
*/
String DEFAULT_GATEWAY_SSL_PROTOCOLS = "any";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@@ -4148,7 +4148,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}Â
*/
@Deprecated
@@ -4157,7 +4157,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}Â
*/
@Deprecated
@@ -4168,14 +4168,14 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} value.
* <p>
* Actual value of this constant is <code>any</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS}Â
*/
String DEFAULT_GATEWAY_SSL_CIPHERS = "any";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_CIPHERS} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}Â
*/
@@ -4186,7 +4186,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
@Deprecated
@@ -4196,7 +4196,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setGatewaySSLRequireAuthentication(boolean)}
*/
@Deprecated
@@ -4207,7 +4207,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} value.
* <p>
* Actual value of this constant is <code>true</code>.
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
*/
@Deprecated
@@ -4217,7 +4217,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@@ -4227,7 +4227,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@Deprecated
@@ -4236,7 +4236,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@Deprecated
@@ -4247,7 +4247,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
*/
@Deprecated
@@ -4256,7 +4256,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@@ -4266,7 +4266,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@Deprecated
@@ -4275,7 +4275,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@Deprecated
@@ -4286,7 +4286,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
@Deprecated
@@ -4296,7 +4296,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property The name of
* the {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@@ -4307,7 +4307,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@Deprecated
@@ -4316,7 +4316,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@Deprecated
@@ -4327,7 +4327,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
*/
@Deprecated
@@ -4338,7 +4338,7 @@ public interface DistributionConfig extends Config, LogConfig {
* of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@@ -4348,7 +4348,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@Deprecated
@@ -4357,7 +4357,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
@Deprecated
@@ -4368,7 +4368,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
*/
@Deprecated
@@ -4377,7 +4377,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property The name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@@ -4388,7 +4388,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD}
* property.
- *
+ *
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@Deprecated
@@ -4397,7 +4397,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} property.
- *
+ *
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@Deprecated
@@ -4408,7 +4408,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} value.
* <p>
* Actual value of this constant is "".
- *
+ *
* @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
*/
@Deprecated
@@ -4419,7 +4419,7 @@ public interface DistributionConfig extends Config, LogConfig {
* name of the
* {@link org.apache.geode.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD}
* property
- *
+ *
* @deprecated Geode 1.0 use
* {@link org.apache.geode.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@@ -4438,7 +4438,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#LOCK_MEMORY} property. Used to cause pages to be
* locked into memory, thereby preventing them from being swapped to disk.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = Boolean.class)
@@ -4449,7 +4449,7 @@ public interface DistributionConfig extends Config, LogConfig {
* Gets the value of {@link ConfigurationProperties#LOCK_MEMORY}
* <p>
* Gets the value of {@link org.apache.geode.distributed.ConfigurationProperties#LOCK_MEMORY}
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = LOCK_MEMORY)
@@ -4457,7 +4457,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set the value of {@link ConfigurationProperties#LOCK_MEMORY}
- *
+ *
* @param value the new setting
*
* @since Geode 1.0
@@ -4477,7 +4477,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_CLUSTER_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_CLUSTER_ALIAS)
@@ -4485,7 +4485,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_CLUSTER_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_CLUSTER_ALIAS)
@@ -4493,14 +4493,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The Default Cluster SSL alias
- *
+ *
* @since Geode 1.0
*/
String DEFAULT_SSL_ALIAS = "";
/**
* The name of the {@link ConfigurationProperties#SSL_CLUSTER_ALIAS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
@@ -4508,7 +4508,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_LOCATOR_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_LOCATOR_ALIAS)
@@ -4516,7 +4516,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_LOCATOR_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_LOCATOR_ALIAS)
@@ -4524,7 +4524,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SSL_LOCATOR_ALIAS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
@@ -4532,7 +4532,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_GATEWAY_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_GATEWAY_ALIAS)
@@ -4540,7 +4540,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_GATEWAY_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_GATEWAY_ALIAS)
@@ -4548,7 +4548,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SSL_GATEWAY_ALIAS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
@@ -4556,7 +4556,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_CLUSTER_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_WEB_ALIAS)
@@ -4564,7 +4564,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_WEB_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_WEB_ALIAS)
@@ -4572,7 +4572,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SSL_WEB_ALIAS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
@@ -4580,7 +4580,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_JMX_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_JMX_ALIAS)
@@ -4588,7 +4588,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_JMX_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_JMX_ALIAS)
@@ -4596,7 +4596,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SSL_JMX_ALIAS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
@@ -4604,7 +4604,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_SERVER_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_SERVER_ALIAS)
@@ -4612,7 +4612,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_SERVER_ALIAS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_SERVER_ALIAS)
@@ -4620,7 +4620,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SSL_SERVER_ALIAS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
@@ -4628,7 +4628,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_ENABLED_COMPONENTS)
@@ -4636,7 +4636,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property.
- *
+ *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_ENABLED_COMPONENTS)
@@ -4644,7 +4644,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property
- *
+ *
* @since Geode 1.0
*/
@ConfigAttribute(type = SecurableCommunicationChannel[].class)
@@ -4652,7 +4652,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default ssl enabled components
- *
+ *
* @since Geode 1.0
*/
SecurableCommunicationChannel[] DEFAULT_SSL_ENABLED_COMPONENTS =
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
index abaa83c..cceeaf9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
@@ -105,7 +105,7 @@ import org.apache.geode.redis.GeodeRedisServer;
* <p>
* Note that if you add a property to this interface, should should update the
* {@link #DistributionConfigImpl(DistributionConfig) copy constructor}.
- *
+ *
* @see InternalDistributedSystem
* @since GemFire 2.1
*/
@@ -176,7 +176,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/**
* The level at which log messages are logged
- *
+ *
* @see org.apache.geode.internal.logging.LogWriterImpl#levelNameToCode(String)
*/
protected int logLevel = DEFAULT_LOG_LEVEL;
@@ -376,7 +376,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/**
* The level at which security related log messages are logged
- *
+ *
* @see org.apache.geode.internal.logging.LogWriterImpl#levelNameToCode(String)
*/
protected int securityLogLevel = DEFAULT_LOG_LEVEL;
@@ -867,7 +867,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
* Creates a new <code>DistributionConfigImpl</code> with the given non-default configuration
* properties. See {@link org.apache.geode.distributed.DistributedSystem#connect} for a list of
* exceptions that may be thrown.
- *
+ *
* @param nonDefault The configuration properties specified by the caller
*/
public DistributionConfigImpl(Properties nonDefault) {
@@ -878,7 +878,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
* Creates a new <code>DistributionConfigImpl</code> with the given non-default configuration
* properties. See {@link org.apache.geode.distributed.DistributedSystem#connect} for a list of
* exceptions that may be thrown.
- *
+ *
* @param nonDefault The configuration properties specified by the caller
* @param ignoreGemFirePropsFile whether to skip loading distributed system properties from
* gemfire.properties file
@@ -894,7 +894,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
* Creates a new <code>DistributionConfigImpl</code> with the given non-default configuration
* properties. See {@link org.apache.geode.distributed.DistributedSystem#connect} for a list of
* exceptions that may be thrown.
- *
+ *
* @param nonDefault The configuration properties specified by the caller
* @param ignoreGemFirePropsFile whether to skip loading distributed system properties from
* gemfire.properties file
@@ -1095,7 +1095,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/**
* Here we will validate the correctness of the set properties as per the CheckAttributeChecker
* annotations defined in #AbstractDistributionConfig
- *
+ *
* @param props
*/
private void validateConfigurationProperties(final HashMap props) {
@@ -1539,7 +1539,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/**
* Loads the properties from gemfire.properties & gfsecurity.properties files into given
* Properties object.
- *
+ *
* @param p the Properties to fill in
*
* @throws GemFireIOException when error occurs while reading properties file
@@ -1552,7 +1552,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
* Loads the properties from gemfire.properties & gfsecurity.properties files into given
* Properties object. if <code>ignoreGemFirePropsFile</code> is <code>true</code>, properties are
* not read from gemfire.properties.
- *
+ *
* @param p the Properties to fill in
* @param ignoreGemFirePropsFile whether to ignore properties from gemfire.properties
*
@@ -3107,7 +3107,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionConfig#getMembershipPortRange()
*/
public int[] getMembershipPortRange() {
@@ -3116,7 +3116,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionConfig#setMembershipPortRange(int[])
*/
public void setMembershipPortRange(int[] range) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
index e878cce..2f518f7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
@@ -38,7 +38,7 @@ public class DistributionConfigSnapshot extends DistributionConfigImpl {
/**
* Constructs an internal system config given an existing one.
- *
+ *
* @param dc an existing system configuration.
*/
public DistributionConfigSnapshot(DistributionConfig dc) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
index 300c672..339d673 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
@@ -14,6 +14,34 @@
*/
package org.apache.geode.distributed.internal;
+import java.io.NotSerializableException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.ForcedDisconnectException;
@@ -58,33 +86,6 @@ import org.apache.geode.internal.tcp.Connection;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.internal.tcp.ReenteredConnectException;
import org.apache.geode.internal.util.concurrent.StoppableReentrantLock;
-import org.apache.logging.log4j.Logger;
-
-import java.io.NotSerializableException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
/**
* The <code>DistributionManager</code> uses a {@link MembershipManager} to distribute
@@ -195,7 +196,7 @@ public class DistributionManager implements DM {
/**
* Whether or not to include link local addresses in the list of addresses we use to determine if
* two members are no the same host.
- *
+ *
* Added for normura issue 7033 - they have duplicate link local addresses on different boxes
*/
public static volatile boolean INCLUDE_LINK_LOCAL_ADDRESSES =
@@ -206,7 +207,7 @@ public class DistributionManager implements DM {
/**
* The DM type for locator distribution managers
- *
+ *
* @since GemFire 7.0
*/
public static final int LOCATOR_DM_TYPE = 11;
@@ -218,7 +219,7 @@ public class DistributionManager implements DM {
/**
* an NIO priority type
- *
+ *
* @see org.apache.geode.distributed.internal.PooledDistributionMessage
* @see #SERIAL_EXECUTOR
* @see #HIGH_PRIORITY_EXECUTOR
@@ -228,7 +229,7 @@ public class DistributionManager implements DM {
/**
* an NIO priority type
- *
+ *
* @see org.apache.geode.distributed.internal.SerialDistributionMessage
* @see #STANDARD_EXECUTOR
*/
@@ -236,7 +237,7 @@ public class DistributionManager implements DM {
/**
* an NIO priority type
- *
+ *
* @see org.apache.geode.distributed.internal.HighPriorityDistributionMessage
* @see #STANDARD_EXECUTOR
*/
@@ -246,7 +247,7 @@ public class DistributionManager implements DM {
/**
* an NIO priority type
- *
+ *
* @see org.apache.geode.internal.cache.InitialImageOperation
* @see #STANDARD_EXECUTOR
*/
@@ -254,7 +255,7 @@ public class DistributionManager implements DM {
/**
* an NIO priority type
- *
+ *
* @see org.apache.geode.internal.cache.InitialImageOperation
* @see #STANDARD_EXECUTOR
*/
@@ -263,7 +264,7 @@ public class DistributionManager implements DM {
/**
* Executor for view related messages
- *
+ *
* @see org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage
* @see #STANDARD_EXECUTOR
*/
@@ -290,7 +291,7 @@ public class DistributionManager implements DM {
* Is this admin agent used for a command line console. This flag controls whether connect will
* throw an exception or just wait for a DS if one is not available. If true, we will throw an
* exception.
- *
+ *
*/
public static volatile boolean isCommandLineAdminVM = false;
@@ -299,7 +300,7 @@ public class DistributionManager implements DM {
///////////////////// Instance Fields //////////////////////
/** The id of this distribution manager */
- final protected InternalDistributedMember myid;
+ protected final InternalDistributedMember myid;
/**
* The distribution manager type of this dm; set in its constructor.
@@ -317,13 +318,13 @@ public class DistributionManager implements DM {
protected final Object membershipListenersLock = new MembershipListenersLock();
/**
* The <code>MembershipListener</code>s that are registered on this manager for ALL members.
- *
+ *
* @since GemFire 5.7
*/
protected volatile Set allMembershipListeners = Collections.EMPTY_SET;
/**
* A lock to hold while adding and removing all membership listeners.
- *
+ *
* @since GemFire 5.7
*/
protected final Object allMembershipListenersLock = new MembershipListenersLock();
@@ -438,7 +439,7 @@ public class DistributionManager implements DM {
/**
* Thread used to decouple {@link org.apache.geode.internal.cache.partitioned.PartitionMessage}s
* from {@link org.apache.geode.internal.cache.DistributedCacheOperation}s </b>
- *
+ *
* @see #SERIAL_EXECUTOR
*/
private ThreadPoolExecutor partitionedRegionThread;
@@ -451,7 +452,7 @@ public class DistributionManager implements DM {
/**
* Message processing executor for view messages
- *
+ *
* @see org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage
*/
private ThreadPoolExecutor viewThread;
@@ -530,7 +531,7 @@ public class DistributionManager implements DM {
/**
* Given two DistributionManager ids, check to see if they are from the same host address.
- *
+ *
* @param id1 a DistributionManager id
* @param id2 a DistributionManager id
* @return true if id1 and id2 are from the same host, false otherwise
@@ -542,7 +543,7 @@ public class DistributionManager implements DM {
/**
* Creates a new distribution manager and discovers the other members of the distributed system.
* Note that it does not check to see whether or not this VM already has a distribution manager.
- *
+ *
* @param system The distributed system to which this distribution manager will send messages.
*/
public static DistributionManager create(InternalDistributedSystem system) {
@@ -1259,7 +1260,7 @@ public class DistributionManager implements DM {
/**
* Returns true if the two members are on the same equivalent host based on overlapping IP
* addresses collected for all NICs during exchange of startup messages.
- *
+ *
* @param member1 First member
* @param member2 Second member
*/
@@ -1272,7 +1273,7 @@ public class DistributionManager implements DM {
/**
* Set the host equivalencies for a given host. This overrides any previous information in the
* tables.
- *
+ *
* @param equivs list of InetAddress's that all point at same host
*/
public void setEquivalentHosts(Set<InetAddress> equivs) {
@@ -1292,7 +1293,7 @@ public class DistributionManager implements DM {
/**
* Return all of the InetAddress's that are equivalent to the given one (same host)
- *
+ *
* @param in host to match up
* @return all the addresses thus equivalent
*/
@@ -1407,11 +1408,11 @@ public class DistributionManager implements DM {
/**
* Print a membership view (list of {@link InternalDistributedMember}s)
- *
+ *
* @param v the list
* @return String
*/
- static public String printView(NetView v) {
+ public static String printView(NetView v) {
if (v == null)
return "null";
@@ -1515,7 +1516,7 @@ public class DistributionManager implements DM {
/**
* Return when DM is ready to send out messages.
- *
+ *
* @param msg the messsage that is currently being sent
*/
protected void waitUntilReadyToSendMsgs(DistributionMessage msg) {
@@ -1694,7 +1695,7 @@ public class DistributionManager implements DM {
* Gets the value in {@link #hostedLocatorsAll} for a member with one or more hosted locators. The
* value is a collection of host[port] strings. If a bind-address was used for a locator then the
* form is bind-addr[port].
- *
+ *
* @since GemFire 6.6.3
*/
public Collection<String> getHostedLocators(InternalDistributedMember member) {
@@ -1715,7 +1716,7 @@ public class DistributionManager implements DM {
* The keyset of the map are the locator vms in this cluster.
*
* the value is a collection of strings in case one vm can have multiple locators ????
- *
+ *
* @since GemFire 6.6.3
*/
public Map<InternalDistributedMember, Collection<String>> getAllHostedLocators() {
@@ -1728,7 +1729,7 @@ public class DistributionManager implements DM {
* Returns a copy of the map of all members hosting locators with shared configuration. The key is
* the member, and the value is a collection of host[port] strings. If a bind-address was used for
* a locator then the form is bind-addr[port].
- *
+ *
* @since GemFire 8.0
*/
@Override
@@ -1864,7 +1865,7 @@ public class DistributionManager implements DM {
/**
* Send outgoing data; message is guaranteed to be serialized.
- *
+ *
* @return list of recipients who did not receive the message
* @throws InternalGemFireException if message is not serializable
*/
@@ -2066,21 +2067,21 @@ public class DistributionManager implements DM {
/**
* maximum time, in milliseconds, to wait for all threads to exit
*/
- static private final int MAX_STOP_TIME = 20000;
+ private static final int MAX_STOP_TIME = 20000;
/**
* Time to sleep, in milliseconds, while polling to see if threads have finished
*/
- static private final int STOP_PAUSE_TIME = 1000;
+ private static final int STOP_PAUSE_TIME = 1000;
/**
* Maximum number of interrupt attempts to stop a thread
*/
- static private final int MAX_STOP_ATTEMPTS = 10;
+ private static final int MAX_STOP_ATTEMPTS = 10;
/**
* Cheap tool to kill a referenced thread
- *
+ *
* @param t the thread to kill
*/
private void clobberThread(Thread t) {
@@ -2115,7 +2116,7 @@ public class DistributionManager implements DM {
/**
* Cheap tool to examine an executor to see if it is still working
- *
+ *
* @param tpe
* @return true if executor is still active
*/
@@ -2314,7 +2315,7 @@ public class DistributionManager implements DM {
/**
* Returns the transport configuration for this distribution manager
- *
+ *
* @since GemFire 5.0
*/
public RemoteTransportConfig getTransport() {
@@ -2340,7 +2341,7 @@ public class DistributionManager implements DM {
/**
* Adds a <code>MembershipListener</code> to this distribution manager.
- *
+ *
* @since GemFire 5.7
*/
public void addAllMembershipListener(MembershipListener l) {
@@ -2423,7 +2424,7 @@ public class DistributionManager implements DM {
/**
* This thread processes member events as they occur.
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionManager.MemberCrashedEvent
* @see org.apache.geode.distributed.internal.DistributionManager.MemberJoinedEvent
* @see org.apache.geode.distributed.internal.DistributionManager.MemberDepartedEvent
@@ -2613,7 +2614,7 @@ public class DistributionManager implements DM {
/**
* Add a membership listener for all members and return other DistribtionManagerIds as an atomic
* operation
- *
+ *
* @since GemFire 5.7
*/
public Set addAllMembershipListenerAndGetAllIds(MembershipListener l) {
@@ -2890,7 +2891,7 @@ public class DistributionManager implements DM {
/**
* Based on a recent JGroups view, return a member that might be the next elder.
- *
+ *
* @return the elder candidate, possibly this VM.
*/
private InternalDistributedMember getElderCandidate() {
@@ -3188,7 +3189,7 @@ public class DistributionManager implements DM {
/**
* Makes note of a console that has shut down.
- *
+ *
* @param theId The id of the console shutting down
* @param crashed only true if we detect this id to be gone from a javagroup view
*
@@ -3434,7 +3435,7 @@ public class DistributionManager implements DM {
/**
* Send a message that is guaranteed to be serialized
- *
+ *
* @param msg
* @return the recipients who did not receive the message
*/
@@ -3540,7 +3541,7 @@ public class DistributionManager implements DM {
/**
* Schedule a given message appropriately, depending upon its executor kind.
- *
+ *
* @param message
*/
protected void scheduleIncomingMessage(DistributionMessage message) {
@@ -3559,7 +3560,7 @@ public class DistributionManager implements DM {
/**
* Must be read/written while holding {@link #elderMonitor}
- *
+ *
* @see #elderChangeWait()
*/
private boolean waitingForElderChange = false;
@@ -3572,9 +3573,9 @@ public class DistributionManager implements DM {
/**
* This is the "elder" member of the distributed system, responsible for certain types of
* arbitration.
- *
+ *
* Must hold {@link #elderMonitor} in order to change this.
- *
+ *
* @see #getElderId()
*/
protected volatile InternalDistributedMember elder = null;
@@ -3697,7 +3698,7 @@ public class DistributionManager implements DM {
/**
* Waits until elder if newElder or newElder is no longer a member
- *
+ *
* @return true if newElder is the elder; false if he is no longer a member or we are the elder.
*/
public boolean waitForElder(final InternalDistributedMember desiredElder) {
@@ -3910,7 +3911,7 @@ public class DistributionManager implements DM {
/**
* Returns the agent that owns this distribution manager. (in ConsoleDistributionManager)
- *
+ *
* @since GemFire 3.5
*/
public RemoteGfManagerAgent getAgent() {
@@ -3942,7 +3943,7 @@ public class DistributionManager implements DM {
/**
* Returns the health monitor for this distribution manager and owner.
- *
+ *
* @param owner the agent that owns the returned monitor
* @return the health monitor created by the owner; <code>null</code> if the owner has now created
* a monitor.
@@ -3979,7 +3980,7 @@ public class DistributionManager implements DM {
/**
* Remove a monitor that was previously created.
- *
+ *
* @param owner the agent that owns the monitor to remove
*/
public void removeHealthMonitor(InternalDistributedMember owner, int theId) {
@@ -4073,7 +4074,7 @@ public class DistributionManager implements DM {
* multiple serial thread. This class takes care of executing messages related to a sender using
* the same thread.
*/
- static private class SerialQueuedExecutorPool {
+ private static class SerialQueuedExecutorPool {
/** To store the serial threads */
ConcurrentMap serialQueuedExecutorMap = new ConcurrentHashMap(MAX_SERIAL_QUEUE_THREAD);
@@ -4096,7 +4097,7 @@ public class DistributionManager implements DM {
/**
* Constructor.
- *
+ *
* @param group thread group to which the threads will belog to.
* @param stats
*/
@@ -4109,9 +4110,9 @@ public class DistributionManager implements DM {
/*
* Returns an id of the thread in serialQueuedExecutorMap, thats mapped to the given seder.
- *
+ *
* @param sender
- *
+ *
* @param createNew boolean flag to indicate whether to create a new id, if id doesnot exists.
*/
private Integer getQueueId(InternalDistributedMember sender, boolean createNew) {
@@ -4156,7 +4157,7 @@ public class DistributionManager implements DM {
* Returns the serial queue executor, before returning the thread this applies throttling, based
* on the total serial queue size (total - sum of all the serial queue size). The throttling is
* applied during put event, this doesnt block the extract operation on the queue.
- *
+ *
*/
public SerialQueuedExecutorWithDMStats getThrottledSerialExecutor(
InternalDistributedMember sender) {
@@ -4421,7 +4422,7 @@ public class DistributionManager implements DM {
}
- private static abstract class MemberEvent {
+ private abstract static class MemberEvent {
private InternalDistributedMember id;
@@ -4477,7 +4478,7 @@ public class DistributionManager implements DM {
/**
* This is an event reflecting that a InternalDistributedMember has joined the system.
- *
+ *
*
*/
private static class MemberJoinedEvent extends MemberEvent {
@@ -4522,7 +4523,7 @@ public class DistributionManager implements DM {
/**
* This is an event reflecting that a InternalDistributedMember has left the system in an
* unexpected way.
- *
+ *
*
*/
private static class MemberCrashedEvent extends MemberEvent {
@@ -4639,7 +4640,7 @@ public class DistributionManager implements DM {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#getRootCause()
*/
public Throwable getRootCause() {
@@ -4648,7 +4649,7 @@ public class DistributionManager implements DM {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#setRootCause(java.lang.Throwable)
*/
public void setRootCause(Throwable t) {
@@ -4657,9 +4658,9 @@ public class DistributionManager implements DM {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#getMembersOnThisHost()
- *
+ *
* @since GemFire 5.9
*/
public Set<InternalDistributedMember> getMembersInThisZone() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index bf11f7a..20884b2 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
@@ -175,7 +175,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* If true then this message most be sent on an ordered channel. If false then it can be
* unordered.
- *
+ *
* @since GemFire 5.5
*/
public boolean orderedDelivery() {
@@ -210,7 +210,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Causes this message to be send using multicast if v is true.
- *
+ *
* @since GemFire 5.0
*/
public void setMulticast(boolean v) {
@@ -219,7 +219,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Return true if this message should be sent using multicast.
- *
+ *
* @since GemFire 5.0
*/
public boolean getMulticast() {
@@ -335,7 +335,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
protected abstract void process(DistributionManager dm);
@@ -591,7 +591,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Sets the timestamp of this message to the current time (in nanos).
- *
+ *
* @return the number of elapsed nanos since this message's last timestamp
*/
public long resetTimestamp() {
@@ -622,7 +622,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
}
/**
- *
+ *
* @return null if message is not conflatable. Otherwise return a key that can be used to identify
* the entry to conflate.
* @since GemFire 4.2.2
@@ -643,7 +643,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
* Severe alert processing enables suspect processing at the ack-wait-threshold and issuing of a
* severe alert at the end of the ack-severe-alert-threshold. Some messages should not support
* this type of processing (e.g., GII, or DLockRequests)
- *
+ *
* @return whether severe-alert processing may be performed on behalf of this message
*/
public boolean isSevereAlertCompatible() {
@@ -652,7 +652,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Returns true if the message is for internal-use such as a meta-data region.
- *
+ *
* @return true if the message is for internal-use such as a meta-data region
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
index f84bee9..e918e12 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
@@ -17,7 +17,7 @@ package org.apache.geode.distributed.internal;
/**
* This class is a test hook to intercept DistributionMessages in the VM receiving the message.
- *
+ *
*
*/
public abstract class DistributionMessageObserver {
@@ -26,7 +26,7 @@ public abstract class DistributionMessageObserver {
/**
* Set the instance of the observer. Setting to null will clear the observer.
- *
+ *
* @param instance
* @return the old observer, or null if there was no old observer.
*/
@@ -42,7 +42,7 @@ public abstract class DistributionMessageObserver {
/**
* Called before a the process method of the DistributionMessage is called
- *
+ *
* @param dm the distribution manager that received the message
* @param message The message itself
*/
@@ -52,7 +52,7 @@ public abstract class DistributionMessageObserver {
/**
* Called after the process method of the DistributionMessage is called
- *
+ *
* @param dm the distribution manager that received the message
* @param message The message itself
*/
@@ -62,7 +62,7 @@ public abstract class DistributionMessageObserver {
/**
* Called just before a message is distributed.
- *
+ *
* @param dm the distribution manager that's sending the messsage
* @param msg the message itself
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
index 3419b43..ad109bd 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
@@ -22,9 +22,8 @@ import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.logging.LogService;
-// import java.io.*;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.tcp.Buffers;
import org.apache.geode.internal.util.Breadcrumbs;
@@ -42,130 +41,130 @@ public class DistributionStats implements DMStats {
////////////////// Statistic "Id" Fields //////////////////
- private final static StatisticsType type;
- private final static int sentMessagesId;
- private final static int sentCommitMessagesId;
- private final static int commitWaitsId;
- private final static int sentMessagesTimeId;
- private final static int sentMessagesMaxTimeId;
- private final static int broadcastMessagesId;
- private final static int broadcastMessagesTimeId;
- private final static int receivedMessagesId;
- private final static int receivedBytesId;
- private final static int sentBytesId;
- private final static int processedMessagesId;
- private final static int processedMessagesTimeId;
- private final static int messageProcessingScheduleTimeId;
- private final static int messageChannelTimeId;
- private final static int udpDispatchRequestTimeId;
- private final static int replyMessageTimeId;
- private final static int distributeMessageTimeId;
- private final static int nodesId;
- private final static int overflowQueueSizeId;
- private final static int processingThreadsId;
- private final static int serialThreadsId;
- private final static int waitingThreadsId;
- private final static int highPriorityThreadsId;
- private final static int partitionedRegionThreadsId;
- private final static int functionExecutionThreadsId;
- private final static int partitionedRegionThreadJobsId;
- private final static int functionExecutionThreadJobsId;
- private final static int waitingQueueSizeId;
- private final static int overflowQueueThrottleTimeId;
- private final static int overflowQueueThrottleCountId;
- private final static int highPriorityQueueSizeId;
- private final static int highPriorityQueueThrottleTimeId;
- private final static int highPriorityQueueThrottleCountId;
- private final static int partitionedRegionQueueSizeId;
- private final static int partitionedRegionQueueThrottleTimeId;
- private final static int partitionedRegionQueueThrottleCountId;
- private final static int functionExecutionQueueSizeId;
- private final static int functionExecutionQueueThrottleCountId;
- private final static int functionExecutionQueueThrottleTimeId;
- private final static int serialQueueSizeId;
- private final static int serialQueueBytesId;
- private final static int serialPooledThreadId;
- private final static int serialQueueThrottleTimeId;
- private final static int serialQueueThrottleCountId;
- private final static int replyWaitsInProgressId;
- private final static int replyWaitsCompletedId;
- private final static int replyWaitTimeId;
- private final static int replyTimeoutsId;
- private final static int replyWaitMaxTimeId;
- private final static int receiverConnectionsId;
- private final static int failedAcceptsId;
- private final static int failedConnectsId;
- private final static int reconnectAttemptsId;
- private final static int lostConnectionLeaseId;
- private final static int sharedOrderedSenderConnectionsId;
- private final static int sharedUnorderedSenderConnectionsId;
- private final static int threadOrderedSenderConnectionsId;
- private final static int threadUnorderedSenderConnectionsId;
-
- private final static int syncSocketWritesInProgressId;
- private final static int syncSocketWriteTimeId;
- private final static int syncSocketWritesId;
- private final static int syncSocketWriteBytesId;
-
- private final static int ucastReadsId;
- private final static int ucastReadBytesId;
- private final static int ucastWritesId;
- private final static int ucastWriteBytesId;
- private final static int ucastRetransmitsId;
-
- private final static int mcastReadsId;
- private final static int mcastReadBytesId;
- private final static int mcastWritesId;
- private final static int mcastWriteBytesId;
- private final static int mcastRetransmitsId;
- private final static int mcastRetransmitRequestsId;
-
- private final static int serializationTimeId;
- private final static int serializationsId;
- private final static int serializedBytesId;
-
- private final static int pdxSerializationsId;
- private final static int pdxSerializedBytesId;
-
- private final static int deserializationTimeId;
- private final static int deserializationsId;
- private final static int deserializedBytesId;
- private final static int pdxDeserializationsId;
- private final static int pdxDeserializedBytesId;
- private final static int pdxInstanceDeserializationsId;
- private final static int pdxInstanceDeserializationTimeId;
- private final static int pdxInstanceCreationsId;
-
- private final static int msgSerializationTimeId;
- private final static int msgDeserializationTimeId;
-
- private final static int udpMsgEncryptionTimeId;
- private final static int udpMsgDecryptionTimeId;
-
- private final static int batchSendTimeId;
- private final static int batchCopyTimeId;
- private final static int batchWaitTimeId;
- private final static int batchFlushTimeId;
-
- private final static int threadOwnedReceiversId;
- private final static int threadOwnedReceiversId2;
-
- private final static int asyncSocketWritesInProgressId;
- private final static int asyncSocketWritesId;
- private final static int asyncSocketWriteRetriesId;
- private final static int asyncSocketWriteTimeId;
- private final static int asyncSocketWriteBytesId;
-
- private final static int socketLocksInProgressId;
- private final static int socketLocksId;
- private final static int socketLockTimeId;
-
- private final static int bufferAcquiresInProgressId;
- private final static int bufferAcquiresId;
- private final static int bufferAcquireTimeId;
-
- private final static int asyncQueueAddTimeId;
- private final static int asyncQueueRemoveTimeId;
+ private static final StatisticsType type;
+ private static final int sentMessagesId;
+ private static final int sentCommitMessagesId;
+ private static final int commitWaitsId;
+ private static final int sentMessagesTimeId;
+ private static final int sentMessagesMaxTimeId;
+ private static final int broadcastMessagesId;
+ private static final int broadcastMessagesTimeId;
+ private static final int receivedMessagesId;
+ private static final int receivedBytesId;
+ private static final int sentBytesId;
+ private static final int processedMessagesId;
+ private static final int processedMessagesTimeId;
+ private static final int messageProcessingScheduleTimeId;
+ private static final int messageChannelTimeId;
+ private static final int udpDispatchRequestTimeId;
+ private static final int replyMessageTimeId;
+ private static final int distributeMessageTimeId;
+ private static final int nodesId;
+ private static final int overflowQueueSizeId;
+ private static final int processingThreadsId;
+ private static final int serialThreadsId;
+ private static final int waitingThreadsId;
+ private static final int highPriorityThreadsId;
+ private static final int partitionedRegionThreadsId;
+ private static final int functionExecutionThreadsId;
+ private static final int partitionedRegionThreadJobsId;
+ private static final int functionExecutionThreadJobsId;
+ private static final int waitingQueueSizeId;
+ private static final int overflowQueueThrottleTimeId;
+ private static final int overflowQueueThrottleCountId;
+ private static final int highPriorityQueueSizeId;
+ private static final int highPriorityQueueThrottleTimeId;
+ private static final int highPriorityQueueThrottleCountId;
+ private static final int partitionedRegionQueueSizeId;
+ private static final int partitionedRegionQueueThrottleTimeId;
+ private static final int partitionedRegionQueueThrottleCountId;
+ private static final int functionExecutionQueueSizeId;
+ private static final int functionExecutionQueueThrottleCountId;
+ private static final int functionExecutionQueueThrottleTimeId;
+ private static final int serialQueueSizeId;
+ private static final int serialQueueBytesId;
+ private static final int serialPooledThreadId;
+ private static final int serialQueueThrottleTimeId;
+ private static final int serialQueueThrottleCountId;
+ private static final int replyWaitsInProgressId;
+ private static final int replyWaitsCompletedId;
+ private static final int replyWaitTimeId;
+ private static final int replyTimeoutsId;
+ private static final int replyWaitMaxTimeId;
+ private static final int receiverConnectionsId;
+ private static final int failedAcceptsId;
+ private static final int failedConnectsId;
+ private static final int reconnectAttemptsId;
+ private static final int lostConnectionLeaseId;
+ private static final int sharedOrderedSenderConnectionsId;
+ private static final int sharedUnorderedSenderConnectionsId;
+ private static final int threadOrderedSenderConnectionsId;
+ private static final int threadUnorderedSenderConnectionsId;
+
+ private static final int syncSocketWritesInProgressId;
+ private static final int syncSocketWriteTimeId;
+ private static final int syncSocketWritesId;
+ private static final int syncSocketWriteBytesId;
+
+ private static final int ucastReadsId;
+ private static final int ucastReadBytesId;
+ private static final int ucastWritesId;
+ private static final int ucastWriteBytesId;
+ private static final int ucastRetransmitsId;
+
+ private static final int mcastReadsId;
+ private static final int mcastReadBytesId;
+ private static final int mcastWritesId;
+ private static final int mcastWriteBytesId;
+ private static final int mcastRetransmitsId;
+ private static final int mcastRetransmitRequestsId;
+
+ private static final int serializationTimeId;
+ private static final int serializationsId;
+ private static final int serializedBytesId;
+
+ private static final int pdxSerializationsId;
+ private static final int pdxSerializedBytesId;
+
+ private static final int deserializationTimeId;
+ private static final int deserializationsId;
+ private static final int deserializedBytesId;
+ private static final int pdxDeserializationsId;
+ private static final int pdxDeserializedBytesId;
+ private static final int pdxInstanceDeserializationsId;
+ private static final int pdxInstanceDeserializationTimeId;
+ private static final int pdxInstanceCreationsId;
+
+ private static final int msgSerializationTimeId;
+ private static final int msgDeserializationTimeId;
+
+ private static final int udpMsgEncryptionTimeId;
+ private static final int udpMsgDecryptionTimeId;
+
+ private static final int batchSendTimeId;
+ private static final int batchCopyTimeId;
+ private static final int batchWaitTimeId;
+ private static final int batchFlushTimeId;
+
+ private static final int threadOwnedReceiversId;
+ private static final int threadOwnedReceiversId2;
+
+ private static final int asyncSocketWritesInProgressId;
+ private static final int asyncSocketWritesId;
+ private static final int asyncSocketWriteRetriesId;
+ private static final int asyncSocketWriteTimeId;
+ private static final int asyncSocketWriteBytesId;
+
+ private static final int socketLocksInProgressId;
+ private static final int socketLocksId;
+ private static final int socketLockTimeId;
+
+ private static final int bufferAcquiresInProgressId;
+ private static final int bufferAcquiresId;
+ private static final int bufferAcquireTimeId;
+
+ private static final int asyncQueueAddTimeId;
+ private static final int asyncQueueRemoveTimeId;
private static final int asyncQueuesId;
private static final int asyncQueueFlushesInProgressId;
@@ -204,37 +203,37 @@ public class DistributionStats implements DMStats {
private static final int replyHandoffTimeId;
- private final static int viewThreadsId;
- private final static int serialThreadJobsId;
- private final static int viewProcessorThreadJobsId;
- private final static int serialPooledThreadJobsId;
- private final static int pooledMessageThreadJobsId;
- private final static int highPriorityThreadJobsId;
- private final static int waitingPoolThreadJobsId;
+ private static final int viewThreadsId;
+ private static final int serialThreadJobsId;
+ private static final int viewProcessorThreadJobsId;
+ private static final int serialPooledThreadJobsId;
+ private static final int pooledMessageThreadJobsId;
+ private static final int highPriorityThreadJobsId;
+ private static final int waitingPoolThreadJobsId;
- private final static int eldersId;
- private final static int initialImageMessagesInFlightId;
- private final static int initialImageRequestsInProgressId;
+ private static final int eldersId;
+ private static final int initialImageMessagesInFlightId;
+ private static final int initialImageRequestsInProgressId;
// For GMSHealthMonitor
- private final static int heartbeatRequestsSentId;
- private final static int heartbeatRequestsReceivedId;
- private final static int heartbeatsSentId;
- private final static int heartbeatsReceivedId;
- private final static int suspectsSentId;
- private final static int suspectsReceivedId;
- private final static int finalCheckRequestsSentId;
- private final static int finalCheckRequestsReceivedId;
- private final static int finalCheckResponsesSentId;
- private final static int finalCheckResponsesReceivedId;
- private final static int tcpFinalCheckRequestsSentId;
- private final static int tcpFinalCheckRequestsReceivedId;
- private final static int tcpFinalCheckResponsesSentId;
- private final static int tcpFinalCheckResponsesReceivedId;
- private final static int udpFinalCheckRequestsSentId;
- private final static int udpFinalCheckRequestsReceivedId;
- private final static int udpFinalCheckResponsesSentId;
- private final static int udpFinalCheckResponsesReceivedId;
+ private static final int heartbeatRequestsSentId;
+ private static final int heartbeatRequestsReceivedId;
+ private static final int heartbeatsSentId;
+ private static final int heartbeatsReceivedId;
+ private static final int suspectsSentId;
+ private static final int suspectsReceivedId;
+ private static final int finalCheckRequestsSentId;
+ private static final int finalCheckRequestsReceivedId;
+ private static final int finalCheckResponsesSentId;
+ private static final int finalCheckResponsesReceivedId;
+ private static final int tcpFinalCheckRequestsSentId;
+ private static final int tcpFinalCheckRequestsReceivedId;
+ private static final int tcpFinalCheckResponsesSentId;
+ private static final int tcpFinalCheckResponsesReceivedId;
+ private static final int udpFinalCheckRequestsSentId;
+ private static final int udpFinalCheckRequestsReceivedId;
+ private static final int udpFinalCheckResponsesSentId;
+ private static final int udpFinalCheckResponsesReceivedId;
static {
String statName = "DistributionStats";
@@ -965,7 +964,7 @@ public class DistributionStats implements DMStats {
/**
* Returns the current NanoTime or, if clock stats are disabled, zero.
- *
+ *
* @since GemFire 5.0
*/
public static long getStatTime() {
@@ -1777,7 +1776,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the overflow queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public ThrottledQueueStatHelper getOverflowQueueHelper() {
@@ -1807,7 +1806,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the waiting queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public QueueStatHelper getWaitingQueueHelper() {
@@ -1829,7 +1828,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the high priority queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public ThrottledQueueStatHelper getHighPriorityQueueHelper() {
@@ -1859,7 +1858,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the partitioned region queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 5.0
*/
public ThrottledQueueStatHelper getPartitionedRegionQueueHelper() {
@@ -1889,7 +1888,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the partitioned region pool can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 5.0.2
*/
public PoolStatHelper getPartitionedRegionPoolHelper() {
@@ -1907,7 +1906,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the function execution queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 6.0
*/
public ThrottledQueueStatHelper getFunctionExecutionQueueHelper() {
@@ -1937,7 +1936,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the function execution pool can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 6.0
*/
public PoolStatHelper getFunctionExecutionPoolHelper() {
@@ -1955,7 +1954,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the serial queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public ThrottledMemQueueStatHelper getSerialQueueHelper() {
@@ -1993,7 +1992,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the normal pool can record its stats to the proper distribution
* stats.
- *
+ *
* @since GemFire 3.5
*/
public PoolStatHelper getNormalPoolHelper() {
@@ -2011,7 +2010,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the waiting pool can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public PoolStatHelper getWaitingPoolHelper() {
@@ -2029,7 +2028,7 @@ public class DistributionStats implements DMStats {
/**
* Returns a helper object so that the highPriority pool can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public PoolStatHelper getHighPriorityPoolHelper() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/FlowControlParams.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/FlowControlParams.java
index 8367fbb..e4594eb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/FlowControlParams.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/FlowControlParams.java
@@ -26,7 +26,7 @@ package org.apache.geode.distributed.internal;
* <p>
* The byteAllowance and rechargeBlockMs settings are used in hashcode calculations, and should not
* be changed if the hashcode of a FlowControlParams needs to remain invariant.
- *
+ *
* @since GemFire 5.0
*/
@@ -107,5 +107,3 @@ public class FlowControlParams implements java.io.Serializable {
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
index 3f3eaba..3c792ff 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
@@ -15,23 +15,23 @@
package org.apache.geode.distributed.internal;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.util.List;
import java.util.concurrent.*;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* A ThreadPoolExecutor with stat support. This executor also has a buffer that rejected executions
* spill over into.
- *
+ *
* This executor has also been modified to handle rejected execution in one of three ways: If the
* executor is for function execution we ignore size caps on the thread pool<br>
* If the executor has a SynchronousQueue or SynchronousQueueNoSpin then rejected executions are run
* in the current thread.<br>
* Otherwise a thread is started in the pool that buffers the rejected tasks and puts them back into
* the executor.
- *
+ *
*/
public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor {
protected final PoolStatHelper stats;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitor.java
index 531dfaa..e4a682c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitor.java
@@ -19,7 +19,7 @@ import org.apache.geode.admin.GemFireHealth;
/**
* Represents a thread that monitor the health of the vm it lives in.
- *
+ *
* @since GemFire 3.5
*/
public interface HealthMonitor {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java
index 370d893..2d1793b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Implements a thread that monitors the health of the vm it lives in.
- *
+ *
* @since GemFire 3.5
*/
public class HealthMonitorImpl implements HealthMonitor, Runnable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
index 93ebe55..39879a8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* reply. This guarantees that all high priority messages have been received and applied to the
* cache. Their reply messages may not necessarily have been sent back or processed (if they have
* any).
- *
+ *
* @since GemFire 5.1
*/
public class HighPriorityAckedMessage extends HighPriorityDistributionMessage
@@ -58,7 +58,7 @@ public class HighPriorityAckedMessage extends HighPriorityDistributionMessage
};
transient DistributionManager originDm;
- transient private ReplyProcessor21 rp;
+ private transient ReplyProcessor21 rp;
private boolean useNative;
public HighPriorityAckedMessage() {
@@ -106,7 +106,7 @@ public class HighPriorityAckedMessage extends HighPriorityDistributionMessage
/**
* send the message and wait for replies
- *
+ *
* @param recipients the destination manager ids
* @param multicast whether to use multicast or unicast
* @throws InterruptedException if the operation is interrupted (as by shutdown)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index eaf2bc3..382ba6a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -113,34 +113,11 @@ import org.apache.geode.management.ManagementException;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.lang.reflect.Array;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
/**
* The concrete implementation of {@link DistributedSystem} that provides internal-only
* functionality.
- *
+ *
* @since GemFire 3.0
*/
public class InternalDistributedSystem extends DistributedSystem
@@ -275,18 +252,18 @@ public class InternalDistributedSystem extends DistributedSystem
* insure consistency with LoggingThreadGroup. Due to Bug 38407, be careful about moving this to
* another class.
*/
- public final static String SHUTDOWN_HOOK_NAME = "Distributed system shutdown hook";
+ public static final String SHUTDOWN_HOOK_NAME = "Distributed system shutdown hook";
/**
* A property to prevent shutdown hooks from being registered with the VM. This is regarding bug
* 38407
*/
- public final static String DISABLE_SHUTDOWN_HOOK_PROPERTY =
+ public static final String DISABLE_SHUTDOWN_HOOK_PROPERTY =
DistributionConfig.GEMFIRE_PREFIX + "disableShutdownHook";
/**
* A property to append to existing log-file instead of truncating it.
*/
- public final static String APPEND_TO_LOG_FILE = DistributionConfig.GEMFIRE_PREFIX + "append-log";
+ public static final String APPEND_TO_LOG_FILE = DistributionConfig.GEMFIRE_PREFIX + "append-log";
//////////////////// Configuration Fields ////////////////////
@@ -381,7 +358,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Returns a connection to the distributed system that is suitable for administration. For
* administration, we are not as strict when it comes to existing connections.
- *
+ *
* @since GemFire 4.0
*/
public static DistributedSystem connectForAdmin(Properties props) {
@@ -394,7 +371,7 @@ public class InternalDistributedSystem extends DistributedSystem
* <p>
* <p>
* author bruce
- *
+ *
* @since GemFire 5.0
*/
public static InternalDistributedSystem getConnectedInstance() {
@@ -416,7 +393,7 @@ public class InternalDistributedSystem extends DistributedSystem
* size existingSystems uses copy-on-write.
* <p>
* author bruce
- *
+ *
* @since GemFire 5.0
*/
public static InternalDistributedSystem unsafeGetConnectedInstance() {
@@ -493,7 +470,7 @@ public class InternalDistributedSystem extends DistributedSystem
* Creates a new <code>InternalDistributedSystem</code> with the given configuration properties.
* Does all of the magic of finding the "default" values of properties. See
* {@link DistributedSystem#connect} for a list of exceptions that may be thrown.
- *
+ *
* @param nonDefault The non-default configuration properties specified by the caller
*
* @see DistributedSystem#connect
@@ -546,7 +523,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Registers a listener to the system
- *
+ *
* @param listener listener to be added
*/
public void addResourceListener(ResourceEventsListener listener) {
@@ -555,7 +532,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Un-Registers a listener to the system
- *
+ *
* @param listener listener to be removed
*/
public void removeResourceListener(ResourceEventsListener listener) {
@@ -571,7 +548,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Handles a particular event associated with a resource
- *
+ *
* @param event Resource event
* @param resource resource on which event is generated
*/
@@ -903,7 +880,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Checks whether or not this connection to a distributed system is closed.
- *
+ *
* @throws DistributedSystemDisconnectedException This connection has been
* {@link #disconnect(boolean, String, boolean) disconnected}
*/
@@ -992,7 +969,7 @@ public class InternalDistributedSystem extends DistributedSystem
/*
* public Cache myCache;
- *
+ *
* public void setCache(Cache cache){ myCache=cache; } public Cache getCache(){ return myCache; }
*/
@@ -1021,7 +998,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Disconnects this member from the distributed system when an internal error has caused
* distribution to fail (e.g., this member was shunned)
- *
+ *
* @param reason a string describing why the disconnect is occurring
* @param cause an optional exception showing the reason for abnormal disconnect
* @param shunned whether this member was shunned by the membership coordinator
@@ -1044,13 +1021,13 @@ public class InternalDistributedSystem extends DistributedSystem
* This is how much time, in milliseconds to allow a disconnect listener to run before we
* interrupt it.
*/
- static private final long MAX_DISCONNECT_WAIT =
+ private static final long MAX_DISCONNECT_WAIT =
Long.getLong("DistributionManager.DISCONNECT_WAIT", 10 * 1000).longValue();
/**
* Run a disconnect listener, checking for errors and honoring the timeout
* {@link #MAX_DISCONNECT_WAIT}.
- *
+ *
* @param dc the listener to run
*/
private void runDisconnect(final DisconnectListener dc, ThreadGroup tg) {
@@ -1112,7 +1089,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Run a disconnect listener in the same thread sequence as the reconnect.
- *
+ *
* @param dc the listener to run
* @param tg the thread group to run the listener in
*/
@@ -1136,7 +1113,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Disconnect cache, run disconnect listeners.
- *
+ *
* @param doReconnect whether a reconnect will be done
* @param reason the reason that the system is disconnecting
*
@@ -1172,7 +1149,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Process the shutdown listeners. It is essential that the DM has been shut down before calling
* this step, to ensure that no new listeners are registering.
- *
+ *
* @param shutdownListeners shutdown listeners initially registered with us
*/
private void doShutdownListeners(HashSet shutdownListeners) {
@@ -1258,10 +1235,10 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Ensure that the MembershipManager class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
- static public void loadEmergencyClasses() {
+ public static void loadEmergencyClasses() {
if (emergencyClassesLoaded) {
return;
}
@@ -1271,7 +1248,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Closes the membership manager
- *
+ *
* @see SystemFailure#emergencyClose()
*/
public void emergencyClose() {
@@ -1330,7 +1307,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Disconnects this VM from the distributed system. Shuts down the distribution manager.
- *
+ *
* @param preparingForReconnect true if called by a reconnect operation
* @param reason the reason the disconnect is being performed
* @param keepAlive true if user requested durable subscriptions are to be retained at server.
@@ -1515,7 +1492,7 @@ public class InternalDistributedSystem extends DistributedSystem
* If this DistributedSystem is attempting to reconnect to the distributed system this will return
* the quorum checker created by the old MembershipManager for checking to see if a quorum of old
* members can be reached.
- *
+ *
* @return the quorum checking service
*/
public QuorumChecker getQuorumChecker() {
@@ -1532,7 +1509,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Returns whether or not this distributed system has the same configuration as the given set of
* properties.
- *
+ *
* @see DistributedSystem#connect
*/
public boolean sameAs(Properties props, boolean isConnected) {
@@ -1552,7 +1529,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Returns whether or not the given configuration properties refer to the same distributed system
* as this <code>InternalDistributedSystem</code> connection.
- *
+ *
* @since GemFire 4.0
*/
public boolean sameSystemAs(Properties props) {
@@ -1581,7 +1558,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Canonicalizes a locators string so that they may be compared.
- *
+ *
* @since GemFire 4.0
*/
private static String canonicalizeLocators(String locators) {
@@ -1623,7 +1600,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Returns the id of this connection to the distributed system. This is actually the port of the
* distribution manager's distribution channel.
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionChannel#getId
*/
@Override
@@ -1703,7 +1680,7 @@ public class InternalDistributedSystem extends DistributedSystem
* Since {@link DistributedSystem#connect} guarantees that there is a canonical instance of
* <code>DistributedSystem</code> for each configuration, we can use the default implementation of
* <code>equals</code>.
- *
+ *
* @see #sameAs
*/
@Override
@@ -1893,7 +1870,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Used to "visit" each instance of Statistics registered with
- *
+ *
* @see #visitStatistics
*/
public interface StatisticsVisitor {
@@ -1989,7 +1966,7 @@ public class InternalDistributedSystem extends DistributedSystem
// StatisticsTypeFactory methods
- private final static StatisticsTypeFactory tf = StatisticsTypeFactoryImpl.singleton();
+ private static final StatisticsTypeFactory tf = StatisticsTypeFactoryImpl.singleton();
/**
* Creates or finds a StatisticType for the given shared class.
@@ -2067,7 +2044,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Makes note of a <code>ConnectListener</code> whose <code>onConnect</code> method will be
* invoked when a connection is created to a distributed system.
- *
+ *
* @return set of currently existing system connections
*/
public static List addConnectListener(ConnectListener listener) {
@@ -2099,7 +2076,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Removes a <code>ConnectListener</code> from the list of listeners that will be notified when a
* connection is created to a distributed system.
- *
+ *
* @return true if listener was in the list
*/
public static boolean removeConnectListener(ConnectListener listener) {
@@ -2188,7 +2165,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Notifies all resource event listeners. All exceptions are caught here and only a warning
* message is printed in the log
- *
+ *
* @param event Enumeration depicting particular resource event
* @param resource the actual resource object.
*/
@@ -2254,7 +2231,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Removes a <code>DisconnectListener</code> from the list of listeners that will be notified when
* this connection to the distributed system is disconnected.
- *
+ *
* @return true if listener was in the list
*/
public boolean removeDisconnectListener(DisconnectListener listener) {
@@ -2295,7 +2272,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Fires an "informational" <code>SystemMembershipEvent</code> in admin VMs.
- *
+ *
* @since GemFire 4.0
*/
public void fireInfoEvent(Object callback) {
@@ -2361,7 +2338,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Invoked before a connection to the distributed system is disconnected.
- *
+ *
* @param sys the the system we are disconnecting from process should take before returning.
*/
void onDisconnect(InternalDistributedSystem sys);
@@ -2375,7 +2352,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Invoked when reconnect attempts are initiated
- *
+ *
* @param oldSystem the old DS, which is in a partially disconnected state and cannot be used
* for messaging
*/
@@ -2383,7 +2360,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Invoked after a reconnect to the distributed system
- *
+ *
* @param oldSystem the old DS
* @param newSystem the new DS
*/
@@ -2397,7 +2374,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Invoked after the connection to the distributed system has been disconnected
- *
+ *
* @param sys
*/
void onShutdown(InternalDistributedSystem sys);
@@ -2406,7 +2383,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Integer representing number of tries already made to reconnect and that failed.
*/
- private volatile static int reconnectAttemptCounter = 0;
+ private static volatile int reconnectAttemptCounter = 0;
/**
* The time at which reconnect attempts last began
@@ -2521,7 +2498,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Tries to reconnect to the distributed system on role loss if configure to reconnect.
- *
+ *
* @param oldCache cache that has apparently failed
*/
public boolean tryReconnect(boolean forcedDisconnect, String reason, InternalCache oldCache) {
@@ -2903,7 +2880,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Validates that the configuration provided is the same as the configuration for this
* InternalDistributedSystem
- *
+ *
* @param propsToCheck the Properties instance to compare with the existing Properties
*
* @throws IllegalStateException when the configuration is not the same other returns
@@ -3009,7 +2986,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* see {@link org.apache.geode.admin.AdminDistributedSystemFactory}
- *
+ *
* @since GemFire 5.7
*/
public static void setEnableAdministrationOnly(boolean adminOnly) {
@@ -3030,7 +3007,7 @@ public class InternalDistributedSystem extends DistributedSystem
* distributed system. GemFire distributed system coordinator adjusts each member's time by an
* offset. This offset for each member is calculated based on Berkeley Time Synchronization
* algorithm.
- *
+ *
* @return time in milliseconds.
*/
public long systemTimeMillis() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
index 06603cc..942bbf2 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
@@ -96,7 +96,7 @@ import org.apache.geode.management.internal.configuration.messages.SharedConfigu
* The startLocator() methods provide a way to start all three services in one call. Otherwise, the
* services can be started independently {@code locator = createLocator();
* locator.startPeerLocation(); locator.startDistributeSystem();}
- *
+ *
* @since GemFire 4.0
*/
public class InternalLocator extends Locator implements ConnectListener {
@@ -249,7 +249,7 @@ public class InternalLocator extends Locator implements ConnectListener {
* Create a locator that listens on a given port. This locator will not have peer or server
* location services available until they are started by calling startServerLocation or
* startPeerLocation on the locator object.
- *
+ *
* @param port the tcp/ip port to listen on
* @param logFile the file that log messages should be written to
* @param stateFile the file that state should be read from / written to for recovery
@@ -290,7 +290,7 @@ public class InternalLocator extends Locator implements ConnectListener {
* Creates a distribution locator that runs in this VM on the given port and bind address.
* <p>
* This is for internal use only as it does not create a distributed system unless told to do so.
- *
+ *
* @param port the tcp/ip port to listen on
* @param logFile the file that log messages should be written to
* @param logger a log writer that should be used (logFile parameter is ignored)
@@ -362,7 +362,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/***
* Determines if this VM is a locator which must ignore a shutdown.
- *
+ *
* @return true if this VM is a locator which should ignore a shutdown , false if it is a normal
* member.
*/
@@ -386,7 +386,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* Creates a new {@code Locator} with the given port, log file, logger, and bind address.
- *
+ *
* @param port the tcp/ip port to listen on
* @param logF the file that log messages should be written to
* @param stateF the file that state should be read from / written to for recovery
@@ -590,7 +590,7 @@ public class InternalLocator extends Locator implements ConnectListener {
* For backward-compatibility we retain this method
* <p>
* TODO: parameters peerLocator and serverLocator and b1 are never used
- *
+ *
* @deprecated use a form of the method that does not have peerLocator/serverLocator parameters
*/
@Deprecated
@@ -631,7 +631,7 @@ public class InternalLocator extends Locator implements ConnectListener {
* Start a distributed system whose life cycle is managed by this locator. When the locator is
* stopped, this distributed system will be disconnected. If a distributed system already exists,
* this method will have no affect.
- *
+ *
* @since GemFire 5.7
*/
private void startDistributedSystem() throws UnknownHostException {
@@ -728,7 +728,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* End the initialization of the locator. This method should be called once the location services
* and distributed system are started.
- *
+ *
* @param distributedSystem The distributed system to use for the statistics.
*
* @since GemFire 5.7
@@ -754,7 +754,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* Start server location services in this locator. Server location can only be started once there
* is a running distributed system.
- *
+ *
* @param distributedSystem The distributed system which the server location services should use.
* If null, the method will try to find an already connected distributed system.
*
@@ -805,7 +805,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* Stop this locator
- *
+ *
* @param stopForReconnect - stopping for distributed system reconnect
* @param waitForDisconnect - wait up to 60 seconds for the locator to completely stop
*/
@@ -936,7 +936,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* Waits for a locator to be told to stop.
- *
+ *
* @throws InterruptedException thrown if the thread is interrupted
*/
public void waitToStop() throws InterruptedException {
@@ -1004,7 +1004,7 @@ public class InternalLocator extends Locator implements ConnectListener {
* succeeds. It will then wait for the system to finish reconnecting before returning. If quorum
* checks are not being done this merely waits for the distributed system to reconnect and then
* starts location services.
- *
+ *
* @return true if able to reconnect the locator to the new distributed system
*/
private boolean attemptReconnect() throws InterruptedException, IOException {
@@ -1139,7 +1139,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* Return the port on which the locator is actually listening. If called before the locator has
* actually started, this method will return null.
- *
+ *
* @return the port the locator is listening on or null if it has not yet been started
*/
@Override
@@ -1342,7 +1342,7 @@ public class InternalLocator extends Locator implements ConnectListener {
/**
* Returns collection of locator strings representing every locator instance hosted by this
* member.
- *
+ *
* @see #getLocators()
*/
public static Collection<String> getLocatorStrings() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
index 6b19a12..364b92a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
@@ -39,9 +39,9 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
/**
* A data structure used to hold load information for a locator
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public class LocatorLoadSnapshot {
private final Map/* <ServerLocation, String[]> */ serverGroupMap = new HashMap();
@@ -172,7 +172,7 @@ public class LocatorLoadSnapshot {
/**
* Pick the least loaded server in the given group
- *
+ *
* @param group the group, or null or "" if the client has no server group.
* @param excludedServers a list of servers to exclude as choices
* @return the least loaded server, or null if there are no servers that aren't excluded.
@@ -234,7 +234,7 @@ public class LocatorLoadSnapshot {
/**
* Pick the least loaded server in the given group if currentServer is the most loaded server. n
- *
+ *
* @param group the group, or null or "" if the client has no server group.
* @param excludedServers a list of servers to exclude as choices
* @return currentServer if it is not the most loaded, null if there are no servers that aren't
@@ -275,7 +275,7 @@ public class LocatorLoadSnapshot {
/**
* Pick the least loaded servers in the given group.
- *
+ *
* @param group the group, or null or "" if the client has no server group.
* @param excludedServers a list of servers to exclude as choices
* @param count how many distinct servers to pick.
@@ -288,7 +288,7 @@ public class LocatorLoadSnapshot {
/**
* Pick the least loaded servers in the given group.
- *
+ *
* @param id the id of the client creating the queue
* @param group the group, or null or "" if the client has no server group.
* @param excludedServers a list of servers to exclude as choices
@@ -493,7 +493,7 @@ public class LocatorLoadSnapshot {
/**
* Remove the task from the estimate map at the given key.
- *
+ *
* @return true it task was removed; false if it was not the task mapped to key
*/
protected boolean removeIfPresentEstimate(EstimateMapKey key, LoadEstimateTask task) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
index 1f51a8d..4ee4f54 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
@@ -14,17 +14,17 @@
*/
package org.apache.geode.distributed.internal;
-import org.apache.geode.*;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import org.apache.geode.*;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* This class maintains statistics for the locator
- *
+ *
* @since GemFire 5.7
*/
public class LocatorStats {
@@ -53,10 +53,10 @@ public class LocatorStats {
private static final int _REQUESTS_TO_LOCATOR;
private static final int _RESPONSES_FROM_LOCATOR;
private static final int _ENDPOINTS_KNOWN;
- private final static int _REQUESTS_IN_PROGRESS;
- private final static int _REQUEST_TIME;
- private final static int _RESPONSE_TIME;
- private final static int _SERVER_LOAD_UPDATES;
+ private static final int _REQUESTS_IN_PROGRESS;
+ private static final int _REQUEST_TIME;
+ private static final int _RESPONSE_TIME;
+ private static final int _SERVER_LOAD_UPDATES;
private Statistics _stats = null;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index 970a083..8bbe019 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.distributed.internal;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+import java.util.concurrent.*;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.distributed.DistributedMember;
@@ -24,17 +30,11 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.MemberAttributes;
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
-
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.*;
+import org.apache.geode.internal.net.SocketCreator;
/**
* A <code>LonerDistributionManager</code> is a dm that never communicates with anyone else.
@@ -89,11 +89,11 @@ public class LonerDistributionManager implements DM {
* org.apache.geode.internal.OSProcess.getId(), DistributionManager.LONER_DM_TYPE,
* MemberAttributes.parseRoles(system.getConfig().getRoles())); id = new
* InternalDistributedMember(host, 65535); // noise value for port number
- *
+ *
* } catch (UnknownHostException ex) { throw new InternalError(LocalizedStrings.
* LonerDistributionManager_CANNOT_RESOLVE_LOCAL_HOST_NAME_TO_AN_IP_ADDRESS.toLocalizedString());
* }
- *
+ *
* }
*/
@@ -101,7 +101,7 @@ public class LonerDistributionManager implements DM {
private final List<InternalDistributedMember> viewMembers;
private ConcurrentMap<InternalDistributedMember, InternalDistributedMember> canonicalIds =
new ConcurrentHashMap();
- static private final DummyDMStats stats = new DummyDMStats();
+ private static final DummyDMStats stats = new DummyDMStats();
private final ExecutorService executor = Executors.newCachedThreadPool();
@Override
@@ -1208,7 +1208,7 @@ public class LonerDistributionManager implements DM {
* update the loner port with an integer that may be more unique than the default port (zero).
* This updates the ID in place and establishes new default settings for the manufacture of new
* IDs.
- *
+ *
* @param newPort the new port to use
*/
public void updateLonerPort(int newPort) {
@@ -1257,7 +1257,7 @@ public class LonerDistributionManager implements DM {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#getMembershipManager()
*/
public MembershipManager getMembershipManager() {
@@ -1267,7 +1267,7 @@ public class LonerDistributionManager implements DM {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#getRootCause()
*/
public Throwable getRootCause() {
@@ -1276,16 +1276,16 @@ public class LonerDistributionManager implements DM {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#setRootCause(java.lang.Throwable)
*/
public void setRootCause(Throwable t) {}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DM#getMembersOnThisHost()
- *
+ *
* @since GemFire 5.9
*/
public Set<InternalDistributedMember> getMembersInThisZone() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java
index a701c24..71e7f5c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java
@@ -49,7 +49,7 @@ public interface MembershipListener {
/**
* This method is invoked after the group membership service has suspected that a member is no
* longer alive, but has not yet been removed from the membership view
- *
+ *
* @param id the suspected member
* @param whoSuspected the member that initiated suspect processing
* @param reason the reason the member was suspected
@@ -60,7 +60,7 @@ public interface MembershipListener {
/**
* This is notification that more than 50% of member weight has been lost in a single view change.
* Notification is performed before the view has been installed.
- *
+ *
* @param failures members that have been lost
* @param remaining members that remain
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java
index 8f94ba0..5d455f2 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java
@@ -15,9 +15,9 @@
package org.apache.geode.distributed.internal;
+import java.util.Collection;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import java.util.Collection;
/**
* A LinkedBlockingQueue that supports stats. Named OverflowQueue for historical reasons.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
index 9888342..61939ae 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
@@ -28,4 +28,3 @@ public abstract class PooledDistributionMessage extends DistributionMessage {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
index 00dcf00..f26095b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
@@ -15,12 +15,12 @@
package org.apache.geode.distributed.internal;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.util.List;
import java.util.concurrent.*;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* A ThreadPoolExecutor with stat support.
*
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
index 2795c97..9d74733 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.distributed.internal;
-import org.apache.geode.internal.*;
import java.lang.ref.WeakReference;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.internal.*;
+
/**
* A message processor class typically creates an instance of ProcessorKeeper and holds it in a
* static variable. In the constructor of the processor class, do this:
- *
+ *
* <code>processorId = keeper.put()</code>
- *
+ *
* When a message is processed, do this:
- *
+ *
* <code>processor = <processorclass>.keeper().get(processorId);
- *
+ *
* <p>
* Processor ids are always greater than 0.
* </p>
@@ -74,7 +75,7 @@ public class ProcessorKeeper21 {
* Save the processor in this keeper, generate an id for the processor, and return that id so it
* can be used to retrieve the processor later. This keeper keeps a weak reference to the
* processor.
- *
+ *
* @param processor the processor to keep
* @return the unique id for processor
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
index 924d49b..5fda531 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.logging.PureLogWriter;
* when it gets too large. The size of the log file is limited to 5mb by default and can be adjusted
* with the system property <b>gemfire.max_product_use_file_size</b>, though the size is not allowed
* to be less than 1mb.
- *
+ *
* @since GemFire 2013
*/
public class ProductUseLog implements MembershipListener {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java
index 021447e..ca3d877 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java
@@ -19,28 +19,28 @@ import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
/**
* Callback for changes to profiles in a DistributionAdvisor. A ProfileListener can be registered
* with a DistributionAdvisor.
- *
+ *
* These methods are called while the monitor is held on the DistributionAdvisor.
*
*/
public interface ProfileListener {
/**
* Method is invoked after a new profile is created/added to profiles.
- *
+ *
* @param profile the created profile
*/
void profileCreated(Profile profile);
/**
* Method is invoked after a profile is updated in profiles.
- *
+ *
* @param profile the updated profile
*/
void profileUpdated(Profile profile);
/**
* Method is invoked after a profile is removed from profiles.
- *
+ *
* @param profile the removed profile
* @param destroyed indicated that the profile member was destroyed, rather than closed (used for
* persistence)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java
index c859c49..a9c150e 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.distributed.internal;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
index c57d38e..545d4ac 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
@@ -16,6 +16,7 @@
package org.apache.geode.distributed.internal;
import java.util.*;
+
import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -85,7 +86,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 {
/**
* Use this method instead of {@link #waitForReplies()} if you want the wait to throw an exception
* when a member departs.
- *
+ *
* @throws ReplyException the exception passed back in reply
* @throws InterruptedException
* @throws ReliableReplyException when a member departs
@@ -114,4 +115,3 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java
index b9059ab..ad0086a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java
@@ -33,7 +33,7 @@ public class ReplyException extends GemFireException {
/**
* Creates a new instance of <code>ReplyException</code> without detail message.
- *
+ *
* Used by serialization
*/
public ReplyException() {}
@@ -41,7 +41,7 @@ public class ReplyException extends GemFireException {
/**
* Constructs an instance of <code>ReplyException</code> with the specified detail message.
- *
+ *
* @param msg the detail message.
*/
public ReplyException(String msg) {
@@ -51,7 +51,7 @@ public class ReplyException extends GemFireException {
/**
* Constructs an instance of <code>ReplyException</code> with the specified detail message and
* cause.
- *
+ *
* @param msg the detail message.
* @param cause the causal Throwable
*/
@@ -61,7 +61,7 @@ public class ReplyException extends GemFireException {
/**
* Constructs an instance of <code>ReplyException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public ReplyException(Throwable cause) {
@@ -102,7 +102,7 @@ public class ReplyException extends GemFireException {
/**
* Fixes a remote exception that this ReplyException has wrapped. Adds the local stack frames. The
* remote stack elements have the sender id info.
- *
+ *
* @param t Remote exception to fix up
* @since GemFire 5.1
*/
@@ -145,7 +145,7 @@ public class ReplyException extends GemFireException {
/**
* Adds the sender information to the stack trace elements of the given exception. Also traverses
* recursively over the 'cause' for adding this sender information.
- *
+ *
* @param toModify Throwable instance to modify the stack trace elements
* @param senderId id of the sender member
*/
@@ -172,7 +172,7 @@ public class ReplyException extends GemFireException {
/**
* Sets the member that threw the received exception
- *
+ *
* @param sendr the member that threw the exception
* @since GemFire 6.0
*/
@@ -184,7 +184,7 @@ public class ReplyException extends GemFireException {
/**
* Gets the member which threw the exception
- *
+ *
* @return the throwing member
* @since GemFire 6.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
index 2673f68..d53939b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
@@ -178,7 +178,7 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
* Processes this message. This method is invoked by the receiver of the message if the message is
* not direct ack. If the message is a direct ack, the process(dm, ReplyProcessor) method is
* invoked instead.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
index d93487d..3ab199b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.distributed.internal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.TimeoutException;
@@ -31,14 +40,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
/**
* This class processes responses to {@link DistributionMessage}s. It handles a the generic case of
@@ -52,7 +53,7 @@ import java.util.Set;
* <p>
*
* Recommended usage pattern in subclass...
- *
+ *
* <pre>
*
* public void process(DistributionMessage msg) {
@@ -65,7 +66,7 @@ import java.util.Set;
* }
*
* </pre>
- *
+ *
* The above usage pattern causes the waitForReplies latch to not be released until after the
* message has been processed. In addition, it is guaranteed to be released even if the custom
* subclass code throws a runtime exception.
@@ -79,17 +80,17 @@ public class ReplyProcessor21 implements MembershipListener {
private static final Logger logger = LogService.getLogger();
- public final static boolean THROW_EXCEPTION_ON_TIMEOUT =
+ public static final boolean THROW_EXCEPTION_ON_TIMEOUT =
Boolean.getBoolean("ack-threshold-exception");
/**
* the ratio by which ack-severe-alert-threshold is lowered when waiting for a BucketRegion
* operation
*/
- public final static double PR_SEVERE_ALERT_RATIO;
+ public static final double PR_SEVERE_ALERT_RATIO;
/** All live reply processors in this VM */
- protected final static ProcessorKeeper21 keeper = new ProcessorKeeper21();
+ protected static final ProcessorKeeper21 keeper = new ProcessorKeeper21();
//////////////////// Instance Methods ////////////////////
@@ -159,7 +160,7 @@ public class ReplyProcessor21 implements MembershipListener {
* on this one. This is a thread-local so that lower level comm layers can tell that the interval
* should be shortened
*/
- public final static ThreadLocal SevereAlertShorten = new ThreadLocal() {
+ public static final ThreadLocal SevereAlertShorten = new ThreadLocal() {
@Override
protected Object initialValue() {
return Boolean.FALSE;
@@ -454,7 +455,7 @@ public class ReplyProcessor21 implements MembershipListener {
* Handle a {@link DSFIDNotFoundException} indicating a message type is not implemented on another
* server (for example due to different product version). Default implementation logs the
* exception as severe and moves on.
- *
+ *
* Rationale for default handling: New operations can have caused changes to other newer versioned
* GFE JVMs that cannot be reverted. So ignoring exceptions is a conservative way considering such
* scenarios. It will be upto individual messages to handle differently by overriding the above
@@ -508,7 +509,7 @@ public class ReplyProcessor21 implements MembershipListener {
* Wait for all expected acks to be returned or an exception to come in. This method will return
* whether a) we have received replies from all desired members or b) the necessary conditions
* have been met so that we don't need to wait anymore.
- *
+ *
* @throws InternalGemFireException if ack-threshold was exceeded and system property
* "ack-threshold-exception" is set to true
* @throws InterruptedException thrown if the wait is interrupted
@@ -523,7 +524,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* Registers this processor as a membership listener and returns a set of the current members.
- *
+ *
* @return a Set of the current members
* @since GemFire 5.7
*/
@@ -533,7 +534,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* Unregisters this processor as a membership listener
- *
+ *
* @since GemFire 5.7
*/
protected void removeListener() {
@@ -546,7 +547,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* Returns the set of members that this processor should care about.
- *
+ *
* @return a Set of the current members
* @since GemFire 5.7
*/
@@ -566,7 +567,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* perform initial membership processing while under synchronization of this.members
- *
+ *
* @param activeMembers the DM's current membership set
*/
protected void processActiveMembers(Set activeMembers) {
@@ -669,7 +670,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* basicWait occurs after preWait and before postWait. Attempts to acquire the latch are made.
- *
+ *
* @param msecs the number of milliseconds to wait for replies
* @return whether or not we received all of the replies in the given amount of time
*/
@@ -832,7 +833,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* Used to cleanup resources allocated by the processor after we are done using it.
- *
+ *
* @since GemFire 5.1
*/
public void cleanup() {
@@ -911,7 +912,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* Control of reply processor waiting behavior in the face of exceptions.
- *
+ *
* @since GemFire 5.7
* @return true to stop waiting when exceptions are present
*/
@@ -1046,7 +1047,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* process a wait-timeout. Usually suspectThem would be used in the first timeout, followed by a
* subsequent use of disconnectThem
- *
+ *
* @param suspectThem whether to ask the membership manager to suspect the unresponsive members
* @param severeAlert whether to ask the membership manager to disconnect the unresponseive
* members
@@ -1161,7 +1162,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* Set a shorter ack-severe-alert-threshold than normal
- *
+ *
* @param flag whether to shorten the time or not
*/
public static void setShortSevereAlertProcessing(boolean flag) {
@@ -1211,9 +1212,9 @@ public class ReplyProcessor21 implements MembershipListener {
}
- private final static ThreadLocal messageId = new ThreadLocal();
+ private static final ThreadLocal messageId = new ThreadLocal();
- private final static Integer VOID_RPID = Integer.valueOf(0);
+ private static final Integer VOID_RPID = Integer.valueOf(0);
/**
* Used by messages to store the id for the current message into a thread local. This allows the
@@ -1247,7 +1248,7 @@ public class ReplyProcessor21 implements MembershipListener {
/**
* To fix the hang of 42951 make sure the guys waiting on this processor are told to quit waiting
* and tell them why.
- *
+ *
* @param ex the reason the reply processor is being canceled
*/
public void cancel(InternalDistributedMember sender, RuntimeException ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java
index 41ad1bc..513cab7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.cache.DirectReplyMessage;
* This interface is used by direct ack messages to send a reply to the original sender of the
* message. Any message which implements {@link DirectReplyMessage} must reply by calling
* putOutgoing on the ReplySender returned by {@link DistributionMessage#getReplySender(DM)}
- *
+ *
* The reply sender may be the distribution manager itself, or it may send the reply directly back
* on the same socket the message as received on.
*
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java
index b004113..b3f7add 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java
@@ -49,4 +49,3 @@ public enum ResourceEvent {
CACHE_SERVICE_REMOVE
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java
index fa3468b..e06e408 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java
@@ -16,14 +16,14 @@ package org.apache.geode.distributed.internal;
/**
* Internal interface to be implemented to catch various resource events
- *
- *
+ *
+ *
*/
public interface ResourceEventsListener {
/**
* Handles various GFE resource life-cycle methods vis-a-vis Management and Monitoring
- *
+ *
* @param event Resource events for which invocation has happened
* @param resource the GFE resource type
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
index 567bbac..349cfd7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -15,20 +15,20 @@
package org.apache.geode.distributed.internal;
-import org.apache.geode.GemFireIOException;
-import org.apache.geode.internal.ConfigSource;
-import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.GemFireIOException;
+import org.apache.geode.internal.ConfigSource;
+import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
/**
* Provides an implementation of <code>DistributionConfig</code> that is used at runtime by a
* {@link InternalDistributedSystem}. It allows for dynamic reconfig of the app the owns it.
- *
+ *
* The attribute settor methods in this class all assume that they are being called at runtime. If
* they are called from some other ConfigSource then those calls should come through
* setAttributeObject and it will set the attSourceMap to the correct source after these methods
@@ -40,7 +40,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
public class RuntimeDistributionConfigImpl extends DistributionConfigImpl {
private static final long serialVersionUID = -805637520096606113L;
- transient private final InternalDistributedSystem ds;
+ private final transient InternalDistributedSystem ds;
////////////////////// Constructors //////////////////////
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
index c56a929..c11d434 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* A message that is sent to a given collection of managers and then awaits replies. It is used by
* some tests to flush the serial communication channels after no-ack tests.
- *
+ *
*/
public class SerialAckedMessage extends SerialDistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
@@ -42,7 +42,7 @@ public class SerialAckedMessage extends SerialDistributionMessage implements Mes
private int processorId;
transient DistributionManager originDm;
- transient private ReplyProcessor21 rp;
+ private transient ReplyProcessor21 rp;
public SerialAckedMessage() {
super();
@@ -55,7 +55,7 @@ public class SerialAckedMessage extends SerialDistributionMessage implements Mes
/**
* send the message and wait for replies
- *
+ *
* @param recipients the destination manager ids
* @param multicast whether to use multicast or unicast
* @throws InterruptedException if the operation is interrupted (as by shutdown)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java
index 9568fdf..b9bf3f9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java
@@ -29,4 +29,3 @@ public abstract class SerialDistributionMessage extends DistributionMessage {
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
index 3004496..6526bb5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.net.SocketCreator;
/**
* Represents the location of a bridge server. This class is preferable to InetSocketAddress because
* it doesn't do any name resolution.
- *
+ *
*
*/
public class ServerLocation implements DataSerializable, Comparable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
index 27c557c..2c92610 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelCriterion;
@@ -51,7 +50,7 @@ import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.cache.CacheServerAdvisor.CacheServerProfile;
import org.apache.geode.internal.cache.ControllerAdvisor;
import org.apache.geode.internal.cache.ControllerAdvisor.ControllerProfile;
@@ -59,9 +58,10 @@ import org.apache.geode.internal.cache.FindDurableQueueProcessor;
import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SocketCreator;
/**
- *
+ *
* @since GemFire 5.7
*/
public class ServerLocator implements TcpHandler, DistributionAdvisee {
@@ -79,7 +79,7 @@ public class ServerLocator implements TcpHandler, DistributionAdvisee {
private volatile List<ServerLocation> cachedLocators;
private final Object cachedLocatorsLock = new Object();
- private final static AtomicInteger profileSN = new AtomicInteger();
+ private static final AtomicInteger profileSN = new AtomicInteger();
private static final long SERVER_LOAD_LOG_INTERVAL = (60 * 60 * 1000); // log server load once an
// hour
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
index 42de647..ed3eb1e 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.distributed.internal;
+import java.io.*;
+
import org.apache.geode.*;
+import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-import org.apache.geode.distributed.internal.membership.*;
-
/**
* A message that is sent to all other distribution manager when a distribution manager shuts down.
- *
+ *
* N.B. -- this is a SerialDistributionMessage due to bug32980
*/
public class ShutdownMessage extends HighPriorityDistributionMessage
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java
index bf6785a..8ddefac 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java
@@ -16,7 +16,7 @@ package org.apache.geode.distributed.internal;
/**
* Sizeable objects have a getSize() method that returns the approximate size of the object.
- *
+ *
* @since GemFire 5.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java
index bc37c77..348a55a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java
@@ -19,10 +19,10 @@ package org.apache.geode.distributed.internal;
* SizeableRunnable is a Runnable with a size. It implements the Sizeable interface for use in
* QueuedExecutors using a ThrottlingMemLinkedBlockingQueue.
* <p>
- *
+ *
* Instances/subclasses must provide the run() method to complete the Runnable interface.
* <p>
- *
+ *
* @since GemFire 5.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
index d81aed0..df7b5ba 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.distributed.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.SystemConnectException;
@@ -24,17 +35,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SocketCreator;
-import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
/**
* A message that is sent to all other distribution manager when a distribution manager starts up.
*/
@@ -59,7 +59,7 @@ public class StartupMessage extends HighPriorityDistributionMessage implements A
/**
* Determine all of the addresses that this host represents. An empty list will be regarded as an
* error by all who see it.
- *
+ *
* @return list of addresses for this host
* @since GemFire 5.7
*/
@@ -85,7 +85,7 @@ public class StartupMessage extends HighPriorityDistributionMessage implements A
/**
* Creates new instance for StartupOperation.
- *
+ *
* @param hostedLocators
* @param isSharedConfigurationEnabled true if cluster configuration is enabled
*/
@@ -105,7 +105,7 @@ public class StartupMessage extends HighPriorityDistributionMessage implements A
/**
* Sets the mcastEnabled flag for this message
- *
+ *
* @since GemFire 5.0
*/
void setMcastEnabled(boolean flag) {
@@ -144,7 +144,7 @@ public class StartupMessage extends HighPriorityDistributionMessage implements A
/**
* Sets the tcpDisabled flag for this message
- *
+ *
* @since GemFire 5.0
*/
void setTcpDisabled(boolean flag) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java
index e375c6a..ab7cb19 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.GemFireVersion;
* is handled by serializing and deserializing a new Properties instance if and only if the member
* version is 6.6.3 or greater. New fields can be added to the Properties without breaking backwards
* compatibility. All new fields added should be written to allow for version compatibility.
- *
+ *
* @since GemFire 7.0
*/
class StartupMessageData {
@@ -194,7 +194,7 @@ class StartupMessageData {
/**
* Writes all optional fields to the DataOutput or null for minimal wire footprint.
- *
+ *
* @throws IOException
*/
void writeTo(DataOutput out) throws IOException {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
index f90f0da..c0f4806 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
@@ -15,6 +15,7 @@
package org.apache.geode.distributed.internal;
import java.util.Set;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.i18n.LogWriterI18n;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java
index 28dbcda..6d8ebc9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java
@@ -44,7 +44,7 @@ public class StartupOperation {
* responses to come back. This method may throw jgroups and other io exceptions since it
* interacts with the distribution manager at a low level to send the startup messages. It does
* this to ensure it knows which recipients didn't receive the message.
- *
+ *
* @return whether all recipients could be contacted. The failure set can be fetched with
* getFailureSet??
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
index e0ba8e3..3ba5d31 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
@@ -24,7 +24,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java
index d1aeceb..c6122fb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java
@@ -31,21 +31,21 @@ public interface ThrottledMemQueueStatHelper extends QueueStatHelper {
/**
* Called after a throttled operation has completed.
- *
+ *
* @param nanos the amount of time, in nanoseconds, the throttle caused us to wait.
*/
public void throttleTime(long nanos);
/**
* Increments the amount of memory consumed by queue contents.
- *
+ *
* @param amount number of bytes added to the queue
*/
public void addMem(int amount);
/**
* Decrements the amount of memory consumed by queue contents.
- *
+ *
* @param amount number of bytes removed from the queue
*/
public void removeMem(int amount);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java
index 46a3d13..9a11dde 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java
@@ -31,7 +31,7 @@ public interface ThrottledQueueStatHelper extends QueueStatHelper {
/**
* Called after a throttled operation has completed.
- *
+ *
* @param nanos the amount of time, in nanoseconds, the throttle caused us to wait.
*/
public void throttleTime(long nanos);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
index c8fafb2..c6a3e53 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
@@ -15,9 +15,10 @@
package org.apache.geode.distributed.internal;
-import org.apache.geode.distributed.internal.DistributionStats;
import java.util.*;
+import org.apache.geode.distributed.internal.DistributionStats;
+
/**
* An instance of ThrottlingMemLinkedQueue allows the instantiator to specify a maximum queue
* footprint (M) and a size to begin throttling (B) (which must be between 1 and the M). When adding
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
index 3a8d611..c010ce7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.distributed.internal;
@@ -83,7 +83,7 @@ public class WaitForViewInstallation extends HighPriorityDistributionMessage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
@@ -106,7 +106,7 @@ public class WaitForViewInstallation extends HighPriorityDistributionMessage
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.distributed.internal.DistributionMessage#process(org.apache.geode.distributed.
* internal.DistributionManager)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java
index 2821244..992c414 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.locks.DLockToken;
/**
* Report dependencies on dlocks that exist in theis VM.
- *
+ *
*
*/
public class DLockDependencyMonitor implements DependencyMonitor {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
index 385065e..ba4451f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
@@ -41,20 +41,20 @@ import org.apache.geode.internal.ExitCode;
* A class used for detecting deadlocks. The static method
* {@link #collectAllDependencies(Serializable)} will find all dependencies between threads and
* locks in the current VM.
- *
+ *
* To use this class, collect dependencies in each VM you want to analyze, and add them to an
* instance of a {@link DeadlockDetector} using the {@link #addDependencies(Set)} method. The
* {@link #findDeadlock()} method will analyze the dependencies to find any deadlocks.
- *
+ *
* This class uses Java 1.6 management APIs on {@link ThreadMXBean}, so it will not find any
* deadlocks in 1.5 VM. It also uses the {@link DependencyMonitorManager} framework to collect
* dependencies that are not reported by the VM - such as the association between message senders
* and processors in different VMs.
- *
+ *
* This class also has a main() method that can read serialized DependencyGraphs from multiple JVMs,
* merge them and perform various analysis on them.
- *
- *
+ *
+ *
*/
public class DeadlockDetector {
DependencyGraph graph = new DependencyGraph();
@@ -73,7 +73,7 @@ public class DeadlockDetector {
/**
* Finds the first deadlock in the list of dependencies, or null if there are no deadlocks in the
* set of dependencies.
- *
+ *
* @return a linked list of dependencies which shows the circular dependencies. The List will be
* of the form Dependency(A,B), Dependency(B,C), Dependency(C, A).
*/
@@ -98,13 +98,13 @@ public class DeadlockDetector {
/**
* Collect all of the dependencies that exist between threads in this VM, using java management
* beans and the {@link DependencyMonitor}.
- *
+ *
* Threads may depend on locks, or on other resources that are tracked by the
* {@link DependencyMonitor}.
- *
+ *
* @param locality a name tag to stick on entities to help associate them with this JVM and
* distinguish them from entities from other jvms
- *
+ *
* @return All of the dependencies between threads and locks or other resources on this VM.
*/
public static Set<Dependency> collectAllDependencies(Serializable locality) {
@@ -204,7 +204,7 @@ public class DeadlockDetector {
/**
* attempts to sort the given dependencies according to their contents so that dependents come
* after dependers.
- *
+ *
* @param dependencies TODO this method needs more work
*/
public static List<Dependency> sortDependencies(Collection<Dependency> dependencies) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java
index ea8dd81..f9b2267 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java
@@ -19,11 +19,11 @@ import java.io.Serializable;
/**
* Holds a dependency between one object and another. This class is used as an edge in the @link
* {@link DependencyGraph}.
- *
+ *
* An example of a dependency is a Thread that is blocking on a lock, or a lock that is held by a
* thread.
- *
- *
+ *
+ *
*/
public class Dependency<A, B> implements Serializable {
@@ -82,4 +82,3 @@ public class Dependency<A, B> implements Serializable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
index 893292f..da029fc 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
@@ -30,12 +30,12 @@ import org.apache.geode.internal.util.PluckStacks;
/**
* This class holds a graph of dependencies between objects
- *
+ *
* It detects cycles in the graph by using the Depth First Search algorithm. Calling findCycle will
* return the first cycle that is discovered in the graph.
- *
- *
- *
+ *
+ *
+ *
*/
public class DependencyGraph implements Serializable {
private static final long serialVersionUID = -6794339771271587648L;
@@ -79,7 +79,7 @@ public class DependencyGraph implements Serializable {
/**
* Find a cycle in the graph, if one exists.
- *
+ *
* This method works by starting at any vertex and doing a depth first search. If it ever
* encounters a vertex that is currently in the middle of the search (as opposed to a vertex whose
* dependencies have been completely analyzed), then it returns the chain that starts from our
@@ -108,7 +108,7 @@ public class DependencyGraph implements Serializable {
* Otherwise all subgraphs are traversed to find the one that has the most depth. This usually
* indicates the thread that is blocking the most other threads.
* <p>
- *
+ *
* The findDependenciesWith method can then be used to find all top-level threads that are blocked
* by the culprit.
*/
@@ -199,7 +199,7 @@ public class DependencyGraph implements Serializable {
/**
* Visit a vertex for the purposes of finding a cycle in the graph.
- *
+ *
* @param start the node
* @param unvisited the set of vertices that have not yet been visited
* @param finished the set of vertices that have been completely analyzed
@@ -251,7 +251,7 @@ public class DependencyGraph implements Serializable {
/**
* Get the subgraph that the starting object has dependencies on.
- *
+ *
* This does not include any objects that have dependencies on the starting object.
*/
public DependencyGraph getSubGraph(Object start) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
index 5d43f4d..6173b5f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
@@ -22,7 +22,7 @@ import java.util.Set;
* classes that monitor a particular type of dependency. Classes implementing this interface should
* register themselves with the dependency monitor using the
* {@link DependencyMonitorManager#addMonitor(DependencyMonitor)} method.
- *
+ *
*/
public interface DependencyMonitor {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
index 9b6569f..8a7f7da 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
@@ -23,14 +23,14 @@ import org.apache.geode.internal.CopyOnWriteHashSet;
/**
* A singleton which keeps track of all of the dependency monitors registered in this VM.
- *
+ *
* Dependency monitors track dependencies between threads that may not be known to the JVM. For
* example, a thread in one VM may be waiting for a response to a thread in another VM.
- *
+ *
* {@link DependencyMonitor}s should register themselves with this class. Then, the
* {@link DeadlockDetector} will be able to query them for dependencies when finding deadlocks.
- *
- *
+ *
+ *
*/
public class DependencyMonitorManager {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
index 9e45d74..ed6d70b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
@@ -36,8 +36,8 @@ import org.apache.geode.internal.cache.execute.AbstractExecution;
* This class uses gemfire function execution to get the dependencies between threads present in
* each member of the distributed system. It then uses the {@link DeadlockDetector} class to
* determine if any deadlocks exist within those dependencies.
- *
- *
+ *
+ *
*/
public class GemFireDeadlockDetector {
@@ -53,7 +53,7 @@ public class GemFireDeadlockDetector {
/**
* Find any deadlocks the exist in this distributed system.
- *
+ *
* The deadlocks are returned as a list of dependencies. See {@link DeadlockDetector}
*/
public DependencyGraph find() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
index cdb5451..276b644 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.concurrent.LI;
/**
* This class is serializable version of the java 1.6 lock info class. It also holds a locality
* field to identify the VM where the lock is held.
- *
+ *
*
*/
class LocalLockInfo implements Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
index 498ac7c..5d2ef18 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
@@ -22,7 +22,7 @@ import java.lang.management.ThreadInfo;
/**
* This class is serializable version of the java 1.6 ThreadInfo class. It also holds a locality
* field to identify the VM where the thread exists.
- *
+ *
*
*/
public class LocalThread implements Serializable, ThreadReference {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
index 6ce03c5..fae6e29 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
@@ -26,10 +26,10 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
/**
- *
+ *
* This class keeps track of the information we need to determine which threads in the receiver
* system a reply processor thread is waiting for.
- *
+ *
* This will allow us to programatically discover deadlocks.
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
index ffff0ae..51d3707 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
@@ -22,15 +22,15 @@ import java.lang.reflect.Method;
* Most of this thread local is safe to use, except for the getValue(Thread) method. That is not
* guaranteed to be correct. But for our deadlock detection tool I think it's good enough, and this
* class provides a very low overhead way for us to record what thread holds a particular resource.
- *
- *
+ *
+ *
*/
public class UnsafeThreadLocal<T> extends ThreadLocal<T> {
/**
* Dangerous method. Uses reflection to extract the thread local for a given thread.
- *
+ *
* Unlike get(), this method does not set the initial value if none is found
- *
+ *
* @throws SecurityException
*/
public T get(Thread thread) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index 97519e3..527a611 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -15,6 +15,15 @@
package org.apache.geode.distributed.internal.direct;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.net.InetAddress;
+import java.net.SocketTimeoutException;
+import java.util.*;
+import java.util.concurrent.Semaphore;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.*;
import org.apache.geode.cache.TimeoutException;
import org.apache.geode.distributed.DistributedMember;
@@ -23,24 +32,16 @@ import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.DirectReplyMessage;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.tcp.*;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.internal.util.concurrent.ReentrantSemaphore;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.net.InetAddress;
-import java.net.SocketTimeoutException;
-import java.util.*;
-import java.util.concurrent.Semaphore;
/**
* DirectChannel is used to interact directly with other Direct servers to distribute GemFire
@@ -69,7 +70,7 @@ public class DirectChannel {
/**
* Callback to set the local address, must be done before this channel is used.
- *
+ *
* @param localAddr
* @throws ConnectionException if the conduit has stopped
*/
@@ -87,7 +88,7 @@ public class DirectChannel {
/**
* when the initial number of members is known, this method is invoked to ensure that connections
* to those members can be established in a reasonable amount of time. See bug 39848
- *
+ *
* @param numberOfMembers
*/
public void setMembershipSize(int numberOfMembers) {
@@ -153,13 +154,13 @@ public class DirectChannel {
* value raises the possibility of a deadlock when serializing a message with PDX objects, because
* the PDX serialization can trigger further distribution.
*/
- static public final int DEFAULT_CONCURRENCY_LEVEL =
+ public static final int DEFAULT_CONCURRENCY_LEVEL =
Integer.getInteger("p2p.defaultConcurrencyLevel", Integer.MAX_VALUE / 2).intValue();
/**
* The maximum number of concurrent senders sending a message to a group of recipients.
*/
- static private final int MAX_GROUP_SENDERS =
+ private static final int MAX_GROUP_SENDERS =
Integer.getInteger("p2p.maxGroupSenders", DEFAULT_CONCURRENCY_LEVEL).intValue();
private Semaphore groupUnorderedSenderSem;
private Semaphore groupOrderedSenderSem;
@@ -221,7 +222,7 @@ public class DirectChannel {
* This is basically just sendToMany, giving us a way to see on the stack whether we are sending
* to a single member or multiple members, in which case the group-send lock will be held during
* distribution.
- *
+ *
* @param mgr - the membership manager
* @param p_destinations - the list of addresses to send the message to.
* @param msg - the message to send
@@ -241,7 +242,7 @@ public class DirectChannel {
/**
* Sends a msg to a list of destinations. This code does some special optimizations to stream
* large messages
- *
+ *
* @param mgr - the membership manager
* @param p_destinations - the list of addresses to send the message to.
* @param msg - the message to send
@@ -497,7 +498,7 @@ public class DirectChannel {
/**
* Obtain the connections needed to transmit a message. The connections are put into the cons
* object (the last parameter)
- *
+ *
* @param mgr the membership manager
* @param msg the message to send
* @param destinations who to send the message to
@@ -562,7 +563,7 @@ public class DirectChannel {
/**
* Method send.
- *
+ *
* @param mgr - the membership manager
* @param destinations - the address(es) to send the message to.
* @param msg - the message to send
@@ -622,7 +623,7 @@ public class DirectChannel {
/**
* Returns null if no config is available.
- *
+ *
* @since GemFire 4.2.2
*/
public DistributionConfig getDMConfig() {
@@ -642,7 +643,7 @@ public class DirectChannel {
}
/**
- *
+ *
* @param ackTimeout ack wait threshold
* @param ackSATimeout severe alert threshold
* @param c
@@ -731,7 +732,7 @@ public class DirectChannel {
/**
* Ensure that the TCPConduit class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
@@ -740,7 +741,7 @@ public class DirectChannel {
/**
* Close the Conduit
- *
+ *
* @see SystemFailure#emergencyClose()
*/
public void emergencyClose() {
@@ -836,7 +837,7 @@ public class DirectChannel {
* adds state for thread-owned serial connections to the given member to the parameter
* <i>result</i>. This can be used to wait for the state to reach the given level in the member's
* vm.
- *
+ *
* @param member the member whose state is to be captured
* @param result the map to add the state to
* @since GemFire 5.1
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
index 6953330..24506fc 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
@@ -21,7 +21,7 @@ public interface DirectChannelListener {
/**
* Event indicating a message has been delivered that we need to process.
- *
+ *
* @param o the message that should be processed.
*/
public void messageReceived(DistributionMessage o);
@@ -29,7 +29,7 @@ public interface DirectChannelListener {
/**
* Return the distribution manager for this receiver
- *
+ *
* @return the distribution manager
*/
public DistributionManager getDM();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
index 4bfc3bd..c61ae38 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
@@ -18,7 +18,7 @@ import org.apache.geode.GemFireCheckedException;
/**
* Exception thrown when a member is no longer in the distributed system
- *
+ *
*/
public class ShunnedMemberException extends GemFireCheckedException {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
index 54d91e9..b26889d 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
@@ -16,6 +16,7 @@
package org.apache.geode.distributed.internal.locks;
import java.util.*;
+
import org.apache.geode.distributed.internal.membership.*;
/**
@@ -35,10 +36,9 @@ public interface DLockBatch {
/**
* Specifies the lock grantor id that granted this lock batch.
- *
+ *
* @param lockGrantorId the lock grantor id that granted this lock batch
*/
public void grantedBy(LockGrantorId lockGrantorId);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
index cbe00fa..4576ea8 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
@@ -25,4 +25,3 @@ public interface DLockBatchId extends DataSerializable {
/** Gets the lock grantor id that granted this lock */
public LockGrantorId getLockGrantorId();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
index b8d01d3..2907544 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
@@ -15,6 +15,12 @@
package org.apache.geode.distributed.internal.locks;
+import java.util.*;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.cache.CommitConflictException;
@@ -35,11 +41,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.atomic.AtomicLong;
/**
* Provides lock grantor authority to a distributed lock service. This is responsible for granting,
@@ -85,7 +86,7 @@ public class DLockGrantor {
/**
* Map of grant tokens for tracking grantor-side state of distributed locks. Key: Object name,
* Value: DLockGrantToken grant
- *
+ *
* guarded.By grantTokens
*/
private final Map grantTokens = new HashMap();
@@ -111,7 +112,7 @@ public class DLockGrantor {
* be replied to until a successor is found, registers transfer intentions with the elder and
* sends this process a transfer grantorship request. At that point the state will be HALTED as
* described above.
- *
+ *
* guarded.By this
*/
private volatile int state = INITIALIZING;
@@ -127,7 +128,7 @@ public class DLockGrantor {
* Key: Object batchId, Value: DLockBatch batch
* <p>
* Handling of batch locks synchronizes on this to assure serial processing.
- *
+ *
* guarded.By batchLocks
*/
private final Map batchLocks = new HashMap();
@@ -172,7 +173,7 @@ public class DLockGrantor {
/**
* Identifies remote thread that has currently suspended locking or null.
- *
+ *
* Concurrency: protected by synchronization of {@link #suspendLock}
*/
protected RemoteThread lockingSuspendedBy = null;
@@ -184,14 +185,14 @@ public class DLockGrantor {
/**
* Identifies the lockId used by the remote thread to suspend locking.
- *
+ *
* Concurrency: protected by synchronization of {@link #suspendLock}
*/
protected int suspendedLockId = INVALID_LOCK_ID;
/**
* FIFO queue for suspend read and write lock waiters.
- *
+ *
* guarded.By {@link #suspendLock}
*/
private final LinkedList suspendQueue = new LinkedList();
@@ -200,35 +201,35 @@ public class DLockGrantor {
* Map of read lock counts for each RemoteThread currently holding locks.
* <p>
* Key=RemoteThread, Value=ReadLockCount
- *
+ *
* guarded.By {@link #suspendLock}
*/
private final HashMap readLockCountMap = new HashMap();
/**
* Number of suspend waiters waiting for write lock.
- *
+ *
* guarded.By {@link #suspendLock}
*/
private int writeLockWaiters = 0;
/**
* Total number of read locks held against suspend write lock.
- *
+ *
* guarded.By {@link #suspendLock}
*/
private int totalReadLockCount = 0;
/**
* List of next requests to process after handling an unlock or resume.
- *
+ *
* guarded.By {@link #suspendLock}
*/
private ArrayList permittedRequests = new ArrayList();
/**
* List of active drains of permittedRequests. TODO: does this need to be a synchronizedList?
- *
+ *
* guarded.By {@link #suspendLock}
*/
private final List permittedRequestsDrain = Collections.synchronizedList(new LinkedList());
@@ -326,7 +327,7 @@ public class DLockGrantor {
/**
* Returns the grantor's version id which was assigned by an elder. Required to help uniquely
* identify this grantor instance.
- *
+ *
* @return the grantor's version id which was assigned by an elder
*/
public long getVersionId() {
@@ -336,7 +337,7 @@ public class DLockGrantor {
/**
* Sets the version id after the elder tells us what it is. This is called during the explicit
* become grantor process.
- *
+ *
* @param v the elder assigned version id for this grantor
*/
public void setVersionId(long v) {
@@ -346,7 +347,7 @@ public class DLockGrantor {
/**
* Waits uninterruptibly while this grantor is initializing. Returns when grantor is ready to
* handle lock requests.
- *
+ *
* @throws DistributedSystemDisconnectedException if system shuts down before grantor is ready
*/
public void waitWhileInitializing() throws InterruptedException {
@@ -374,7 +375,7 @@ public class DLockGrantor {
/**
* Waits uninterruptibly until this service is destroyed. Returns when grantor has been completely
* destroyed.
- *
+ *
* @throws DistributedSystemDisconnectedException if system shuts down before grantor is destroyed
*/
public void waitUntilDestroyed() throws InterruptedException {
@@ -405,7 +406,7 @@ public class DLockGrantor {
/**
* Returns true if this grantor is ready to handle lock requests.
- *
+ *
* @return true if this grantor is ready to handle lock requests
*/
boolean isReady() {
@@ -414,7 +415,7 @@ public class DLockGrantor {
/**
* Returns true if this grantor is still initializing and not yet ready for lock requests.
- *
+ *
* @return true if this grantor is still initializing
*/
boolean isInitializing() {
@@ -423,7 +424,7 @@ public class DLockGrantor {
/**
* Returns true if this grantor has been destroyed.
- *
+ *
* @return true if this grantor has been destroyed
*/
public boolean isDestroyed() {
@@ -441,7 +442,7 @@ public class DLockGrantor {
/**
* Throws LockGrantorDestroyedException if destroyed is true.
- *
+ *
* @param destroyed if true then throw LockGrantorDestroyedException
* @throws LockGrantorDestroyedException if destroyed is true
*/
@@ -456,7 +457,7 @@ public class DLockGrantor {
* Handles request for a batch of locks using optimization for transactions.
* <p>
* Synchronizes on {@link #batchLocks}.
- *
+ *
* @throws LockGrantorDestroyedException if grantor is destroyed
*/
void handleLockBatch(DLockRequestMessage request) throws InterruptedException {
@@ -543,7 +544,7 @@ public class DLockGrantor {
* Returns transaction optimized lock batches that were created by the specified owner.
* <p>
* Synchronizes on batchLocks.
- *
+ *
* @param owner member that owned the lock batches to return
* @return lock batches that were created by owner
*/
@@ -568,7 +569,7 @@ public class DLockGrantor {
* Acquires acquireDestroyReadLock. Synchronizes on batchLocks.
* <p>
* see org.apache.geode.internal.cache.TXCommitMessage#updateLockMembers()
- *
+ *
* @param batchId the identifier for the batch to retrieve
* @return the transaction lock batch identified by the given batchId
* @see org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage
@@ -606,7 +607,7 @@ public class DLockGrantor {
* Acquires acquireDestroyReadLock. Synchronizes on batchLocks.
* <p>
* see org.apache.geode.internal.cache.locks.TXCommitMessage#updateLockMembers()
- *
+ *
* @param batchId the identify of the transaction lock batch
* @param newBatch the new lock batch to be used
* @see org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage
@@ -642,7 +643,7 @@ public class DLockGrantor {
* Releases the transaction optimized lock batch.
* <p>
* Acquires acquireDestroyReadLock. Synchronizes on batchLocks.
- *
+ *
* @param batchId the identify of the transaction lock batch to release
* @param owner the member that has created and locked the lock batch
* @throws LockGrantorDestroyedException if grantor is destroyed or interrupted
@@ -679,7 +680,7 @@ public class DLockGrantor {
/**
* Returns true if the request comes from the local member.
- *
+ *
* @param request the lock request to check
* @return true if the request comes from the local member
*/
@@ -708,7 +709,7 @@ public class DLockGrantor {
* Handles a DLockQueryMessage. Returns DLockGrantToken for the lock or null.
* <p>
* Acquires destroyReadLock. Synchronizes on grantTokens.
- *
+ *
* @param query the dlock query message to handle
* @return DLockGrantToken for the lock or null
*/
@@ -732,7 +733,7 @@ public class DLockGrantor {
* scheduled at end of waiting queue to eventually be granted or timed out.
* <p>
* Acquires destroyReadLock. Synchronizes on grantTokens, suspendLock and the grant token.
- *
+ *
* @param request the lock request to be processed by this grantor
* @throws LockGrantorDestroyedException if grantor is destroyed
*/
@@ -786,7 +787,7 @@ public class DLockGrantor {
* <p>
* Calling thread must hold destroyReadLock. Synchronizes on grantTokens, suspendLock and the
* grant token.
- *
+ *
* @param request the lock request to be processed by this grantor guarded.By
* {@link #acquireDestroyReadLock(long)}
*/
@@ -834,7 +835,7 @@ public class DLockGrantor {
* <p>
* Acquires destroyReadLock. Synchronizes on this grantor, grantTokens, suspendLock, the grant
* token.
- *
+ *
* @param owner the member that owns the tokens to be scheduled
* @param tokens set of DLockRemoteTokens to be scheduled for owner
*/
@@ -931,7 +932,7 @@ public class DLockGrantor {
* Handles a request for extending the lease time of an already held lock.
* <p>
* Acquires destroyReadLock. Synchronizes on grantTokens and the grant token.
- *
+ *
* @param request the lock request to be reentered for lease extension
* @return new extended leaseExpireTime or 0 if requestor no longer holds lock
*/
@@ -984,7 +985,7 @@ public class DLockGrantor {
* for remote unlock.
* <p>
* Acquires destroyReadLock. Synchronizes on grantTokens and the grant token.
- *
+ *
* @param name the name of the lock to release
* @param owner the member releasing the lock
* @param lockId the identity of the lease used by the owner
@@ -1010,7 +1011,7 @@ public class DLockGrantor {
* DLockReleaseMessage.basicProcess -> releaseIfLocked -> getAndReleaseGrantIfLockedBy
* <p>
* Caller must hold destroyReadLock. Synchronizes on grantTokens and the grant token.
- *
+ *
* @param name the name of the lock to release
* @param owner the member attempting to release the granted lock
* @param lockId the id of the lease used by the owner guarded.By
@@ -1043,7 +1044,7 @@ public class DLockGrantor {
* the reply has been sent.
* <p>
* Acquires destroyReadLock. Synchronizes on grantTokens and the grant token.
- *
+ *
* @param name the name of the lock to grant
* @throws LockGrantorDestroyedException if grantor is destroyed
*/
@@ -1068,7 +1069,7 @@ public class DLockGrantor {
* Handles the departure of a member by releasing every lock it owned.
* <p>
* Acquires destroyReadLock. Synchronizes on grantTokens, suspendLock, and the grant token.
- *
+ *
* @param owner the member that departed
*/
void handleDepartureOf(InternalDistributedMember owner) throws InterruptedException {
@@ -1239,7 +1240,7 @@ public class DLockGrantor {
* <p>
* Caller must acquire destroyWriteLock. Synchronizes on suspendLock, grantTokens, and each grant
* token.
- *
+ *
* guarded.By {@link #acquireDestroyWriteLock(long)}
*/
private void destroyGrantor() {
@@ -1305,7 +1306,7 @@ public class DLockGrantor {
* Send responses to specified requests informing the senders that this is no longer the grantor.
* <p>
* Caller must acquire destroyWriteLock.
- *
+ *
* @param requests the requests to respond to guarded.By {@link #acquireDestroyWriteLock(long)}
*/
private void respondWithNotGrantor(Iterator requests) {
@@ -1348,7 +1349,7 @@ public class DLockGrantor {
* Make this grantor ready for handling lock requests.
* <p>
* Synchronizes on this grantor.
- *
+ *
* @param enforceInitializing true if this should assert isInitializing
* @return true if grantor was successfully made ready
*/
@@ -1384,7 +1385,7 @@ public class DLockGrantor {
* Drain currently permitted requests and grant lock to next requestor.
* <p>
* Acquires destroyReadLock. Synchronizes on suspendLock, grantTokens, and the grant token.
- *
+ *
* @param objectName the lock to perform post release tasks for
*/
void postRemoteReleaseLock(Object objectName) throws InterruptedException {
@@ -1407,7 +1408,7 @@ public class DLockGrantor {
/**
* Acquires a read lock on the destroy ReadWrite lock uninterruptibly using millis for try-lock
* attempt.
- *
+ *
* @param millis the milliseconds to try to acquire lock within
* @return true if destroy read lock was acquired
* @throws DistributedSystemDisconnectedException if system has been disconnected
@@ -1444,7 +1445,7 @@ public class DLockGrantor {
/**
* Acquires the write lock on the destroy ReadWrite lock within specified millis.
- *
+ *
* @param millis the milliseconds to attempt to acquire the lock within
* @throws DistributedSystemDisconnectedException if system has been disconnected
*/
@@ -1476,7 +1477,7 @@ public class DLockGrantor {
/**
* Returns time to wait in millis from now based on start and wait in request.
- *
+ *
* @return the current wait time for the request before it times out
*/
private long calcWaitMillisFromNow(DLockRequestMessage request) {
@@ -1515,7 +1516,7 @@ public class DLockGrantor {
* Returns a snapshot of the current grant tokens.
* <p>
* Synchronizes on grantTokens.
- *
+ *
* @return a snapshot of the current grant tokens
*/
protected Collection snapshotGrantTokens() {
@@ -1530,7 +1531,7 @@ public class DLockGrantor {
* Fetches or creates a new grant token for the named lock.
* <p>
* Synchronizes on grantTokens and the grant token.
- *
+ *
* @param name the name of the lock
* @return the grant token for the named lock
*/
@@ -1562,7 +1563,7 @@ public class DLockGrantor {
* for testing purposes only.
* <p>
* Synchronizes on grantTokens.
- *
+ *
* @return unmodifible collection of the grant tokens
*/
public Collection getGrantTokens() {
@@ -1575,7 +1576,7 @@ public class DLockGrantor {
* Remove the grant token if it is unused.
* <p>
* Synchronizes on grantTokens and the grant token.
- *
+ *
* @param grant the grant token to remove
*/
protected void removeGrantIfUnused(DLockGrantToken grant) {
@@ -1597,7 +1598,7 @@ public class DLockGrantor {
* Iterates over grants and attempts to remove any that are no longer in use.
* <p>
* Synchronizes on grantTokens and the grant token.
- *
+ *
* @param grants the grants to be checked for removal
*/
protected void removeUnusedGrants(Iterator grants) {
@@ -1622,7 +1623,7 @@ public class DLockGrantor {
* Fetches the grant token value stored in the map under key name.
* <p>
* Caller must synchronize on grantTokens
- *
+ *
* @param name the key to fetch the grant token value for
* @return the grant token stored under key name guarded.By {@link #grantTokens}
*/
@@ -1634,7 +1635,7 @@ public class DLockGrantor {
* Stores the grant token as a value in the map under the key of its name.
* <p>
* Caller must synchronize on grantTokens
- *
+ *
* @param grantToken the grant token to store in the map guarded.By {@link #grantTokens}
*/
private void basicPutGrantToken(DLockGrantToken grantToken) {
@@ -1646,7 +1647,7 @@ public class DLockGrantor {
* Removes the grant token from the map.
* <p>
* Caller must synchronize on grantTokens and then the grantToken.
- *
+ *
* @param grantToken the grant token to remove from the map. guarded.By {@link #grantTokens} and
* grantToken
*/
@@ -1666,7 +1667,7 @@ public class DLockGrantor {
* Iterates over grants and handles any that have expired.
* <p>
* Synchronizes on each grant token.
- *
+ *
* @param grants the grants to iterate over
* @return the next smallest expiration time
*/
@@ -1689,7 +1690,7 @@ public class DLockGrantor {
* Iterates over grants and handles any that have timed out.
* <p>
* Synchronizes on each grant token.
- *
+ *
* @param grants the grants to iterate over
* @return the next smallest timeout
*/
@@ -1712,7 +1713,7 @@ public class DLockGrantor {
* TEST HOOK: Specifies time to sleep while handling suspend in order to cause a timeout.
* <p>
* Synchronizes on suspendLock.
- *
+ *
* @param value
*/
public void setDebugHandleSuspendTimeouts(int value) {
@@ -1723,7 +1724,7 @@ public class DLockGrantor {
/**
* True to enable test hook to sleep while handling suspend to cause timeout.
- *
+ *
* guarded.By {@link #suspendLock}
*/
private int debugHandleSuspendTimeouts = 0;
@@ -1732,7 +1733,7 @@ public class DLockGrantor {
* Iterates through a copy of suspendQueue and handles any requests that have timed out.
* <p>
* Synchronizes on suspendLock.
- *
+ *
* @return the next smallest timeout in the suspendQueue
*/
protected long handleSuspendTimeouts() {
@@ -1808,7 +1809,7 @@ public class DLockGrantor {
/**
* Returns string representation for the enumerated grantor state.
- *
+ *
* @param stateInt the number of the state to return a string for
* @return string representation for the enumerated grantor state
*/
@@ -1837,7 +1838,7 @@ public class DLockGrantor {
/**
* Throws IllegalStateException if this grantor is not still initializing.
- *
+ *
* @throws IllegalStateException if this grantor is not still initializing
*/
private void assertInitializing() {
@@ -1853,9 +1854,9 @@ public class DLockGrantor {
* Suspends locking by the remote thread and lease id.
* <p>
* Caller must synchronize on suspendLock.
- *
+ *
* Concurrency: protected by synchronization of {@link #suspendLock}
- *
+ *
* @param myRThread the remote thread that is about to suspend locking
* @param lockId the id of the lock request used to suspend locking
*/
@@ -1895,9 +1896,9 @@ public class DLockGrantor {
* Returns true if locking has been suspended.
* <p>
* Caller must synchronize on suspendLock.
- *
+ *
* Concurrency: protected by synchronization of {@link #suspendLock}
- *
+ *
* @return true if locking has been suspended
*/
protected boolean isLockingSuspended() {
@@ -1911,7 +1912,7 @@ public class DLockGrantor {
* Returns true if locking has been suspended.
* <p>
* Synchronizes on suspendLock.
- *
+ *
* @return true if locking has been suspended
*/
protected boolean isLockingSuspendedWithSync() {
@@ -1924,9 +1925,9 @@ public class DLockGrantor {
* Returns true if locking has been suspended by the remote thread.
* <p>
* Caller must synchronize on suspendLock.
- *
+ *
* Concurrency: protected by synchronization of {@link #suspendLock}
- *
+ *
* @return true if locking has been suspended by the remote thread
*/
protected boolean isLockingSuspendedBy(final RemoteThread rThread) {
@@ -2082,7 +2083,7 @@ public class DLockGrantor {
* Handles post release lock tasks including tracking the current suspend locking states.
* <p>
* Synchronizes on suspendLock.
- *
+ *
* @param rThread the remote thread that released the lock
* @param lock the named lock that was released
*/
@@ -2108,7 +2109,7 @@ public class DLockGrantor {
* was already permitted to request. This needs to be invoked for both regular and suspend locks.
* <p>
* Synchronizes on suspendLock.
- *
+ *
* @param request the request to cleanup after due to departure of sender
*/
protected void cleanupSuspendState(DLockRequestMessage request) {
@@ -2121,7 +2122,7 @@ public class DLockGrantor {
* <p>
* Caller must acquire destroyReadLock. Synchronizes on suspendLock, grantTokens and each grant
* token.
- *
+ *
* Concurrency: protected by {@link #destroyLock} via invoking
* {@link #acquireDestroyReadLock(long)}
*/
@@ -2280,7 +2281,7 @@ public class DLockGrantor {
* suspendQueue and returns false.
* <p>
* Synchronizes on suspendLock.
- *
+ *
* @param request the lock request to acquire permission for
*/
private boolean acquireLockPermission(final DLockRequestMessage request) {
@@ -2301,7 +2302,7 @@ public class DLockGrantor {
/**
* Throws InterruptedException if local lock request exists and is interruptible or
* CancelException if DistributionManager is forcing us to cancel for shutdown.
- *
+ *
* @param e the throwable that caused this check
*/
private void throwIfInterruptible(InterruptedException e) throws InterruptedException {
@@ -2338,7 +2339,7 @@ public class DLockGrantor {
/**
* Verify the waiters (for debugging)
- *
+ *
* guarded.By {@link #suspendLock}
*/
private void checkWriteLockWaiters() {
@@ -2359,7 +2360,7 @@ public class DLockGrantor {
/**
* Debugging method
- *
+ *
* guarded.By {@link #suspendLock}
*/
private void checkTotalReadLockCount() {
@@ -2400,7 +2401,7 @@ public class DLockGrantor {
/**
* Pending requests queued up for the lock
- *
+ *
* guarded.By this
*/
private LinkedList pendingRequests;
@@ -2408,14 +2409,14 @@ public class DLockGrantor {
/**
* The reply processor id is used to identify the specific lock operation used by the lessee to
* lease this lock
- *
+ *
* guarded.By this
*/
private int leaseId = -1;
/**
* Distributed member that currently has a lease on this lock
- *
+ *
* guarded.By this
*/
private InternalDistributedMember lessee;
@@ -2424,35 +2425,35 @@ public class DLockGrantor {
* Absolute time in milliseconds when the current lease will expire. When this lock is not
* leased out, the value is -1. When the lock is leased out, the value is > 0. A value of
* Long.MAX_VALUE indicates a non-expiring (infinite) lease.
- *
+ *
* guarded.By this
*/
private long leaseExpireTime = -1;
/**
* Current count of threads attempting to access this grant token.
- *
+ *
* guarded.By this
*/
private int accessCount = 0;
/**
* True if this token has been destroyed and removed from usage.
- *
+ *
* guarded.By this
*/
private boolean destroyed = false;
/**
* RemoteThread identity of thread currently holding lease on this lock
- *
+ *
* guarded.By this
*/
private RemoteThread lesseeThread = null;
/**
* Instatiates a new instance of DLockGrantToken.
- *
+ *
* @param dlock the lock service scope for this lock
* @param grantor the grantor handling locks for the lock service
* @param name the name of this lock
@@ -2469,7 +2470,7 @@ public class DLockGrantor {
* queue.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @param request the request to grant or schedule
* @return true if the lock request was immediately granted
*/
@@ -2526,7 +2527,7 @@ public class DLockGrantor {
* NOTE: expiration is only as accurate as clock synchronization on the hardware that the
* members are running on probably should have Requestors handle expirations and send Release
* msg - need an Evictor thread in each Requestor
- *
+ *
* @return the lease expiration time in millis for the currently held lock or Long.MAX_VALUE if
* lock has no owner
*/
@@ -2550,7 +2551,7 @@ public class DLockGrantor {
* Caller must synchronize on this grant token.
*
* Concurrency: protected by synchronization of *this* DLockGrantToken
- *
+ *
* @return true if there are pending requests waiting to lock this
*/
protected synchronized boolean hasWaitingRequests() {
@@ -2563,7 +2564,7 @@ public class DLockGrantor {
* Grant this lock to the request if possible. Returns true if lock was granted to the request.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @param request the lock request asking for this lock
* @return true if lock was granted to the request
*/
@@ -2597,9 +2598,9 @@ public class DLockGrantor {
* <p>
* Call stack: DLockReleaseMessage -> releaseIfLocked -> getAndReleaseGrantIfLockedBy ->
* grant.releaseIfLockedBy
- *
+ *
* Concurrency: protected by synchronization of *this* DLockGrantToken
- *
+ *
* @param owner the member to release the lock for
* @param lockId the lock id that the member used to acquire the lock
*/
@@ -2633,9 +2634,9 @@ public class DLockGrantor {
* Returns true if lock is currently leased by the owner with the specified lock id.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* Concurrency: protected by synchronization of *this* DLockGrantToken
- *
+ *
* @param owner the member to check for lock ownership
* @param lockId the lock id that the member used for locking
* @return true if lock is currently leased by the owner with the specified lock id
@@ -2650,7 +2651,7 @@ public class DLockGrantor {
* this lock.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @return next smallest timeout of the requests still waiting on this lock
*/
protected long handleRequestTimeouts() {
@@ -2690,7 +2691,7 @@ public class DLockGrantor {
* released. Any pending lock requests for this member will be removed.
* <p>
* Synchronizes on this grant token, suspendLock, and grantTokens.
- *
+ *
* @param member the departed member
*/
protected void handleDepartureOf(final InternalDistributedMember member,
@@ -2772,7 +2773,7 @@ public class DLockGrantor {
* Adds this grant to the list if it references the departed member.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @param member the departed member
* @param grantsReferencingMember list to add grant to if it references departed member
*/
@@ -2802,7 +2803,7 @@ public class DLockGrantor {
* Remove all the specified pending requests.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @param requestsToRemove the pending requests to remove guarded.By this
*/
private void removeRequests(Collection requestsToRemove) {
@@ -2818,9 +2819,9 @@ public class DLockGrantor {
* Grants this lock to the next waiting request if one exists.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* Concurrency: protected by synchronization of *this* DLockGrantToken
- *
+ *
* @return true if the lock was granted to next request
*/
protected boolean grantLockToNextRequest() {
@@ -2873,7 +2874,7 @@ public class DLockGrantor {
* request.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @param request the request to grant the lock to
* @return leaseExpireTime or -1 if failed to grant. guarded.By this
*/
@@ -2932,7 +2933,7 @@ public class DLockGrantor {
/**
* Returns the absolute time at which the specified lease time will expire from now. This call
* does not change or check any state other than current time.
- *
+ *
* @param leaseTime the desired length of lease time
* @return the absolute time at which the lease will expire
*/
@@ -2958,9 +2959,9 @@ public class DLockGrantor {
* Returns true if this grant token is currently granted.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* Concurrency: protected by synchronization of *this* DLockGrantToken
- *
+ *
* @param checkForExpiration true if expiration should be attempted before checking if this
* grant token is currently granted
* @return true if this grant token is currently granted
@@ -2976,7 +2977,7 @@ public class DLockGrantor {
* Creates a string of the pending requests for logging or debugging.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @return a string of the pending requests for logging or debugging guarded.By this
*/
private String pendingRequestsToString() {
@@ -3009,7 +3010,7 @@ public class DLockGrantor {
* <p>
* Synchronizes on this grant token.
* <p>
- *
+ *
* @param displayPendingRequests true if string should include pendingRequests
*/
public String toString(boolean displayPendingRequests) {
@@ -3034,7 +3035,7 @@ public class DLockGrantor {
/**
* Returns the name of this lock.
- *
+ *
* @return the name of this lock
*/
Object getName() {
@@ -3043,7 +3044,7 @@ public class DLockGrantor {
/**
* Returns true if this lock represents suspend locking.
- *
+ *
* @return true if this lock represents suspend locking
* @see org.apache.geode.distributed.DistributedLockService#suspendLocking(long)
*/
@@ -3055,7 +3056,7 @@ public class DLockGrantor {
* Returns the lock id used to lease this lock.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @return the lock id used to lease this lock guarded.By this
*/
int getLockId() {
@@ -3066,7 +3067,7 @@ public class DLockGrantor {
* Returns the identity of the thread that has this lock leased.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @return the identity of the thread that has this lock leased guarded.By this
*/
RemoteThread getRemoteThread() {
@@ -3077,7 +3078,7 @@ public class DLockGrantor {
* Increments or decrements access count by the specified amount.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @param amount the amount to inc or dec access count by
*/
private synchronized void incAccess(int amount) {
@@ -3110,7 +3111,7 @@ public class DLockGrantor {
* Returns true if the access count is greater than zero.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @return true if the access count is greater than zero
*/
boolean isBeingAccessed() {
@@ -3123,7 +3124,7 @@ public class DLockGrantor {
* Returns the member that currently holds a lease on this lock.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @return the member that currently holds a lease on this lock
*/
public synchronized InternalDistributedMember getOwner() {
@@ -3135,9 +3136,9 @@ public class DLockGrantor {
* lease will expire.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* Concurrency: protected by synchronization of *this* DLockGrantToken
- *
+ *
* @return the lease expiration time
*/
public long getLeaseExpireTime() {
@@ -3148,7 +3149,7 @@ public class DLockGrantor {
* Returns true if this grant token has been destroyed.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @return true if this grant token has been destroyed
*/
public synchronized boolean isDestroyed() {
@@ -3157,7 +3158,7 @@ public class DLockGrantor {
/**
* Returns the current time in milliseconds.
- *
+ *
* @return the current time in milliseconds
*/
long getCurrentTime() {
@@ -3169,7 +3170,7 @@ public class DLockGrantor {
* grant token.
* <p>
* Synchronizes on this grant token.
- *
+ *
* @return true if the lease is expired
*/
synchronized boolean checkForExpiration() {
@@ -3208,7 +3209,7 @@ public class DLockGrantor {
* Grants this lock.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @param owner the member that is being granted the lock
* @param newLeaseExpireTime the absolute expiration time
* @param lockId the lock id used to request the lock
@@ -3225,7 +3226,7 @@ public class DLockGrantor {
* Modify grant token state to mark the lock as granted.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @param owner the member that has been granted the lock
* @param newLeaseExpireTime the absolute expiration time
* @param lockId the lock id used to request the lock
@@ -3249,7 +3250,7 @@ public class DLockGrantor {
* Returns true if this lock is currently leased out.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @return true if this lock is currently leased out guarded.By this
*/
boolean isLeaseHeld() {
@@ -3277,7 +3278,7 @@ public class DLockGrantor {
* Throws IllegalStateException if this grant token has been destroyed.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @throws IllegalStateException if this grant token has been destroyed guarded.By this
*/
private void checkDestroyed() {
@@ -3294,7 +3295,7 @@ public class DLockGrantor {
* member and lockId.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @param member the member to release the lock from
* @param lockId the lock id that the member used when locking
* @return true if lock was released guarded.By this
@@ -3328,7 +3329,7 @@ public class DLockGrantor {
* Returns true if the sender holds a lease on this lock using lockId.
* <p>
* Caller must synchronize on this grant token.
- *
+ *
* @param sender the member that potentially holds a lease
* @param lockId the lock id provided by the member
* @return true if the sender holds a lease on this lock guarded.By this
@@ -3697,4 +3698,3 @@ public class DLockGrantor {
};
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
index 36c122b..1a3d2a5 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
@@ -29,4 +29,3 @@ public interface DLockLessorDepartureHandler {
public void handleDepartureOf(InternalDistributedMember owner, DLockGrantor grantor);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
index df21141..ced1ea5 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* Queries the grantor for current leasing information of a lock.
- *
+ *
*/
public class DLockQueryProcessor extends ReplyProcessor21 {
private static final Logger logger = LogService.getLogger();
@@ -50,7 +50,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Query the grantor for current leasing information of a lock.
- *
+ *
* @param grantor the member that is the grantor
* @param serviceName the name of the lock service
* @param objectName the named lock
@@ -93,7 +93,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Instantiates a new DLockQueryProcessor.
- *
+ *
* @param dm the distribution manager to use for logging and messaging
* @param grantor the member to query for lock leasing info
* @param serviceName the name of the lock service
@@ -369,7 +369,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Returns true if the queried grantor replied with the current lease info for the named lock.
- *
+ *
* @return true if the queried grantor replied with the current lease info
*/
boolean repliedOK() {
@@ -378,7 +378,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Returns true if the queried grantor replied NOT_GRANTOR.
- *
+ *
* @return true if the queried grantor replied NOT_GRANTOR
*/
boolean repliedNotGrantor() {
@@ -387,7 +387,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Returns the member holding the lease or null if there was no lease.
- *
+ *
* @return the member holding the lease or null
*/
DistributedMember getLessee() {
@@ -400,7 +400,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Returns the query reply's lesseeThread or null if there was no lease.
- *
+ *
* @return the query reply's lesseeThread or null
*/
RemoteThread getLesseeThread() {
@@ -409,7 +409,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Return the query reply's leaseId or -1 if there was no lease.
- *
+ *
* @return the query reply's leaseId or -1
*/
int getLeaseId() {
@@ -418,7 +418,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
/**
* Return the query reply's leaseExpireTime or 0 if there was no lease.
- *
+ *
* @return the query reply's leaseExpireTime or 0
*/
long getLeaseExpireTime() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
index 0ed4890..1423bde 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
@@ -49,7 +49,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
private static final Logger logger = LogService.getLogger();
- protected final static DefaultMessageProcessor nullServiceProcessor =
+ protected static final DefaultMessageProcessor nullServiceProcessor =
new DefaultMessageProcessor();
private DM dm;
@@ -242,7 +242,7 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
/**
* For unit testing we need to push the message through scheduleAction so that message observers
* are invoked
- *
+ *
* @param dm the distribution manager
*/
protected void scheduleMessage(DM dm) {
@@ -460,4 +460,3 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
index e133f79..b1045f1 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
@@ -429,4 +429,3 @@ public class DLockReleaseProcessor extends ReplyProcessor21 {
}
} // DLockReleaseReplyMessage
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
index 9d1b17a..4e433b3 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
@@ -15,21 +15,21 @@
package org.apache.geode.distributed.internal.locks;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+
/**
* Represents a held lock in a member for use when initializing a new grantor. All currently held
* locks are represented as DLockRemoteTokens and provided in response to a
* DLockRecoverGrantorMessage.
- *
+ *
*/
public class DLockRemoteToken implements DataSerializableFixedID {
@@ -58,7 +58,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Creates a new immutable instance of DLockRemoteToken representing the current lease tracked by
* DLockToken. Synchronizes on the provided DLockToken to read data from it.
- *
+ *
* @param token the lock token to gather lease information from
* @return new immutable instance of DLockRemoteToken
*/
@@ -71,7 +71,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Creates a new immutable instance of DLockRemoteToken from the provided DataInput.
- *
+ *
* @param in the input stream to gather state from
* @return new immutable instance of DLockRemoteToken
* @throws IOException if DataSerializer failed to read object from input stream
@@ -104,7 +104,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Instantiates an immutable DLockRemoteToken.
- *
+ *
* @param name the name of the lock
* @param lesseeThread the remotable thread identity of the lease holder
* @param leaseId used to identify the distinct lease used by the lease holder
@@ -120,7 +120,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Returns the identifying name of this lock.
- *
+ *
* @return the identifying name of this lock
*/
public Object getName() {
@@ -130,7 +130,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Returns the serializable identity of the thread currently leasing this lock or null if no
* thread currently holds this lock.
- *
+ *
* @return identity of the thread holding the current lease or null if none
*/
public RemoteThread getLesseeThread() {
@@ -139,7 +139,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Returns the member currently leasing this lock or null if no member curently holds this lock.
- *
+ *
* @return member currently leasing this lock or null
*/
public DistributedMember getLessee() {
@@ -153,7 +153,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Returns the lease id currently used to hold a lease on this lock or -1 if no thread currently
* holds this lock.
- *
+ *
* @return the id of the current lease on this lock or -1 if none
*/
public int getLeaseId() {
@@ -162,7 +162,7 @@ public class DLockRemoteToken implements DataSerializableFixedID {
/**
* Returns the absolute time at which the current lease will expire or -1 if there is no lease.
- *
+ *
* @return the absolute time at which the current lease will expire or -1
*/
public long getLeaseExpireTime() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index f0377b4..4008d2e 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -15,6 +15,24 @@
package org.apache.geode.distributed.internal.locks;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.InternalGemFireException;
@@ -44,23 +62,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.internal.util.concurrent.FutureResult;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Implements the distributed locking service with distributed lock grantors.
@@ -197,7 +198,7 @@ public class DLockService extends DistributedLockService {
/**
* Create a new LockServiceDestroyedException for this lock service.
- *
+ *
* @param message the detail message that explains the exception
* @return new LockServiceDestroyedException
*/
@@ -207,7 +208,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns the string message to use in a LockServiceDestroyedException for this lock service.
- *
+ *
* @return the detail message that explains LockServiceDestroyedException
*/
protected String generateLockServiceDestroyedMessage() {
@@ -217,7 +218,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns true if {@link #lockGrantorId} is the same as the specified LockGrantorId. Caller must
* synchronize on {@link #lockGrantorIdLock}.
- *
+ *
* @param someLockGrantorId the LockGrantorId to check
*/
private boolean checkLockGrantorId(LockGrantorId someLockGrantorId) {
@@ -231,7 +232,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns true if lockGrantorId is the same as the specified LockGrantorId. Caller must
* synchronize on lockGrantorIdLock.
- *
+ *
* @param someLockGrantorId the LockGrantorId to check
*/
public boolean isLockGrantorId(LockGrantorId someLockGrantorId) {
@@ -373,7 +374,7 @@ public class DLockService extends DistributedLockService {
* Creates a local {@link DLockGrantor}.
*
* if (!createLocalGrantor(xxx)) { theLockGrantorId = this.lockGrantorId; }
- *
+ *
* @param elder the elder that told us to be the grantor
* @param needsRecovery true if recovery is required
* @param myLockGrantorId lockGrantorId to use
@@ -534,7 +535,7 @@ public class DLockService extends DistributedLockService {
/**
* Set {@link #lockGrantorId} to the given new value if the current value is null or is an older
* grantor version. Caller must hold {@link #lockGrantorIdLock}.
- *
+ *
* @param newLockGrantorId the new value for lockGrantorId
*/
private boolean setLockGrantorId(LockGrantorId newLockGrantorId) {
@@ -564,7 +565,7 @@ public class DLockService extends DistributedLockService {
* Set {@link #lockGrantorId} to the <code>localLockGrantorId</code> if current value is null or
* is an older grantor version. This also atomically sets {@link #grantor} to ensure that the two
* fields are kept in sync. Caller must hold {@link #lockGrantorIdLock}.
- *
+ *
* @param localLockGrantorId the new value for lockGrantorId
* @param localGrantor the new local intance of DLockGrantor
*/
@@ -582,7 +583,7 @@ public class DLockService extends DistributedLockService {
/**
* Deposes {@link #lockGrantorId} if <code>newLockGrantorId</code> is newer.
- *
+ *
* @param newLockGrantorId the new lock grantor
*/
void deposeOlderLockGrantorId(LockGrantorId newLockGrantorId) {
@@ -609,7 +610,7 @@ public class DLockService extends DistributedLockService {
/**
* Sets {@link #lockGrantorId} to null if the current value equals the expected old value. Caller
* must hold {@link #lockGrantorIdLock}.
- *
+ *
* @param oldLockGrantorId the expected old value
* @return true if lockGrantorId was set to null
*/
@@ -650,7 +651,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns true if the grantor version of <code>dlockGrantor</code> equals the
* <code>grantorVersion</code>.
- *
+ *
* @param dlockGrantor the grantor instance to compare to grantorVersion
* @param grantorVersion the grantor version number
* @return true if dlockGrantor is the same grantor version
@@ -664,7 +665,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns true if <code>someLockGrantor</code> equals the current {@link #lockGrantorId}.
- *
+ *
* @param someLockGrantor
* @return true if someLockGrantor equals the current lockGrantorId
*/
@@ -730,7 +731,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns lockGrantorId when lockGrantorFutureResultRef has been set by another thread.
- *
+ *
* @param lockGrantorFutureResultRef FutureResult to wait for
* @param timeToWait how many ms to wait, 0 = forever
* @param timeUnit the unit of measure for timeToWait
@@ -773,7 +774,7 @@ public class DLockService extends DistributedLockService {
/**
* nulls out grantor to force call to elder
- *
+ *
* @param timeToWait how long to wait for a new grantor. -1 don't wait, 0 no time limit
* @param timeUnit the unit of measure of timeToWait
*/
@@ -1090,7 +1091,7 @@ public class DLockService extends DistributedLockService {
/**
* Attempt to destroy and remove lock token. Synchronizes on tokens map and the lock token.
- *
+ *
* @param name the name of the lock token
* @return true if token has been destroyed and removed
*/
@@ -1336,16 +1337,16 @@ public class DLockService extends DistributedLockService {
* @param name the name of the lock to acquire in this service. This object must conform to the
* general contract of <code>equals(Object)</code> and <code>hashCode()</code> as described
* in {@link java.lang.Object#hashCode()}.
- *
+ *
* @param waitTimeMillis the number of milliseconds to try to acquire the lock before giving up
* and returning false. A value of -1 causes this method to block until the lock is
* acquired.
- *
+ *
* @param leaseTimeMillis the number of milliseconds to hold the lock after granting it, before
* automatically releasing it if it hasn't already been released by invoking
* {@link #unlock(Object)}. If <code>leaseTimeMillis</code> is -1, hold the lock until
* explicitly unlocked.
- *
+ *
* @param tryLock true if the lock should be acquired or fail if currently held. waitTimeMillis
* will be ignored if the lock is currently held by another client.
*
@@ -1356,7 +1357,7 @@ public class DLockService extends DistributedLockService {
*
* @return true if the lock was acquired, false if the timeout <code>waitTimeMillis</code> passed
* without acquiring the lock.
- *
+ *
* @throws InterruptedException if the thread is interrupted before or during this method.
*
* @throws UnsupportedOperationException if attempt to lock batch involves non-tryLocks
@@ -1839,7 +1840,7 @@ public class DLockService extends DistributedLockService {
/**
* Query the grantor for current leasing information of a lock. Returns the current lease info.
- *
+ *
* @param name the named lock to get lease information for
* @return snapshot of the remote lock information
* @throws LockServiceDestroyedException if local instance of lock service has been destroyed
@@ -1884,7 +1885,7 @@ public class DLockService extends DistributedLockService {
* instance.
* <p>
* Caller must be synchronized on {@link DLockService#services}.
- *
+ *
* @see org.apache.geode.distributed.DistributedLockService#create(String, DistributedSystem)
*/
static DLockService basicCreate(String serviceName, InternalDistributedSystem ds,
@@ -2133,7 +2134,7 @@ public class DLockService extends DistributedLockService {
* Returns copy of the tokens map. Synchronizes on token map.
* <p>
* Called by {@link org.apache.geode.internal.admin.remote.FetchDistLockInfoResponse}.
- *
+ *
* @return copy of the tokens map
*/
public Map<Object, DLockToken> snapshotService() {
@@ -2183,7 +2184,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns true if any tokens in this service are currently held. Synchronizes on tokens map and
* on each token to check the lease.
- *
+ *
* @return true if any tokens in this service are currently held
*/
boolean hasHeldLocks() {
@@ -2272,7 +2273,7 @@ public class DLockService extends DistributedLockService {
/**
* Destroys an existing service and removes it from the map
- *
+ *
* @since GemFire 3.5
*/
public void destroyAndRemove() {
@@ -2470,7 +2471,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns the named lock token or null if it doesn't exist. Synchronizes on tokens map.
- *
+ *
* @return the named lock token or null if it doesn't exist
*/
public DLockToken getToken(Object name) {
@@ -2482,7 +2483,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns the named lock token or null if it doesn't exist. Caller must synchronize on tokens
* map.
- *
+ *
* @return the named lock token or null if it doesn't exist
*/
private DLockToken basicGetToken(Object name) {
@@ -2492,7 +2493,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns an unmodifiable collection backed by the values of the DLockToken map for testing
* purposes only. Synchronizes on tokens map.
- *
+ *
* @return an unmodifiable collection of the tokens map values
*/
public Collection getTokens() {
@@ -2536,7 +2537,7 @@ public class DLockService extends DistributedLockService {
/**
* Returns number of lock tokens currently leased by this member. Synchronizes on tokens map and
* each lock token.
- *
+ *
* @return number of lock tokens currently leased by this member
*/
private int numLocksHeldInThisVM() {
@@ -2615,7 +2616,7 @@ public class DLockService extends DistributedLockService {
// -------------------------------------------------------------------------
/** Destroys all named locking services on disconnect from system */
- protected final static InternalDistributedSystem.DisconnectListener disconnectListener =
+ protected static final InternalDistributedSystem.DisconnectListener disconnectListener =
new InternalDistributedSystem.DisconnectListener() {
@Override
public String toString() {
@@ -2683,7 +2684,7 @@ public class DLockService extends DistributedLockService {
/**
* Incrementing serial number used to identify order of DLS creation
- *
+ *
* @see DLockService#getSerialNumber()
*/
private static final AtomicInteger serialNumberSequencer = new AtomicInteger(START_SERIAL_NUMBER);
@@ -2698,7 +2699,7 @@ public class DLockService extends DistributedLockService {
* Generates a serial number for identifying a DLS. Later instances of the same named DLS will
* have a greater serial number than earlier instances. This number increments statically
* throughout the life of this JVM. Rollover to negative is allowed.
- *
+ *
* @return the new serial number
*/
protected static int createSerialNumber() {
@@ -2814,7 +2815,7 @@ public class DLockService extends DistributedLockService {
/**
* Fills lists of service names.
- *
+ *
* @param grantors filled with service names of all services we are currently the grantor of.
* @param grantorVersions elder assigned grantor version ids
* @param grantorSerialNumbers member specific DLS serial number hosting grantor
@@ -2848,7 +2849,7 @@ public class DLockService extends DistributedLockService {
* Called when an elder is doing recovery. For every service that we are the grantor for add it to
* the grantorMap For every service we have that is not in the grantorMap add its name to
* needsRecovery set.
- *
+ *
* @param dm our local DM
*/
public static void recoverLocalElder(DM dm, Map grantors, Set needsRecovery) {
@@ -2948,7 +2949,7 @@ public class DLockService extends DistributedLockService {
/**
* Return a timestamp that represents the current time for locking purposes.
- *
+ *
* @since GemFire 3.5
*/
static long getLockTimeStamp(DM dm) {
@@ -3092,7 +3093,7 @@ public class DLockService extends DistributedLockService {
/**
* Creates a new DLockStopper for the specified DLockService and DM.
- *
+ *
* @param dm the DM to check for shutdown
* @param dls the DLockService to check for DLS destroy
*/
@@ -3139,4 +3140,3 @@ public class DLockService extends DistributedLockService {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
index 567afe9..8dea067 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
@@ -30,74 +30,74 @@ public class DLockStats implements DistributedLockStats {
// Statistic "Id" Fields
// -------------------------------------------------------------------------
- private final static StatisticsType type;
-
- private final static int grantorsId;
- private final static int servicesId;
- private final static int tokensId;
- private final static int grantTokensId;
- private final static int requestQueuesId;
- private final static int serialQueueSizeId;
- private final static int serialThreadsId;
- private final static int waitingQueueSizeId;
- private final static int waitingThreadsId;
- private final static int lockWaitsInProgressId;
- private final static int lockWaitsCompletedId;
- private final static int lockWaitTimeId;
- private final static int lockWaitsFailedId;
- private final static int lockWaitFailedTimeId;
- private final static int grantWaitsInProgressId;
- private final static int grantWaitsCompletedId;
- private final static int grantWaitTimeId;
- private final static int grantWaitsNotGrantorId;
- private final static int grantWaitNotGrantorTimeId;
- private final static int grantWaitsTimeoutId;
- private final static int grantWaitTimeoutTimeId;
- private final static int grantWaitsNotHolderId;
- private final static int grantWaitNotHolderTimeId;
- private final static int grantWaitsFailedId;
- private final static int grantWaitFailedTimeId;
- private final static int grantWaitsSuspendedId;
- private final static int grantWaitSuspendedTimeId;
- private final static int grantWaitsDestroyedId;
- private final static int grantWaitDestroyedTimeId;
- private final static int createGrantorsInProgressId;
- private final static int createGrantorsCompletedId;
- private final static int createGrantorTimeId;
- private final static int serviceCreatesInProgressId;
- private final static int serviceCreatesCompletedId;
- private final static int serviceCreateLatchTimeId;
- private final static int serviceInitLatchTimeId;
- private final static int grantorWaitsInProgressId;
- private final static int grantorWaitsCompletedId;
- private final static int grantorWaitTimeId;
- private final static int grantorWaitsFailedId;
- private final static int grantorWaitFailedTimeId;
- private final static int grantorThreadsInProgressId;
- private final static int grantorThreadsCompletedId;
- private final static int grantorThreadExpireAndGrantLocksTimeId;
- private final static int grantorThreadHandleRequestTimeoutsTimeId;
- private final static int grantorThreadRemoveUnusedTokensTimeId;
- private final static int grantorThreadTimeId;
- private final static int pendingRequestsId;
- private final static int destroyReadWaitsInProgressId;
- private final static int destroyReadWaitsCompletedId;
- private final static int destroyReadWaitTimeId;
- private final static int destroyReadWaitsFailedId;
- private final static int destroyReadWaitFailedTimeId;
- private final static int destroyWriteWaitsInProgressId;
- private final static int destroyWriteWaitsCompletedId;
- private final static int destroyWriteWaitTimeId;
- private final static int destroyWriteWaitsFailedId;
- private final static int destroyWriteWaitFailedTimeId;
- private final static int destroyReadsId;
- private final static int destroyWritesId;
- private final static int lockReleasesInProgressId;
- private final static int lockReleasesCompletedId;
- private final static int lockReleaseTimeId;
- private final static int becomeGrantorRequestsId;
- private final static int freeResourcesCompletedId;
- private final static int freeResourcesFailedId;
+ private static final StatisticsType type;
+
+ private static final int grantorsId;
+ private static final int servicesId;
+ private static final int tokensId;
+ private static final int grantTokensId;
+ private static final int requestQueuesId;
+ private static final int serialQueueSizeId;
+ private static final int serialThreadsId;
+ private static final int waitingQueueSizeId;
+ private static final int waitingThreadsId;
+ private static final int lockWaitsInProgressId;
+ private static final int lockWaitsCompletedId;
+ private static final int lockWaitTimeId;
+ private static final int lockWaitsFailedId;
+ private static final int lockWaitFailedTimeId;
+ private static final int grantWaitsInProgressId;
+ private static final int grantWaitsCompletedId;
+ private static final int grantWaitTimeId;
+ private static final int grantWaitsNotGrantorId;
+ private static final int grantWaitNotGrantorTimeId;
+ private static final int grantWaitsTimeoutId;
+ private static final int grantWaitTimeoutTimeId;
+ private static final int grantWaitsNotHolderId;
+ private static final int grantWaitNotHolderTimeId;
+ private static final int grantWaitsFailedId;
+ private static final int grantWaitFailedTimeId;
+ private static final int grantWaitsSuspendedId;
+ private static final int grantWaitSuspendedTimeId;
+ private static final int grantWaitsDestroyedId;
+ private static final int grantWaitDestroyedTimeId;
+ private static final int createGrantorsInProgressId;
+ private static final int createGrantorsCompletedId;
+ private static final int createGrantorTimeId;
+ private static final int serviceCreatesInProgressId;
+ private static final int serviceCreatesCompletedId;
+ private static final int serviceCreateLatchTimeId;
+ private static final int serviceInitLatchTimeId;
+ private static final int grantorWaitsInProgressId;
+ private static final int grantorWaitsCompletedId;
+ private static final int grantorWaitTimeId;
+ private static final int grantorWaitsFailedId;
+ private static final int grantorWaitFailedTimeId;
+ private static final int grantorThreadsInProgressId;
+ private static final int grantorThreadsCompletedId;
+ private static final int grantorThreadExpireAndGrantLocksTimeId;
+ private static final int grantorThreadHandleRequestTimeoutsTimeId;
+ private static final int grantorThreadRemoveUnusedTokensTimeId;
+ private static final int grantorThreadTimeId;
+ private static final int pendingRequestsId;
+ private static final int destroyReadWaitsInProgressId;
+ private static final int destroyReadWaitsCompletedId;
+ private static final int destroyReadWaitTimeId;
+ private static final int destroyReadWaitsFailedId;
+ private static final int destroyReadWaitFailedTimeId;
+ private static final int destroyWriteWaitsInProgressId;
+ private static final int destroyWriteWaitsCompletedId;
+ private static final int destroyWriteWaitTimeId;
+ private static final int destroyWriteWaitsFailedId;
+ private static final int destroyWriteWaitFailedTimeId;
+ private static final int destroyReadsId;
+ private static final int destroyWritesId;
+ private static final int lockReleasesInProgressId;
+ private static final int lockReleasesCompletedId;
+ private static final int lockReleaseTimeId;
+ private static final int becomeGrantorRequestsId;
+ private static final int freeResourcesCompletedId;
+ private static final int freeResourcesFailedId;
/** returns the current nano time, if time stats are enabled */
static long getStatTime() {
@@ -972,7 +972,7 @@ public class DLockStats implements DistributedLockStats {
/**
* Returns a helper object so that the serial queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public QueueStatHelper getSerialQueueHelper() {
@@ -994,7 +994,7 @@ public class DLockStats implements DistributedLockStats {
/**
* Returns a helper object so that the waiting pool can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public PoolStatHelper getWaitingPoolHelper() {
@@ -1012,7 +1012,7 @@ public class DLockStats implements DistributedLockStats {
/**
* Returns a helper object so that the waiting queue can record its stats to the proper
* distribution stats.
- *
+ *
* @since GemFire 3.5
*/
public QueueStatHelper getWaitingQueueHelper() {
@@ -1036,4 +1036,3 @@ public class DLockStats implements DistributedLockStats {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
index 3e85171..9d36d74 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
@@ -108,7 +108,7 @@ public class DLockToken {
/**
* Instantiates a new DLockToken for use by {@link DLockService}.
- *
+ *
* @param dm the DistributionManager for this member
* @param name the identifying name of this lock
*/
@@ -126,7 +126,7 @@ public class DLockToken {
* Caller must synchronize on this lock token.
* <p>
* Public because {@link org.apache.geode.internal.admin.remote.RemoteDLockInfo} is a caller.
- *
+ *
* @return the lock re-entry recursion of the current lease or -1 if none
*/
public int getRecursion() {
@@ -138,7 +138,7 @@ public class DLockToken {
* Caller must synchronize on this lock token.
* <p>
* Public because {@link org.apache.geode.internal.admin.remote.RemoteDLockInfo} is a caller.
- *
+ *
* @return the name of the actual local thread leasing this lock or null
*/
public String getThreadName() {
@@ -157,7 +157,7 @@ public class DLockToken {
* Caller must synchronize on this lock token.
* <p>
* Public because {@link org.apache.geode.internal.admin.remote.RemoteDLockInfo} is a caller.
- *
+ *
* @return the absolute time at which the current lease will expire or -1
*/
public long getLeaseExpireTime() {
@@ -175,7 +175,7 @@ public class DLockToken {
/**
* Returns the identifying name of this lock. Caller must synchronize on this lock token if
* instance was deserialized.
- *
+ *
* @return the identifying name of this lock
*/
Object getName() {
@@ -185,7 +185,7 @@ public class DLockToken {
/**
* Returns the lease id currently used to hold a lease on this lock or -1 if no thread currently
* holds this lock. Caller must synchronize on this token.
- *
+ *
* @return the id of the current lease on this lock or -1 if none
*/
int getLeaseId() {
@@ -195,7 +195,7 @@ public class DLockToken {
/**
* Returns the remotable identity of the thread currently leasing this lock or null if no thread
* currently holds this lock. Caller must synchronize on this lock token.
- *
+ *
* @return identity of the thread holding the current lease or null if none
*/
RemoteThread getLesseeThread() {
@@ -219,7 +219,7 @@ public class DLockToken {
/**
* Returns true if the usage count for this lock token is greater than zero. Caller must
* synchronize on this lock token.
- *
+ *
* @return true if the usage count for this lock token is greater than zero
*/
boolean isBeingUsed() {
@@ -239,7 +239,7 @@ public class DLockToken {
/**
* Returns the current time in absolute milliseconds for use calculating lease expiration times.
- *
+ *
* @return the current time in absolute milliseconds
*/
long getCurrentTime() {
@@ -252,7 +252,7 @@ public class DLockToken {
* Throws LeaseExpiredException if the calling thread's lease on this lock previously expired. The
* expired lease will no longer be tracked after throwing LeaseExpiredException. Caller must
* synchronize on this lock token.
- *
+ *
* @throws LeaseExpiredException if calling thread's lease expired
*/
void throwIfCurrentThreadHadExpiredLease() throws LeaseExpiredException {
@@ -269,7 +269,7 @@ public class DLockToken {
/**
* Checks the current lease for expiration and returns true if it has been marked as expired.
* Caller must synchronize on this lock token.
- *
+ *
* @return true if the current lease has been marked as expired
*/
boolean checkForExpiration() {
@@ -295,7 +295,7 @@ public class DLockToken {
/**
* Grants new lease to calling thread for this lock token. Synchronizes on this lock token.
- *
+ *
* @param newLeaseExpireTime absolute expiration in millis or Long.MAX_VALUE
* @param newLeaseId uniquely identifies the lease for this thread
* @param newRecursion recursion count if lock has been re-entered
@@ -325,7 +325,7 @@ public class DLockToken {
/**
* Returns true if there's currently a lease on this lock token. Synchronizes on this lock token.
- *
+ *
* @return true if there's currently a lease on this lock token
*/
synchronized boolean isLeaseHeld() {
@@ -335,7 +335,7 @@ public class DLockToken {
/**
* Returns true if lease on this lock token is held by calling thread or the specified remote
* thread. Caller must synchronize on this lock token.
- *
+ *
* @param remoteThread remotable identity of thread to check for
* @return true if lease is held by calling thread or remote thread
*/
@@ -351,7 +351,7 @@ public class DLockToken {
/**
* Returns true if lease on this lock token is held by calling thread. Caller must synchronize on
* this lock token.
- *
+ *
* @return true if lease is held by calling thread
*/
boolean isLeaseHeldByCurrentThread() {
@@ -361,7 +361,7 @@ public class DLockToken {
/**
* Returns true if this lock token should be ignored for grantor recovery. Caller must synchronize
* on this lock token.
- *
+ *
* @return true if this lock token should be ignored for grantor recovery
*/
synchronized boolean ignoreForRecovery() {
@@ -371,7 +371,7 @@ public class DLockToken {
/**
* Sets whether or not this lock token should be ignored for grantor recovery. Caller must
* synchronize on this lock token.
- *
+ *
* @param value true if this lock token should be ignored for grantor recovery
*/
void setIgnoreForRecovery(boolean value) {
@@ -380,7 +380,7 @@ public class DLockToken {
/**
* Releases the current lease on this lock token. Synchronizes on this lock token.
- *
+ *
* @param leaseIdToRelease lease id to release
* @param remoteThread identity of thread holding lease
* @return true if lock was successfully released
@@ -391,7 +391,7 @@ public class DLockToken {
/**
* Releases the current lease on this lock token. Synchronizes on this lock token.
- *
+ *
* @param leaseIdToRelease lease id to release
* @param remoteThread identity of thread holding lease
* @param decRecursion true if recursion should be decremented
@@ -454,7 +454,7 @@ public class DLockToken {
/**
* Returns true if lease is held using specified lease id. Caller must synchronize on this lock
* token.
- *
+ *
* @param memberLeaseId lease id used by member
* @return true if lease is held using specified lease id
*/
@@ -465,7 +465,7 @@ public class DLockToken {
/**
* Increments or decrements usage count by the specified amount. Caller must synchronize on this
* lock token.
- *
+ *
* @param amount the amount to inc or dec usage count by
*/
private void incUsage(int amount) {
@@ -479,7 +479,7 @@ public class DLockToken {
/**
* Increments or decrements recursion by the specified amount. Caller must synchronize on this
* lock token.
- *
+ *
* @param amount the amount to inc or dec recursion by
*/
private void incRecursion(int amount) {
@@ -493,7 +493,7 @@ public class DLockToken {
/**
* Throws IllegalStateException if this lock token has been destroyed. Caller must synchronize on
* this lock token.
- *
+ *
* @throws IllegalStateException if this lock token has been destroyed
*/
private void checkDestroyed() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
index 907e731..92c36ea 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
@@ -69,7 +69,7 @@ public class DeposeGrantorProcessor extends ReplyProcessor21 {
}
}
- static protected void doOldGrantorWork(final String serviceName,
+ protected static void doOldGrantorWork(final String serviceName,
final InternalDistributedMember elder, final InternalDistributedMember youngTurk,
final long newGrantorVersion, final int newGrantorSerialNumber, final DM dm,
final DeposeGrantorMessage msg) {
@@ -180,4 +180,3 @@ public class DeposeGrantorProcessor extends ReplyProcessor21 {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
index 629efce..2a8d772 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
@@ -267,4 +267,3 @@ public interface DistributedLockStats {
public void incFreeResourcesFailed();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
index 9b379c7..54fe848 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
@@ -15,17 +15,16 @@
package org.apache.geode.distributed.internal.locks;
import java.io.Serializable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
import org.apache.geode.distributed.DistributedLockService;
-import org.apache.geode.distributed.internal.locks.DLockService.ThreadRequestState;
import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.locks.DLockService.ThreadRequestState;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-
/**
* Distributed lock which is owned by a member rather than a single thread. Any thread within the
* {@link org.apache.geode.distributed.DistributedMember} may unlock a held
@@ -33,10 +32,10 @@ import java.util.concurrent.locks.Lock;
*
* While this member holds the lock, another member will not be able to acquire it. Any thread
* within this member may reenter or unlock the lock.
- *
+ *
* Operations delegate to {@link org.apache.geode.distributed.DistributedLockService} and may throw
* LockNotHeldException or LockServiceDestroyedException.
- *
+ *
* @since GemFire 5.1
*/
public class DistributedMemberLock implements Lock {
@@ -46,7 +45,7 @@ public class DistributedMemberLock implements Lock {
/**
* Defines the behavior when attempting to reenter a held lock.
- *
+ *
*/
public enum LockReentryPolicy {
/** Allows lock reentry */
@@ -58,7 +57,7 @@ public class DistributedMemberLock implements Lock {
/**
* Returns true if lock reentry should be rejected.
- *
+ *
* @param lock the lock that reentry is being attempted on
* @return true if lock reentry should be rejected
* @throws IllegalStateException if reentry policy is NONREENTRANT_ERROR
@@ -112,7 +111,7 @@ public class DistributedMemberLock implements Lock {
/**
* Constructs a new <code>DistributedMemberLock</code>.
- *
+ *
* @param dls the instance of <code>DistributedLockService</code> to use
* @param key name of the key for this lock
* @throws NullPointerException if dls or key is null
@@ -123,7 +122,7 @@ public class DistributedMemberLock implements Lock {
/**
* Constructs a new <code>DistributedMemberLock</code>.
- *
+ *
* @param dls the instance of <code>DistributedLockService</code> to use
* @param key name of the key for this lock
* @param leaseTimeout number of milliseconds to hold a lock before automatically releasing it
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
index b0bf347..55b69ad 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
@@ -383,4 +383,3 @@ public class DummyDLockStats implements DistributedLockStats {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
index 0dbaa0f..9f4914a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
@@ -291,4 +291,3 @@ public class ElderInitProcessor extends ReplyProcessor21 {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
index 1ee15af..58003d8 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
@@ -104,7 +104,7 @@ public class ElderState {
/**
* Atomically determine who is the current grantor of the given service. If no current grantor
* exists then the caller is made the grantor.
- *
+ *
* @param serviceName the name of the lock service we want the grantor of
* @param requestor the id of the member who is making this request
* @return the current grantor of <code>serviceName</code> and recoveryNeeded will be true if
@@ -149,7 +149,7 @@ public class ElderState {
/**
* Atomically determine who is the current grantor of the given service.
- *
+ *
* @param serviceName the name of the lock service we want the grantor of
* @return the current grantor of <code>serviceName</code> and recoveryNeeded will be true if
* requestor has become the grantor and needs to recover lock info.
@@ -176,7 +176,7 @@ public class ElderState {
/**
* Atomically sets the current grantor of the given service to <code>newGrantor</code>.
- *
+ *
* @param serviceName the name of the lock service we want the grantor of
* @param newGrantor the id of the member who is making this request
* @param oldTurk if non-null then only do the become if the current grantor is the oldTurk
@@ -307,7 +307,7 @@ public class ElderState {
* Atomically clears the current grantor of the given service if the current grantor is
* <code>oldGrantor</code>. The next grantor for this service will not need to recover unless
* <code>locksHeld</code> is true.
- *
+ *
* @param locksHeld true if old grantor had held locks
*/
public void clearGrantor(long grantorVersion, String serviceName, int dlsSerialNumber,
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
index 21dd318..221f568 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
@@ -74,7 +74,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Encapsulates the context necessary for processing a given grantor request for a given
* InternalDistributedSystem
- *
+ *
*/
public static class GrantorRequestContext {
/**
@@ -89,21 +89,21 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Our notion of the current elder
- *
+ *
* guarded.By {@link #elderLock}
*/
InternalDistributedMember currentElder = null;
/**
* Count of the elder calls in-flight
- *
+ *
* guarded.By {@link #elderLock}
*/
int elderCallsInProgress = 0;
/**
* If true, we're cooling our heels waiting for the elders to pass the baton
- *
+ *
* guarded.By {@link #elderLock}
*/
boolean waitingToChangeElder = false;
@@ -152,7 +152,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Waits until elder recovery can proceed safely. Currently this is done by waiting until any in
* progress calls to an old elder are complete
- *
+ *
* @param elderId the member id of the new elder; null if new elder is local
*/
static void readyForElderRecovery(InternalDistributedSystem sys,
@@ -187,7 +187,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* elderSyncWait
- *
+ *
* @param newElder
* @param dls
*/
@@ -270,7 +270,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Asks the elder who the grantor is for the specified service. If no grantor exists then makes us
* the grantor.
- *
+ *
* @param service the service we want to know the grantor of.
* @param sys the distributed system
* @return information describing the current grantor of this service and if it needs recovery.
@@ -282,7 +282,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Asks the elder who the grantor is for the specified service.
- *
+ *
* @param service the service we want to know the grantor of.
* @param sys th distributed system
* @return information describing the current grantor of this service and if recovery is needed
@@ -297,7 +297,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Tells the elder we want to become the grantor
- *
+ *
* @param service the service we want to be the grantor of.
* @param oldTurk if non-null then only become grantor if it is currently oldTurk.
* @param sys the distributed system
@@ -311,7 +311,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/**
* Tells the elder we are doing a clean destroy of our grantor
- *
+ *
* @param service the service we are no longer the grantor of.
* @param sys the distributed system
*/
@@ -468,7 +468,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
private InternalDistributedMember oldTurk;
/**
- *
+ *
* @param serviceName
* @param elder
* @param dm
@@ -694,4 +694,3 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
index b193ef3..2dd2e1e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
@@ -44,4 +44,3 @@ public class LockGrantorDestroyedException extends IllegalStateException {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
index 02fb64e..a887d84 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Identifies specific lock grantor member and version.
- *
+ *
* @since GemFire 5.1
*/
public class LockGrantorId {
@@ -38,7 +38,7 @@ public class LockGrantorId {
/**
* Constructs a new instance to identify a specific lock grantor member and version.
- *
+ *
* @param dm the distribution manager which is used by {@link #isLocal()}
* @param lockGrantorMember the non-null member hosting the grantor
* @param lockGrantorVersion the long grantor version number
@@ -57,7 +57,7 @@ public class LockGrantorId {
/**
* Returns the non-null member hosting the grantor.
- *
+ *
* @return the member hosting the grantor
*/
public InternalDistributedMember getLockGrantorMember() {
@@ -67,7 +67,7 @@ public class LockGrantorId {
/**
* Returns the long grantor version number. A given member may host grantor several times during
* its life and this version number will be greater for later grantor instances.
- *
+ *
* @return the long grantor version number
*/
public long getLockGrantorVersion() {
@@ -76,7 +76,7 @@ public class LockGrantorId {
/**
* Returns the DLS serial number of the lock service that is hosting the grantor.
- *
+ *
* @return the grantor's DLS serial number
*/
public int getLockGrantorSerialNumber() {
@@ -85,7 +85,7 @@ public class LockGrantorId {
/**
* Returns true if the grantor version number is positive.
- *
+ *
* @return true if the grantor version number is positive
*/
public boolean hasLockGrantorVersion() {
@@ -95,7 +95,7 @@ public class LockGrantorId {
/**
* Returns true if <code>otherLockGrantorId</code> is same as this instance. Returns false if
* different or if <code>otherLockGrantorId</code> is null.
- *
+ *
* @param otherLockGrantorId the other instance to compare this instance to
* @return true if <code>otherLockGrantorId</code> is same
*/
@@ -110,7 +110,7 @@ public class LockGrantorId {
/**
* Returns true if this instance represents a newer lock grantor version than
* <code>otherLockGrantorId</code>. Returns true if <code>otherLockGrantorId</code> is null.
- *
+ *
* @param otherLockGrantorId the other lock grantor id to compare to
* @return true if this instance represents a newer lock grantor version
*/
@@ -131,7 +131,7 @@ public class LockGrantorId {
/**
* Returns true if this instance represents the same lock grantor member and version
- *
+ *
* @param someLockGrantorMember the lock grantor member
* @param someLockGrantorVersion the lock grantor version
* @return true if <code>otherLockGrantorId</code> is same
@@ -149,7 +149,7 @@ public class LockGrantorId {
/**
* Returns true if this instance represents a local lock grantor.
- *
+ *
* @return true if this instance represents a local lock grantor
*/
public boolean isLocal() {
@@ -159,7 +159,7 @@ public class LockGrantorId {
/**
* Returns true if this instance represents a local lock grantor with the specified DLS serial
* number
- *
+ *
* @return ture if local grantor with matching serial number
*/
public boolean isLocal(int dlsSerialNumber) {
@@ -169,7 +169,7 @@ public class LockGrantorId {
/**
* Returns true if this instance represents a remote lock grantor.
- *
+ *
* @return true if this instance represents a remote lock grantor
*/
public boolean isRemote() {
@@ -178,7 +178,7 @@ public class LockGrantorId {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
index d8f688b..cfc1888 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
@@ -31,10 +31,7 @@ import org.apache.geode.distributed.internal.PooledDistributionMessage;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.distributed.internal.ReplyProcessor21;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-// import org.apache.geode.distributed.internal.DistributionAdvisor;
-// import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
@@ -53,7 +50,7 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
////////// Public static entry point /////////
/**
- *
+ *
* Send a message to grantor telling him that we've shutdown the named lock service for this
* member.
* <p>
@@ -286,4 +283,3 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
index 5cf2ffa..ddb2672 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
@@ -71,7 +71,7 @@ public class RemoteThread {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -86,4 +86,3 @@ public class RemoteThread {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
index b2e2d60..73d896d 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
@@ -35,14 +35,14 @@ public interface DistributedMembershipListener extends DirectChannelListener {
/**
* Event indicating that a new member has joined the system.
- *
+ *
* @param m the new member
*/
public void newMemberConnected(InternalDistributedMember m);
/**
* Event indicating that a member has left the system
- *
+ *
* @param id the member who has left
* @param crashed true if the departure was unexpected
* @param reason a characterization of the departure
@@ -52,7 +52,7 @@ public interface DistributedMembershipListener extends DirectChannelListener {
/**
* Event indicating that a member is suspected of having departed but is still in the membership
* view
- *
+ *
* @param reason TODO
*/
public void memberSuspect(InternalDistributedMember suspect,
@@ -60,7 +60,7 @@ public interface DistributedMembershipListener extends DirectChannelListener {
/**
* Event indicating a message has been delivered that we need to process.
- *
+ *
* @param o the message that should be processed.
*/
public void messageReceived(DistributionMessage o);
@@ -68,10 +68,10 @@ public interface DistributedMembershipListener extends DirectChannelListener {
/**
* Indicates whether, during the shutdown sequence, if other members of the distributed system
* have been notified.
- *
+ *
* This allows a membership manager to identify potential race conditions during the shutdown
* process.
- *
+ *
* @return true if other members of the distributed system have been notified.
*/
public boolean isShutdownMsgSent();
@@ -84,7 +84,7 @@ public interface DistributedMembershipListener extends DirectChannelListener {
/**
* Support good logging on this listener
- *
+ *
* @return a printable string for this listener
*/
public String toString();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 18f4c33..b5db42c 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.distributed.internal.membership;
+import java.io.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.InternalGemFireError;
@@ -30,18 +36,12 @@ import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.net.SocketCreator;
-import java.io.*;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-
/**
* This is the fundamental representation of a member of a GemFire distributed system.
*/
public class InternalDistributedMember implements DistributedMember, Externalizable,
DataSerializableFixedID, ProfileId, VersionSource<DistributedMember> {
- private final static long serialVersionUID = -2785249969777296507L;
+ private static final long serialVersionUID = -2785249969777296507L;
// whether to show NetMember components in toString()
private final boolean SHOW_NETMEMBER =
@@ -146,7 +146,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* <p>
* This is not the preferred way of creating an instance since the NetMember may not have all
* required information (e.g., a JGroups address without direct-port and other information).
- *
+ *
* @param m
*/
public InternalDistributedMember(NetMember m) {
@@ -170,7 +170,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* Replace the current NetMember with the given member. This can be used to fill out an
* InternalDistributedMember that was created from a partial NetMember created by
* readEssentialData.
- *
+ *
* @param m the replacement NetMember
*/
public void setNetMember(NetMember m) {
@@ -194,7 +194,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* <b> THIS METHOD IS FOR TESTING ONLY. DO NOT USE IT TO CREATE IDs FOR USE IN THE PRODUCT. IT
* DOES NOT PROPERLY INITIALIZE ATTRIBUTES NEEDED FOR P2P FUNCTIONALITY. </b>
*
- *
+ *
* @param i the hostname, must be for the current host
* @param p the membership listening port
* @throws UnknownHostException if the given hostname cannot be resolved
@@ -206,7 +206,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
/**
* Creates a new InternalDistributedMember for use in notifying membership listeners. The version
* information in the ID is set to Version.CURRENT.
- *
+ *
* @param location the coordinates of the server
*/
@@ -232,7 +232,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* <b> THIS METHOD IS FOR TESTING ONLY. DO NOT USE IT TO CREATE IDs FOR USE IN THE PRODUCT. IT
* DOES NOT PROPERLY INITIALIZE ATTRIBUTES NEEDED FOR P2P FUNCTIONALITY. </b>
*
- *
+ *
* @param i the hostname, must be for the current host
* @param p the membership listening port
* @param version the version of this member
@@ -275,7 +275,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* @param vmKind the dmType
* @param groups the server groups / roles
* @param attr durable client attributes, if any
- *
+ *
* @throws UnknownHostException if the given hostname cannot be resolved
*/
public InternalDistributedMember(String host, int p, String n, String u, int vmKind,
@@ -302,7 +302,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* <b> THIS METHOD IS FOR TESTING ONLY. DO NOT USE IT TO CREATE IDs FOR USE IN THE PRODUCT. IT
* DOES NOT PROPERLY INITIALIZE ATTRIBUTES NEEDED FOR P2P FUNCTIONALITY. </b>
*
- *
+ *
* @param i the hostname, must be for the current host
* @param p the membership listening port
*/
@@ -314,10 +314,10 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
/**
* Create a InternalDistributedMember as defined by the given address.
* <p>
- *
+ *
* <b> THIS METHOD IS FOR TESTING ONLY. DO NOT USE IT TO CREATE IDs FOR USE IN THE PRODUCT. IT
* DOES NOT PROPERLY INITIALIZE ATTRIBUTES NEEDED FOR P2P FUNCTIONALITY. </b>
- *
+ *
* @param addr address of the server
* @param p the listening port of the server
* @param isCurrentHost true if the given host refers to the current host (bridge and gateway use
@@ -345,7 +345,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
/**
* Return the underlying port (membership port)
- *
+ *
* @return the underlying membership port
*/
public int getPort() {
@@ -456,7 +456,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
/**
* Returns the name of this member's distributed system connection or null if no name was
* specified.
- *
+ *
* @see org.apache.geode.distributed.DistributedSystem#getName
*/
public String getName() {
@@ -611,7 +611,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
/**
* An InternalDistributedMember created for a test or via readEssentialData will be a Partial ID,
* possibly not having ancillary info like "name".
- *
+ *
* @return true if this is a partial ID
*/
public boolean isPartial() {
@@ -1191,7 +1191,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* sb.append(addr.getHostAddress()); } else { appendShortName(addr.getHostName(), sb); } if
* (this.vmPid != 0) { sb.append("("); sb.append(this.vmPid); sb.append(")"); } sb.append(":");
* sb.append(this.ipAddr.getPort()); return sb.toString(); } }
- *
+ *
* // Helper method for getId()... copied from IpAddress. private void appendShortName(String
* hostname, StringBuffer sb) { if (hostname == null) return; int index = hostname.indexOf('.');
* if(index > 0 && !Character.isDigit(hostname.charAt(0))) { sb.append(hostname.substring(0,
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
index 3467092..cff6908 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
@@ -14,21 +14,21 @@
*/
package org.apache.geode.distributed.internal.membership;
+import java.util.*;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.*;
-
-import org.apache.commons.lang.StringUtils;
-
/**
* <p>
* Members of the distributed system can fill one or more user defined roles. A role is metadata
* that describes how the member relates to other members or what purpose it fills.
* </p>
- *
+ *
* <p>
* This class should not be Serializable or DataSerializable. It has a private constructor and it
* maintains a static canonical map of instances. Any serializable object which has instances of
@@ -65,7 +65,7 @@ public class InternalRole implements Role {
/**
* implements the java.lang.Comparable interface
- *
+ *
* @see java.lang.Comparable
* @param o the Object to be compared
* @return a negative integer, zero, or a positive integer as this object is less than, equal to,
@@ -160,7 +160,7 @@ public class InternalRole implements Role {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -169,5 +169,3 @@ public class InternalRole implements Role {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
index f8ea15d..e6d5053 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
@@ -121,4 +121,3 @@ public class MemberAttributes {
return this.vmViewId;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java
index b682d93..92cf3f4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.distributed.internal.membership;
+import java.io.File;
+import java.net.InetAddress;
+
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.LocatorStats;
@@ -22,13 +25,10 @@ import org.apache.geode.distributed.internal.membership.gms.NetLocator;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.security.SecurityService;
-import java.io.File;
-import java.net.InetAddress;
-
/**
* Create a new Member based on the given inputs. TODO: need to implement a real factory
* implementation based on gemfire.properties
- *
+ *
* @see org.apache.geode.distributed.internal.membership.NetMember
*/
public class MemberFactory {
@@ -37,7 +37,7 @@ public class MemberFactory {
/**
* Return a new NetMember, possibly for a different host
- *
+ *
* @param i the name of the host for the specified NetMember, the current host (hopefully) if
* there are any problems.
* @param p the membership port
@@ -53,7 +53,7 @@ public class MemberFactory {
/**
* Return a new NetMember representing current host
- *
+ *
* @param i an InetAddress referring to the current host
* @param p the membership port being used
* @return the new NetMember
@@ -65,7 +65,7 @@ public class MemberFactory {
/**
* Return a new NetMember representing current host
- *
+ *
* @param s a String referring to the current host
* @param p the membership port being used
* @return the new member
@@ -77,7 +77,7 @@ public class MemberFactory {
/**
* Create a new MembershipManager. Be sure to send the manager a postConnect() message before you
* start using it.
- *
+ *
* @param listener the listener to notify for callbacks
* @param config the configuration of connection to distributed system
* @param transport holds configuration information that can be used by the manager to configure
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java
index c52ccbc..33d8131 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.distributed.internal.membership;
+import java.io.File;
+import java.net.InetAddress;
+
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.LocatorStats;
@@ -21,19 +24,16 @@ import org.apache.geode.distributed.internal.membership.gms.NetLocator;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.security.SecurityService;
-import java.io.File;
-import java.net.InetAddress;
-
/**
* This is the SPI for a provider of membership services.
- *
+ *
* @see org.apache.geode.distributed.internal.membership.NetMember
*/
public interface MemberServices {
/**
* Return a new NetMember, possibly for a different host
- *
+ *
* @param i the name of the host for the specified NetMember, the current host (hopefully) if
* there are any problems.
* @param port the membership port
@@ -48,17 +48,17 @@ public interface MemberServices {
/**
* Return a new NetMember representing current host
- *
+ *
* @param i an InetAddress referring to the current host
* @param port the membership port being used
- *
+ *
* @return the new NetMember
*/
public abstract NetMember newNetMember(InetAddress i, int port);
/**
* Return a new NetMember representing current host
- *
+ *
* @param s a String referring to the current host
* @param p the membership port being used
* @return the new member
@@ -67,12 +67,12 @@ public interface MemberServices {
/**
* Create a new MembershipManager
- *
+ *
* @param listener the listener to notify for callbacks
* @param transport holds configuration information that can be used by the manager to configure
* itself
* @param stats a gemfire statistics collection object for communications stats
- *
+ *
* @return a MembershipManager
*/
public abstract MembershipManager newMembershipManager(DistributedMembershipListener listener,
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java
index 2e9f87c..f9e5544 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java
@@ -32,8 +32,8 @@ import org.apache.geode.internal.logging.InternalLogWriter;
* <p>
*
* Note that it is imperative to send a new manager a postConnect message after instantiation.
- *
- *
+ *
+ *
*/
public interface MembershipManager {
@@ -45,7 +45,7 @@ public interface MembershipManager {
/**
* Fetch the current view of memberships in th distributed system, as an ordered list.
- *
+ *
* @return list of members
*/
public NetView getView();
@@ -53,21 +53,21 @@ public interface MembershipManager {
/**
* Returns an object that is used to sync access to the view. While this lock is held the view
* can't change.
- *
+ *
* @since GemFire 5.7
*/
public ReadWriteLock getViewLock();
/**
* Return a {@link InternalDistributedMember} representing the current system
- *
+ *
* @return an address corresponding to the current system
*/
public InternalDistributedMember getLocalMember();
/**
* Sanity checking, esp. for elder processing. Does the existing member (still) exist in our view?
- *
+ *
* @param m the member
* @return true if it still exists
*/
@@ -76,7 +76,7 @@ public interface MembershipManager {
/**
* Is this manager still connected? If it has not been initialized, this method will return true;
* otherwise it indicates whether the connection is stil valid
- *
+ *
* @return true if the manager is still connected.
*/
public boolean isConnected();
@@ -104,7 +104,7 @@ public interface MembershipManager {
/**
* Stall the current thread until we are ready to accept view events
- *
+ *
* @throws InterruptedException if the thread is interrupted while waiting
* @see #startEventProcessing()
*/
@@ -112,7 +112,7 @@ public interface MembershipManager {
/**
* Commence delivering events to my listener.
- *
+ *
* @see #waitForEventProcessing()
*/
public void startEventProcessing();
@@ -143,14 +143,14 @@ public interface MembershipManager {
/**
* Determine whether GCS shutdown has commenced
- *
+ *
* @return true if it is shutting down
*/
public boolean shutdownInProgress();
/**
* Returns a serializable map of communications state for use in state stabilization.
- *
+ *
* @param member the member whose message state is to be captured
* @param includeMulticast whether the state of the mcast messaging should be included
* @return the current state of the communication channels between this process and the given
@@ -161,7 +161,7 @@ public interface MembershipManager {
/**
* Waits for the given communications to reach the associated state
- *
+ *
* @param member The member whose messaging state we're waiting for
* @param state The message states to wait for. This should come from getMessageStates
* @throws InterruptedException Thrown if the thread is interrupted
@@ -172,7 +172,7 @@ public interface MembershipManager {
/**
* Wait for the given member to not be in the membership view and for all direct-channel receivers
* for this member to be closed.
- *
+ *
* @param mbr the member
* @return for testing purposes this returns true if the serial queue for the member was flushed
* @throws InterruptedException if interrupted by another thread
@@ -184,7 +184,7 @@ public interface MembershipManager {
/**
* Returns true if remoteId is an existing member, otherwise waits till timeout. Returns false if
* remoteId is not confirmed to be a member.
- *
+ *
* @param remoteId
* @return true if membership is confirmed, else timeout and false
*/
@@ -192,7 +192,7 @@ public interface MembershipManager {
/**
* Release critical resources, avoiding any possibility of deadlock
- *
+ *
* @see SystemFailure#emergencyClose()
*/
public void emergencyClose();
@@ -207,7 +207,7 @@ public interface MembershipManager {
* is in the view though we try to connect to its failure-detection port to see if it's still
* around. If we can't then suspect processing is initiated on the member with the given reason
* string.
- *
+ *
* @param mbr the member to verify
* @param reason why the check is being done (must not be blank/null)
* @return true if the member checks out
@@ -230,14 +230,14 @@ public interface MembershipManager {
/**
* if the manager initiated shutdown, this will return the cause of abnormal termination of
* membership management in this member
- *
+ *
* @return the exception causing shutdown
*/
public Throwable getShutdownCause();
/**
* register a test hook for membership events
- *
+ *
* @see MembershipTestHook
*/
public void registerTestHook(MembershipTestHook mth);
@@ -249,7 +249,7 @@ public interface MembershipManager {
/**
* If this member is shunned, ensure that a warning is generated at least once.
- *
+ *
* @param mbr the member that may be shunned
*/
public void warnShun(DistributedMember mbr);
@@ -259,7 +259,7 @@ public interface MembershipManager {
/**
* if a StartupMessage is going to reject a new member, this should be used to make sure we don't
* keep that member on as a "surprise member"
- *
+ *
* @param mbr the failed member
* @param failureMessage the reason for the failure (e.g., license limitation)
*/
@@ -300,7 +300,7 @@ public interface MembershipManager {
/**
* After a forced-disconnect this method should be used once before attempting to use
* quorumCheckForAutoReconnect().
- *
+ *
* @return the quorum checker to be used in reconnecting the system
*/
public QuorumChecker getQuorumChecker();
@@ -309,7 +309,7 @@ public interface MembershipManager {
/**
* Frees resources used for quorum checks during auto-reconnect polling. Invoke this method when
* you're all done using the quorum checker.
- *
+ *
* @param checker the QuorumChecker instance
*/
public void releaseQuorumChecker(QuorumChecker checker);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java
index 9ef6343..06329fc 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java
@@ -13,13 +13,13 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.distributed.internal.membership;
/**
* Test hook for hydra test development
- *
+ *
*
*/
public interface MembershipTestHook {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
index 1f909f2..c71ee04 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.shared.StringPrintWriter;
/**
* This is the SPI for the basic element of membership provided in the GemFire system.
- *
+ *
*
*/
public interface NetMember extends Comparable<NetMember> {
@@ -46,7 +46,7 @@ public interface NetMember extends Comparable<NetMember> {
/**
* return a flag stating whether the member has network partition detection enabled
- *
+ *
* @since GemFire 5.6
*/
public boolean isNetworkPartitionDetectionEnabled();
@@ -55,7 +55,7 @@ public interface NetMember extends Comparable<NetMember> {
/**
* return a flag stating whether the member can be the membership coordinator
- *
+ *
* @since GemFire 5.6
*/
public boolean preferredForCoordinator();
@@ -63,7 +63,7 @@ public interface NetMember extends Comparable<NetMember> {
/**
* Set whether this member ID is preferred for coordinator. This is mostly useful for unit tests
* because it does not distribute this status to other members in the distributed system.
- *
+ *
* @param preferred
*/
public void setPreferredForCoordinator(boolean preferred);
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java
index c935074..17451a1 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java
@@ -14,14 +14,6 @@
*/
package org.apache.geode.distributed.internal.membership;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
-import org.apache.logging.log4j.Logger;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -38,10 +30,19 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
+
/**
* The NetView class represents a membership view. Note that this class is not synchronized, so take
* that under advisement if you decide to modify a view with add() or remove().
- *
+ *
* @since GemFire 5.5
*/
public class NetView implements DataSerializableFixedID {
@@ -56,7 +57,7 @@ public class NetView implements DataSerializableFixedID {
private InternalDistributedMember creator;
private Set<InternalDistributedMember> hashedMembers;
private final Object membersLock = new Object();
- static public final Random RANDOM = new Random();
+ public static final Random RANDOM = new Random();
public NetView() {
@@ -94,7 +95,7 @@ public class NetView implements DataSerializableFixedID {
/**
* Test method
- *
+ *
* @param size size of the view, used for presizing collections
* @param viewId the ID of the view
*/
@@ -344,7 +345,7 @@ public class NetView implements DataSerializableFixedID {
* This functions returns the list of preferred coordinators. One random member from list of
* non-preferred member list. It make sure that random member is not in suspected Set. And local
* member.
- *
+ *
* @param filter Suspect member set.
* @param localAddress the address of this member
* @param maxNumberDesired number of preferred coordinators to return
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java
index 838039c..d7a22fa 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java
@@ -18,14 +18,14 @@ package org.apache.geode.distributed.internal.membership;
/**
* A QuorumChecker is created after a forced-disconnect in order to probe the network to see if
* there is a quorum of members that can be contacted.
- *
+ *
*
*/
public interface QuorumChecker {
/**
* Check to see if a quorum of the old members are reachable
- *
+ *
* @param timeoutMS time to wait for responses, in milliseconds
*/
public boolean checkForQuorum(long timeoutMS) throws InterruptedException;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
index e368c9a..5ddaf05 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.distributed.internal.membership.gms;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.jgroups.util.UUID;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.DurableClientAttributes;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -23,30 +32,22 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.jgroups.util.UUID;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
/**
* This is the fundamental representation of a member of a GemFire distributed system.
- *
+ *
* Unfortunately, this class serves two distinct functions. First, it is the fundamental element of
* membership in the GemFire distributed system. As such, it is used in enumerations and properly
* responds to hashing and equals() comparisons.
- *
+ *
* Second, it is used as a cheap way of representing an address. This is unfortunate, because as a
* NetMember, it holds two separate port numbers: the "membership" descriptor as well as a direct
* communication channel.
- *
+ *
*/
public class GMSMember implements NetMember, DataSerializableFixedID {
// whether to show UUID info in toString()
- private final static boolean SHOW_UUIDS =
+ private static final boolean SHOW_UUIDS =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "show_UUIDs");
private int udpPort = 0;
@@ -91,7 +92,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
/**
* Create a CacheMember referring to the current host (as defined by the given string).
- *
+ *
* @param i the hostname, must be for the current host
* @param p the membership listening port
*/
@@ -106,7 +107,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
/**
* Create a CacheMember referring to the current host (as defined by the given string).
- *
+ *
* @param i the hostname, must be for the current host
* @param p the membership listening port
* @param networkPartitionDetectionEnabled whether the member has network partition detection
@@ -141,7 +142,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
/**
* Clone a GMSMember
- *
+ *
* @param other the member to create a copy of
*/
public GMSMember(GMSMember other) {
@@ -215,14 +216,14 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
/*
* implements the java.lang.Comparable interface
- *
+ *
* @see java.lang.Comparable
- *
+ *
* @param o - the Object to be compared
- *
+ *
* @return a negative integer, zero, or a positive integer as this object is less than, equal to,
* or greater than the specified object.
- *
+ *
* @exception java.lang.ClassCastException - if the specified object's type prevents it from being
* compared to this Object.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
index 01d9995..6be8d85 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
@@ -40,14 +40,14 @@ import org.apache.geode.security.GemFireSecurityException;
/**
* Create a new Member based on the given inputs.
- *
+ *
* @see org.apache.geode.distributed.internal.membership.NetMember
*/
public class GMSMemberFactory implements MemberServices {
/**
* Return a new NetMember, possibly for a different host
- *
+ *
* @param i the name of the host for the specified NetMember, the current host (hopefully) if
* there are any problems.
* @param splitBrainEnabled whether the member has this feature enabled
@@ -67,7 +67,7 @@ public class GMSMemberFactory implements MemberServices {
/**
* Return a new NetMember representing current host. This assumes that the member does not have
* network partition detection enabled and can be group coordinator
- *
+ *
* @param i an InetAddress referring to the current host
* @param p the membership port being used
* @return the new NetMember
@@ -81,7 +81,7 @@ public class GMSMemberFactory implements MemberServices {
/**
* Return a new NetMember representing current host. This is used for testing, so we ignore
* host-name lookup localhost inetAddress
- *
+ *
* @param s a String referring to a host - ignored
* @param p the membership port being used
* @return the new member
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
index 9f3126a..92b708d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
@@ -31,7 +31,7 @@ public class GMSUtil {
/**
* parse locators & check that the resulting address is compatible with the given address
- *
+ *
* @param locatorsString a DistributionConfig "locators" string
* @param bindAddress optional address to check for loopback compatibility
* @return addresses of locators
@@ -53,7 +53,7 @@ public class GMSUtil {
/**
* parse locators & check that the resulting address is compatible with the given address
- *
+ *
* @param locatorsString a DistributionConfig "locators" string
* @param bindAddress optional address to check for loopback compatibility
* @return addresses of locators
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java
index ede1516..f2e1e22 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java
@@ -22,7 +22,7 @@ public interface NetLocator extends TcpHandler {
/**
* This must be called after booting the membership manager so that the locator can use its
* services
- *
+ *
* @param mgr
* @return true if the membership manager was accepted
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
index e7e6820..f4d244a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.distributed.internal.membership.gms;
+import java.net.InetAddress;
+
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
-
-import java.net.InetAddress;
+import org.apache.geode.internal.net.SocketCreator;
public class ServiceConfig {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
index 2d6af1a..eb73fe6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.distributed.internal.membership.gms;
+import java.util.Timer;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.ForcedDisconnectException;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
@@ -43,9 +47,6 @@ import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Timer;
@SuppressWarnings("ConstantConditions")
public class Services {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 30d083d..9378ec6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -19,31 +19,6 @@ import static org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_REQUES
import static org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE;
import static org.apache.geode.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
-import org.apache.geode.CancelException;
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.SystemConnectException;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.DMStats;
-import org.apache.geode.distributed.internal.DistributionMessage;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.distributed.internal.membership.NetView;
-import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.distributed.internal.membership.gms.Services;
-import org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor;
-import org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler;
-import org.apache.geode.distributed.internal.membership.gms.messages.FinalCheckPassedMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
-import org.apache.geode.internal.ConnectionWatcher;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.logging.log4j.Logger;
-import org.jgroups.util.UUID;
-
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -78,6 +53,32 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.Logger;
+import org.jgroups.util.UUID;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.DMStats;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.NetView;
+import org.apache.geode.distributed.internal.membership.gms.GMSMember;
+import org.apache.geode.distributed.internal.membership.gms.Services;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler;
+import org.apache.geode.distributed.internal.membership.gms.messages.FinalCheckPassedMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
+import org.apache.geode.internal.ConnectionWatcher;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.net.SocketCreatorFactory;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+
/**
* Failure Detection
* <p>
@@ -99,11 +100,11 @@ import java.util.stream.Collectors;
public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
private Services services;
- volatile private NetView currentView;
- volatile private InternalDistributedMember nextNeighbor;
+ private volatile NetView currentView;
+ private volatile InternalDistributedMember nextNeighbor;
long memberTimeout;
- volatile private boolean isStopping = false;
+ private volatile boolean isStopping = false;
private final AtomicInteger requestId = new AtomicInteger();
/**
@@ -147,24 +148,24 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
/**
* Members currently being suspected and the view they were suspected in
*/
- final private ConcurrentHashMap<InternalDistributedMember, NetView> suspectedMemberInView =
+ private final ConcurrentHashMap<InternalDistributedMember, NetView> suspectedMemberInView =
new ConcurrentHashMap<>();
/**
* Members undergoing final checks
*/
- final private List<InternalDistributedMember> membersInFinalCheck =
+ private final List<InternalDistributedMember> membersInFinalCheck =
Collections.synchronizedList(new ArrayList<>(30));
/**
* Replies to messages
*/
- final private Map<Integer, Response> requestIdVsResponse = new ConcurrentHashMap<>();
+ private final Map<Integer, Response> requestIdVsResponse = new ConcurrentHashMap<>();
/**
* Members suspected in a particular view
*/
- final private Map<NetView, Set<SuspectRequest>> viewVsSuspectedMembers = new HashMap<>();
+ private final Map<NetView, Set<SuspectRequest>> viewVsSuspectedMembers = new HashMap<>();
private ScheduledExecutorService scheduler;
@@ -508,7 +509,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
/**
* During final check, establish TCP connection between current member and suspect member. And
* exchange PING/PONG message to see if the suspect member is still alive.
- *
+ *
* @param suspectMember member that does not respond to HeartbeatRequestMessage
* @return true if successfully exchanged PING/PONG with TCP connection, otherwise false.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java
index 9aed555..c10bc37 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java
@@ -26,14 +26,14 @@ public interface HealthMonitor extends Service {
/**
* Note that this member has been contacted by the given member
- *
+ *
* @param sender
*/
public void contactedBy(InternalDistributedMember sender);
/**
* initiate, asynchronously, suspicion that the member is no longer available
- *
+ *
* @param mbr
* @param reason
*/
@@ -42,7 +42,7 @@ public interface HealthMonitor extends Service {
/**
* Check on the health of the given member, initiating suspicion if it fails. Return true if the
* member is found to be available, false if it isn't.
- *
+ *
* @param mbr
* @param reason the reason this check is being performed
* @param initiateRemoval if the member should be removed if it is not available
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java
index be69574..c9704b2 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java
@@ -38,14 +38,14 @@ public interface Manager extends Service, MessageHandler {
/**
* Sends a message using a selected distribution channel (e.g. Messenger or DirectChannel)
- *
+ *
* @return a set of recipients that did not receive the message
*/
Set<InternalDistributedMember> send(DistributionMessage m) throws NotSerializableException;
/**
* initiates a Forced Disconnect, shutting down the distributed system and closing the cache
- *
+ *
* @param reason
*/
void forceDisconnect(String reason);
@@ -57,7 +57,7 @@ public interface Manager extends Service, MessageHandler {
/**
* Notifies the manager that a member has contacted us who is not in the current membership view
- *
+ *
* @param mbr
* @param birthTime
*/
@@ -67,7 +67,7 @@ public interface Manager extends Service, MessageHandler {
* Tests to see if the given member has been put into "shunned" state, meaning that it has left
* the distributed system and we should no longer process requests from it. Shunned status
* eventually times out.
- *
+ *
* @param mbr
* @return true if the member is shunned
*/
@@ -76,7 +76,7 @@ public interface Manager extends Service, MessageHandler {
/**
* returns the lead member from the current membership view. This is typically the oldest member
* that is not an Admin or Locator member.
- *
+ *
* @return the ID of the lead member
*/
DistributedMember getLeadMember();
@@ -89,7 +89,7 @@ public interface Manager extends Service, MessageHandler {
/**
* sometimes we cannot perform multicast messaging, such as during a rolling upgrade.
- *
+ *
* @return true if multicast messaging can be performed
*/
boolean isMulticastAllowed();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java
index 68dc505..971e402 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java
@@ -58,7 +58,7 @@ public interface Messenger extends Service {
/**
* test whether multicast is not only turned on but is working
- *
+ *
* @return true multicast is enabled and working
*/
boolean testMulticast(long timeout) throws InterruptedException;
@@ -67,7 +67,7 @@ public interface Messenger extends Service {
* For the state-flush algorithm we need to be able to record the state of outgoing messages to
* the given member. If multicast is being used for region operations we also need to record its
* state.
- *
+ *
* @param member the target member
* @param state messaging state is stored in this map
* @param includeMulticast whether to record multicast state
@@ -77,7 +77,7 @@ public interface Messenger extends Service {
/**
* The flip-side of getMessageState, this method takes the state it recorded and waits for
* messages from the given member to be received.
- *
+ *
* @param member the member flushing operations to this member
* @param state the state of that member's outgoing messaging to this member
*/
@@ -85,7 +85,7 @@ public interface Messenger extends Service {
/**
* Get the public key of member.
- *
+ *
* @param mbr
* @return byte[] public key for member
*/
@@ -93,7 +93,7 @@ public interface Messenger extends Service {
/**
* Set public key of member.
- *
+ *
* @param publickey
* @param mbr
*/
@@ -102,21 +102,21 @@ public interface Messenger extends Service {
/**
* Set cluster key in local member.Memebr calls when it gets cluster key in join response
- *
+ *
* @param clusterSecretKey
*/
void setClusterSecretKey(byte[] clusterSecretKey);
/**
* To retrieve the cluster key. This needs to send cluster key to new memebr.
- *
+ *
* @return byte[] cluster key
*/
byte[] getClusterSecretKey();
/**
* To set requestId in request. This requestId comes back in response to match the request.
- *
+ *
* @return int request id
*/
int getRequestId();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
index e627452..5bb8ccf 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.distributed.internal.membership.gms.locator;
+import static org.apache.geode.internal.i18n.LocalizedStrings.LOCATOR_UNABLE_TO_RECOVER_VIEW;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -32,21 +34,20 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.geode.InternalGemFireException;
-
-import org.apache.geode.distributed.internal.ClusterConfigurationService;
-import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.LocatorStats;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper;
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.distributed.internal.membership.NetView;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.NetLocator;
import org.apache.geode.distributed.internal.membership.gms.Services;
@@ -59,8 +60,6 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedObjectInput;
import org.apache.geode.internal.logging.LogService;
-import static org.apache.geode.internal.i18n.LocalizedStrings.LOCATOR_UNABLE_TO_RECOVER_VIEW;
-
public class GMSLocator implements Locator, NetLocator {
/* package */ static final int LOCATOR_FILE_STAMP = 0x7b8cf741;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index ec04e39..f90329c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -27,7 +27,30 @@ import static org.apache.geode.internal.DataSerializableFixedID.NETWORK_PARTITIO
import static org.apache.geode.internal.DataSerializableFixedID.REMOVE_MEMBER_REQUEST;
import static org.apache.geode.internal.DataSerializableFixedID.VIEW_ACK_MESSAGE;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TimerTask;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.SystemConnectException;
import org.apache.geode.distributed.DistributedMember;
@@ -59,28 +82,6 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TimerTask;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* GMSJoinLeave handles membership communication with other processes in the distributed system. It
@@ -2280,7 +2281,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
/**
* Create a new membership view and send it to members (including crashed members). Returns
* false if the view cannot be prepared successfully, true otherwise
- *
+ *
* @throws InterruptedException
*/
void createAndSendView(List<DistributionMessage> requests)
@@ -2423,7 +2424,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
/**
* This handles the 2-phase installation of the view
- *
+ *
* @throws InterruptedException
*/
void prepareAndSendView(NetView newView, List<InternalDistributedMember> joinReqs,
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/HostAddress.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/HostAddress.java
index 40a482a..da83f68 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/HostAddress.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/HostAddress.java
@@ -60,7 +60,7 @@ public class HostAddress {
* If component has retry logic then use this method to get the InetSocketAddress address
* AutoConnectionSourceImpl for client has retry logic; This way client will not make DNS query
* each time
- *
+ *
* @return InetSocketAddress
*/
public InetSocketAddress getSocketInetAddressNoLookup() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java
index 4d233d5..ae5b89e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java
@@ -34,7 +34,7 @@ import org.apache.geode.distributed.internal.membership.gms.Services;
* "logical address" and requests physical addresses from the Discovery protocol that is normally in
* a JGroups stack. We don't have one of these, so we need to maintain a mapping between logical and
* physical addresses.
- *
+ *
*
*/
public class AddressManager extends Protocol {
@@ -80,7 +80,7 @@ public class AddressManager extends Protocol {
/**
* update the logical->physical address cache in UDP, which doesn't seem to be updated by UDP when
* processing responses from FIND_MBRS
- *
+ *
* @param pd
*/
private void updateUDPCache(PingData pd) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
index f0461f2..225ab6e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
@@ -31,11 +31,11 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import org.apache.geode.GemFireConfigException;
+import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.Services;
-import org.apache.geode.distributed.internal.DistributionConfig;
public class GMSEncrypt implements Cloneable {
@@ -348,11 +348,11 @@ public class GMSEncrypt implements Cloneable {
return blocksize;
}
- static public byte[] encryptBytes(byte[] data, Cipher encrypt) throws Exception {
+ public static byte[] encryptBytes(byte[] data, Cipher encrypt) throws Exception {
return encrypt.doFinal(data);
}
- static public byte[] decryptBytes(byte[] data, Cipher decrypt) throws Exception {
+ public static byte[] decryptBytes(byte[] data, Cipher decrypt) throws Exception {
try {
byte[] decryptBytes = decrypt.doFinal(data);
return decryptBytes;
@@ -607,4 +607,3 @@ public class GMSEncrypt implements Cloneable {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
index d2a6d1e..a6ffa29 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.distributed.internal.membership.gms.messenger;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.internal.net.SocketCreator;
-import org.jgroups.Global;
-import org.jgroups.stack.IpAddress;
-import org.jgroups.util.UUID;
-
import java.io.*;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
+import org.jgroups.Global;
+import org.jgroups.stack.IpAddress;
+import org.jgroups.util.UUID;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.gms.GMSMember;
+import org.apache.geode.internal.net.SocketCreator;
+
/**
* This is a copy of JGroups 3.6.4 IpAddress (Apache 2.0 License) that is repurposed to be a Logical
* address so that we can quickly pull a physical address out of the logical address set in a
@@ -37,7 +38,7 @@ public class JGAddress extends UUID {
private static final long serialVersionUID = -1818672332115113291L;
// whether to show UUID info in toString()
- private final static boolean SHOW_UUIDS =
+ private static final boolean SHOW_UUIDS =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "show_UUIDs");
private InetAddress ip_addr;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index b705190..46142c4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -20,7 +20,50 @@ import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR
import static org.apache.geode.internal.DataSerializableFixedID.JOIN_REQUEST;
import static org.apache.geode.internal.DataSerializableFixedID.JOIN_RESPONSE;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import org.apache.logging.log4j.Logger;
+import org.jgroups.Address;
+import org.jgroups.Event;
+import org.jgroups.JChannel;
+import org.jgroups.Message;
+import org.jgroups.Message.Flag;
+import org.jgroups.Message.TransientFlag;
+import org.jgroups.ReceiverAdapter;
+import org.jgroups.View;
+import org.jgroups.ViewId;
+import org.jgroups.conf.ClassConfigurator;
+import org.jgroups.protocols.UDP;
+import org.jgroups.protocols.pbcast.NAKACK2;
+import org.jgroups.protocols.pbcast.NakAckHeader2;
+import org.jgroups.stack.IpAddress;
+import org.jgroups.util.Digest;
+import org.jgroups.util.UUID;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.ForcedDisconnectException;
import org.apache.geode.GemFireConfigException;
@@ -61,48 +104,6 @@ import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.tcp.MemberShunnedException;
-import org.apache.logging.log4j.Logger;
-import org.jgroups.Address;
-import org.jgroups.Event;
-import org.jgroups.JChannel;
-import org.jgroups.Message;
-import org.jgroups.Message.Flag;
-import org.jgroups.Message.TransientFlag;
-import org.jgroups.ReceiverAdapter;
-import org.jgroups.View;
-import org.jgroups.ViewId;
-import org.jgroups.conf.ClassConfigurator;
-import org.jgroups.protocols.UDP;
-import org.jgroups.protocols.pbcast.NAKACK2;
-import org.jgroups.protocols.pbcast.NakAckHeader2;
-import org.jgroups.stack.IpAddress;
-import org.jgroups.util.Digest;
-import org.jgroups.util.UUID;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
@SuppressWarnings("StatementWithEmptyBody")
@@ -821,7 +822,7 @@ public class JGroupsMessenger implements Messenger {
* This is the constructor to use to create a JGroups message holding a GemFire
* DistributionMessage. It sets the appropriate flags in the Message and properly serializes the
* DistributionMessage for the recipient's product version
- *
+ *
* @param gfmsg the DistributionMessage
* @param src the sender address
* @param version the version of the recipient
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java
index 8d92c1e..207b62e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.distributed.internal.membership.gms.messenger;
+import java.util.concurrent.RejectedExecutionException;
+
import org.apache.logging.log4j.Logger;
import org.jgroups.Event;
import org.jgroups.Header;
@@ -30,12 +32,10 @@ import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.Services;
-import java.util.concurrent.RejectedExecutionException;
-
/**
* JGroups doesn't capture quite the stats we want so this protocol is inserted into the stack to
* gather the missing ones.
- *
+ *
*
*/
public class StatRecorder extends Protocol {
@@ -54,7 +54,7 @@ public class StatRecorder extends Protocol {
/**
* sets the services object of the GMS that is using this recorder
- *
+ *
* @param services the Services collective of the GMS
*/
public void setServices(Services services) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java
index 8645291..e9fea9d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java
@@ -43,7 +43,7 @@ public class Transport extends UDP {
/*
* (non-Javadoc) copied from JGroups to perform Geode-specific error handling when there is a
* network partition
- *
+ *
* @see org.jgroups.protocols.TP#_send(org.jgroups.Message, org.jgroups.Address)
*/
@Override
@@ -104,7 +104,7 @@ public class Transport extends UDP {
/*
* (non-Javadoc) JGroups does not currently (3.6.6) allow you to specify that threads should be
* daemon, so we override the init() method here and create the factories before initializing UDP
- *
+ *
* @see org.jgroups.protocols.UDP#init()
*/
@Override
@@ -121,7 +121,7 @@ public class Transport extends UDP {
/*
* (non-Javadoc)
- *
+ *
* @see org.jgroups.protocols.UDP#stop() JGroups is not terminating its timer. I contacted the
* jgroups-users email list about this.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index b835765..4933696 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -37,7 +37,6 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.geode.distributed.internal.ShutdownMessage;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
@@ -61,6 +60,7 @@ import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.OverflowQueueWithDMStats;
+import org.apache.geode.distributed.internal.ShutdownMessage;
import org.apache.geode.distributed.internal.SizeableRunnable;
import org.apache.geode.distributed.internal.StartupMessage;
import org.apache.geode.distributed.internal.direct.DirectChannel;
@@ -348,7 +348,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
*
* @see #shunnedMembers
*/
- static private final int SHUNNED_SUNSET = Integer
+ private static final int SHUNNED_SUNSET = Integer
.getInteger(DistributionConfig.GEMFIRE_PREFIX + "shunned-member-timeout", 300).intValue();
/**
@@ -377,7 +377,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
/**
* ARB: the map of latches is used to block peer handshakes till authentication is confirmed.
*/
- final private HashMap<DistributedMember, CountDownLatch> memberLatch = new HashMap<>();
+ private final HashMap<DistributedMember, CountDownLatch> memberLatch = new HashMap<>();
/**
* Insert our own MessageReceiver between us and the direct channel, in order to correctly filter
@@ -1668,11 +1668,11 @@ public class GMSMembershipManager implements MembershipManager, Manager {
* like memberExists() this checks to see if the given ID is in the current membership view. If it
* is in the view though we try to contact it to see if it's still around. If we can't contact it
* then suspect messages are sent to initiate final checks
- *
+ *
* @param mbr the member to verify
- *
+ *
* @param reason why the check is being done (must not be blank/null)
- *
+ *
* @return true if the member checks out
*/
public boolean verifyMember(DistributedMember mbr, String reason) {
@@ -1796,7 +1796,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.membership.MembershipManager#isConnected()
*/
public boolean isConnected() {
@@ -2243,7 +2243,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
/*
* (non-Javadoc) MembershipManager method: wait for the given member to be gone. Throws
* TimeoutException if the wait goes too long
- *
+ *
* @see
* org.apache.geode.distributed.internal.membership.MembershipManager#waitForDeparture(org.apache.
* geode.distributed.DistributedMember)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
index be4047f..8b4f0f5 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.NetView;
* LocalViewMessage is used to pass a new membership view to the GemFire cache in an orderly manner.
* It is intended to be queued with serially executed messages so that the view takes effect at the
* proper time.
- *
+ *
*/
public class LocalViewMessage extends SerialDistributionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
index 783f651..b33273a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -83,7 +83,7 @@ public abstract class StreamingOperation {
/**
* Returns normally if succeeded to get data, otherwise throws an exception
- *
+ *
* @throws InterruptedException TODO-javadocs
*/
public void getDataFromAll(Set recipients)
@@ -118,7 +118,7 @@ public abstract class StreamingOperation {
/**
* Called from separate thread when reply is processed.
- *
+ *
* @return false if should abort (region was destroyed or cache was closed)
*/
public boolean processChunk(List objects, InternalDistributedMember sender, int sequenceNum,
@@ -128,7 +128,7 @@ public abstract class StreamingOperation {
/**
* Override in subclass to do something useful with the data.
- *
+ *
* @param sequenceNum the sequence of this data (0-based), in case ordering matters
* @param lastInSequence true if this is the last chunk in the sequence
* @return false to abort
@@ -267,7 +267,7 @@ public abstract class StreamingOperation {
}
- public static abstract class RequestStreamingMessage extends PooledDistributionMessage
+ public abstract static class RequestStreamingMessage extends PooledDistributionMessage
implements MessageWithReply {
protected int processorId;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java
index d8e5033..f7989ed 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java
@@ -23,7 +23,7 @@ import org.apache.geode.DataSerializable;
/**
* A request to the TCP server to provide information about the server
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java
index 02e784c..3cd3ef9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java
@@ -24,7 +24,7 @@ import org.apache.geode.DataSerializer;
/**
* A response from the TCP server with information about the server
- *
+ *
* @since GemFire 5.7
*/
public class InfoResponse implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java
index 24c3e56..d865ec8 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java
@@ -23,7 +23,7 @@ import org.apache.geode.DataSerializable;
/**
* A request to the TCP server to shutdown
- *
+ *
* @since GemFire 5.7
*/
public class ShutdownRequest implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java
index 9224a0d..b06ecde 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java
@@ -23,7 +23,7 @@ import org.apache.geode.DataSerializable;
/**
* A response from the TCP server that it received the shutdown request
- *
+ *
* @since GemFire 5.7
*/
public class ShutdownResponse implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
index 933b25d..e836a00 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
* <p>
* Client for the TcpServer component of the Locator.
* </p>
- *
+ *
* @since GemFire 5.7
*/
public class TcpClient {
@@ -82,7 +82,7 @@ public class TcpClient {
/**
* Constructs a new TcpClient
- *
+ *
* @param socketCreator the SocketCreator to use in communicating with the Locator
*/
public TcpClient(SocketCreator socketCreator) {
@@ -129,7 +129,7 @@ public class TcpClient {
/**
* Send a request to a Locator and expect a reply
- *
+ *
* @param addr The locator's address
* @param port The locator's tcp/ip port
* @param request The request message
@@ -148,7 +148,7 @@ public class TcpClient {
/**
* Send a request to a Locator
- *
+ *
* @param addr The locator's address
* @param port The locator's tcp/ip port
* @param request The request message
@@ -173,7 +173,7 @@ public class TcpClient {
/**
* Send a request to a Locator
- *
+ *
* @param ipAddr The locator's inet socket address
* @param request The request message
* @param timeout Timeout for sending the message and receiving a reply
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java
index d4af158..d18b7cb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java
@@ -22,13 +22,13 @@ import org.apache.geode.distributed.internal.ClusterConfigurationService;
/**
* A handler which responds to messages for the {@link TcpServer}
- *
+ *
* @since GemFire 5.7
*/
public interface TcpHandler {
/**
* Process a request and return a response
- *
+ *
* @param request
* @return the response, or null if there is no reponse
* @throws IOException
@@ -46,7 +46,7 @@ public interface TcpHandler {
/**
* Informs the handler that TcpServer is restarting with the given distributed system and cache
- *
+ *
* @param sharedConfig TODO
*/
void restarting(DistributedSystem ds, GemFireCache cache,
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index e6a797c..aadbfb4 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -58,13 +58,13 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.cache.client.protocol.ClientProtocolProcessor;
import org.apache.geode.internal.cache.client.protocol.ClientProtocolService;
import org.apache.geode.internal.cache.client.protocol.ClientProtocolServiceLoader;
-import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.cache.client.protocol.exception.ServiceLoadingFailureException;
import org.apache.geode.internal.cache.client.protocol.exception.ServiceVersionNotFoundException;
+import org.apache.geode.internal.cache.tier.CommunicationMode;
+import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
@@ -76,7 +76,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
* <p>
* This code was factored out of GossipServer.java to allow multiple handlers to share the same
* gossip server port.
- *
+ *
* @since GemFire 5.7
*/
public class TcpServer {
@@ -94,12 +94,12 @@ public class TcpServer {
* with the addition of support for all old versions of clients you can no longer change this
* version number
*/
- public final static int GOSSIPVERSION = 1002;
- public final static int NON_GOSSIP_REQUEST_VERSION = 0;
+ public static final int GOSSIPVERSION = 1002;
+ public static final int NON_GOSSIP_REQUEST_VERSION = 0;
// Don't change it ever. We did NOT send GemFire version in a Gossip request till 1001 version.
// This GOSSIPVERSION is used in _getVersionForAddress request for getting GemFire version of a
// GossipServer.
- public final static int OLDGOSSIPVERSION = 1001;
+ public static final int OLDGOSSIPVERSION = 1001;
private static/* GemStoneAddition */ final Map GOSSIP_TO_GEMFIRE_VERSION_MAP = new HashMap();
@@ -289,7 +289,7 @@ public class TcpServer {
/**
* Returns the value of the bound port. If the server was initialized with a port of 0 indicating
* that any ephemeral port should be used, this method will return the actual bound port.
- *
+ *
* @return the locator's tcp/ip port. This will be zero if the locator hasn't been started.
*/
public int getPort() {
@@ -570,7 +570,7 @@ public class TcpServer {
/**
* Returns GossipVersion for older Gemfire versions.
- *
+ *
* @return gossip version
*/
public static int getGossipVersionForOrdinal(short ordinal) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java
index 077aba9..eb20852 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.distributed.internal.tcpserver;
-import org.apache.geode.DataSerializable;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+
/**
* @since GemFire 7.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java
index 0bca4d4..04d2df5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.distributed.internal.tcpserver;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.internal.Version;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.internal.Version;
+
/**
* Get GemFire version of the member running TcpServer.
- *
+ *
* @since GemFire 7.1
*/
public class VersionResponse implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
index e83d59e..5babf15 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
@@ -18,7 +18,7 @@ package org.apache.geode.distributed.internal.unsafe;
/**
* The RegisterSignalHandlerSupport class is an ugly hack!
* </p>
- *
+ *
* @since GemFire 7.0
*/
public abstract class RegisterSignalHandlerSupport {
diff --git a/geode-core/src/main/java/org/apache/geode/examples/security/ExamplePostProcessor.java b/geode-core/src/main/java/org/apache/geode/examples/security/ExamplePostProcessor.java
index a8f1655..06da8bb 100644
--- a/geode-core/src/main/java/org/apache/geode/examples/security/ExamplePostProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/examples/security/ExamplePostProcessor.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.examples.security;
-import org.apache.geode.security.PostProcessor;
-
import java.security.Principal;
import java.util.Properties;
+import org.apache.geode.security.PostProcessor;
+
/**
* This is example that implements PostProcessor
*/
diff --git a/geode-core/src/main/java/org/apache/geode/examples/security/ExampleSecurityManager.java b/geode-core/src/main/java/org/apache/geode/examples/security/ExampleSecurityManager.java
index 436ff4b..cb9cf77 100644
--- a/geode-core/src/main/java/org/apache/geode/examples/security/ExampleSecurityManager.java
+++ b/geode-core/src/main/java/org/apache/geode/examples/security/ExampleSecurityManager.java
@@ -58,7 +58,7 @@ import org.apache.geode.security.SecurityManager;
*
* <p>
* The format of the JSON for configuration is as follows:
- *
+ *
* <pre>
* <code>
* {
diff --git a/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java b/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
index fd7d331..8d49812 100644
--- a/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
+++ b/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
@@ -15,11 +15,11 @@
package org.apache.geode.i18n;
+import java.util.logging.Handler;
+
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.DistributedSystem;
-import java.util.logging.Handler;
-
/**
* Defines methods available to clients that want to write a log message to their GemFire
* distributed system log file.
@@ -88,42 +88,42 @@ public interface LogWriterI18n {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object[] params, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object param, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Throwable ex);
/**
* Writes a message to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object[] params);
/**
* Writes a message to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object param);
/**
* Writes a message to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID);
@@ -140,42 +140,42 @@ public interface LogWriterI18n {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object[] params, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object param, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Throwable ex);
/**
* Writes a message to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object[] params);
/**
* Writes a message to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object param);
/**
* Writes a message to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID);
@@ -192,42 +192,42 @@ public interface LogWriterI18n {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object[] params, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object param, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Throwable ex);
/**
* Writes a message to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object[] params);
/**
* Writes a message to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object param);
/**
* Writes a message to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID);
@@ -244,42 +244,42 @@ public interface LogWriterI18n {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object[] params, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object param, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Throwable ex);
/**
* Writes a message to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object[] params);
/**
* Writes a message to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object param);
/**
* Writes a message to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID);
@@ -296,42 +296,42 @@ public interface LogWriterI18n {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object[] params, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object param, Throwable ex);
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Throwable ex);
/**
* Writes a message to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object[] params);
/**
* Writes a message to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object param);
/**
* Writes a message to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID);
@@ -381,7 +381,7 @@ public interface LogWriterI18n {
* <p>
* The logging is done using the <code>finer</code> level. The string message will start with
* <code>"ENTRY"</code> and include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
*/
@@ -392,7 +392,7 @@ public interface LogWriterI18n {
* <p>
* The logging is done using the <code>finer</code> level. The string message will start with
* <code>"RETURN"</code> and include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
*/
@@ -407,7 +407,7 @@ public interface LogWriterI18n {
* This is a convenience method that could be done instead by calling
* {@link #finer(String, Throwable)}. The string message will start with <code>"THROW"</code> and
* include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
* @param thrown The Throwable that is being thrown.
@@ -443,7 +443,7 @@ public interface LogWriterI18n {
/**
* A mechanism for accessing the abstraction layer used for a plain logger.
- *
+ *
* @return LogWriter
*/
public LogWriter convertToLogWriter();
diff --git a/geode-core/src/main/java/org/apache/geode/i18n/StringId.java b/geode-core/src/main/java/org/apache/geode/i18n/StringId.java
index 7825208..302ac33 100755
--- a/geode-core/src/main/java/org/apache/geode/i18n/StringId.java
+++ b/geode-core/src/main/java/org/apache/geode/i18n/StringId.java
@@ -15,15 +15,15 @@
package org.apache.geode.i18n;
-import org.apache.geode.internal.i18n.AbstractStringIdResourceBundle;
-
import java.text.MessageFormat;
import java.util.Locale;
+import org.apache.geode.internal.i18n.AbstractStringIdResourceBundle;
+
/**
* This class forms the basis of the i18n strategy. Its primary function is to be used as a key to
* be passed to an instance of StringIdResourceBundle.
- *
+ *
* @since GemFire 6.0
*/
public class StringId {
@@ -34,7 +34,7 @@ public class StringId {
/**
* A unique identifier that is written when this StringId is logged to allow for reverse
* translation.
- *
+ *
* @see org.apache.geode.internal.logging.LogWriterImpl
*/
public final int id;
@@ -62,7 +62,7 @@ public class StringId {
/*
* Update {@link #currentlocale} and {@link #rb} This method should be used sparingly as there is
* a small window for a race condition.
- *
+ *
* @params locale switch to use this locale. if null then {@link Locale#getDefault()} is used.
*/
public static void setLocale(Locale l) {
@@ -98,7 +98,7 @@ public class StringId {
/**
* Accessor for the raw (unformatted) text of this StringId
- *
+ *
* @return unformated text
**/
public String getRawText() {
@@ -116,7 +116,7 @@ public class StringId {
/**
* Substitutes parameter Objects into the text
- *
+ *
* @see java.text.MessageFormat
* @return the English translation of this StringId
**/
@@ -137,7 +137,7 @@ public class StringId {
/**
* Substitutes parameter Objects into the text
- *
+ *
* @see java.text.MessageFormat
* @return the translation of this StringId based on the current {@link java.util.Locale}
**/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
index 9b9c0da..4560e49 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
@@ -71,7 +71,7 @@ public abstract class AbstractConfig implements Config {
protected abstract Map<String, ConfigSource> getAttSourceMap();
- public final static String sourceHeader = "PropertiesSourceHeader";
+ public static final String sourceHeader = "PropertiesSourceHeader";
/**
* Set to true if most of the attributes can be modified. Set to false if most of the attributes
@@ -110,7 +110,7 @@ public abstract class AbstractConfig implements Config {
/***
* Gets the Map of GemFire properties and values from a given ConfigSource
- *
+ *
* @param source
*
* @return map of GemFire properties and values
@@ -136,7 +136,7 @@ public abstract class AbstractConfig implements Config {
/****
* Gets all the GemFire properties defined using file(s)
- *
+ *
* @return Map of GemFire properties and values set using property files
*/
public Map<String, String> getConfigPropsDefinedUsingFiles() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Assert.java b/geode-core/src/main/java/org/apache/geode/internal/Assert.java
index 5823e2e..1a10cf0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Assert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Assert.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
public class Assert {
/**
* Assert that a boolean value is true.
- *
+ *
* @param b the boolean value to check
* @throws InternalGemFireError if false
*/
@@ -157,11 +157,11 @@ public class Assert {
/**
* This is a workaround for X bug 38288. JRockit can throw a NullPointerException from
* Thread.holdsLock, so we catch the NullPointerException if it happens.
- *
+ *
* This method returns true, unless it throws an exception. This is so we can disable these tests
* for performance reasons with a java assertion, eg
* <code>assert Assert.assertHoldLock(lock, true);</code>
- *
+ *
* @param lock The lock to test
* @param shouldBeHeld true if this thread should hold this lock.
* @return true, unless the method throws an exception.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java b/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
index b0c401e..94bc569 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java
@@ -232,7 +232,7 @@ public class AvailablePort {
/**
* Test to see if a given port is available port on all interfaces on this host.
- *
+ *
* @param port
* @return true of if the port is free on all interfaces
*/
@@ -460,7 +460,7 @@ public class AvailablePort {
*
*/
public static class Keeper implements Serializable {
- private transient final ServerSocket ss;
+ private final transient ServerSocket ss;
private final int port;
public Keeper(ServerSocket ss, int port) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Banner.java b/geode-core/src/main/java/org/apache/geode/internal/Banner.java
index 38b3a31..ea6dace 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/Banner.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Banner.java
@@ -14,12 +14,6 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.util.ArgumentRedactor;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.management.ManagementFactory;
@@ -33,6 +27,12 @@ import java.util.Properties;
import java.util.StringTokenizer;
import java.util.TreeMap;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.util.ArgumentRedactor;
+
/**
* Utility class to print banner information at manager startup.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
index 2e81af6..ab0706b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.VersionedDataStream;
/**
* A reusable {@link DataInput} implementation that wraps a given byte array. It also implements
* {@link VersionedDataStream} for a stream coming from a different product version.
- *
+ *
* @since GemFire 7.1
*/
public class ByteArrayDataInput extends InputStream implements DataInput, VersionedDataStream {
@@ -46,7 +46,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
/**
* Initialize this byte array stream with given byte array and version.
- *
+ *
* @param bytes the content of this stream. Note that this byte array will be read by this class
* (a copy is not made) so it should not be changed externally.
* @param version the product version that serialized the object on given bytes
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
index 4773229..1d6d286 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
@@ -19,13 +19,13 @@ import java.nio.*;
/**
* An OutputStream that wraps to a ByteBuffer
- *
+ *
* @since GemFire 3.5
*/
public class ByteBufferOutputStream extends OutputStream {
private ByteBuffer buffer;
- private final static int DEFAULT_SIZE = 1024;
+ private static final int DEFAULT_SIZE = 1024;
public ByteBufferOutputStream() {
this.buffer = ByteBuffer.allocate(DEFAULT_SIZE);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java b/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
index b272f8a..514bb0e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java
@@ -16,11 +16,6 @@ package org.apache.geode.internal;
import static java.util.stream.Collectors.joining;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.util.CollectionUtils;
-import org.apache.logging.log4j.Logger;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -33,6 +28,12 @@ import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.List;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.util.CollectionUtils;
+
/**
* The delegating <tt>ClassLoader</tt> used by GemFire to load classes and other resources. This
* <tt>ClassLoader</tt> delegates to any <tt>ClassLoader</tt>s added to the list of custom class
@@ -207,7 +208,7 @@ public class ClassPathLoader {
* Finds the resource with the given name. This method will first search the class loader of the
* context class for the resource. That failing, this method will invoke
* {@link #getResource(String)} to find the resource.
- *
+ *
* @param contextClass The class whose class loader will first be searched
* @param name The resource name
* @return A <tt>URL</tt> object for reading the resource, or <tt>null</tt> if the resource could
@@ -245,7 +246,7 @@ public class ClassPathLoader {
* Returns an input stream for reading the specified resource.
* <p>
* The search order is described in the documentation for {@link #getResource(Class, String)}.
- *
+ *
* @param contextClass The class whose class loader will first be searched
* @param name The resource name
* @return An input stream for reading the resource, or <tt>null</tt> if the resource could not be
@@ -264,7 +265,7 @@ public class ClassPathLoader {
/**
* Finds all the resources with the given name. This method will first search the class loader of
* the context class for the resource before searching all other {@link ClassLoader}s.
- *
+ *
* @param contextClass The class whose class loader will first be searched
* @param name The resource name
* @return An enumeration of {@link java.net.URL <tt>URL</tt>} objects for the resource. If no
@@ -314,7 +315,7 @@ public class ClassPathLoader {
/**
* Wrap this {@link ClassPathLoader} with a {@link ClassLoader} facade.
- *
+ *
* @return {@link ClassLoader} facade.
* @since GemFire 8.1
*/
@@ -360,7 +361,7 @@ public class ClassPathLoader {
/**
* Helper method equivalent to <code>ClassPathLoader.getLatest().asClassLoader();</code>.
- *
+ *
* @return {@link ClassLoader} for current {@link ClassPathLoader}.
* @since GemFire 8.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Config.java b/geode-core/src/main/java/org/apache/geode/internal/Config.java
index aa41f45..1f69f64 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Config.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Config.java
@@ -26,14 +26,14 @@ public interface Config {
* Given the attribute's name return its value as a string. This method is used as a way to get
* command line arguments that specify the attribute name and fetch them safely from a Config
* instance.
- *
+ *
* @throws IllegalArgumentException if the specified name is illegal
*/
String getAttribute(String attName);
/**
* Given the attribute's name return its value as an Object.
- *
+ *
* @throws IllegalArgumentException if the specified name is illegal
*/
Object getAttributeObject(String attName);
@@ -41,7 +41,7 @@ public interface Config {
/**
* Given the attribute's name set its value. This method is used as a way to get command line
* arguments that specify the attribute name and value and get them safely into a Config instance.
- *
+ *
* @throws IllegalArgumentException if the specified name or value are illegal
* @throws org.apache.geode.UnmodifiableException if the attribute can not be modified.
*/
@@ -49,7 +49,7 @@ public interface Config {
/**
* Given the attribute's name set its value to the specified Object.
- *
+ *
* @throws IllegalArgumentException if the specified name is unknown
* @throws org.apache.geode.InvalidValueException if the specified value is not compatible with
* the attributes type
@@ -59,7 +59,7 @@ public interface Config {
/**
* Returns true if the named configuration attribute can be modified.
- *
+ *
* @throws IllegalArgumentException if the specified name is illegal
*/
boolean isAttributeModifiable(String attName);
@@ -67,7 +67,7 @@ public interface Config {
/**
* Returns the source of the given attribute. This lets you figure out where an attribute's value
* came from.
- *
+ *
* @param attName the name of the attribute whose source is returned
* @return null if the attribute has not been configured; otherwise returns the source of the
* given attribute
@@ -76,7 +76,7 @@ public interface Config {
/**
* Returns a description of the named configuration attribute.
- *
+ *
* @throws IllegalArgumentException if the specified name is illegal
*/
String getAttributeDescription(String attName);
@@ -84,7 +84,7 @@ public interface Config {
/**
* Returns the class that defines the type of this attribute. The attribute's values will be
* constrained to be instances of this type.
- *
+ *
* @throws IllegalArgumentException if the specified name is illegal
*/
Class getAttributeType(String attName);
@@ -106,21 +106,21 @@ public interface Config {
/**
* Converts the contents of this config to a property instance.
- *
+ *
* @since GemFire 3.5
*/
Properties toProperties();
/**
* Writes this config to the specified file.
- *
+ *
* @since GemFire 3.5
*/
void toFile(File f) throws IOException;
/**
* Returns a formatted string suitable for logging.
- *
+ *
* @since GemFire 7.0
*/
String toLoggerString();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java b/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java
index 6359823..ff8d03f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java
@@ -18,7 +18,7 @@ import java.io.Serializable;
/**
* Describes where the value of a configuration attribute came from.
- *
+ *
* @since GemFire 7.0
*/
public class ConfigSource implements Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java b/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
index 95393b4..71c7285 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
@@ -18,7 +18,7 @@ import java.net.Socket;
/**
* ConnectionWatcher is used to observe tcp/ip connection formation in SockCreator implementations.
- *
+ *
*
*/
public interface ConnectionWatcher {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java b/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java
index 801e22b..6a746cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java
@@ -29,7 +29,7 @@ import java.util.Set;
* A Hash set where every modification makes an internal copy of a HashSet. Similar to
* java.util.concurrent.CopyOnWriteArrayList, except methods provide the access time characteristics
* of HashSet, instead of ArrayList, for example contains is O(1) instead of O(n).
- *
+ *
* Also, this class provides a getSnapshot method, which should be used for any thing that needs an
* unchanging snapshot of this this (For example, any serialization of this class should use
* getSnapshot).
@@ -39,7 +39,7 @@ public class CopyOnWriteHashSet<T> implements Set<T>, Serializable {
private static final long serialVersionUID = 8591978652141659932L;
- private volatile transient Set<T> snapshot = Collections.emptySet();
+ private transient volatile Set<T> snapshot = Collections.emptySet();
public CopyOnWriteHashSet() {}
@@ -148,7 +148,7 @@ public class CopyOnWriteHashSet<T> implements Set<T>, Serializable {
/**
* Return a snapshot of the set at this point in time. The snapshot is guaranteed not to change.
* It is therefore unmodifiable. This will likely be more efficient than copying this set.
- *
+ *
* @return A snapshot of this set.
*/
public Set<T> getSnapshot() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java b/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
index 4289233..80bab9a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
@@ -37,28 +37,28 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
* whose id is a single signed byte.
- *
+ *
* @since GemFire 5.7
*/
public static final byte DS_FIXED_ID_BYTE = 1;
/**
* A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
* whose id is a single signed short.
- *
+ *
* @since GemFire 5.7
*/
public static final byte DS_FIXED_ID_SHORT = 2;
/**
* A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
* whose id is a single signed int.
- *
+ *
* @since GemFire 5.7
*/
public static final byte DS_FIXED_ID_INT = 3;
/**
* A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
* whose id is <code>NO_FIXED_ID</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte DS_NO_FIXED_ID = 4;
@@ -66,7 +66,7 @@ public interface DSCODE {
/**
* A header byte meaning that the object was serialized by a user's <code>DataSerializer</code>
* and the id is encoded with 2 bytes.
- *
+ *
* @since GemFire 5.7
*/
public static final byte USER_CLASS_2 = 5;
@@ -74,7 +74,7 @@ public interface DSCODE {
/**
* A header byte meaning that the object was serialized by a user's <code>DataSerializer</code>
* and the id is encoded with 4 bytes.
- *
+ *
* @since GemFire 5.7
*/
public static final byte USER_CLASS_4 = 6;
@@ -90,7 +90,7 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is a <code>Properties</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte PROPERTIES = 11;
@@ -125,7 +125,7 @@ public interface DSCODE {
/**
* A header byte meaning that a DataSerializable that was registered with the Instantiator was
* data serialized using four bytes for its ID.
- *
+ *
* @since GemFire 5.7
*/
public static final byte USER_DATA_SERIALIZABLE_4 = 37;
@@ -133,7 +133,7 @@ public interface DSCODE {
/**
* A header byte meaning that a DataSerializable that was registered with the Instantiator was
* data serialized using two bytes for its ID.
- *
+ *
* @since GemFire 5.7
*/
public static final byte USER_DATA_SERIALIZABLE_2 = 38;
@@ -297,49 +297,49 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is a <code>Hashtable</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte HASH_TABLE = 70;
/**
* A header byte meaning that the next element in the stream is a <code>Vector</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte VECTOR = 71;
/**
* A header byte meaning that the next element in the stream is a <code>IdentityHashMap</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte IDENTITY_HASH_MAP = 72;
/**
* A header byte meaning that the next element in the stream is a <code>LinkedHashSet</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte LINKED_HASH_SET = 73;
/**
* A header byte meaning that the next element in the stream is a <code>Stack</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte STACK = 74;
/**
* A header byte meaning that the next element in the stream is a <code>TreeMap</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte TREE_MAP = 75;
/**
* A header byte meaning that the next element in the stream is a <code>TreeSet</code>.
- *
+ *
* @since GemFire 5.7
*/
public static final byte TREE_SET = 76;
@@ -355,7 +355,7 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is a buffer of 1-byte characters to
* turn into a String whose length is > 0xFFFF.
- *
+ *
* @since GemFire 5.7
*/
public static final byte HUGE_STRING_BYTES = 88;
@@ -363,7 +363,7 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is a buffer of 2-byte characters to
* turn into a String whose length is > 0xFFFF.
- *
+ *
* @since GemFire 5.7
*/
public static final byte HUGE_STRING = 89;
@@ -379,7 +379,7 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is a PdxSerializable object.
- *
+ *
* @since GemFire 6.6
*/
public static final byte PDX = 93;
@@ -387,20 +387,20 @@ public interface DSCODE {
/**
* A header byte meaning that the next element in the stream is an enum whose type is defined in
* the pdx registry.
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte PDX_ENUM = 94;
/**
* java.math.BigInteger
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte BIG_INTEGER = 95;
/**
* java.math.BigDecimal
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte BIG_DECIMAL = 96;
@@ -409,41 +409,41 @@ public interface DSCODE {
* This code can only be used by PDX. It can't be used for normal DataSerializer writeObject
* because it would break backward compatibility. A header byte meaning that the next element in
* the stream is a ConcurrentHashMap object.
- *
+ *
* @since GemFire 6.6
*/
public static final byte CONCURRENT_HASH_MAP = 97;
/**
* java.util.UUID
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte UUID = 98;
/**
* java.sql.Timestamp
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte TIMESTAMP = 99;
/**
* Used for enums that need to always be deserialized into their enum domain class.
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte GEMFIRE_ENUM = 100;
/**
* Used for enums that need to be encoded inline because the pdx registry may not be available.
* During deserialization this type of enum may be deserialized as a PdxInstance.
- *
+ *
* @since GemFire 6.6.2
*/
public static final byte PDX_INLINE_ENUM = 101;
/**
* Used for wildcard searches in soplogs with composite keys.
- *
+ *
* @since GemFire 8.0
*/
public static final byte WILDCARD = 102;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index 1edb488..f8c8d80 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -374,7 +374,6 @@ import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAbortM
import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAckMessage;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
-import org.apache.geode.internal.cache.tier.sockets.ServerInterestRegistrationMessage;
import org.apache.geode.internal.cache.tier.sockets.ClientBlacklistProcessor.ClientBlacklistMessage;
import org.apache.geode.internal.cache.tier.sockets.ClientDataSerializerMessage;
import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
@@ -390,6 +389,7 @@ import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.ObjectPartList651;
import org.apache.geode.internal.cache.tier.sockets.RemoveClientFromBlacklistMessage;
import org.apache.geode.internal.cache.tier.sockets.SerializedObjectPartList;
+import org.apache.geode.internal.cache.tier.sockets.ServerInterestRegistrationMessage;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
index a9250ba..3b3643a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
@@ -30,7 +30,7 @@ public class DSFIDNotFoundException extends NotSerializableException {
/**
* Constructs a DSFIDNotFoundException object with message string.
- *
+ *
* @param msg exception message
*/
public DSFIDNotFoundException(String msg, int dsfid) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
index 32e89b6..e7a319e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.*;
-
import java.io.*;
+import org.apache.geode.*;
+
/**
* An interface that implements data serialization for internal GemFire product classes that have a
* fixed id. The fixed id is used to represent the class, on the wire, at serialization time and
@@ -61,11 +61,11 @@ public interface DataSerializableFixedID extends SerializationVersions {
/*
* In the class to be serialized, add public FOO(DataInput in) throws IOException,
* ClassNotFoundException { fromData(in); }
- *
+ *
* public int getDSFID() { return FOO; }
- *
+ *
* In DataSerializableFixedId, allocate an ID for the class public static final byte FOO = -54;
- *
+ *
* In DSFIDFactory, add a case for the new class case FOO: return new FOO(in);
*/
public static final short FINAL_CHECK_PASSED_MESSAGE = -158;
@@ -842,7 +842,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
* the getSerializationVersions array of the implementing class. e.g. if msg format changed in
* version 80, create toDataPre_GFE_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
* array and copy previous toData contents to this newly created toDataPre_GFE_X_X_X_X() method.
- *
+ *
* @throws IOException A problem occurs while writing to <code>out</code>
*/
public void toData(DataOutput out) throws IOException;
@@ -856,7 +856,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
* version 80, create fromDataPre_GFE_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
* array and copy previous fromData contents to this newly created fromDataPre_GFE_X_X_X_X()
* method.
- *
+ *
* @throws IOException A problem occurs while reading from <code>in</code>
* @throws ClassNotFoundException A class could not be loaded while reading from <code>in</code>
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
index 8c5dba2..5ce1e0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
@@ -15,18 +15,18 @@
package org.apache.geode.internal;
+import java.io.Console;
+
import org.apache.geode.management.internal.cli.LogWrapper;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.GfshConsoleReader;
-import java.io.Console;
-
/**
* Factory for Console Reader Utility.
- *
+ *
* Default uses <code>java.io.Console</code> returned by <code>System.console()</code>
- *
- *
+ *
+ *
* @since GemFire 7.0.1
*/
public class GfeConsoleReaderFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index 98b1b44..6ea37e2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -14,14 +14,6 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
-import org.apache.logging.log4j.Logger;
-
import java.io.DataOutput;
import java.io.IOException;
import java.io.InputStream;
@@ -33,6 +25,15 @@ import java.nio.channels.SocketChannel;
import java.util.Iterator;
import java.util.LinkedList;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
+
/**
* HeapDataOutputStream is an OutputStream that also implements DataOutput and stores all data
* written to it in heap memory. It is always better to use this class instead
@@ -134,7 +135,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Construct a HeapDataOutputStream which uses the byte array provided as its underlying
* ByteBuffer
- *
+ *
* @param bytes
*/
public HeapDataOutputStream(byte[] bytes) {
@@ -175,7 +176,7 @@ public class HeapDataOutputStream extends OutputStream
* throw an exception instead of allocating a new buffer. The exception is a
* BufferOverflowException thrown from expand, and will restore the position to the point at which
* the flag was set with the disallowExpansion method.
- *
+ *
* @param ee the exception to throw if expansion is needed
*/
public void disallowExpansion(Error ee) {
@@ -461,7 +462,7 @@ public class HeapDataOutputStream extends OutputStream
* assumed that the HeapDataOutputStream is appropriately seeded with a byte array from the
* wrapper. However the filled byte array may or may not be the same as that used for seeding ,
* depending upon whether the data got accommodated in the original byte buffer or not.
- *
+ *
* @param wrapper
*/
// Asif
@@ -484,7 +485,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Write this stream to the specified channel. Call multiple times until size returns zero to make
* sure all bytes in the stream have been written.
- *
+ *
* @return the number of bytes written, possibly zero.
* @throws IOException if channel is closed, not yet connected, or some other I/O error occurs.
*/
@@ -570,7 +571,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Write the contents of this stream to the byte buffer.
- *
+ *
* @throws BufferOverflowException if out is not large enough to contain all of our data.
*/
public void sendTo(ByteBuffer out) {
@@ -871,7 +872,7 @@ public class HeapDataOutputStream extends OutputStream
* Writes two bytes to the output stream to represent the value of the argument. The byte values
* to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -897,7 +898,7 @@ public class HeapDataOutputStream extends OutputStream
* Writes a <code>char</code> value, wich is comprised of two bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -923,7 +924,7 @@ public class HeapDataOutputStream extends OutputStream
* Writes an <code>int</code> value, which is comprised of four bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 24))
@@ -950,7 +951,7 @@ public class HeapDataOutputStream extends OutputStream
* Writes a <code>long</code> value, which is comprised of eight bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 56))
@@ -980,7 +981,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Reserves space in the output for a long and returns a LongUpdater than can be used to update
* this particular long.
- *
+ *
* @return the LongUpdater that allows the long to be updated
*/
public LongUpdater reserveLong() {
@@ -1120,7 +1121,7 @@ public class HeapDataOutputStream extends OutputStream
* If a character <code>c</code> is in the range <code>\u0001</code> through
* <code>\u007f</code>, it is represented by one byte:
* <p>
- *
+ *
* <pre>
* (byte) c
* </pre>
@@ -1129,7 +1130,7 @@ public class HeapDataOutputStream extends OutputStream
* <code>\u0080</code> through <code>\u07ff</code>, then it is represented by two bytes,
* to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xc0 | (0x1f & (c >> 6)))
@@ -1140,7 +1141,7 @@ public class HeapDataOutputStream extends OutputStream
* If a character <code>c</code> is in the range <code>\u0800</code> through
* <code>uffff</code>, then it is represented by three bytes, to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xe0 | (0x0f & (c >> 12)))
@@ -1316,7 +1317,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Write a byte buffer to this HeapDataOutputStream,
- *
+ *
* the contents of the buffer between the position and the limit are copied to the output stream.
*/
@Override
@@ -1345,7 +1346,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Write a byte source to this HeapDataOutputStream,
- *
+ *
* the contents of the buffer between the position and the limit are copied to the output stream.
*/
public void write(ByteSource source) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java b/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
index 6b0190d..16c9978 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
@@ -23,7 +23,7 @@ import org.apache.geode.StatisticsType;
public class HistogramStats {
/** stat type description */
- private final static String hist_typeDesc = "A bucketed histogram of values with unit ";
+ private static final String hist_typeDesc = "A bucketed histogram of values with unit ";
private final int statCounterIndex[];
@@ -33,7 +33,7 @@ public class HistogramStats {
/**
* Create a set of statistics to capture a histogram of values with the given break points.
- *
+ *
* @param name a unique name for the histogram type
* @param unit the unit of data collected
* @param factory
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 019c35c..dfe4005 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -14,7 +14,57 @@
*/
package org.apache.geode.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.NotSerializableException;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.io.UTFDataFormatException;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.CanonicalInstantiator;
import org.apache.geode.DataSerializable;
@@ -66,55 +116,6 @@ import org.apache.geode.pdx.internal.PdxReaderImpl;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PdxWriterImpl;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.NotSerializableException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.io.UTFDataFormatException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
/**
* Contains static methods for data serializing instances of internal GemFire classes. It also
@@ -143,7 +144,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* For backward compatibility we must swizzle the package of some classes that had to be moved
* when GemFire was open- sourced. This preserves backward-compatibility.
- *
+ *
* @param name the fully qualified class name
* @return the name of the class in this implementation
*/
@@ -165,7 +166,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* For backward compatibility we must swizzle the package of some classes that had to be moved
* when GemFire was open- sourced. This preserves backward-compatibility.
- *
+ *
* @param name the fully qualified class name
* @param out the consumer of the serialized object
* @return the name of the class in this implementation
@@ -187,7 +188,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Any time new serialization format is added then a new enum needs to be added here.
- *
+ *
* @since GemFire 6.6.2
*/
private enum SERIALIZATION_VERSION {
@@ -892,7 +893,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Marks a {@code DataSerializer} className for registration with the data serialization
* framework. Does not necessarily load the classes into this VM.
- *
+ *
* @param className Name of the DataSerializer class.
* @param distribute If true, distribute this data serializer.
* @param eventId Event id
@@ -908,7 +909,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Marks a {@code DataSerializer} className for registration with the data serialization
* framework. Does not necessarily load the classes into this VM.
- *
+ *
* @param distribute If true, distribute this data serializer.
* @see DataSerializer#register(Class)
*/
@@ -973,7 +974,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
}
/**
- *
+ *
* @return String the classname of the data serializer this instance represents.
*/
public String getClassName() {
@@ -1209,7 +1210,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Returns all the data serializers in this vm. This method, unlike {@link #getSerializers()},
* does not force loading of the data serializers which were not loaded in the vm earlier.
- *
+ *
* @return Array of {@link SerializerAttributesHolder}
*/
public static SerializerAttributesHolder[] getSerializersForDistribution() {
@@ -1283,7 +1284,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Read the data from in and register it with this class. TODO: loadRegistrations is unused
- *
+ *
* @throws IllegalArgumentException if a registration fails
*/
public static void loadRegistrations(DataInput in) throws IOException {
@@ -1712,10 +1713,10 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Reads a {@code Set} from a {@code DataInput} into the given non-null collection. Returns true
* if collection read is non-null else returns false. TODO: readCollection is unused
- *
+ *
* @throws IOException A problem occurs while reading from {@code in}
* @throws ClassNotFoundException The class of one of the {@code Set}'s elements cannot be found.
- *
+ *
* @see #writeSet
*/
public static <E> boolean readCollection(DataInput in, Collection<E> c)
@@ -1740,7 +1741,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* write a set of Long objects
- *
+ *
* @param set the set of Long objects
* @param hasLongIDs if false, write only ints, not longs
* @param out the output stream
@@ -1781,7 +1782,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* write a set of Long objects TODO: writeListOfLongs is unused
- *
+ *
* @param list the set of Long objects
* @param hasLongIDs if false, write only ints, not longs
* @param out the output stream
@@ -2016,9 +2017,9 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Writes given number of characters from array of {@code char}s to a {@code DataOutput}.
- *
+ *
* @throws IOException A problem occurs while writing to {@code out}
- *
+ *
* @see DataSerializer#readCharArray
* @since GemFire 6.6
*/
@@ -2041,7 +2042,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* returns true if the byte array is the serialized form of a null reference
- *
+ *
* @param serializedForm the serialized byte array
*/
public static boolean isSerializedNull(byte[] serializedForm) {
@@ -2207,7 +2208,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* write an object in java Serializable form with a SERIALIZABLE DSCODE so that it can be
* deserialized with DataSerializer.readObject()
- *
+ *
* @param o the object to serialize
* @param out the data output to serialize to
*/
@@ -2262,7 +2263,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
* DataSerializable. It will invoke the correct toData method based on the class's version
* information. This method does not write information about the class of the object. When
* deserializing use the method invokeFromData to read the contents of the object.
- *
+ *
* @param ds the object to write
* @param out the output stream.
*/
@@ -2335,7 +2336,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
* DataSerializable. It will invoke the correct fromData method based on the class's version
* information. This method does not read information about the class of the object. When
* serializing use the method invokeToData to write the contents of the object.
- *
+ *
* @param ds the object to write
* @param in the input stream.
*/
@@ -2659,7 +2660,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Just like readObject but make sure and pdx deserialized is not a PdxInstance.
- *
+ *
* @since GemFire 6.6.2
*/
public static <T> T readNonPdxInstanceObject(final DataInput in)
@@ -3147,7 +3148,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
* serialized bytes arrive at a VM before the registration message does, the deserializer will
* wait an amount of time for the registration message to arrive. Made public for unit test
* access.
- *
+ *
* @since GemFire 5.7
*/
public static class GetMarker extends Marker {
@@ -3197,7 +3198,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* A marker object for {@code DataSerializer}s that is in the process of being registered. It is
* possible for getSerializer to return {@code null}
- *
+ *
* @since GemFire 5.7
*/
static class InitMarker extends Marker {
@@ -3460,7 +3461,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Used to implement serialization code for the well known classes we support in DataSerializer.
- *
+ *
* @since GemFire 5.7
*/
protected abstract static class WellKnownDS extends DataSerializer {
@@ -3571,10 +3572,10 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Encode a long as a variable length array.
- *
+ *
* This method is appropriate for unsigned integers. For signed integers, negative values will
* always consume 10 bytes, so it is recommended to use writeSignedVL instead.
- *
+ *
* This is taken from the varint encoding in protobufs (BSD licensed). See
* https://developers.google.com/protocol-buffers/docs/encoding
*/
@@ -3592,7 +3593,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Decode a long as a variable length array.
- *
+ *
* This is taken from the varint encoding in protobufs (BSD licensed). See
* https://developers.google.com/protocol-buffers/docs/encoding
*/
@@ -3612,7 +3613,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Encode a signed long as a variable length array.
- *
+ *
* This method is appropriate for signed integers. It uses zig zag encoding to so that negative
* numbers will be represented more compactly. For unsigned values, writeUnsignedVL will be more
* efficient.
@@ -3623,7 +3624,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
/**
* Decode a signed long as a variable length array.
- *
+ *
* This method is appropriate for signed integers. It uses zig zag encoding to so that negative
* numbers will be represented more compactly. For unsigned values, writeUnsignedVL will be more
* efficient.
@@ -3640,7 +3641,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
* @param n An unsigned 64-bit integer, stored in a signed int because Java has no explicit
* unsigned support.
* @return A signed 64-bit integer.
- *
+ *
* This is taken from the varint encoding in protobufs (BSD licensed). See
* https://developers.google.com/protocol-buffers/docs/encoding
*/
@@ -3656,7 +3657,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
* @param n A signed 64-bit integer.
* @return An unsigned 64-bit integer, stored in a signed int because Java has no explicit
* unsigned support.
- *
+ *
* This is taken from the varint encoding in protobufs (BSD licensed). See
* https://developers.google.com/protocol-buffers/docs/encoding
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java b/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
index 252a2ba..b46c3b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
@@ -19,9 +19,9 @@ package org.apache.geode.internal;
* that user objects would typically be stored. For example, registering functions for internal use.
* When determining what to do, or how to display these objects, other classes may use this
* interface as a filter to eliminate internal objects.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
public interface InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
index 64dd90b..6e48681 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
@@ -303,7 +303,7 @@ public class InternalInstantiator {
/**
* Lazily creates a new {@code Instantiator} with the given class and id.
- *
+ *
* @throws IllegalArgumentException The instantiator cannot be created
* @throws IllegalStateException The instantiator cannot be registered
*/
@@ -318,9 +318,9 @@ public class InternalInstantiator {
/**
* Lazily creates a new {@code Instantiator} with the given class and id.
- *
+ *
* This method is only called when server connection and CacheClientUpdaterThread
- *
+ *
* @throws IllegalArgumentException The instantiator cannot be created
* @throws IllegalStateException The instantiator cannot be registered
*/
@@ -695,7 +695,7 @@ public class InternalInstantiator {
/**
* Does not trigger loading of the instantiator/instantiated classes into the vm.
- *
+ *
* @return array of InstantiatorAttributesArray instances.
*/
public static Object[] getInstantiatorsForSerialization() {
@@ -782,7 +782,7 @@ public class InternalInstantiator {
/**
* Read the data from in and register it with this class.
- *
+ *
* @throws IllegalArgumentException if a registration fails
*/
public static void loadRegistrations(DataInput in) throws IOException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java b/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
index e94ed32..5728d5a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
@@ -40,7 +40,7 @@ public class InternalStatisticsDisabledException extends GemFireCheckedException
/**
* Constructs an instance of <code>StatisticsDisabledException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public InternalStatisticsDisabledException(String msg) {
@@ -50,7 +50,7 @@ public class InternalStatisticsDisabledException extends GemFireCheckedException
/**
* Constructs an instance of <code>StatisticsDisabledException</code> with the specified detail
* message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -60,7 +60,7 @@ public class InternalStatisticsDisabledException extends GemFireCheckedException
/**
* Constructs an instance of <code>StatisticsDisabledException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public InternalStatisticsDisabledException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java b/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
index 44b6ac1..61650a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
@@ -78,7 +78,7 @@ public class JarDeployer implements Serializable {
/**
* Writes the jarBytes for the given jarName to the next version of that jar file (if the bytes do
* not match the latest deployed version)
- *
+ *
* @return the DeployedJar that was written from jarBytes, or null if those bytes matched the
* latest deployed version
*/
@@ -106,7 +106,7 @@ public class JarDeployer implements Serializable {
/**
* Get a list of all currently deployed jars.
- *
+ *
* @return The list of DeployedJars
*/
public List<DeployedJar> findDeployedJars() {
@@ -155,7 +155,7 @@ public class JarDeployer implements Serializable {
* Attempt to write the given bytes to the given file. If this VM is able to successfully write
* the contents to the file, or another VM writes the exact same contents, then the write is
* considered to be successful.
- *
+ *
* @param file File of the JAR file to deploy.
* @param jarBytes Contents of the JAR file to deploy.
* @return True if the file was successfully written, false otherwise
@@ -179,7 +179,7 @@ public class JarDeployer implements Serializable {
* method first checks to see if the file is actively being written by checking the length over
* time. If it appears that the file is actively being written, then it loops waiting for that to
* complete before doing the comparison.
- *
+ *
* @param file File to compare
* @param bytes Bytes to compare
* @return True if there's an exact match, false otherwise
@@ -240,7 +240,7 @@ public class JarDeployer implements Serializable {
/**
* Find the version number that's embedded in the name of this file
- *
+ *
* @param filename Filename to get the version number from
* @return The version number embedded in the filename
*/
@@ -271,7 +271,7 @@ public class JarDeployer implements Serializable {
/**
* Find all versions of the JAR file that are currently on disk and return them sorted from newest
* (highest version) to oldest
- *
+ *
* @param unversionedJarName Name of the JAR file that we want old versions of
* @return Sorted array of files that are older versions of the given JAR
*/
@@ -305,7 +305,7 @@ public class JarDeployer implements Serializable {
/**
* Make sure that the deploy directory is writable.
- *
+ *
* @throws IOException If the directory isn't writable
*/
public void verifyWritableDeployDirectory() throws IOException {
@@ -481,7 +481,7 @@ public class JarDeployer implements Serializable {
/**
* Deploy the given JAR files.
- *
+ *
* @param jarNames Array of names of the JAR files to deploy.
* @param jarBytes Array of contents of the JAR files to deploy.
* @return An array of newly created JAR class loaders. Entries will be null for an JARs that were
@@ -533,7 +533,7 @@ public class JarDeployer implements Serializable {
/**
* Returns the latest registered {@link DeployedJar} for the given JarName
- *
+ *
* @param jarName - the unversioned jar name, e.g. myJar.jar
*/
public DeployedJar findDeployedJar(String jarName) {
@@ -563,7 +563,7 @@ public class JarDeployer implements Serializable {
/**
* Undeploy the given JAR file.
- *
+ *
* @param jarName The name of the JAR file to undeploy
* @return The path to the location on disk where the JAR file had been deployed
* @throws IOException If there's a problem deleting the file
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java b/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
index 9411c26..97340c3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
@@ -15,12 +15,12 @@
package org.apache.geode.internal;
-import org.apache.geode.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
import java.net.InetAddress;
+import org.apache.geode.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Represents the information about the manager that is stored in its SystemAdmin manager VM's main
* thread.
@@ -93,7 +93,7 @@ public class ManagerInfo implements DataSerializable {
/**
* Saves the manager information to the info file in the given <code>directory</code>.
- *
+ *
* @param pid the process id of the manager VM.
* @param status the status of the manager
* @param directory the manager's directory.
@@ -160,7 +160,7 @@ public class ManagerInfo implements DataSerializable {
/**
* Gets the status code for the given <code>statusName</code>.
- *
+ *
* @throws IllegalArgumentException if an unknown status name is given.
*/
public static int statusNameToCode(String statusName) {
@@ -372,7 +372,7 @@ public class ManagerInfo implements DataSerializable {
/**
* Constructs a manager info instance given the process id of the manager VM.
- *
+ *
* @param port TODO
* @param bindAddress TODO
*/
@@ -420,4 +420,3 @@ public class ManagerInfo implements DataSerializable {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java b/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
index d7f6b44..b181eac 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
@@ -57,7 +57,7 @@ import org.apache.geode.internal.net.SocketCreator;
* Typically, the cache-xml file will be exactly the same as the one used by the MigrationServer
* with different disk-dirs settings. When Region entries are transferred from the server to the
* client, they are then stored in new files in these directories.
- *
+ *
* @since GemFire 6.0.1
*/
public class MigrationClient {
@@ -120,7 +120,7 @@ public class MigrationClient {
/**
* Create a MigrationClient to be used with a DistributedSystem and Cache that are created using
* GemFire APIs
- *
+ *
* @param bindAddressName the server's address
* @param serverPort the server's port
*/
@@ -136,7 +136,7 @@ public class MigrationClient {
/**
* this is for use by main()
- *
+ *
* @param cacheXmlFileName the name of the xml file describing the cache, or null
* @param bindAddressName the name of the NIC to bind to, or null
* @param serverPort the port to connect to (must not be zero)
@@ -154,7 +154,7 @@ public class MigrationClient {
/**
* Create a distributed system. If this method is not invoked before running the MigrationServer,
* an existing distributed system must exist for the server to use.
- *
+ *
* @throws Exception if there are any problems
*/
private void createDistributedSystem() throws Exception {
@@ -173,7 +173,7 @@ public class MigrationClient {
/**
* create the cache to be used by this migration server
- *
+ *
* @throws Exception if there are any problems
*/
private void createCache() throws Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java b/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java
index 7266c89..35df445 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java
@@ -68,14 +68,14 @@ import org.apache.geode.internal.logging.LogService;
* Details of the transfers can be viewed by setting the system property Migration.VERBOSE=true.
* <p>
* For example,
- *
+ *
* <pre>
* java -cp $MYCLASSES:migration.jar:$GEMFIRE/lib/geode-dependencies.jar \
* org.apache.geode.internal.MigrationServer cacheDescription.xml
* </pre>
* <p>
* Where the cacheDescription.xml file might look like this:
- *
+ *
* <pre>
* <!DOCTYPE cache PUBLIC
"-//GemStone Systems, Inc.//GemFire Declarative Caching 5.7//EN"
@@ -104,12 +104,12 @@ import org.apache.geode.internal.logging.LogService;
</region> <!-- Test region -->
</region> <!-- root region -->
</cache>
- *
+ *
* </pre>
* <p>
* The client is then run with a different cache description having different disk-dirs to hold the
* migrated information.
- *
+ *
* @since GemFire 6.0.1
*/
public class MigrationServer {
@@ -167,7 +167,7 @@ public class MigrationServer {
/**
* Create a MigrationServer to be used with a DistributedSystem and Cache that are created using
* GemFire APIs
- *
+ *
* @param bindAddressName the NIC to bind to, or null to use all interfaces
* @param listenPort the port to listen on
*/
@@ -203,7 +203,7 @@ public class MigrationServer {
/**
* this is for use by main()
- *
+ *
* @param cacheXmlFileName the name of the xml file describing the cache, or null
* @param bindAddressName the name of the NIC to bind to, or null
* @param listenPort the port to listen on (must not be zero)
@@ -221,7 +221,7 @@ public class MigrationServer {
/**
* Create a distributed system. If this method is not invoked before running the MigrationServer,
* an existing distributed system must exist for the server to use.
- *
+ *
* @throws Exception if there are any problems
*/
private void createDistributedSystem() throws Exception {
@@ -243,7 +243,7 @@ public class MigrationServer {
/**
* create the cache to be used by this migration server
- *
+ *
* @throws Exception if there are any problems
*/
private void createCache() throws Exception {
@@ -259,7 +259,7 @@ public class MigrationServer {
/**
* This locates the distributed system and cache, if they have not been created by this server,
* and then listens for requests from MigrationClient processes.
- *
+ *
* @throws IllegalStateException if an attempt is made to reuse a server that has been stopped
*/
public void serve() throws Exception {
@@ -305,7 +305,7 @@ public class MigrationServer {
/**
* this causes the migration server to stop serving after it finishes dispatching any in-process
* requests
- *
+ *
* @throws IOException if there is a problem closing the server socket
*/
public void stop() throws IOException {
@@ -316,7 +316,7 @@ public class MigrationServer {
/**
* get the cache being used by this migration server
- *
+ *
* @return the cache, or null if a cache has not yet been associated with this server
*/
public Cache getCache() {
@@ -325,7 +325,7 @@ public class MigrationServer {
/**
* get the distributed system being used by this migration server
- *
+ *
* @return the distributed system, or null if a system has not yet been associated with this
* server
*/
@@ -454,7 +454,7 @@ public class MigrationServer {
/**
* Use readRequest to create a new request object, not this constructor. Subclasses may refine
* this constructor to perform other initialization
- *
+ *
* @param dsi socket's input stream
* @param dso socket's output stream
* @throws IOException if there are any problems reading initialization information
@@ -468,7 +468,7 @@ public class MigrationServer {
/**
* Read and return a request from a client
- *
+ *
* @param dsi socket input stream
* @param dso socket output stream
* @return the new request
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
index 247f9a9..6930923 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal;
* A timer class that reports current or elapsed time in nanonseconds. The static method
* {@link #getTime} reports the current time. The instance methods support basic stop-watch-style
* functions that are convenient for simple performance measurements. For example:
- *
+ *
* <pre>
* class Example {
* void example() {
@@ -36,7 +36,7 @@ package org.apache.geode.internal;
* }
* }
* </pre>
- *
+ *
*/
public class NanoTimer {
@@ -54,7 +54,7 @@ public class NanoTimer {
private final TimeService timeService;
- private final static TimeService systemTimeService = new TimeService() {
+ private static final TimeService systemTimeService = new TimeService() {
@Override
public long getTime() {
return java.lang.System.nanoTime();
@@ -81,7 +81,7 @@ public class NanoTimer {
/**
* Converts nanoseconds to milliseconds by dividing nanos by {@link #NANOS_PER_MILLISECOND}.
- *
+ *
* @param nanos value in nanoseconds
* @return value converted to milliseconds
*/
@@ -91,7 +91,7 @@ public class NanoTimer {
/**
* Converts milliseconds to nanoseconds by multiplying millis by {@link #NANOS_PER_MILLISECOND}.
- *
+ *
* @param millis value in milliseconds
* @return value converted to nanoseconds
*/
@@ -110,7 +110,7 @@ public class NanoTimer {
/**
* Return the construction time in nanoseconds since some arbitrary time in the past.
- *
+ *
* @return timestamp in nanoseconds since construction.
*/
public long getConstructionTime() {
@@ -123,7 +123,7 @@ public class NanoTimer {
* The time rolls over to zero every 2^64 nanosecs (approx 584 years). Interval computations
* spanning periods longer than this will be wrong. If the timer has not yet been reset then the
* construction time is returned.
- *
+ *
* @return timestamp in nanoseconds of construction or the last reset.
*/
public long getLastResetTime() {
@@ -133,7 +133,7 @@ public class NanoTimer {
/**
* Compute and return the time in nanoseconds since the last reset or construction of this timer,
* and reset the timer to the current {@link #getTime}.
- *
+ *
* @return time in nanoseconds since construction or last reset.
*/
public long reset() {
@@ -145,7 +145,7 @@ public class NanoTimer {
/**
* Compute and return the time in nanoseconds since the last reset or construction of this Timer,
* but does not reset this timer.
- *
+ *
* @return time in nanoseconds since construction or last reset.
*/
public long getTimeSinceReset() {
@@ -154,7 +154,7 @@ public class NanoTimer {
/**
* Compute and return the time in nanoseconds since this timer was constructed.
- *
+ *
* @return time in nanoseconds since construction.
*/
public long getTimeSinceConstruction() {
@@ -171,4 +171,3 @@ public class NanoTimer {
public long getTime();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
index 0945a10..dce63e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal;
import java.io.*;
+
import org.apache.geode.DataSerializer;
/**
@@ -25,7 +26,7 @@ import org.apache.geode.DataSerializer;
* This class is not thread safe
*
* @since GemFire 5.0.2
- *
+ *
*/
public class NullDataOutputStream extends OutputStream implements ObjToByteArraySerializer {
@@ -90,7 +91,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* Writes two bytes to the output stream to represent the value of the argument. The byte values
* to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -113,7 +114,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* Writes a <code>char</code> value, wich is comprised of two bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -136,7 +137,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* Writes an <code>int</code> value, which is comprised of four bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 24))
@@ -160,7 +161,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* Writes a <code>long</code> value, which is comprised of eight bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 56))
@@ -263,7 +264,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* If a character <code>c</code> is in the range <code>\u0001</code> through
* <code>\u007f</code>, it is represented by one byte:
* <p>
- *
+ *
* <pre>
* (byte) c
* </pre>
@@ -272,7 +273,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* <code>\u0080</code> through <code>\u07ff</code>, then it is represented by two bytes,
* to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xc0 | (0x1f & (c >> 6)))
@@ -283,7 +284,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* If a character <code>c</code> is in the range <code>\u0800</code> through
* <code>uffff</code>, then it is represented by three bytes, to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xe0 | (0x0f & (c >> 12)))
diff --git a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java b/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
index d972697..d16f859 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.internal;
+import java.io.*;
+import java.lang.management.*;
+import java.util.*;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.io.TeePrintStream;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
-import org.apache.logging.log4j.Logger;
-
-import java.io.*;
-import java.lang.management.*;
-import java.util.*;
-import java.util.zip.GZIPOutputStream;
/**
* Used to interact with operating system processes. Use <code>exec</code> to create a new process
@@ -322,12 +323,12 @@ public class OSProcess {
/**
* Ask a process to shut itself down. The process may catch and ignore this shutdown request.
- *
+ *
* @param pid the id of the process to shutdown
* @return true if the request was sent to the process; false if the process does not exist or can
* not be asked to shutdown.
*/
- static public boolean shutdown(int pid) {
+ public static boolean shutdown(int pid) {
if (pureMode) {
throw new RuntimeException(
LocalizedStrings.OSProcess_SHUTDOWN_NOT_ALLOWED_IN_PURE_JAVA_MODE.toLocalizedString());
@@ -337,17 +338,17 @@ public class OSProcess {
}
}
- static private native boolean _shutdown(int pid);
+ private static native boolean _shutdown(int pid);
/**
* Terminate a process without warning and without a chance of an orderly shutdown. This method
* should only be used as a last resort. The {@link #shutdown(int)} method should be used in most
* cases.
- *
+ *
* @param pid the id of the process to kill
* @return true if the process was killed; false if it does not exist or can not be killed.
*/
- static public boolean kill(int pid) {
+ public static boolean kill(int pid) {
if (pureMode) {
throw new RuntimeException(
LocalizedStrings.OSProcess_KILL_NOT_ALLOWED_IN_PURE_JAVA_MODE.toLocalizedString());
@@ -357,26 +358,26 @@ public class OSProcess {
}
}
- static private native boolean _kill(int pid);
+ private static native boolean _kill(int pid);
/**
* Tells a process to print its stacks to its standard output
- *
+ *
* @param pid the id of the process that will print its stacks, or zero for the current process
* @return true if the process was told; false if it does not exist or can not be told.
*/
- static public boolean printStacks(int pid) {
+ public static boolean printStacks(int pid) {
return printStacks(pid, false);
}
/**
* Tells a process to print its stacks to its standard output or the given log writer
- *
+ *
* @param pid the id of the process that will print its stacks, or zero for the current process
* @param useNative if true we attempt to use native code, which goes to stdout
* @return true if the process was told; false if it does not exist or can not be told.
*/
- static public boolean printStacks(int pid, boolean useNative) {
+ public static boolean printStacks(int pid, boolean useNative) {
if (pureMode || !useNative) {
if (pid > 0 && pid != myPid[0]) {
return false;
@@ -423,9 +424,9 @@ public class OSProcess {
return result;
}
- static private native boolean _printStacks(int pid);
+ private static native boolean _printStacks(int pid);
- final static int MAX_STACK_FRAMES = 75;
+ static final int MAX_STACK_FRAMES = 75;
private static void formatThreadInfo(ThreadInfo t, PrintWriter pw) {
// this is largely copied from the JDK's ThreadInfo.java, but it limits the
@@ -502,11 +503,11 @@ public class OSProcess {
/**
* Find out if a process exists.
- *
+ *
* @param pid the id of the process to check for
* @return true if the process exists; false if it does not.
*/
- static public boolean exists(int pid) {
+ public static boolean exists(int pid) {
if (pureMode) {
throw new RuntimeException(
LocalizedStrings.OSProcess_EXISTS_NOT_ALLOWED_IN_PURE_JAVA_MODE.toLocalizedString());
@@ -532,13 +533,13 @@ public class OSProcess {
/**
* Waits for a child process to die and reaps it.
*/
- static private native void waitForPid(int pid);
+ private static native void waitForPid(int pid);
/**
* Waits until the identified process exits. If the process does not exist then returns
* immediately.
*/
- static public void waitForPidToExit(int pid) {
+ public static void waitForPidToExit(int pid) {
if (pureMode) {
throw new RuntimeException(
LocalizedStrings.OSProcess_WAITFORPIDTOEXIT_NOT_ALLOWED_IN_PURE_JAVA_MODE
@@ -550,10 +551,10 @@ public class OSProcess {
/**
* Sets the current directory of this process.
- *
+ *
* @return true if current directory was set; false if not.
*/
- static public boolean setCurrentDirectory(File curDir) {
+ public static boolean setCurrentDirectory(File curDir) {
if (pureMode) {
throw new RuntimeException(
LocalizedStrings.OSProcess_SETCURRENTDIRECTORY_NOT_ALLOWED_IN_PURE_JAVA_MODE
@@ -569,7 +570,7 @@ public class OSProcess {
/**
* Reaps a child process if it has died. Does not wait for the child.
- *
+ *
* @param pid the id of the process to reap
* @return true if it was reaped or lost (someone else reaped it); false if the child still
* exists. HACK: If pid is -1 then returns true if this platform needs reaping.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
index a187c65..2c4f9dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
@@ -75,7 +75,7 @@ import java.util.concurrent.locks.ReentrantLock;
*
* @since GemFire 1.5
* @param <V> the type of mapped values
- *
+ *
* Keys on this map are a primitive "int".
*/
public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
@@ -168,7 +168,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/**
* Returns the segment that should be used for key with given hash
- *
+ *
* @param hash the hash code for the key
* @return the segment
*/
@@ -269,7 +269,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/**
* The load factor for the hash table. Even though this value is same for all segments, it is
* replicated to avoid needing links to outer object.
- *
+ *
* @serial
*/
final float loadFactor;
@@ -809,7 +809,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
* identical in functionality to {@link #containsValue}, and exists solely to ensure full
* compatibility with class {@link java.util.Hashtable}, which supported this method prior to
* introduction of the Java Collections framework.
- *
+ *
* @param value a value to search for
* @return <tt>true</tt> if and only if some key maps to the <tt>value</tt> argument in this table
* as determined by the <tt>equals</tt> method; <tt>false</tt> otherwise
@@ -936,7 +936,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/*
* public Set<K> keySet() { Set<K> ks = keySet; return (ks != null) ? ks : (keySet = new
* KeySet()); }
- *
+ *
* /** Returns a {@link Collection} view of the values contained in this map. The collection is
* backed by the map, so changes to the map are reflected in the collection, and vice-versa. The
* collection supports element removal, which removes the corresponding mapping from this map, via
@@ -952,7 +952,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/*
* public Collection<V> values() { Collection<V> vs = values; return (vs != null) ? vs : (values =
* new Values()); }
- *
+ *
* /** Returns a {@link Set} view of the mappings contained in this map. The set is backed by the
* map, so changes to the map are reflected in the set, and vice-versa. The set supports element
* removal, which removes the corresponding mapping from the map, via the
@@ -967,20 +967,20 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/*
* public Set<Map.Entry<K,V>> entrySet() { Set<Map.Entry<K,V>> es = entrySet; return (es != null)
* ? es : (entrySet = new EntrySet()); }
- *
+ *
* /** Returns an enumeration of the keys in this table.
*
* @return an enumeration of the keys in this table
- *
+ *
* @see #keySet()
*/
/*
* public Enumeration<K> keys() { return new KeyIterator(); }
- *
+ *
* /** Returns an enumeration of the values in this table.
*
* @return an enumeration of the values in this table
- *
+ *
* @see #values()
*/
/*
@@ -1052,7 +1052,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/*
* class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> { public K next()
* { return super.nextEntry().key; } public K nextElement() { return super.nextEntry().key; } }
- *
+ *
* class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> { public V
* next() { return super.nextEntry().value; } public V nextElement() { return
* super.nextEntry().value; } }
@@ -1150,20 +1150,20 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/*
* class EntryIterator extends HashIterator implements Iterator<Entry<V>> { public Entry<V> next()
* { HashEntry<V> e = super.nextEntry(); return new WriteThroughEntry(e.key, e.value); } }
- *
+ *
* class KeySet extends AbstractSet<K> { public Iterator<K> iterator() { return new KeyIterator();
* } public int size() { return ObjIdConcurrentMap.this.size(); } public boolean isEmpty() {
* return ObjIdConcurrentMap.this.isEmpty(); } public boolean contains(Object o) { return
* ObjIdConcurrentMap.this.containsKey(o); } public boolean remove(Object o) { return
* ObjIdConcurrentMap.this.remove(o) != null; } public void clear() {
* ObjIdConcurrentMap.this.clear(); } }
- *
+ *
* class Values extends AbstractCollection<V> { public Iterator<V> iterator() { return new
* ValueIterator(); } public int size() { return ObjIdConcurrentMap.this.size(); } public boolean
* isEmpty() { return ObjIdConcurrentMap.this.isEmpty(); } public boolean contains(Object o) {
* return ObjIdConcurrentMap.this.containsValue(o); } public void clear() {
* ObjIdConcurrentMap.this.clear(); } }
- *
+ *
* class EntrySet extends AbstractSet<Map.Entry<K,V>> { public Iterator<Map.Entry<K,V>> iterator()
* { return new EntryIterator(); } public boolean contains(Object o) { if (!(o instanceof
* Map.Entry)) return false; Map.Entry<?,?> e = (Map.Entry<?,?>)o; V v =
@@ -1178,7 +1178,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/**
* Save the state of the <tt>ConcurrentHashMap</tt> instance to a stream (i.e., serialize it).
- *
+ *
* @param s the stream
* @serialData the key (Object) and value (Object) for each key-value mapping, followed by a null
* pair. The key-value mappings are emitted in no particular order.
@@ -1207,7 +1207,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
/**
* Reconstitute the <tt>ConcurrentHashMap</tt> instance from a stream (i.e., deserialize it).
- *
+ *
* @param s the stream
*/
@SuppressWarnings("unchecked")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java b/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java
index 39b5722..ac43121 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.lang.Math;
import java.lang.ref.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* An <code>ObjIdMap</code> maps GemFire object ids to an <code>Object</code>. This is an
* optimization because using a {@link java.util.HashMap} for this purposed proved to be too slow
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java b/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
index 6a5069c..26b3912 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
@@ -22,12 +22,12 @@ import java.io.*;
* sees a byte array arrive.
*
* @since GemFire 5.0.2
- *
+ *
*/
public interface ObjToByteArraySerializer extends DataOutput {
/**
* Serialize the given object v as a byte array
- *
+ *
* @throws IOException if something goes wrong during serialization
*/
public void writeAsSerializedByteArray(Object v) throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
index 26a89ce..2960d1d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
@@ -23,22 +23,22 @@ import java.util.concurrent.TimeUnit;
/**
* A decorator for a ScheduledExecutorService which tries to make sure that there is only one task
* in the queue for the executor service that has been submitted through this decorator.
- *
+ *
* This class is useful if you have a task that you want to make sure runs at least once after an
* event, but if the event happens repeatedly before the task runs, the task should still only run
* once.
- *
+ *
* In many cases it might make sense to have multiple decorators, or to submit one kind of task
* through the decorator and other tasks directly through the executor.
- *
+ *
* For example, a task that recovers redundancy for all buckets of a PR when a member crashes only
* needs to be run once, no matter how many members crash before the task starts. But after the task
* has started, we want to make sure we schedule another execution for the next crash.
- *
+ *
* If the a new task is scheduled to run sooner than the task that is currently in the queue, the
* currently queued task will be canceled and the new task will be submitted to the queue with the
* new time.
- *
+ *
* @since GemFire 6.0
*/
@SuppressWarnings("synthetic-access")
@@ -61,7 +61,7 @@ public class OneTaskOnlyExecutor {
* Schedule an execution of a task. This will either add the task to the execution service, or if
* a task has already been scheduled through this decorator and is still pending execution it will
* return the future associated with the previously scheduled task.
- *
+ *
* @param runnable a runnable to execution
* @param delay the time to delay before execution
* @param unit the time unit
@@ -89,7 +89,7 @@ public class OneTaskOnlyExecutor {
* Schedule an execution of a task. This will either add the task to the execution service, or if
* a task has already been scheduled through this decorator and is still pending execution it will
* return the future associated with the previously scheduled task.
- *
+ *
* @param callable a callable to execute
* @param delay the time to delay before execution
* @param unit the time unit
diff --git a/geode-core/src/main/java/org/apache/geode/internal/PdxSerializerObject.java b/geode-core/src/main/java/org/apache/geode/internal/PdxSerializerObject.java
index e299fbc..fc8028c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/PdxSerializerObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/PdxSerializerObject.java
@@ -18,11 +18,11 @@ package org.apache.geode.internal;
* Marker interface for object used in PdxSerializer Tests that are in the org.apache package. If an
* object implements this interface, it will be passed to a PdxSerializer even if it is in the
* org.apache package.
- *
+ *
* This is necessary because we exclude all other objects from the org.apache package. See
* {@link InternalDataSerializer#writePdx(java.io.DataOutput, org.apache.geode.internal.cache.InternalCache, Object, org.apache.geode.pdx.PdxSerializer)}
- *
- *
+ *
+ *
*/
public interface PdxSerializerObject {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java b/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java
index 798253d..78a3063 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java
@@ -33,7 +33,7 @@ public class ProcessOutputReader {
/**
* Creates a process output reader for the given process.
- *
+ *
* @param p the process whose output should be read.
*/
public ProcessOutputReader(final Process p) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java b/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
index 4e60c0b..08a3a46 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
@@ -24,14 +24,14 @@ public class PureJavaMode {
/**
* System property to set to true to force pure java mode
*/
- public final static String PURE_MODE_PROPERTY =
+ public static final String PURE_MODE_PROPERTY =
DistributionConfig.GEMFIRE_PREFIX + "pureJavaMode";
/**
* System property to set to true enable debug information regarding native library loading.
- *
+ *
* @since GemFire 5.1
*/
- public final static String LOADLIBRARY_DEBUG_PROPERTY =
+ public static final String LOADLIBRARY_DEBUG_PROPERTY =
DistributionConfig.GEMFIRE_PREFIX + "loadLibrary.debug";
private static final boolean debug = Boolean.getBoolean(LOADLIBRARY_DEBUG_PROPERTY);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAlive.java b/geode-core/src/main/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAlive.java
index a41f880..9ca3dce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAlive.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAlive.java
@@ -33,12 +33,12 @@ import java.util.concurrent.TimeUnit;
* A ScheduledThreadPoolExecutor which allows threads to time out after the keep alive time. With
* the normal ScheduledThreadPoolExecutor, there is no way to configure it such that it only add
* threads as needed.
- *
+ *
* This executor is not very useful if you only want to have 1 thread. Use the
* ScheduledThreadPoolExecutor in that case. This class with throw an exception if you try to
* configure it with one thread.
- *
- *
+ *
+ *
*/
@SuppressWarnings("synthetic-access")
public class ScheduledThreadPoolExecutorWithKeepAlive extends ThreadPoolExecutor
@@ -135,7 +135,7 @@ public class ScheduledThreadPoolExecutorWithKeepAlive extends ThreadPoolExecutor
* returned by ScheduledThreadPoolExecutor. In particular, they don't match the future returned by
* the {{@link #submit(Runnable)} method, and the run method won't do anything useful. This list
* should only be used as a count of the number of tasks that didn't execute.
- *
+ *
* @see ScheduledThreadPoolExecutor#shutdownNow()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Sendable.java b/geode-core/src/main/java/org/apache/geode/internal/Sendable.java
index 3ec8393..2dc0dc3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Sendable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Sendable.java
@@ -21,7 +21,7 @@ import java.io.IOException;
* Interface to implement if your class supports sending itself directly to a DataOutput during
* serialization. Note that you are responsible for sending all the bytes that represent your
* instance, even bytes describing your class name if those are required.
- *
+ *
* @since GemFire 6.6
*/
public interface Sendable {
@@ -29,7 +29,7 @@ public interface Sendable {
* Take all the bytes in the object and write them to the data output. It needs to be written in
* the GemFire wire format so that it will deserialize correctly if DataSerializer.readObject is
* called.
- *
+ *
* @param out the data output to send this object to
* @throws IOException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
index f906108..c594647 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal;
/**
* This interface is extended by DataSerializableFixedID and VersionedDataSerializable in order to
* furnish version information to the serialization infrastructure for backward compatibility
- *
+ *
*/
public interface SerializationVersions {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java b/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
index 66bd337..3587d88 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
@@ -20,9 +20,9 @@ import java.util.Set;
/**
* Utility methods for managing and using Sets
- *
+ *
* @since GemFire 59poc
- *
+ *
*/
public class SetUtils {
public static <T> boolean intersectsWith(final Set<? extends T> a, final Set<? extends T> b) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java b/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
index 83e1422..8716062 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.internal;
+import java.io.File;
+import java.net.URL;
+import java.net.URLDecoder;
+
import org.apache.geode.InternalGemFireError;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.lang.SystemUtils;
import org.apache.geode.pdx.internal.unsafe.UnsafeWrapper;
-import java.io.File;
-import java.net.URL;
-import java.net.URLDecoder;
-
/**
* The class puts in one place the code that will determine the name of the GemFire shared library.
* This aids debugging.
@@ -33,7 +33,7 @@ public class SharedLibrary {
* A suffix added on to distinguish between the Linux and Solaris library names since they reside
* in the same directory.
*/
- private final static String SOLARIS_LIBRARY_SUFFIX = "_sol";
+ private static final String SOLARIS_LIBRARY_SUFFIX = "_sol";
private static final boolean is64Bit;
private static final int referenceSize;
@@ -210,7 +210,7 @@ public class SharedLibrary {
* Returns the size in bytes of a C pointer in this shared library, returns 4 for a 32 bit shared
* library, and 8 for a 64 bit shared library . This method makes a native call, so you can't use
* it to determine which library to load .
- *
+ *
*/
public static int pointerSizeBytes() {
return SmHelper.pointerSizeBytes();
@@ -218,7 +218,7 @@ public class SharedLibrary {
/**
* Accessor method for the is64Bit flag
- *
+ *
* @return returns a boolean indicating if the 64bit native library was loaded.
* @since GemFire 5.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java b/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java
index a008ba1..1bfc7e2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
-import java.util.*;
-import java.lang.reflect.*;
import java.io.InvalidClassException;
+import java.lang.reflect.*;
+import java.util.*;
+
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* This class defines general native utils.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
index 8f83792..2f1eda9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
@@ -344,7 +344,7 @@ public class SystemAdmin {
/**
* Gets the status of a locator.
- *
+ *
* @param directory the locator's directory
* @return the status string. Will be one of the following: "running", "killed", "stopped",
* "stopping", or "starting".
@@ -359,7 +359,7 @@ public class SystemAdmin {
/**
* Gets information on the locator.
- *
+ *
* @param directory the locator's directory
* @return information string.
* @throws UncreatedSystemException if the locator <code>directory</code> does not exist or is not
@@ -556,7 +556,7 @@ public class SystemAdmin {
/**
* this is a test hook to allow us to drive SystemAdmin functions without invoking main(), which
* can call System.exit().
- *
+ *
* @param props
*/
public static void setDistributedSystemProperties(Properties props) {
@@ -863,7 +863,7 @@ public class SystemAdmin {
/**
* Returns the contents located at the end of the file as a string.
- *
+ *
* @throws IOException if the file can not be opened or read
*/
public String tailFile(File file, boolean problemsOnly) throws IOException {
@@ -1151,7 +1151,7 @@ public class SystemAdmin {
/**
* List the statistics of a running system.
- *
+ *
* @param directory the system directory of the system to list.
* @param archiveNames the archive file(s) to read.
* @param details if true the statistic descriptions will also be listed.
@@ -1332,7 +1332,7 @@ public class SystemAdmin {
DSFIDFactory.registerTypes();
}
- private final static String[] helpTopics =
+ private static final String[] helpTopics =
new String[] {"all", "overview", "commands", "options", "usage", "configuration"};
protected void printHelpTopic(String topic, PrintWriter pw) {
@@ -1420,7 +1420,7 @@ public class SystemAdmin {
ExitCode.FATAL.doSystemExit();
}
- private final static String[] validCommands = new String[] {"version", "stats", START_LOCATOR,
+ private static final String[] validCommands = new String[] {"version", "stats", START_LOCATOR,
"stop-locator", "status-locator", "info-locator", "tail-locator-log", "merge-logs",
"revoke-missing-disk-store", "list-missing-disk-stores", "validate-disk-store",
"upgrade-disk-store", "compact-disk-store", "compact-all-disk-stores", "modify-disk-store",
@@ -1431,10 +1431,10 @@ public class SystemAdmin {
return validCommands.clone();
}
- private final static String[] aliasCommands = new String[] {"locator-start", "locator-stop",
+ private static final String[] aliasCommands = new String[] {"locator-start", "locator-stop",
"locator-status", "locator-info", "locator-tail-log", "logs-merge", "shutdown-all",
"shutdownall", "compact", "modify", "validate"};
- private final static String[] validOptions =
+ private static final String[] validOptions =
new String[] {"-address=", "-archive=", "-concurrencyLevel=", "-debug", "-remove", "-details",
"-dir=", "-endtime=", "-h", "-help", "-initialCapacity=", "-loadFactor=", "-lru=",
"-lruAction=", "-lruLimit=", "-maxOplogSize=", "-properties=", "-monitor", "-nofilter",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemFailureTestHook.java b/geode-core/src/main/java/org/apache/geode/internal/SystemFailureTestHook.java
index 1fbe545..f157517 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemFailureTestHook.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemFailureTestHook.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal;
/**
* Allows tests to expect certain exceptions without the SystemFailure watchdog getting upset. See
* bug 46988.
- *
+ *
* @since GemFire 7.0.1
*/
public class SystemFailureTestHook {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
index bd6b60a..e23e8ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Instances of this class are like {@link Timer}, but are associated with a "swarm", which can be
* cancelled as a group with {@link #cancelSwarm(Object)}.
- *
+ *
* @see Timer
* @see TimerTask
*
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
public class SystemTimer {
private static final Logger logger = LogService.getLogger();
- final static private boolean isIBM =
+ private static final boolean isIBM =
"IBM Corporation".equals(System.getProperty("java.vm.vendor"));
/**
@@ -58,7 +58,7 @@ public class SystemTimer {
/**
* the underlying {@link Timer}
*/
- final private Timer timer;
+ private final Timer timer;
/**
* True if this timer has been cancelled
@@ -68,7 +68,7 @@ public class SystemTimer {
/**
* the swarm to which this timer belongs
*/
- final private Object /* T */ swarm;
+ private final Object /* T */ swarm;
@Override
public String toString() {
@@ -82,19 +82,19 @@ public class SystemTimer {
/**
* List of all of the swarms in the system
- *
+ *
* @guarded.By self
*/
// <T, HashMap<Object, ArrayList<WeakReference<SystemTimer>>>>
- static private final HashMap allSwarms = new HashMap();
+ private static final HashMap allSwarms = new HashMap();
/**
* Add the given timer is in the given swarm. Used only by constructors.
- *
+ *
* @param swarm swarm to add the timer to
* @param t timer to add
*/
- static private void addToSwarm(Object /* T */ swarm, SystemTimer t) {
+ private static void addToSwarm(Object /* T */ swarm, SystemTimer t) {
final boolean isDebugEnabled = logger.isTraceEnabled();
// Get or add list of timers for this swarm...
ArrayList /* ArrayList<WeakReference<SystemTimer>> */ swarmSet;
@@ -121,24 +121,24 @@ public class SystemTimer {
/**
* time that the last sweep was done
- *
+ *
* @see #sweepAllSwarms
*/
private static long lastSweepAllTime = 0;
/**
* Interval, in milliseconds, to sweep all swarms, measured from when the last sweep finished
- *
+ *
* @see #sweepAllSwarms
*/
private static final long SWEEP_ALL_INTERVAL = 2 * 60 * 1000; // 2 minutes
/**
* Manually garbage collect {@link #allSwarms}, if it hasn't happened in a while.
- *
+ *
* @see #lastSweepAllTime
*/
- static private void sweepAllSwarms() {
+ private static void sweepAllSwarms() {
if (System.currentTimeMillis() < lastSweepAllTime + SWEEP_ALL_INTERVAL) {
// Too soon.
return;
@@ -182,12 +182,12 @@ public class SystemTimer {
/**
* Remove given timer from the swarm.
- *
+ *
* @param t timer to remove
- *
+ *
* @see #cancel()
*/
- static private void removeFromSwarm(SystemTimer t) {
+ private static void removeFromSwarm(SystemTimer t) {
final boolean isDebugEnabled = logger.isTraceEnabled();
synchronized (allSwarms) {
// Get timer's swarm
@@ -242,7 +242,7 @@ public class SystemTimer {
/**
* Cancel all outstanding timers
- *
+ *
* @param swarm the swarm to cancel
*/
public static void cancelSwarm(Object /* T */ swarm) {
@@ -420,7 +420,7 @@ public class SystemTimer {
/**
* Cover class to track behavior of scheduled tasks
- *
+ *
* @see TimerTask
*/
public abstract static class SystemTimerTask extends TimerTask {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/UniqueIdGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/UniqueIdGenerator.java
index b3ba668..2e7fb3c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/UniqueIdGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/UniqueIdGenerator.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* Instances of this class are thread safe.
*
* @since GemFire 5.0.2
- *
+ *
*/
public class UniqueIdGenerator {
/*
@@ -35,9 +35,9 @@ public class UniqueIdGenerator {
* bits, requiring 6 address bits. The choice of unit is determined purely by performance
* concerns.
*/
- private final static int ADDRESS_BITS_PER_UNIT = 6;
- private final static int BITS_PER_UNIT = 1 << ADDRESS_BITS_PER_UNIT;
- private final static int BIT_INDEX_MASK = BITS_PER_UNIT - 1;
+ private static final int ADDRESS_BITS_PER_UNIT = 6;
+ private static final int BITS_PER_UNIT = 1 << ADDRESS_BITS_PER_UNIT;
+ private static final int BIT_INDEX_MASK = BITS_PER_UNIT - 1;
/**
* The units in this BitSet. The ith bit is stored in units[i/64] at bit position i % 64 (where
@@ -94,7 +94,7 @@ public class UniqueIdGenerator {
/*
* trailingZeroTable[i] is the number of trailing zero bits in the binary representation of i.
*/
- private final static byte trailingZeroTable[] = {-25, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+ private static final byte trailingZeroTable[] = {-25, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1,
0, 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0,
1, 0, 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2,
@@ -150,7 +150,7 @@ public class UniqueIdGenerator {
/**
* Returns the index of the first bit that is set to <code>false</code> that occurs on or after
* the specified starting index.
- *
+ *
* @param fromIndex the index to start checking from (inclusive).
* @return the index of the next clear bit.
*/
@@ -202,7 +202,7 @@ public class UniqueIdGenerator {
/**
* Obtain an id form the pool of available ids and return it.
- *
+ *
* @throws IllegalStateException if all ids have been obtained
*/
public int obtain() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 15a4366..6ae5ac2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -27,11 +27,11 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Enumerated type for client / server and p2p version.
- *
+ *
* There are dependencies in versioning code that require newer versions to have ordinals higher
* than older versions in order to protect against deserialization problems. Client/server code also
* uses greater-than comparison of ordinals in backward-compatibility checks.
- *
+ *
* @since GemFire 5.7
*/
public class Version implements Comparable<Version> {
@@ -272,7 +272,7 @@ public class Version implements Comparable<Version> {
/**
* return the version corresponding to the given ordinal, or CURRENT if the ordinal isn't valid
- *
+ *
* @param ordinal
* @return the corresponding ordinal
*/
@@ -291,7 +291,7 @@ public class Version implements Comparable<Version> {
* Write the given ordinal (result of {@link #ordinal()}) to given {@link DataOutput}. This keeps
* the serialization of ordinal compatible with previous versions writing a single byte to
* DataOutput when possible, and a token with 2 bytes if it is large.
- *
+ *
* @param out the {@link DataOutput} to write the ordinal write to
* @param ordinal the version to be written
* @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
@@ -316,7 +316,7 @@ public class Version implements Comparable<Version> {
* Write this {@link Version}'s ordinal (result of {@link #ordinal()}) to given
* {@link DataOutput}. This keeps the serialization of ordinal compatible with previous versions
* writing a single byte to DataOutput when possible, and a token with 2 bytes if it is large.
- *
+ *
* @param out the {@link DataOutput} to write the ordinal write to
* @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
* that, else always use three bytes where the first byte is {@link #TOKEN_ORDINAL}; former
@@ -354,7 +354,7 @@ public class Version implements Comparable<Version> {
* Write the given ordinal (result of {@link #ordinal()}) to given {@link ByteBuffer}. This keeps
* the serialization of ordinal compatible with previous versions writing a single byte to
* DataOutput when possible, and a token with 2 bytes if it is large.
- *
+ *
* @param buffer the {@link ByteBuffer} to write the ordinal write to
* @param ordinal the version to be written
* @param compressed if true, then use single byte for ordinal < 128, and three bytes for beyond
@@ -385,16 +385,16 @@ public class Version implements Comparable<Version> {
/**
* Return the <code>Version</code> reading from given {@link DataInput} as serialized by
* {@link #writeOrdinal(DataOutput, boolean)}.
- *
+ *
* If the incoming ordinal is greater than or equal to current ordinal then this will return null
* or {@link #CURRENT} indicating that version is same as that of {@link #CURRENT} assuming that
* peer will support this JVM.
- *
+ *
* This method is not meant to be used for client-server protocol since servers cannot support
* higher version clients, rather is only meant for P2P/JGroups messaging where a mixed version of
* servers can be running at the same time. Similarly cannot be used when recovering from disk
* since higher version data cannot be read.
- *
+ *
* @param in the {@link DataInput} to read the version from
* @param returnNullForCurrent if true then return null if incoming version >= {@link #CURRENT}
* else return {@link #CURRENT}
@@ -480,7 +480,7 @@ public class Version implements Comparable<Version> {
/**
* Returns whether this <code>Version</code> is compatible with the input <code>Version</code>
- *
+ *
* @param version The <code>Version</code> to compare
* @return whether this <code>Version</code> is compatible with the input <code>Version</code>
*/
@@ -491,7 +491,7 @@ public class Version implements Comparable<Version> {
/**
* Finds the Version instance corresponding to the given ordinal and returns the result of
* compareTo(Version)
- *
+ *
* @param other the ordinal of the other Version object
* @return negative if this version is older, positive if this version is newer, 0 if this is the
* same version
@@ -523,7 +523,7 @@ public class Version implements Comparable<Version> {
/**
* Returns a string representation for this <code>Version</code>.
- *
+ *
* @return the name of this operation.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionDescription.java b/geode-core/src/main/java/org/apache/geode/internal/VersionDescription.java
index 84965ea..3766fa1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionDescription.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionDescription.java
@@ -210,4 +210,3 @@ public class VersionDescription {
return Optional.empty();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
index 93511b4..70b0bc5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
/**
* An extension to {@link DataInputStream} that implements {@link VersionedDataStream} for a stream
* coming from a different product version.
- *
+ *
* @since GemFire 7.1
*/
public class VersionedDataInputStream extends DataInputStream implements VersionedDataStream {
@@ -31,7 +31,7 @@ public class VersionedDataInputStream extends DataInputStream implements Version
/**
* Creates a VersionedDataInputStream that uses the specified underlying InputStream.
- *
+ *
* @param in the specified input stream
* @param version the product version that serialized object on the given input stream
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
index 001fefe..91809df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
/**
* An extension of {@link DataOutputStream} that implements {@link VersionedDataStream}.
- *
+ *
* @since GemFire 7.1
*/
public class VersionedDataOutputStream extends DataOutputStream implements VersionedDataStream {
@@ -29,7 +29,7 @@ public class VersionedDataOutputStream extends DataOutputStream implements Versi
/**
* Creates a VersionedDataOutputStream that wraps the specified underlying OutputStream.
- *
+ *
* @param out the underlying output stream
* @param version the product version that serialized object on the given {@link OutputStream}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java
index f85b808..dce8a3b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataSerializable.java
@@ -21,7 +21,7 @@ import org.apache.geode.DataSerializable;
* compatibility. DataSerializer.writeObject/readObject will invoke getDSFIDVersions() and for each
* version returned it will use the corresponding toDataPreXXX/fromDataPreXXX methods when
* serializing for a particular version of the product.
- *
+ *
*
*/
public interface VersionedDataSerializable extends DataSerializable, SerializationVersions {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
index 7b0ab43..b90aa03 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
@@ -23,12 +23,12 @@ import org.apache.geode.DataSerializable;
/**
* An extension to {@link DataOutput}, {@link DataInput} used internally in product to indicate that
* the input/output stream is attached to a GemFire peer having a different version.
- *
+ *
* Internal product classes that implement {@link DataSerializableFixedID} and
* {@link DataSerializable} and change serialization format must check this on DataInput/DataOutput
* (see {@link InternalDataSerializer#getVersionForDataStream} methods) and deal with serialization
* with previous {@link Version}s appropriately.
- *
+ *
* @since GemFire 7.1
*/
public interface VersionedDataStream {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
index bd0b27f..3ab5255 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
@@ -21,7 +21,7 @@ import java.io.ObjectInput;
/**
* An extension to {@link ObjectInput} that implements {@link VersionedDataStream} wrapping given
* {@link ObjectInput} for a stream coming from a different product version.
- *
+ *
* @since GemFire 7.1
*/
public class VersionedObjectInput implements ObjectInput, VersionedDataStream {
@@ -31,7 +31,7 @@ public class VersionedObjectInput implements ObjectInput, VersionedDataStream {
/**
* Creates a VersionedObjectInput that wraps the specified underlying ObjectInput.
- *
+ *
* @param in the specified {@link ObjectInput}
* @param version the product version that serialized object on the given {@link ObjectInput}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
index 09f3995..afc9136 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
@@ -21,7 +21,7 @@ import java.io.ObjectOutput;
/**
* An extension to {@link ObjectOutput} that implements {@link VersionedDataStream} wrapping given
* {@link ObjectOutput} for a stream directed to a different product version.
- *
+ *
* @since GemFire 7.1
*/
public class VersionedObjectOutput implements ObjectOutput, VersionedDataStream {
@@ -31,7 +31,7 @@ public class VersionedObjectOutput implements ObjectOutput, VersionedDataStream
/**
* Creates a VersionedObjectOutput that wraps the specified underlying ObjectOutput.
- *
+ *
* @param out the underlying {@link ObjectOutput}
* @param version the product version that serialized object on the given {@link ObjectOutput}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java b/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
index e628c4a..be0f8b53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
@@ -47,7 +47,7 @@ public interface Alert {
/**
* Returns a InternalDistributedMember instance representing a member that is sending (or has
* sent) this alert. Could be <code>null</code>.
- *
+ *
* @return the InternalDistributedMember instance representing a member that is sending/has sent
* this alert
*
@@ -55,14 +55,14 @@ public interface Alert {
*/
public InternalDistributedMember getSender();
- public final static int ALL = InternalLogWriter.ALL_LEVEL;
- public final static int OFF = InternalLogWriter.NONE_LEVEL;
- public final static int FINEST = InternalLogWriter.FINEST_LEVEL;
- public final static int FINER = InternalLogWriter.FINER_LEVEL;
- public final static int FINE = InternalLogWriter.FINE_LEVEL;
- public final static int CONFIG = InternalLogWriter.CONFIG_LEVEL;
- public final static int INFO = InternalLogWriter.INFO_LEVEL;
- public final static int WARNING = InternalLogWriter.WARNING_LEVEL;
- public final static int ERROR = InternalLogWriter.ERROR_LEVEL;
- public final static int SEVERE = InternalLogWriter.SEVERE_LEVEL;
+ public static final int ALL = InternalLogWriter.ALL_LEVEL;
+ public static final int OFF = InternalLogWriter.NONE_LEVEL;
+ public static final int FINEST = InternalLogWriter.FINEST_LEVEL;
+ public static final int FINER = InternalLogWriter.FINER_LEVEL;
+ public static final int FINE = InternalLogWriter.FINE_LEVEL;
+ public static final int CONFIG = InternalLogWriter.CONFIG_LEVEL;
+ public static final int INFO = InternalLogWriter.INFO_LEVEL;
+ public static final int WARNING = InternalLogWriter.WARNING_LEVEL;
+ public static final int ERROR = InternalLogWriter.ERROR_LEVEL;
+ public static final int SEVERE = InternalLogWriter.SEVERE_LEVEL;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
index bde5a6f..54264a5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
@@ -15,8 +15,6 @@
package org.apache.geode.internal.admin;
-// import org.apache.geode.cache.Region;
-// import java.util.Set;
/**
* Represents one application vm (as opposed to a GemFire system manager) connected to a GemFire
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheCollector.java b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheCollector.java
index e3d13f7..d402777 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheCollector.java
@@ -15,13 +15,10 @@
package org.apache.geode.internal.admin;
-// import org.apache.geode.internal.admin.remote.*;
-// import org.apache.geode.cache.*;
-// import org.apache.geode.GemFireCacheException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.util.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* A <code>CacheCollector</code> is {@linkplain GfManagerAgent#setCacheCollector registered} on a
* {@link GfManagerAgent} to receive {@link CacheSnapshot}s from other members of the distributed
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
index 5153d94..3edec04 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.admin;
/**
* Describes a cache from a GemFireVM's point of view.
- *
+ *
* @since GemFire 3.5
*/
public interface CacheInfo {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java
index b1ae54d..78636d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java
@@ -46,7 +46,7 @@ public class ClientHealthMonitoringRegion {
/**
* This is an accessor method used to get the reference of this region. If this region is not yet
* initialized, then it attempts to create it.
- *
+ *
* @param cache the Cache we are currently using
* @return ClientHealthMonitoringRegion reference.
*/
@@ -93,7 +93,7 @@ public class ClientHealthMonitoringRegion {
/**
* This method prepares a CacheListener, responsible for the cleanup of reference of admin region,
* upon the cache closure.
- *
+ *
* @return CacheListener.
*/
private static CacheListener prepareCacheListener() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
index fce209a..98ff92c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientMembershipMessage.java
@@ -27,7 +27,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
/**
* A PooledDistributionMessage for notifying admin members about changes in Client Membership
* received through BridgeMembership
- *
+ *
*/
public class ClientMembershipMessage extends PooledDistributionMessage {
public static final int JOINED = 0;
@@ -46,7 +46,7 @@ public class ClientMembershipMessage extends PooledDistributionMessage {
/**
* Parameterized constructor
- *
+ *
* @param clientId Id of the client
* @param clientHost host the client was running on (could be null)
* @param eventType whether client joined, left or crashed. Should be one of
@@ -60,7 +60,7 @@ public class ClientMembershipMessage extends PooledDistributionMessage {
}
/**
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionMessage#process(org.apache.geode.distributed.internal.DistributionManager)
*/
@Override
@@ -84,7 +84,7 @@ public class ClientMembershipMessage extends PooledDistributionMessage {
}
/**
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
@@ -148,7 +148,7 @@ public class ClientMembershipMessage extends PooledDistributionMessage {
/**
* String representation of this message.
- *
+ *
* @return String representation of this message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java
index 4276500..38b7122 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java
@@ -43,7 +43,7 @@ public class ClientStatsManager {
/**
* Last cache that was initialized
- *
+ *
* GuardedBy ClientStatsManager.class
*/
private static InternalCache lastInitializedCache = null;
@@ -60,7 +60,7 @@ public class ClientStatsManager {
/**
* This method publishes the client stats using the admin region.
- *
+ *
* @param pool Connection pool which may be used for admin region.
*/
public static synchronized void publishClientStats(PoolImpl pool) {
@@ -180,7 +180,7 @@ public class ClientStatsManager {
/**
* This method queries the client stats & prepares the client health stats object to be published
* to the server.
- *
+ *
* @return the client health stats object to be published to the server.
*/
private static ClientHealthStats getClientHealthStats(InternalCache currentCache, PoolImpl pool) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundEntrySnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundEntrySnapshot.java
index a753f32..2b8f7fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundEntrySnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundEntrySnapshot.java
@@ -15,10 +15,9 @@
package org.apache.geode.internal.admin;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.util.*;
-// import org.apache.geode.cache.*;
+
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Presents an amalgam snapshot of all the {@linkplain org.apache.geode.cache.Region.Entry regions
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundRegionSnapshot.java
index a361deb..0285561 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CompoundRegionSnapshot.java
@@ -16,6 +16,7 @@
package org.apache.geode.internal.admin;
import java.util.*;
+
import org.apache.geode.cache.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
index ea0459c..51bbee3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.admin;
import java.io.Serializable;
import java.util.Date;
+
import org.apache.geode.distributed.internal.membership.*;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
index 7b6747d..c5de447 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.Config;
/**
* Represents one java vm connected to a GemFire distributed system
- *
+ *
*/
public interface GemFireVM {
@@ -82,7 +82,7 @@ public interface GemFireVM {
/**
* Returns a String describing the vm's gemfire version info
- *
+ *
* @since GemFire 3.5
*/
public String getVersionInfo();
@@ -117,7 +117,7 @@ public interface GemFireVM {
/**
* Adds a {@link HealthListener} with the given configuration to the vm. If a health listener has
* already been added it will be removed and a new one added.
- *
+ *
* @param cfg determines how and when the health will be checked.
* @since GemFire 3.5
*/
@@ -125,14 +125,14 @@ public interface GemFireVM {
/**
* Removes an added health listener.
- *
+ *
* @since GemFire 3.5
*/
public void removeHealthListener();
/**
* Resets the current health status to "good".
- *
+ *
* @since GemFire 3.5
*/
public void resetHealthStatus();
@@ -157,7 +157,7 @@ public interface GemFireVM {
* Returns the runtime {@link org.apache.geode.admin.GemFireMemberStatus} from the vm The idea is
* this snapshot is similar to stats that represent the current state of a running VM. However,
* this is a bit higher level than a stat
- *
+ *
* @since GemFire 5.7
*/
public GemFireMemberStatus getSnapshot();
@@ -165,7 +165,7 @@ public interface GemFireVM {
/**
* Returns the runtime {@link org.apache.geode.admin.RegionSubRegionSnapshot} from the vm The idea
* is this snapshot is quickly salvageable to present a cache's region's info
- *
+ *
* @since GemFire 5.7
*/
public RegionSubRegionSnapshot getRegionSnapshot();
@@ -242,7 +242,7 @@ public interface GemFireVM {
/**
* Sets the cache inspection mode to {@link #LIGHTWEIGHT_CACHE_VALUE},
* {@link #LOGICAL_CACHE_VALUE}, or {@link #PHYSICAL_CACHE_VALUE}.
- *
+ *
* @throws IllegalArgumentException if the type is not one of the appropriate constants
*/
public void setCacheInspectionMode(int mode);
@@ -256,7 +256,7 @@ public interface GemFireVM {
/**
* Causes a snapshot of the given region to be taken. Results are streamed back to any
* SnapshotListeners registered with this <code>GemFireVM</code>'s parent {@link GfManagerAgent}.
- *
+ *
* @param regionName the region to snapshot
*/
public void takeRegionSnapshot(String regionName, int snapshotId);
@@ -340,11 +340,11 @@ public interface GemFireVM {
* This method should be used to set the Alerts Manager for the member agent. Stat Alerts
* Aggregator would use this method to set stat Alerts Manager with the available alert
* definitions and the refresh interval set for each member joining the distributed system.
- *
+ *
* @param alertDefs Stat Alert Definitions to set for the Alerts Manager
* @param refreshInterval refresh interval to be used by the Alerts Manager
* @param setRemotely whether to be set on remote VM
- *
+ *
* @since GemFire 5.7
*/
public void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval,
@@ -353,9 +353,9 @@ public interface GemFireVM {
/**
* This method would be used to set refresh interval for the GemFireVM. This method would mostly
* be called on each member after initial set up whenever the refresh interval is changed.
- *
+ *
* @param refreshInterval refresh interval to set (in milliseconds)
- *
+ *
* @since GemFire 5.7
*/
public void setRefreshInterval(long refreshInterval);
@@ -364,12 +364,12 @@ public interface GemFireVM {
* This method would be used to set Sta Alert Definitions for the GemFireVM. This method would
* mostly be called on each member after initial set up whenever one or more Stat Alert
* Definitions get added/updated/removed.
- *
+ *
* @param alertDefs an array of StaAlertDefinition objects
* @param actionCode one of UpdateAlertDefinitionRequest.ADD_ALERT_DEFINITION,
* UpdateAlertDefinitionRequestUPDATE_ALERT_DEFINITION,
* UpdateAlertDefinitionRequest.REMOVE_ALERT_DEFINITION
- *
+ *
* @since GemFire 5.7
*/
public void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
index 242d059..c129583 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.admin;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-// import java.util.*;
/**
* This interface is the point of entry into a GemFire distributed system for the admin API. It
@@ -28,7 +27,7 @@ public interface GfManagerAgent {
/**
* Disconnects this agent from the distributed system.
- *
+ *
* @return true if this call resulted in being disconnected
*/
public boolean disconnect();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ListenerIdMap.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ListenerIdMap.java
index 8d905b8..06f1b24 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ListenerIdMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ListenerIdMap.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.internal.admin;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.lang.Math;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* A <code>ListenerIdMap</code> maps ints to an <code>Object</code>. This is an optimization because
* using a {@link java.util.HashMap} for this purposed proved to be too slow because of all of the
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
index 6cbdce7..b454443 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
@@ -182,7 +182,7 @@ public class SSLConfig {
/**
* Populates a <code>Properties</code> object with the SSL-related configuration information used
* by {@link org.apache.geode.distributed.DistributedSystem#connect}.
- *
+ *
* @since GemFire 4.0
*/
public void toDSProperties(Properties props) {
@@ -196,4 +196,3 @@ public class SSLConfig {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java b/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
index c646907..fb2e482 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
@@ -37,4 +37,3 @@ public interface Stat extends GfObject {
public boolean isCounter();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlert.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlert.java
index 3763b2c..c310dbd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlert.java
@@ -21,7 +21,7 @@ import java.util.Date;
* This class defines the Alert sent by the AlertManager to the Alert Aggregator. This class
* includes the information about the <code>AlertDefinition<code> for which this alert being raised
* & the value of the statistic.
- *
+ *
*/
public class StatAlert implements Serializable {
@@ -62,7 +62,7 @@ public class StatAlert implements Serializable {
/**
* The non default constructor.
- *
+ *
* @param definitionId StatAlertDefinition identifer value
* @param values actual value of the statistic.
*/
@@ -73,7 +73,7 @@ public class StatAlert implements Serializable {
/**
* This function returns the definition identifier for this StatAlert.
- *
+ *
* @return StatAlertDefinition identifier.
*/
public int getDefinitionId() {
@@ -82,7 +82,7 @@ public class StatAlert implements Serializable {
/**
* This function sets the definition identifier for this alert.
- *
+ *
* @param definitionId StatAlertDefinition identifier.
*/
public void setDefinitionId(int definitionId) {
@@ -92,7 +92,7 @@ public class StatAlert implements Serializable {
/**
* This method returns the statistic value for this alert. This can either be the latest value for
* the statistic or the delta between the last two readings, depending on the alert definition.
- *
+ *
* @return the value.
*/
public Number[] getValues() {
@@ -103,7 +103,7 @@ public class StatAlert implements Serializable {
* This method sets the value of the statistic for this alert. This can either be the latest value
* for the statistic or the delta between the last two readings, depending on the alert
* definition.
- *
+ *
* @param values value to be set.
*/
public void setValues(Number[] values) {
@@ -112,7 +112,7 @@ public class StatAlert implements Serializable {
/**
* This method returns the timestamp when this alert was created.
- *
+ *
* @return timestamp when this alert was created.
*/
public Date getTime() {
@@ -121,7 +121,7 @@ public class StatAlert implements Serializable {
/**
* This method sets the timestamp when this alert was created.
- *
+ *
* @param time timestamp when this alert was created.
*/
public void setTime(Date time) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
index 25fb1c0..7b7142a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.admin.statalerts.StatisticInfo;
/**
* Base interface that supports a StatAlertDefinition
- *
+ *
*/
public interface StatAlertDefinition extends DataSerializable {
/**
@@ -61,7 +61,7 @@ public interface StatAlertDefinition extends DataSerializable {
/**
* Get the value of the Statistic this Definition object is created for Depending on the Decorator
* the value returned can be different
- *
+ *
* @return Number[]
*/
public Number[] getValue();
@@ -69,7 +69,7 @@ public interface StatAlertDefinition extends DataSerializable {
/**
* Get the value of the Statistic this Definition object is created for Depending on the Decorator
* the value returned can be different
- *
+ *
* @return Number[]
*/
public Number[] getValue(Number[] vals);
@@ -84,14 +84,14 @@ public interface StatAlertDefinition extends DataSerializable {
/**
* This method returns the name of this stat alert definition.
- *
+ *
* @return Name of the StatAlertDefinition
*/
public String getName();
/**
* This method sets the name of this stat alert definition.
- *
+ *
* @param name name to be set for this StatAlertDefinition.
*/
public void setName(String name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertsManager.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertsManager.java
index fecb952..f1a1164 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertsManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertsManager.java
@@ -45,14 +45,14 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* The alert manager maintains the list of alert definitions (added by client e.g GFMon 2.0).
- *
+ *
* It retrieved the value of statistic( defined in alert definition) and notify alert aggregator
* sitting on admin VM
- *
+ *
* @see StatAlertDefinition
* @see StatAlert
- *
- *
+ *
+ *
* @since GemFire 5.7
*/
public class StatAlertsManager {
@@ -60,7 +60,7 @@ public class StatAlertsManager {
/**
* Instance for current DM
- *
+ *
* Guarded by StatAlertsManager.class
*/
private static StatAlertsManager alertManager;
@@ -99,7 +99,7 @@ public class StatAlertsManager {
/**
* @return singleton instance of StatAlertsManager
*/
- public synchronized static StatAlertsManager getInstance(DistributionManager dm) {
+ public static synchronized StatAlertsManager getInstance(DistributionManager dm) {
// As per current implementation set up request will be send only once ,
// when member joined to Admin distributed system
// we don't need to care about race condition
@@ -122,17 +122,17 @@ public class StatAlertsManager {
/**
* Nullifies the StatAlertsManager instance.
*/
- private synchronized static void closeInstance() {
+ private static synchronized void closeInstance() {
StatAlertsManager.alertManager = null;
}
/**
- *
+ *
* Update the alert's definition map
- *
+ *
* @param defns Alert definitions
* @param actionCode Action to be performed like add , remove or update alert's definition
- *
+ *
* @see UpdateAlertDefinitionMessage
*/
public void updateAlertDefinition(StatAlertDefinition[] defns, int actionCode) {
@@ -188,7 +188,7 @@ public class StatAlertsManager {
/**
* Set refresh time interval also cancel the previous {@link TimerTask} and create new timer task
* based on ner refresh time interval
- *
+ *
* @param interval Refresh time interval
*/
public synchronized void setRefreshTimeInterval(long interval) {
@@ -197,7 +197,7 @@ public class StatAlertsManager {
}
/**
- *
+ *
* @return time interval alert generation
*/
public synchronized long getRefreshTimeInterval() {
@@ -217,7 +217,7 @@ public class StatAlertsManager {
* {@link TimerTask}
*
* TODO never called
- *
+ *
* @param refreshAtFixedRate
*/
public synchronized void setRefreshAtFixedRate(boolean refreshAtFixedRate) {
@@ -228,7 +228,7 @@ public class StatAlertsManager {
/**
* Query all the statistic defined by alert definition and notify alerts aggregator if at least
* one statistic value crosses the threshold defined in alert definition
- *
+ *
*/
protected StatAlert[] getAlerts() {
Set alerts = new HashSet();
@@ -333,7 +333,7 @@ public class StatAlertsManager {
/**
* Timer task to send all the alerts raised to {@link StatAlertsAggregator}
- *
+ *
*/
class EvaluateAlertDefnsTask extends SystemTimerTask {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
index f0050a1..b844325 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
@@ -15,7 +15,6 @@
package org.apache.geode.internal.admin;
-// import java.util.List;
/**
* Interface to represent one statistic resource
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/TransportConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/TransportConfig.java
index 7163753..f954805 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/TransportConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/TransportConfig.java
@@ -21,4 +21,3 @@ package org.apache.geode.internal.admin;
*/
public interface TransportConfig {
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
index 6dd97e8..795b00c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
@@ -16,18 +16,16 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.admin.GemFireHealthConfig;
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to add a health listener.
- *
+ *
* @since GemFire 3.5
*/
public class AddHealthListenerRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
index 8777303..3fda3f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
@@ -16,18 +16,15 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
+import java.io.*;
+
import org.apache.geode.admin.GemFireHealthConfig;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
/**
* The response to adding a health listener.
- *
+ *
* @since GemFire 3.5
*/
public class AddHealthListenerResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
index a911263..2165ee8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
@@ -16,15 +16,12 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-// import java.util.*;
-
/**
* A message that is sent to a particular distribution manager to add a statistic listener.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
index f5d708e..b5f52a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
@@ -16,11 +16,9 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.admin.*;
-import org.apache.geode.distributed.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.statistics.GemFireStatSampler;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
index dd9b793..0fbcb3c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
@@ -26,11 +26,11 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.PooledDistributionMessage;
-import org.apache.geode.internal.statistics.GemFireStatSampler;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.statistics.GemFireStatSampler;
/**
* A message that is sent to a particular distribution manager to let it know that the sender is an
@@ -69,7 +69,7 @@ public class AdminConsoleDisconnectMessage extends PooledDistributionMessage {
/**
* @param reason the reason for getting disconnected
- *
+ *
* @since GemFire 6.5
*/
public void setReason(String reason) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
index d201575..fc5556b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
@@ -16,11 +16,10 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.*;
-// import org.apache.geode.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.*;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java
index d67d56a..6bd8e56 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java
@@ -16,22 +16,16 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.locks.Lock;
+
import org.apache.geode.admin.RuntimeAdminException;
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.snapshot.RegionSnapshotService;
import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-// import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.util.*;
-
-import java.io.*;
-// import java.net.*;
-import java.util.*;
-import java.util.concurrent.locks.Lock;
/**
* Represents a snapshot of a {@link Region}.
@@ -555,7 +549,7 @@ public class AdminRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#putIfAbsent(java.lang.Object, java.lang.Object)
*/
public Object putIfAbsent(Object key, Object value) {
@@ -564,7 +558,7 @@ public class AdminRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#remove(java.lang.Object, java.lang.Object)
*/
public boolean remove(Object key, Object value) {
@@ -573,7 +567,7 @@ public class AdminRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object)
*/
public Object replace(Object key, Object value) {
@@ -582,7 +576,7 @@ public class AdminRegion implements Region {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object,
* java.lang.Object)
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java
index 6c82b56..6ea7de6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRequest.java
@@ -17,7 +17,6 @@
package org.apache.geode.internal.admin.remote;
import java.io.DataInput;
-// import org.apache.geode.internal.*;
import java.io.DataOutput;
import java.io.IOException;
@@ -28,8 +27,6 @@ import org.apache.geode.admin.RuntimeAdminException;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.PooledDistributionMessage;
import org.apache.geode.distributed.internal.ReplyException;
-// import java.util.*;
-// import java.net.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java
index 50d80a3..adb72b1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminResponse.java
@@ -16,11 +16,9 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminWaiters.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminWaiters.java
index 258faa5..b964a4e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminWaiters.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminWaiters.java
@@ -48,7 +48,7 @@ public class AdminWaiters {
/**
* Sends <code>msg</code> using <code>dm</code> and waits for the response.
- *
+ *
* @return the response.
* @throws RuntimeAdminException if this method is interrupted, times out, cancelled
* ({@link #cancelWaiters}), or failed with an exception on the server side.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
index 25f1eb1..442b244 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
@@ -18,11 +18,11 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.distributed.internal.SerialDistributionMessage;
import org.apache.logging.log4j.Logger;
import org.apache.geode.admin.AlertLevel;
import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.SerialDistributionMessage;
import org.apache.geode.internal.admin.Alert;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
index 9f0e4bf..48b3a37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
@@ -16,17 +16,16 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.admin.AlertLevel;
import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.internal.*;
+import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.admin.*;
import org.apache.geode.management.internal.AlertDetails;
-import java.io.*;
-import java.util.*;
-import org.apache.geode.distributed.internal.membership.*;
-
/**
* A message that is sent to a particular console distribution manager to notify it of an alert.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java
index 2a6c652..4a944dc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertsNotificationMessage.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.admin.StatAlert;
/**
* Distribution message to be sent to alert aggregator {@link StatAlertsAggregator} It wraps alert
* objects{@link StatAlert}
- *
+ *
* @since GemFire 5.7
*/
public class AlertsNotificationMessage extends PooledDistributionMessage {
@@ -79,7 +79,7 @@ public class AlertsNotificationMessage extends PooledDistributionMessage {
}
/**
- *
+ *
* @param alerts List of alerts raised by member vm
*/
public void setAlerts(StatAlert[] alerts) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
index 72f6903..c8770ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
@@ -17,12 +17,10 @@
package org.apache.geode.internal.admin.remote;
import java.io.*;
-// import org.apache.geode.internal.admin.*;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.cache.*;
-// import org.apache.geode.internal.cache.*;
+
import org.apache.geode.*;
-// import java.util.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.internal.*;
public class AppCacheSnapshotMessage extends RegionAdminMessage {
// private int numResults;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
index f65b09d..04c4233 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.admin.CacheInfo;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-
/**
* A message that is sent to a VM that hosts a cache to perform an administrative operation on one
* of its bridge servers.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
index b541658..dba5810 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
@@ -16,19 +16,16 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-// import java.util.*;
-
/**
* A message that is sent to a particular distribution manager to get information on its current
* cache.
- *
+ *
* @since GemFire 3.5
*/
public class CacheConfigRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
index 2e9c37c..0aae5ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.InternalCache;
/**
* A message that is sent in response to a {@link CacheConfigRequest}.
- *
+ *
* @since GemFire 3.5
*/
public class CacheConfigResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
index 21ad6c2..db13737 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
@@ -16,17 +16,15 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to get information on its current
* cache.
- *
+ *
* @since GemFire 3.5
*/
public class CacheInfoRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
index 578252e..f6191c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.InternalCache;
/**
* A message that is sent in response to a {@link CacheInfoRequest}.
- *
+ *
* @since GemFire 3.5
*/
public class CacheInfoResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
index d96d567..0602fc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to get rid of a previously added
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
index 903f6fb..d105fa3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
@@ -16,13 +16,11 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.admin.*;
-import org.apache.geode.distributed.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.statistics.GemFireStatSampler;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
index 5bab9f1..5633b77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
@@ -15,12 +15,9 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationRegistry.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationRegistry.java
index 5f65a47..a4c6b0c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationRegistry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationRegistry.java
@@ -16,6 +16,7 @@
package org.apache.geode.internal.admin.remote;
import java.util.*;
+
import org.apache.geode.distributed.internal.membership.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -30,7 +31,7 @@ public class CancellationRegistry {
private CancellationRegistry() {}
- public synchronized static CancellationRegistry getInstance() {
+ public static synchronized CancellationRegistry getInstance() {
if (internalRef == null) {
internalRef = new CancellationRegistry();
}
@@ -57,7 +58,7 @@ public class CancellationRegistry {
/////// Inner Classes ////////////////////////////////////////
- static private class Key {
+ private static class Key {
private final InternalDistributedMember console;
private final int msgId;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java
index 04261ed..a052cca 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage.java
@@ -25,9 +25,9 @@ import org.apache.geode.internal.admin.StatAlertsManager;
/**
* Distribution message, sets refresh time interval in member's alerts manager
- *
+ *
* @see StatAlertsManager
- *
+ *
* @since GemFire 5.7
*/
public class ChangeRefreshIntervalMessage extends PooledDistributionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
index 6d50405..b271baf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
@@ -22,14 +22,15 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
+
+import org.apache.geode.DataSerializer;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.management.internal.beans.CacheServerBridge;
-import org.apache.geode.DataSerializer;
/**
* Bean class act as container for client stats
- *
+ *
*/
public class ClientHealthStats implements DataSerializableFixedID, Serializable {
@@ -97,7 +98,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method returns total number of successful get requests completed.
- *
+ *
* @return total number of get requests completed successfully.
*/
public int getNumOfGets() {
@@ -106,7 +107,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method sets the total number of successful get requests completed.
- *
+ *
* @param numOfGets Total number of get requests to be set.
*/
public void setNumOfGets(int numOfGets) {
@@ -115,7 +116,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method returns the total number of successful put requests completed.
- *
+ *
* @return Total number of put requests completed.
*/
public int getNumOfPuts() {
@@ -124,7 +125,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method sets the total number of successful put requests completed.
- *
+ *
* @param numOfPuts Total number of put requests to be set.
*/
public void setNumOfPuts(int numOfPuts) {
@@ -133,7 +134,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method returns total number of cache misses in this client.
- *
+ *
* @return total number of cache misses.
*/
public int getNumOfMisses() {
@@ -142,7 +143,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method sets total number of cache misses in this client.
- *
+ *
* @param numOfMisses total number of cache misses.
*/
public void setNumOfMisses(int numOfMisses) {
@@ -151,7 +152,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method returns total number of cache listener calls completed.
- *
+ *
* @return total number of cache listener calls completed.
*/
public int getNumOfCacheListenerCalls() {
@@ -160,7 +161,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method sets total number of cache listener calls compeleted.
- *
+ *
* @param numOfCacheListenerCalls total number of cache listener calls completed.
*/
public void setNumOfCacheListenerCalls(int numOfCacheListenerCalls) {
@@ -169,7 +170,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method returns total number of threads in the client VM.
- *
+ *
* @return total number of threads in the client VM
*/
public int getNumOfThreads() {
@@ -178,7 +179,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method sets the total number of threads in the client VM.
- *
+ *
* @param numOfThreads total number of threads in the client VM
*/
public void setNumOfThreads(int numOfThreads) {
@@ -187,7 +188,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method returns the CPU time used by the process (in nanoseconds)
- *
+ *
* @return CPU time used by the process (in nanoseconds)
*/
public long getProcessCpuTime() {
@@ -196,7 +197,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/**
* This method sets the CPU time used by the process (in nanoseconds).
- *
+ *
* @param processCpuTime CPU time used by the process (in nanoseconds)
*/
public void setProcessCpuTime(long processCpuTime) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
index ceb940f..7fc5abb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
@@ -17,15 +17,12 @@ package org.apache.geode.internal.admin.remote;
import java.io.DataInput;
import java.io.DataOutput;
-// import java.util.*;
import java.io.IOException;
import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.ExpirationAction;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
index e6ed87c..ee80e7c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
@@ -23,14 +23,11 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.ExpirationAction;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to let it know that the sender is an
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
index a9505c1..39c6095 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
@@ -15,13 +15,6 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.InternalGemFireException;
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.internal.admin.SSLConfig;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
@@ -32,6 +25,13 @@ import java.util.Collections;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.InetAddressValidator;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.distributed.Locator;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.net.SocketCreator;
+
/**
* Identifies the host, port, and bindAddress a distribution locator is listening on.
*
@@ -43,7 +43,7 @@ public class DistributionLocatorId implements java.io.Serializable {
private InetAddress host;
private final int port;
private final String bindAddress;
- transient private SSLConfig sslConfig;
+ private transient SSLConfig sslConfig;
// the following two fields are not used but are retained for backward compatibility
// as this class is Serializable and is used in WAN locator information exchange
private boolean peerLocator = true;
@@ -219,7 +219,7 @@ public class DistributionLocatorId implements java.io.Serializable {
/**
* Returns the resolved InetSocketAddress of the locator We cache the InetAddress if hostname is
* ipString Otherwise we create InetAddress each time.
- *
+ *
**/
public InetSocketAddress getHost() throws UnknownHostException {
if (this.hostname != null) {
@@ -286,7 +286,7 @@ public class DistributionLocatorId implements java.io.Serializable {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -359,7 +359,7 @@ public class DistributionLocatorId implements java.io.Serializable {
* Converts a collection of {@link Locator} instances to a collection of DistributionLocatorId
* instances. Note this will use {@link SocketCreator#getLocalHost()} as the host for
* DistributionLocatorId. This is because all instances of Locator are local only.
- *
+ *
* @param locators collection of Locator instances
* @return collection of DistributionLocatorId instances
* @throws UnknownHostException
@@ -383,7 +383,7 @@ public class DistributionLocatorId implements java.io.Serializable {
* Marshals a collection of {@link Locator} instances to a collection of DistributionLocatorId
* instances. Note this will use {@link SocketCreator#getLocalHost()} as the host for
* DistributionLocatorId. This is because all instances of Locator are local only.
- *
+ *
* @param locatorIds collection of DistributionLocatorId instances
* @return collection of String instances
* @see #marshal()
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
index 517b726..a079d25 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
@@ -15,16 +15,17 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.*; // import
import java.io.*;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.*;
+
/**
* A message that is sent to a particular distribution manager to get information about a durable
* client's proxy in the bridge-servers of its current cache.
- *
+ *
* @since GemFire 5.6
- *
+ *
*/
public class DurableClientInfoRequest extends AdminRequest {
static final int HAS_DURABLE_CLIENT_REQUEST = 10;
@@ -78,7 +79,7 @@ public class DurableClientInfoRequest extends AdminRequest {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
index 6cc6f2f..98837c5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.InternalCache;
/**
* A message that is sent in response to a {@link DurableClientInfoRequest}.
- *
+ *
* @since GemFire 5.6
*/
public class DurableClientInfoResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/EntryValueNodeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/EntryValueNodeImpl.java
index ce4ae52..c5f0e89 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/EntryValueNodeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/EntryValueNodeImpl.java
@@ -15,14 +15,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.lang.reflect.*;
-import java.io.*;
-import java.util.*;
-
/**
* This class holds the metadata for a single object field in a value stored in the cache. They are
* built during construction of {@link ObjectDetailsResponse} instances and returned to the console.
@@ -384,5 +384,3 @@ public class EntryValueNodeImpl implements EntryValueNode, Externalizable/* , Da
// }
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
index 22e8378..0e394ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
public class FetchDistLockInfoRequest extends AdminRequest {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
index ba6a0c4..4492fb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
@@ -16,15 +16,15 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import org.apache.geode.internal.admin.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.locks.*;
-import java.io.*;
-import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.admin.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
public class FetchDistLockInfoResponse extends AdminResponse {
// instance variables
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
index b491632..37d0a33 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
@@ -16,15 +16,16 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.admin.GemFireHealth;
-import java.io.*;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A message that is sent to a particular distribution manager to fetch its health diagnosis
- *
+ *
* @since GemFire 3.5
*/
public class FetchHealthDiagnosisRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
index 55bdc64..1585907 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
@@ -16,18 +16,16 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.admin.GemFireHealth;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
/**
* The response to fetching the health diagnosis.
- *
+ *
* @since GemFire 3.5
*/
public class FetchHealthDiagnosisResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
index 74e5fec..ee3d8b6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
@@ -16,11 +16,11 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-
/**
* A message that is sent to a particular distribution manager to get its current information
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
index 9ca66ca..f41f0ac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
@@ -16,26 +16,26 @@
package org.apache.geode.internal.admin.remote;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.CacheServerLauncher;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URL;
-import java.net.UnknownHostException;
+import org.apache.geode.internal.net.SocketCreator;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to get its current
@@ -171,4 +171,3 @@ public class FetchHostResponse extends AdminResponse {
.toLocalizedString(new Object[] {this.getRecipient(), this.host});
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
index e4cf695..308a759 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
public class FetchResourceAttributesRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
index 7d0fbb8..7f2be75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
@@ -16,9 +16,10 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.*;
import java.io.*;
+
+import org.apache.geode.*;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
public class FetchResourceAttributesResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
index 36994ad..dc98cae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
public class FetchStatsRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
index ab122c6..f9a861c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
@@ -14,11 +14,6 @@
*/
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.Statistics;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.distributed.internal.InternalDistributedSystem.StatisticsVisitor;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -26,6 +21,11 @@ import java.util.ArrayList;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Statistics;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem.StatisticsVisitor;
import org.apache.geode.distributed.internal.membership.*;
/**
@@ -125,7 +125,7 @@ public class FetchStatsResponse extends AdminResponse {
/**
* Returns a string representation of the object.
- *
+ *
* @return a string representation of the object
*/
@Override
@@ -134,4 +134,3 @@ public class FetchStatsResponse extends AdminResponse {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
index a06356a..fa1288f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
@@ -16,11 +16,11 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-
/**
* A message that is sent to a particular distribution manager to get its current
* {@link org.apache.geode.internal.Config}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
index b50a3b5..57d58c1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
@@ -16,12 +16,12 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.*;
-import org.apache.geode.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.*;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.*;
/**
* A message that is sent to a particular distribution manager to get its current {@link Config}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
index fddafe5..ee46789 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
@@ -16,11 +16,10 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
import java.io.*;
+import org.apache.geode.distributed.internal.*;
+
/**
* A message to cause a remote application to release any snapshot info it was holding on behalf of
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
index b3b309a..0c4474a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
@@ -16,19 +16,17 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.admin.GemFireHealth;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import java.io.*;
-// import java.util.*;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A message that is sent to a particular agent who was registered a health listener on a GemFireVM.
* This message is only sent when the health status changes.
- *
+ *
* @since GemFire 3.5
*/
public class HealthListenerMessage extends PooledDistributionMessage implements AdminMessageType {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
index 1ba0088..22a5f67 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to get its current license info.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
index 41bfa9c..ba05780 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
@@ -14,18 +14,18 @@
*/
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-// import java.net.*;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.logging.LogService;
+
/**
* A message that is sent in response to a {@link LicenseInfoRequest}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
index 86167a8..36dba51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
@@ -16,12 +16,11 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
+import org.apache.geode.*;
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular app vm to request the value, stats, and attributes of a
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
index af056e4..aeb33e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
@@ -16,13 +16,12 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
/**
@@ -119,7 +118,7 @@ public class ObjectDetailsResponse extends AdminResponse implements Cancellable
// Holds the last result of getObjectName to optimize the next call
- static private Object lastObjectNameFound = null;
+ private static Object lastObjectNameFound = null;
static Object getObjectName(Region r, Object objName) throws CacheException {
if (objName instanceof RemoteObjectName) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
index 6424e19..c51cb2b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular app vm to request all the subregions of a given parent
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
index e6832c5..3f02d0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
@@ -16,13 +16,12 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java
index 5b04bbd..0de8b79 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java
@@ -15,13 +15,14 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
import java.io.*;
+import org.apache.geode.distributed.internal.*;
+
/**
* A message that is sent to a particular distribution manager to get its current
* {@link org.apache.geode.admin.GemFireMemberStatus}
- *
+ *
*/
public class RefreshMemberSnapshotRequest extends AdminRequest {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java
index a4f4fab..58ae141 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminMessage.java
@@ -16,14 +16,12 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.cache.*;
-import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.DistributedSystem;
-import java.io.*;
-// import java.util.*;
+import org.apache.geode.distributed.internal.*;
/**
* A message that is sent to a particular app vm on a distribution manager to make an administration
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java
index f66ecf2..6e2baa2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAdminRequest.java
@@ -16,18 +16,13 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
-// import org.apache.geode.admin.OperationCancelledException;
import org.apache.geode.admin.RegionNotFoundException;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.cache.*;
-// import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.admin.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular app vm on a distribution manager to make an administration
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
index 4592161..9cf6d3c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular app vm to request the region statistics of a given region.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
index 4ef4cd2..f618826 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
@@ -16,13 +16,11 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
index c63a8ce..ebd176e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
@@ -16,16 +16,17 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
/**
* A message that is sent to a particular application to get the region for the specified path.
- *
+ *
* @since GemFire 3.5
*/
public class RegionRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
index b3b678e..e444be8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
@@ -16,19 +16,18 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-import org.apache.geode.internal.admin.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.admin.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Responds to {@link RegionResponse}.
- *
+ *
* @since GemFire 3.5
*/
public class RegionResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
index 453e076..73a5b50 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
@@ -16,14 +16,12 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
import org.apache.geode.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-// import java.util.*;
-
/**
* A message that is sent to a particular app vm to request all the subregions of a given parent
* region.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
index d0c28b3..69fbec4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
@@ -16,13 +16,11 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
-import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import org.apache.geode.distributed.internal.*;
import java.io.*;
import java.util.*;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
index c95f9db..4799b91 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular app vm to request the region statistics of a given region.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
index e2c919d..9197eda 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
@@ -16,13 +16,11 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-// import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java
index 88a4fac..2306bca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest.java
@@ -22,7 +22,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
/**
* Admin request to transfer region info for a member
- *
+ *
*/
public class RegionSubRegionSizeRequest extends AdminRequest implements Cancellable {
public RegionSubRegionSizeRequest() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java
index 1ce35ad..5e24f63 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse.java
@@ -94,7 +94,7 @@ public class RegionSubRegionsSizeResponse extends AdminResponse implements Cance
/**
* Populates the collection of sub-region snapshots for the parentSnapShot with snapshots for the
* regions given.
- *
+ *
* @param parentSnapShot RegionSubRegionSnapshot of a parent region
* @param regions collection of sub-regions of the region represented by parentSnapShot
* @param cache cache instance is used for to get the LogWriter instance to log exceptions if any
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteAlert.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteAlert.java
index 74266a7..1b5297a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteAlert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteAlert.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.*;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.*;
import org.apache.geode.internal.admin.*;
@@ -22,11 +27,6 @@ import org.apache.geode.internal.logging.DateFormatter;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.internal.logging.log4j.LogLevel;
-import java.io.*;
-import java.util.*;
-import java.text.DateFormat;
-import java.text.ParseException;
-
/**
* Implementation of the Alert interface.
*/
@@ -96,10 +96,10 @@ public class RemoteAlert implements Alert {
/**
* Returns a InternalDistributedMember instance representing a member that is sending (or has
* sent) this alert. Could be <code>null</code>.
- *
+ *
* @return the InternalDistributedMember instance representing a member that is sending/has sent
* this alert
- *
+ *
* @since GemFire 6.5
*/
public InternalDistributedMember getSender() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
index cfbdd5b..177604e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
@@ -16,8 +16,8 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.admin.*;
/**
* Represents an application VM (member of the distributed system).
@@ -32,7 +32,7 @@ public class RemoteApplicationVM extends RemoteGemFireVM implements ApplicationV
* <p/>
* You MUST invoke {@link RemoteGemFireVM#startStatDispatcher()} immediately after constructing an
* instance.
- *
+ *
* @param alertLevel The level of {@link Alert}s that this administration console should receive
* from this member of the distributed system.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteBridgeServer.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteBridgeServer.java
index caab651..4dc94b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteBridgeServer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteBridgeServer.java
@@ -249,9 +249,9 @@ public class RemoteBridgeServer extends AbstractCacheServer
/**
* Registers a new <code>InterestRegistrationListener</code> with the set of
* <code>InterestRegistrationListener</code>s.
- *
+ *
* @param listener The <code>InterestRegistrationListener</code> to register
- *
+ *
* @since GemFire 5.8Beta
*/
public void registerInterestRegistrationListener(InterestRegistrationListener listener) {
@@ -264,9 +264,9 @@ public class RemoteBridgeServer extends AbstractCacheServer
/**
* Unregisters an existing <code>InterestRegistrationListener</code> from the set of
* <code>InterestRegistrationListener</code>s.
- *
+ *
* @param listener The <code>InterestRegistrationListener</code> to unregister
- *
+ *
* @since GemFire 5.8Beta
*/
public void unregisterInterestRegistrationListener(InterestRegistrationListener listener) {
@@ -279,10 +279,10 @@ public class RemoteBridgeServer extends AbstractCacheServer
/**
* Returns a read-only set of <code>InterestRegistrationListener</code>s registered with this
* notifier.
- *
+ *
* @return a read-only set of <code>InterestRegistrationListener</code>s registered with this
* notifier
- *
+ *
* @since GemFire 5.8Beta
*/
public Set getInterestRegistrationListeners() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteCacheStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteCacheStatistics.java
index 10ef1c4..9133c31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteCacheStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteCacheStatistics.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.*;
-import java.io.*;
/**
* This class represents a snapshot of a {@link org.apache.geode.cache.CacheStatistics} from a
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteDLockInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteDLockInfo.java
index b5e245c..0a6b2f0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteDLockInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteDLockInfo.java
@@ -16,15 +16,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.Date;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.admin.*;
-// import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.locks.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-import java.util.Date;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.admin.*;
public class RemoteDLockInfo implements DLockInfo, DataSerializable {
private static final long serialVersionUID = 3350265007784675017L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteEntrySnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteEntrySnapshot.java
index 47892d2..842b55f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteEntrySnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteEntrySnapshot.java
@@ -15,12 +15,12 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.*;
import org.apache.geode.internal.admin.*;
-// import java.util.*;
-import java.io.*;
public class RemoteEntrySnapshot implements EntrySnapshot, DataSerializable {
private static final long serialVersionUID = 1360498801579593535L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java
index 9919032..8e55f10 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java
@@ -608,10 +608,10 @@ public abstract class RemoteGemFireVM implements GemFireVM {
/**
* Checks whether a durable-queue for a given client is present on the system member represented
* by this RemoteGemFireVM
- *
+ *
* @param durableClientId - the 'durable-client-id' for the client
* @return - true if the member contains a durable-queue for the given client
- *
+ *
* @since GemFire 5.6
*/
public boolean hasDurableClient(String durableClientId) {
@@ -625,10 +625,10 @@ public abstract class RemoteGemFireVM implements GemFireVM {
/**
* Checks whether the system member represented by this RemoteGemFireVM is hosting a primary
* durable-queue for the client
- *
+ *
* @param durableClientId - the 'durable-client-id' for the client
* @return - true if the member contains a primary durable-queue for the given client
- *
+ *
* @since GemFire 5.6
*/
public boolean isPrimaryForDurableClient(String durableClientId) {
@@ -845,7 +845,7 @@ public abstract class RemoteGemFireVM implements GemFireVM {
/**
* Encapsulates an update to several statistics
*/
- static private class DispatchArgs {
+ private static class DispatchArgs {
protected final long timestamp;
protected final int[] listenerIds;
protected final double[] values;
@@ -901,7 +901,7 @@ public abstract class RemoteGemFireVM implements GemFireVM {
* This method should be used to set the Alerts Manager for the member agent. Stat Alerts
* Aggregator would use this method to set stat Alerts Manager with the available alert
* definitions and the refresh interval set for each member joining the distributed system.
- *
+ *
* @param alertDefs Stat Alert Definitions to set for the Alerts Manager
* @param refreshInterval refresh interval to be used by the Alerts Manager
* @param setRemotely whether to be set on remote VM
@@ -917,7 +917,7 @@ public abstract class RemoteGemFireVM implements GemFireVM {
/**
* This method would be used to set refresh interval for the GemFireVM. This method would mostly
* be called on each member after initial set up whenever the refresh interval is changed.
- *
+ *
* @param refreshInterval refresh interval to set (in milliseconds)
*/
public void setRefreshInterval(long refreshInterval) {
@@ -928,7 +928,7 @@ public abstract class RemoteGemFireVM implements GemFireVM {
* This method would be used to set Sta Alert Definitions for the GemFireVM. This method would
* mostly be called on each member after initial set up whenever one or more Stat Alert
* Definitions get added/updated/removed.
- *
+ *
* @param alertDefs an array of StaAlertDefinition objects
* @param actionCode one of UpdateAlertDefinitionRequest.ADD_ALERT_DEFINITION,
* UpdateAlertDefinitionRequestUPDATE_ALERT_DEFINITION,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
index 64b5925..2a18bd8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.internal.admin.remote;
+import java.util.*;
+import java.util.concurrent.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.IncompatibleSystemException;
import org.apache.geode.SystemFailure;
@@ -34,10 +39,6 @@ import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.*;
/**
* An implementation of <code>GfManagerAgent</code> that uses a {@link DistributionManager} to
@@ -149,14 +150,14 @@ class RemoteGfManagerAgent implements GfManagerAgent {
private DisconnectListener disconnectListener;
- static private final Object enumerationSync = new Object();
+ private static final Object enumerationSync = new Object();
/**
* Safe to read, updates controlled by {@link #enumerationSync}
*/
- static private volatile ArrayList allAgents = new ArrayList();
+ private static volatile ArrayList allAgents = new ArrayList();
- static private void addAgent(RemoteGfManagerAgent toAdd) {
+ private static void addAgent(RemoteGfManagerAgent toAdd) {
synchronized (enumerationSync) {
ArrayList replace = new ArrayList(allAgents);
replace.add(toAdd);
@@ -164,7 +165,7 @@ class RemoteGfManagerAgent implements GfManagerAgent {
}
}
- static private void removeAgent(RemoteGfManagerAgent toRemove) {
+ private static void removeAgent(RemoteGfManagerAgent toRemove) {
synchronized (enumerationSync) {
ArrayList replace = new ArrayList(allAgents);
replace.remove(toRemove);
@@ -179,10 +180,10 @@ class RemoteGfManagerAgent implements GfManagerAgent {
/**
* Ensure that the InternalDistributedSystem class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
- static public void loadEmergencyClasses() {
+ public static void loadEmergencyClasses() {
if (emergencyClassesLoaded)
return;
emergencyClassesLoaded = true;
@@ -191,10 +192,10 @@ class RemoteGfManagerAgent implements GfManagerAgent {
/**
* Close all of the RemoteGfManagerAgent's.
- *
+ *
* @see SystemFailure#emergencyClose()
*/
- static public void emergencyClose() {
+ public static void emergencyClose() {
ArrayList members = allAgents; // volatile fetch
for (int i = 0; i < members.size(); i++) {
RemoteGfManagerAgent each = (RemoteGfManagerAgent) members.get(i);
@@ -204,10 +205,10 @@ class RemoteGfManagerAgent implements GfManagerAgent {
/**
* Return a recent (though possibly incomplete) list of all existing agents
- *
+ *
* @return list of agents
*/
- static public ArrayList getAgents() {
+ public static ArrayList getAgents() {
return allAgents;
}
@@ -1287,7 +1288,7 @@ class RemoteGfManagerAgent implements GfManagerAgent {
if (this.paused || noPendingJoins) {// fix for #39893
/*
* JoinProcessor waits when: 1. this.paused is set to true 2. There are no pending joins
- *
+ *
* If the JoinProcessor is interrupted when it was waiting due to second reason, it
* should still continue after catching InterruptedException. From code, currently,
* JoinProcessor is interrupted through JoinProcessor.abort() method which is called
@@ -1423,4 +1424,3 @@ class RemoteGfManagerAgent implements GfManagerAgent {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteObjectName.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteObjectName.java
index cac1733..296c61c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteObjectName.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteObjectName.java
@@ -16,13 +16,9 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.*;
-// import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-// import org.apache.geode.distributed.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.*;
/**
* Used to name an object in a region. This class is needed so that the console will not need to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
index fdcb224..57b2a8d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
@@ -556,7 +556,7 @@ public class RemoteRegionAttributes implements RegionAttributes, DataSerializabl
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CustomExpiry#getExpiry(org.apache.geode.cache.Region.Entry)
*/
public ExpirationAttributes getExpiry(Entry entry) {
@@ -565,7 +565,7 @@ public class RemoteRegionAttributes implements RegionAttributes, DataSerializabl
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionSnapshot.java
index 285aa2c..961c1a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionSnapshot.java
@@ -15,14 +15,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.*;
import org.apache.geode.internal.admin.*;
-import java.util.*;
-import java.io.*;
-
public class RemoteRegionSnapshot implements RegionSnapshot, DataSerializable {
private static final long serialVersionUID = -2006079857403000280L;
private String name;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStat.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStat.java
index 57166eb..ed56d21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStat.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStat.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.statistics.StatisticDescriptorImpl;
-// import java.util.*;
-import java.io.*;
public class RemoteStat implements Stat, DataSerializable {
private static final long serialVersionUID = 8263951659282343027L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStatResource.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStatResource.java
index dc117f4..476c95e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStatResource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteStatResource.java
@@ -15,9 +15,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.internal.admin.*;
-import java.io.*;
public class RemoteStatResource implements StatResource, DataSerializable {
private static final long serialVersionUID = -3118720083415516133L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
index 4759fe8..847b7fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
@@ -23,13 +23,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.MEMBERSHIP_PORT_RANGE;
import static org.apache.geode.distributed.ConfigurationProperties.TCP_PORT;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.admin.SSLConfig;
-import org.apache.geode.internal.admin.TransportConfig;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Collections;
@@ -39,6 +32,14 @@ import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.internal.admin.TransportConfig;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Tranport config for RemoteGfManagerAgent.
*/
@@ -65,7 +66,7 @@ public class RemoteTransportConfig implements TransportConfig {
* Creates a new <code>RemoteTransportConfig</code> from the configuration information in a
* <code>DistributionConfig</code>. We assume that <code>config</code> already been checked for
* errors.
- *
+ *
* @since GemFire 3.0
*/
public RemoteTransportConfig(DistributionConfig config, int vmKind) {
@@ -245,7 +246,7 @@ public class RemoteTransportConfig implements TransportConfig {
/**
* Returns a <code>Properties</code> based on this config that is appropriate to use with
* {@link org.apache.geode.distributed.DistributedSystem#connect}.
- *
+ *
* @since GemFire 4.0
*/
Properties toDSProperties() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
index 570b6fa..3a615a5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
@@ -16,17 +16,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to remove a health listener.
- *
+ *
* @since GemFire 3.5
*/
public class RemoveHealthListenerRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
index 894a2a6..eeb85b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
@@ -16,17 +16,14 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import org.apache.geode.distributed.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
/**
* The response to adding a health listener.
- *
+ *
* @since GemFire 3.5
*/
public class RemoveHealthListenerResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
index e381f6e..709f069 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
@@ -16,17 +16,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to reset its current health status.
- *
+ *
* @since GemFire 3.5
*/
public class ResetHealthStatusRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
index 66ca180..0659b9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
@@ -16,17 +16,14 @@
package org.apache.geode.internal.admin.remote;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
-import org.apache.geode.distributed.internal.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
/**
* The response to reseting the health status.
- *
+ *
* @since GemFire 3.5
*/
public class ResetHealthStatusResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
index 2651f53..f6332dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular application to get its root region(s). All it really needs
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
index 4ebdf73..7ab1f1e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
@@ -23,14 +23,14 @@ import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.ReplyMessage;
/**
- *
+ *
* This ShutdownAllGatewayHubsRequest just reply with ignored bit true so that old version member's
* request will be ignored and no exception will be thrown.
- *
+ *
* From 9.0 old wan support is removed. Ideally ShutdownAllGatewayHubsRequest should be removed but
* it it there for rolling upgrade support when request come from old version member to shut down
* hubs.
- *
+ *
* @since Geode 1.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java
index d1f5bc8..85aaba3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ShutdownAllResponse.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+
/**
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
index 9b2aa02..0aaecb1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
@@ -16,13 +16,12 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
+import java.io.*;
+
import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import org.apache.geode.internal.admin.*;
import org.apache.geode.cache.*;
-import java.io.*;
-// import java.util.*;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.internal.admin.*;
public class SnapshotResultMessage extends PooledDistributionMessage implements AdminMessageType {
private CacheSnapshot results;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java
index 33201cd..87c5f4d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.admin.StatAlertsManager;
/**
* This class represents a request object to set an alert manager for the newly joined member.
- *
+ *
* @since GemFire 5.7
*/
public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
@@ -47,7 +47,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
/**
* Parameterized constructor for convenience
- *
+ *
* @param alertDefs Array of stat alert definitions to set
* @param refreshInterval Refresh interval to set
*/
@@ -60,7 +60,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
* This method can be used to create a request used to assign a Stat Alerts Manager for a newly
* joined member. Stat Alert Definitions & refresh interval at that moment are set on the Stat
* Alerts Manager
- *
+ *
* @param alertDefs Array of stat alert definitions to be set
* @param refreshInterval Refresh interval to be set
* @return an instance of StatAlertsManagerAssignRequest
@@ -72,7 +72,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
/**
* Executed at the receiver's end. Sets the AlertsManager to the receiver member VM.
- *
+ *
* @param dm DistributionManager instance
*/
@Override
@@ -83,7 +83,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
/**
* Sets the Alerts Manager on the receiver member VM. For the Alerts Manager, alert defs & the
* refresh interval are set.
- *
+ *
* @param dm DistributionManager instance
*/
private void setManager(DistributionManager dm) {
@@ -94,7 +94,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
/**
* A callback used by GemFire Data Serialization mechanism to write to a stream.
- *
+ *
* @param out DataOutput stream to write to
*/
@Override
@@ -106,7 +106,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
/**
* A callback used by GemFire Data Serialization mechanism to read from a stream.
- *
+ *
* @param in DataInput stream to read from
*/
@Override
@@ -125,7 +125,7 @@ public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
/**
* String representation of this object
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
index e4142b9..221f78f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
@@ -16,12 +16,9 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.internal.admin.*;
import java.io.*;
-// import java.util.*;
+
+import org.apache.geode.distributed.internal.*;
/**
* A message that is sent to a particular console distribution manager when changes have been
@@ -54,7 +51,7 @@ public class StatListenerMessage extends PooledDistributionMessage implements Ad
* Notes that the value of a given statistics has changed
*
* @param listenerId
- *
+ *
*/
public void addChange(int listenerId, double value) {
listenerIds[changeCount] = listenerId;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
index 340794f..f05cf9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
@@ -16,14 +16,13 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
+import java.io.*;
+
import org.apache.geode.*;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-// import java.util.*;
-
/**
* A message that is sent to a particular distribution manager to modify its current
* {@link org.apache.geode.internal.Config}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
index c1d0048..6cbb08d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
@@ -16,11 +16,11 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.internal.*;
-
import java.io.*;
+
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.*;
/**
* A message that is sent to a particular distribution manager to modify its current
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
index e9216b5..6641941 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular app vm to request all the subregions of a given parent
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
index 267648f..513a1fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
@@ -16,14 +16,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-// import org.apache.geode.internal.*;
-import org.apache.geode.internal.admin.*;
import org.apache.geode.distributed.internal.*;
-import java.io.*;
-import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.admin.*;
/**
* Responds to {@link SubRegionResponse}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
index 8ca369d..e79b99c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
@@ -16,12 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
public class TailLogRequest extends AdminRequest {
public static TailLogRequest create() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
index 5d94bc7..137c8ba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
@@ -16,6 +16,10 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -26,12 +30,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogWriterAppender;
import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
-import org.apache.logging.log4j.Logger;
-
-import java.io.*;
-// import org.apache.geode.distributed.DistributedSystem;
-// import java.util.*;
public class TailLogResponse extends AdminResponse {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java
index b9db274..99590cc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.admin.remote;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -27,7 +28,7 @@ import org.apache.geode.internal.admin.StatAlertsManager;
/**
* distribution message to register alert's definition {@link StatAlertDefinition} to member's alert
* manager {@link StatAlertsManager}
- *
+ *
*/
public class UpdateAlertDefinitionMessage extends PooledDistributionMessage {
@@ -43,7 +44,7 @@ public class UpdateAlertDefinitionMessage extends PooledDistributionMessage {
/**
* Returns a <code>FetchHostRequest</code> to be sent to the specified recipient.
- *
+ *
* @param alertDefs an array of stat alert definitions to set
* @param actionCode either of ADD_ALERT_DEFINITION, UPDATE_ALERT_DEFINITION,
* REMOVE_ALERT_DEFINITION
@@ -98,17 +99,17 @@ public class UpdateAlertDefinitionMessage extends PooledDistributionMessage {
}
/**
- *
+ *
* @return action(ADD_ALERT_DEFINITION, UPDATE_ALERT_DEFINITION, REMOVE_ALERT_DEFINITION) to be
* taken on alert definitions
- *
+ *
*/
public int getActionCode() {
return _actionCode;
}
/**
- *
+ *
* @param alertDefinitions List of stat alert definitions
* @param actionCode Action(ADD_ALERT_DEFINITION, UPDATE_ALERT_DEFINITION,
* REMOVE_ALERT_DEFINITION) to be taken on alert definitions
@@ -126,7 +127,7 @@ public class UpdateAlertDefinitionMessage extends PooledDistributionMessage {
* <p>
* 2. if the internalDS instance is null or is dis-connected, the returned string is -
* "InternalDistributedSystem instance not found, no connection with DistributedSystem."
- *
+ *
* @return String representation of this message object.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
index 1079025..db4fa42 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
@@ -16,16 +16,14 @@
package org.apache.geode.internal.admin.remote;
+import java.io.*;
+
import org.apache.geode.distributed.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.*;
-// import org.apache.geode.internal.*;
-import java.io.*;
-// import java.util.*;
/**
* A message that is sent to a particular distribution manager to get its current version info.
- *
+ *
* @since GemFire 3.5
*/
public class VersionInfoRequest extends AdminRequest {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
index a472af8..e8a87ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
@@ -16,17 +16,16 @@
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.*;
-import org.apache.geode.internal.*;
import java.io.*;
-// import java.net.*;
-// import java.util.*;
+
+import org.apache.geode.*;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.*;
/**
* A message that is sent in response to a {@link VersionInfoRequest}.
- *
+ *
* @since GemFire 3.5
*/
public class VersionInfoResponse extends AdminResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionMismatchAlert.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionMismatchAlert.java
index 49f2283..0dbc18d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionMismatchAlert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionMismatchAlert.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.admin.remote;
+import java.util.*;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.admin.*;
-import java.util.*;
public class VersionMismatchAlert implements Alert {
private final RemoteGfManagerAgent source;
@@ -68,9 +69,9 @@ public class VersionMismatchAlert implements Alert {
/**
* Returns a InternalDistributedMember instance representing the agent.
- *
+ *
* @return the InternalDistributedMember instance representing this agent instance
- *
+ *
* @since GemFire 6.5
*/
public InternalDistributedMember getSender() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
index 5b7c750..35f3add 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
@@ -26,11 +26,11 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Base class for all the decorators
- *
+ *
* @see FunctionDecoratorImpl
* @see GaugeThresholdDecoratorImpl
* @see NumberThresholdDecoratorImpl
- *
+ *
*/
public abstract class BaseDecoratorImpl implements StatAlertDefinition {
@@ -58,7 +58,7 @@ public abstract class BaseDecoratorImpl implements StatAlertDefinition {
/**
* This method returns the name of this stat alert definition.
- *
+ *
* @return Name of the StatAlertDefinition
*/
public String getName() {
@@ -67,7 +67,7 @@ public abstract class BaseDecoratorImpl implements StatAlertDefinition {
/**
* This method sets the name of this stat alert definition.
- *
+ *
* @param name name to be set for this StatAlertDefinition.
*/
public void setName(String name) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl.java
index c73c709..9e42283 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.StatisticDescriptor;
@@ -24,14 +24,14 @@ import org.apache.geode.internal.admin.StatAlertsManager;
/**
* Implementation {@link StatisticInfo} This does not contains associated statistics object
- *
+ *
* This has been created client(E.g GFMon2.0), where we actually don't need statistic object. So,
* Instance of this will be light weight object So that we can reduce the overhead of data transfer
* across network and serialization/dserialization
- *
+ *
* on server side , {@link StatAlertsManager} create instance of {@link StatisticInfoImpl} class
* with help of this class instance
- *
+ *
*/
public class DummyStatisticInfoImpl implements StatisticInfo {
private static final long serialVersionUID = -5456779525795868187L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
index 54a0d06..ee6e97a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
@@ -26,7 +26,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Implementation of {@link StatAlertDefinition}, which defines function Function to be applied on
* all the statistic Threshold is valid for value evaluated by function
- *
+ *
*/
public class FunctionDecoratorImpl extends BaseDecoratorImpl {
private static final long serialVersionUID = -4857857489413081553L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
index b1a8b0d..156d70d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
@@ -14,19 +14,19 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import org.apache.geode.SystemFailure;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import org.apache.geode.SystemFailure;
+
/**
* This class acts as a helper for the AlertManager & AlertAggregator for the execution of the user
* specified functions
- *
+ *
* This class also keeps a registry of all the functions which are supported, which should be used
* during creation of alert definition.
- *
+ *
*/
public class FunctionHelper {
@@ -49,7 +49,7 @@ public class FunctionHelper {
/**
* This function returns the available function names.
- *
+ *
* @return List of the function names.
*/
public static String[] getFunctionNames() {
@@ -58,7 +58,7 @@ public class FunctionHelper {
/**
* This method returns the function's name for the requested function identifier.
- *
+ *
* @param functionId Identifier of the function
* @return Function name.
*/
@@ -79,7 +79,7 @@ public class FunctionHelper {
/**
* This function returns the function identifier for the requested function name.
- *
+ *
* @param qFunctionName Name of the function
* @return Function identifier.
*/
@@ -102,10 +102,10 @@ public class FunctionHelper {
/**
* Apply the given function of the given list of numbers and returns result
- *
+ *
* @param functorId Id of function to be applied
* @param vals List of number on which function will be applied
- *
+ *
*/
public static Number[] applyFunction(short functorId, Number[] vals) {
Number[] res = new Number[1];
@@ -129,7 +129,7 @@ public class FunctionHelper {
/**
* Apply the SUM function on given list of number
- *
+ *
* @param vals Array of number
*/
public static Number SUM(Number[] vals) {
@@ -157,7 +157,7 @@ public class FunctionHelper {
/**
* Apply the Average function on given list of number
- *
+ *
* @param vals Array of number
*/
public static Number AVG(Number[] vals) {
@@ -181,7 +181,7 @@ public class FunctionHelper {
/**
* Apply the Minimum function on given list of number
- *
+ *
* @param vals Array of number
*/
public static Number MIN(Number[] vals) {
@@ -208,7 +208,7 @@ public class FunctionHelper {
/**
* Apply the Maximum function on given list of number
- *
+ *
* @param vals Array of number
*/
public static Number MAX(Number[] vals) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
index 0a02001..83b7f49 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
@@ -27,7 +27,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Implementation of {@link StatAlertDefinition}, represents threshold as data range
- *
+ *
*/
public class GaugeThresholdDecoratorImpl extends BaseDecoratorImpl
implements DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
index 506263c..639bd06 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
@@ -14,21 +14,20 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsFactory;
-
import org.apache.geode.internal.admin.StatAlert;
import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Implementation of {@link StatAlertDefinition} This provides the definition for multiple statistic
- *
+ *
*/
public class MultiAttrDefinitionImpl implements StatAlertDefinition {
private static final long serialVersionUID = 2508805676076940969L;
@@ -116,7 +115,7 @@ public class MultiAttrDefinitionImpl implements StatAlertDefinition {
/**
* This method returns the name of this stat alert definition.
- *
+ *
* @return Name of the StatAlertDefinition
*/
public String getName() {
@@ -125,7 +124,7 @@ public class MultiAttrDefinitionImpl implements StatAlertDefinition {
/**
* This method sets the name of this stat alert definition.
- *
+ *
* @param name name to be set for this StatAlertDefinition.
*/
public void setName(String name) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
index c0d0f47..deaa243 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
@@ -27,7 +27,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Implementation of {@link StatAlertDefinition}, represents threshold as number
- *
+ *
*/
public class NumberThresholdDecoratorImpl extends BaseDecoratorImpl
implements DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
index 50df697..baf0b19 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.geode.DataSerializer;
@@ -27,7 +27,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
/**
* Implementation of {@link StatAlertDefinition} This provides the definition for single statistic
- *
+ *
*/
public class SingleAttrDefinitionImpl implements StatAlertDefinition {
private static final long serialVersionUID = 3292417185742697896L;
@@ -107,7 +107,7 @@ public class SingleAttrDefinitionImpl implements StatAlertDefinition {
/**
* This method returns the name of this stat alert definition.
- *
+ *
* @return Name of the StatAlertDefinition
*/
public String getName() {
@@ -116,7 +116,7 @@ public class SingleAttrDefinitionImpl implements StatAlertDefinition {
/**
* This method sets the name of this stat alert definition.
- *
+ *
* @param name name to be set for this StatAlertDefinition.
*/
public void setName(String name) {
@@ -125,7 +125,7 @@ public class SingleAttrDefinitionImpl implements StatAlertDefinition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.admin.StatAlertDefinition#getStatisticInfo()
*/
public StatisticInfo[] getStatisticInfo() {
@@ -134,7 +134,7 @@ public class SingleAttrDefinitionImpl implements StatAlertDefinition {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.admin.StatAlertDefinition#setStatisticInfo(org.apache.geode.internal.
* admin.StatisticInfo[])
@@ -159,7 +159,7 @@ public class SingleAttrDefinitionImpl implements StatAlertDefinition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.admin.StatAlertDefinition#evaluate(java.lang.Number[])
*/
public boolean evaluate(Number[] params) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
index 6b8d172..ded2f48 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
@@ -15,15 +15,14 @@
package org.apache.geode.internal.admin.statalerts;
import org.apache.geode.DataSerializable;
-
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
/**
* Provides informations of the statistic
- *
- *
+ *
+ *
*/
public interface StatisticInfo extends DataSerializable {
@@ -33,13 +32,13 @@ public interface StatisticInfo extends DataSerializable {
public String getStatisticName();
/**
- *
+ *
* @param statisticName Name of statistic
*/
public void setStatisticName(String statisticName);
/**
- *
+ *
* @return instance of statistic descriptor
*/
public StatisticDescriptor getStatisticDescriptor();
@@ -60,19 +59,19 @@ public interface StatisticInfo extends DataSerializable {
public Statistics getStatistics();
/**
- *
+ *
* @return associated {@link StatisticsType}
*/
public String getStatisticsTypeName();
/**
- *
+ *
* @param statisticsType Associated {@link StatisticsType}
*/
public void setStatisticsTypeName(String statisticsType);
/**
- *
+ *
* @return value of statistic
*/
public Number getValue();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java
index 84702f8..1d6f986 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.admin.statalerts;
-import java.io.DataOutput;
import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import org.apache.commons.lang.StringUtils;
@@ -27,10 +27,10 @@ import org.apache.geode.StatisticsType;
import org.apache.geode.admin.Statistic;
/**
- *
+ *
* Implemetation of {@link StatisticInfo}, provides all the information {@link Statistic}
- *
- *
+ *
+ *
*/
public class StatisticInfoImpl implements StatisticInfo {
private static final long serialVersionUID = -1525964578728218894L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index 3674474..58bdadd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.internal.cache;
+import java.util.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.lru.LRUStatistics;
@@ -29,12 +36,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
public abstract class AbstractBucketRegionQueue extends BucketRegion {
protected static final Logger logger = LogService.getLogger();
@@ -188,7 +189,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
* ((CachedDeserializable)object).getDeserializedValue(this, this.getRegionEntry(k)); } } } catch
* (EntryNotFoundException ok) { // just return null; } if (object == Token.TOMBSTONE) { object =
* null; }
- *
+ *
* return object; }
*/
@@ -382,7 +383,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
* It should be an atomic operation. If the key has been added to the eventSeqNumQueue then make
* sure that the value is in the Bucket before the eventSeqNumQueue is available for
* peek/remove/take from other thread.
- *
+ *
* @param key
* @param value
* @return boolean which shows whether the operation was successful or not.
@@ -500,7 +501,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
}
/**
- *
+ *
* @param key
*/
public void addToFailedBatchRemovalMessageKeys(Object key) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractCacheServer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractCacheServer.java
index 93e1194..ac55ea3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractCacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractCacheServer.java
@@ -84,7 +84,7 @@ public abstract class AbstractCacheServer implements InternalCacheServer {
protected int messageTimeToLive;
/**
* The groups this server belongs to. Use <code>getGroups</code> to read.
- *
+ *
* @since GemFire 5.7
*/
protected String[] groups;
@@ -93,13 +93,13 @@ public abstract class AbstractCacheServer implements InternalCacheServer {
/**
* The ip address or host name that this server is to listen on.
- *
+ *
* @since GemFire 5.7
*/
protected String bindAddress;
/**
* The ip address or host name that will be given to clients so they can connect to this server
- *
+ *
* @since GemFire 5.7
*/
protected String hostnameForClients;
@@ -175,7 +175,7 @@ public abstract class AbstractCacheServer implements InternalCacheServer {
/**
* Method to create & send the ClientMembershipMessage to admin members. The message is sent
* only if there are any admin members in the distribution system.
- *
+ *
* @param event describes a change in client membership
* @param type type of event - one of ClientMembershipMessage.JOINED,
* ClientMembershipMessage.LEFT, ClientMembershipMessage.CRASHED
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
index ca07426..bc7d2e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal.cache;
+import java.io.PrintStream;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import joptsimple.internal.Strings;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.compression.Compressor;
@@ -33,16 +44,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
-import org.apache.logging.log4j.Logger;
-
-import java.io.PrintStream;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import joptsimple.internal.Strings;
/**
* Code shared by both DiskRegion and RecoveredDiskRegion.
@@ -90,7 +91,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
* vector of what is in memory, because updates may be written asynchronously to disk. We need to
* keep track of exactly what has been written to disk so that we can record a version vector at
* the beginning of each oplog.
- *
+ *
* The version vector of what is in memory is held in is held in LocalRegion.versionVector.
*/
private RegionVersionVector versionVector;
@@ -191,7 +192,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
/**
* Used to initialize a PlaceHolderDiskRegion for a region that is being closed
- *
+ *
* @param drv the region that is being closed
*/
protected AbstractDiskRegion(DiskRegionView drv) {
@@ -742,7 +743,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
/**
* gets the number of entries recovered
- *
+ *
* @since GemFire 3.2.1
*/
public int getRecoveredEntryCount() {
@@ -913,7 +914,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
/**
* Dump the (bucket specific) persistent view to the string builder
- *
+ *
* @param msg
*/
public void dumpPersistentView(StringBuilder msg) {
@@ -938,7 +939,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
/**
* Dump the attributes which are common across the PR to the string builder.
- *
+ *
* @param msg
*/
public void dumpCommonAttributes(StringBuilder msg) {
@@ -965,7 +966,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
/**
* This method was added to fix bug 40192. It is like getBytesAndBits except it will return
* Token.REMOVE_PHASE1 if the htreeReference has changed (which means a clear was done).
- *
+ *
* @return an instance of BytesAndBits or Token.REMOVED_PHASE1
*/
public Object getRaw(DiskId id) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
index 622f746..a2f6e00 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
@@ -97,7 +97,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
/*
* modification for LIFO Logic incubation
- *
+ *
*/
if (ea == EvictionAlgorithm.LIFO_ENTRY || ea == EvictionAlgorithm.LIFO_MEMORY) {
_setLruList(new NewLIFOClockHand(owner, _getCCHelper(), internalRegionArgs));
@@ -167,7 +167,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
/**
* Used when a CachedDeserializable's value changes form. PRECONDITION: caller has le synced
- *
+ *
* @param le the entry whose CachedDeserializable's value changed.
* @param cd the CachedDeserializable whose form has changed
* @param v the new form of the CachedDeserializable's value.
@@ -270,7 +270,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
/**
* Evicts the given entry from the cache. Returns the total number of bytes evicted. 1. For action
* local destroy, returns size(key + value) 2. For action evict to disk, returns size(value)
- *
+ *
* @return number of bytes evicted, zero if no eviction took place
*/
protected int evictEntry(LRUEntry entry, LRUStatistics stats) throws RegionClearedException {
@@ -402,7 +402,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
/**
* return the current size of all the entries.
- *
+ *
* @return The current size of all the entries.
*/
protected long getTotalEntrySize() {
@@ -630,7 +630,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
/**
* Update counter related to limit in list
- *
+ *
* @since GemFire 5.7
*/
// TODO this method acts as LRUupdateCallbacks
@@ -689,7 +689,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
/*
* Asif : Motivation: An entry which is no longer existing in the system due to clear operation,
* should not be present the LRUList being used by the region.
- *
+ *
* Case1 : An entry has been written to disk & on its return code path, it invokes lruCreate or
* lruUpdate. Before starting the operation of writing to disk, the HTree reference is set in the
* threadlocal. A clear operation changes the Htree reference in a write lock. Thus if the htree
@@ -697,7 +697,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
* clear operation is in progress but has not changed the Htree Reference . Since we store the
* LRUList in a local variable, it implies that if clear occurs , it will go in the stale list &
* if not it goes in the right list. Both ways we are safe.
- *
+ *
* Case 2: The Htree reference has changed ( implying a clear conflic with put) but the entry is
* valid. This is possible as we first set the Htree Ref in thread local. Now before the update
* operation has acquired the entry , clear happens. As a result the update operation has become
@@ -707,7 +707,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
* bound to be the new List. Since our code checks if the entry reference exists in the region in
* case of conflict & if yes, we append the entry to the List. It is guaranteed to be added to the
* new List.
- *
+ *
* Also it is necessary that when we clear the region, first the concurrent map of the region
* containing entries needs to be cleared. The Htree Reference should be reset after that. And
* then we should be resetting the LRUList. Previously the Htree reference was being set before
@@ -717,9 +717,9 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
* time the clear proceeds & it has reset the LRUList & cleared the entries. But as the Htree ref
* has not changed, we would take the locally available LRUList ( which may be the new List) &
* append the entry to the List.
- *
- *
- *
+ *
+ *
+ *
*/
@Override
protected void lruEntryCreate(RegionEntry re) {
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 bc97a35..542157e 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
@@ -195,7 +195,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* True if this region uses off-heap memory; otherwise false (default)
- *
+ *
* @since Geode 1.0
*/
protected boolean offHeap;
@@ -275,7 +275,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* Unit test constructor. DO NOT USE!
- *
+ *
* @since GemFire 8.1
* @deprecated For unit testing only. Use
* {@link #AbstractRegion(InternalCache, RegionAttributes, String, InternalRegionArguments)}
@@ -384,7 +384,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
* SingleWriteSingleReadRegionQueue.SingleReadWriteMetaRegion to return false as the event
* propagation from those regions do not need EventID objects. This method is made abstract to
* directly use it in clear operations. (clear and localclear)
- *
+ *
* @return boolean indicating whether to generate eventID or not
*/
abstract boolean generateEventID();
@@ -457,7 +457,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* Return a cache loader if this region has one. Note if region's loader is used to implement
* bridge then null is returned.
- *
+ *
* @since GemFire 5.7
*/
CacheLoader basicGetLoader() {
@@ -467,7 +467,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* Return a cache writer if this region has one. Note if region's writer is used to implement
* bridge then null is returned.
- *
+ *
* @since GemFire 5.7
*/
public CacheWriter basicGetWriter() {
@@ -823,7 +823,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* Use ONLY imSync for IndexManager get and set.
- *
+ *
* @return {@link IndexManager} lock.
*/
public Object getIMSync() {
@@ -935,7 +935,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* We wrap RegionMembershipListeners in a container when adding them at runtime, so that we can
* properly initialize their membership set prior to delivering events to them.
- *
+ *
* @param listener a cache listener to be added to the region
*/
private CacheListener wrapRegionMembershipListener(CacheListener listener) {
@@ -1652,7 +1652,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
/**
* Returns the pool this region is using or null if it does not have one or the pool does not
* exist.
- *
+ *
* @since GemFire 5.7
*/
private PoolImpl getPool() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 6ea53be..da0cf59 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -23,11 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
-import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
-import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
-import org.apache.geode.internal.util.BlobHelper;
import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireIOException;
@@ -51,6 +46,10 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
+import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
+import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
+import org.apache.geode.internal.cache.entries.DiskEntry;
+import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.ha.HAContainerWrapper;
import org.apache.geode.internal.cache.ha.HARegionQueue;
import org.apache.geode.internal.cache.lru.LRUEntry;
@@ -80,6 +79,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.BlobHelper;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
/**
@@ -3951,4 +3951,3 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
index 14e276a..1914132 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -101,7 +101,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
/**
* Does a remote update (could be create or put). This code was factored into a static for
* QueuedOperation.
- *
+ *
* @param rgn the region to do the update on
* @param ev the event describing the operation
* @param lastMod the modification timestamp for this op
@@ -227,7 +227,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
}
}
- public static abstract class AbstractUpdateMessage extends CacheOperationMessage {
+ public abstract static class AbstractUpdateMessage extends CacheOperationMessage {
protected long lastModified;
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
index 5ff3bce..215f0d6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
@@ -23,11 +23,11 @@ package org.apache.geode.internal.cache;
*
*/
-import java.util.Set;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SelectionKey;
import java.io.IOException;
import java.net.*;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.ServerSocketChannel;
+import java.util.Set;
class AcceptHelper {
public ServerSocketChannel ackServerChannel;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java
index e72c8bc..747250f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AddCacheServerProfileMessage.java
@@ -156,4 +156,3 @@ public class AddCacheServerProfileMessage extends SerialDistributionMessage
return this.getShortClassName() + "(processorId=" + this.processorId + ")";
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BackupLock.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BackupLock.java
index f531860..1c130bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BackupLock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BackupLock.java
@@ -20,7 +20,7 @@ import java.util.concurrent.locks.ReentrantLock;
/**
* A lock used for the backup process. This is a reentrant lock that provides a "backup" mode, where
* the lock is held by a "backup thread" which can be assigned later than the time we lock.
- *
+ *
* We need this because our backup process is two phase. In the first phase we aquire the lock and
* in the second phase we actually do the backup. During the second phase we need to reenter the
* lock and release it with a different thread.
@@ -80,7 +80,7 @@ public class BackupLock extends ReentrantLock {
/**
* Acquire this lock, waiting for a backup to finish the first phase.
- *
+ *
*/
@Override
public void lock() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BackupManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BackupManager.java
index 89b7091..72bbd48 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BackupManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BackupManager.java
@@ -181,7 +181,7 @@ public class BackupManager implements MembershipListener {
/**
* Returns the memberId directory for this member in the baseline. The memberId may have changed
* if this member has been restarted since the last backup.
- *
+ *
* @param baselineParentDir parent directory of last backup.
* @return null if the baseline for this member could not be located.
*/
@@ -206,7 +206,7 @@ public class BackupManager implements MembershipListener {
* Performs a sanity check on the baseline directory for incremental backups. If a baseline
* directory exists for the member and there is no INCOMPLETE_BACKUP_FILE file then return the
* data stores directory for this member.
- *
+ *
* @param baselineParentDir a previous backup directory. This is used with the incremental backup
* option. May be null if the user specified a full backup.
* @return null if the backup is to be a full backup otherwise return the data store directory in
@@ -494,7 +494,7 @@ public class BackupManager implements MembershipListener {
/**
* Copies user deployed jars to the backup directory.
- *
+ *
* @param backupDir The backup directory for this member.
* @throws IOException one or more of the jars did not successfully copy.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BackupUtil.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BackupUtil.java
index ec6ccf7..e9ae635 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BackupUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BackupUtil.java
@@ -26,8 +26,8 @@ import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.management.BackupStatus;
-import org.apache.geode.management.internal.BackupStatusImpl;
import org.apache.geode.management.ManagementException;
+import org.apache.geode.management.internal.BackupStatusImpl;
public class BackupUtil {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
index e8fabb7..6575d65 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
@@ -124,10 +124,10 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* A random number generator
- *
+ *
* @see #getPreferredNode()
*/
- static private final Random myRand = new Random();
+ private static final Random myRand = new Random();
/**
* A read/write lock to prevent making this bucket not primary while a write is in progress on the
@@ -161,7 +161,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Constructs a new BucketAdvisor for the Bucket owned by RegionAdvisor.
- *
+ *
* @param bucket the bucket to provide metadata and advice for
* @param regionAdvisor advisor for the PartitionedRegion
*/
@@ -220,7 +220,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the lock that prevents the primary from moving while active writes are in progress.
* This should be locked before checking if the local bucket is primary.
- *
+ *
* @return the lock for in-progress write operations
*/
public Lock getActiveWriteLock() {
@@ -230,7 +230,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the lock that prevents the parent's primary from moving while active writes are in
* progress. This should be locked before checking if the local bucket is primary.
- *
+ *
* @return the lock for in-progress write operations
*/
Lock getParentActiveWriteLock() {
@@ -242,7 +242,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Try to lock the primary bucket to make sure no operation is on-going at current bucket.
- *
+ *
*/
public void tryLockIfPrimary() {
if (isPrimary()) {
@@ -257,7 +257,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Makes this <code>BucketAdvisor</code> give up being a primary and become a secondary. Does
* nothing if not currently the primary.
- *
+ *
* @return true if this advisor has been deposed as primary
*/
public boolean deposePrimary() {
@@ -298,7 +298,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* profile update.
* <p>
* Caller must synchronize on this BucketAdvisor.
- *
+ *
* @return true if children were all deposed as primaries
* @guarded.By this
*/
@@ -350,7 +350,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Return (and possibly choose) a thread-sticky member from whose data store this bucket's values
* should be read
- *
+ *
* @return member to use for reads, null if none available
*/
public InternalDistributedMember getPreferredNode() {
@@ -377,7 +377,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the thread-safe queue of primary volunteering tasks for the parent Partitioned Region.
- *
+ *
* @return the queue of primary volunteering tasks
*/
Queue getVolunteeringQueue() {
@@ -387,7 +387,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the semaphore which controls the number of threads allowed to consume from the
* {@link #getVolunteeringQueue volunteering queue}.
- *
+ *
* @return the semaphore which controls the number of volunteering threads
*/
Semaphore getVolunteeringSemaphore() {
@@ -396,7 +396,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the PartitionedRegionStats.
- *
+ *
* @return the PartitionedRegionStats
*/
PartitionedRegionStats getPartitionedRegionStats() {
@@ -484,10 +484,10 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Called by the RegionAdvisor.profileRemoved, this method tests to see if the missing member is
* the primary elector for this bucket.
- *
+ *
* We can't call this method from BucketAdvisor.profileRemoved, because the primaryElector may not
* actually host the bucket.
- *
+ *
* @param profile
*/
public void checkForLostPrimaryElector(Profile profile) {
@@ -512,11 +512,11 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Only allows profiles that actually hosting this bucket. If the profile is primary, then
* primaryMember will be set to that member but only if we are not already the primary.
- *
+ *
* @param profile the profile to add (must be a BucketProfile)
* @param forceProfile true will force profile to be added even if member is not in distributed
* view
- *
+ *
* @see #adviseProfileUpdate()
*/
@Override
@@ -679,7 +679,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Only for local profile.
- *
+ *
* @param p
*/
public synchronized void updateServerBucketProfile(BucketProfile p) {
@@ -708,7 +708,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Removes the profile for the specified member. If that profile is marked as primary, this will
* call {@link #notPrimary(InternalDistributedMember)}.
- *
+ *
* @param memberId the member to remove the profile for
* @param serialNum specific serial number to remove
* @return true if a matching profile for the member was found
@@ -777,7 +777,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* This method was split out from getPrimary() due to bug #40639 and is only intended to be called
* from within that method.
- *
+ *
* @see #getPrimary()
* @return the existing primary (if it is still in the view) otherwise null
*/
@@ -804,7 +804,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* This method was split out from getPrimary() due to bug #40639 and is only intended to be called
* from within that method.
- *
+ *
* @see #getPrimary()
* @return the new primary
*/
@@ -823,7 +823,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Marks member as not primary. Initiates volunteerForPrimary if this member is hosting a real
* bucket. This method does nothing if the member parameter is the current member.
- *
+ *
* @param member the member who is not primary
*/
public void notPrimary(InternalDistributedMember member) {
@@ -837,7 +837,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Marks member as not primary. Initiates volunteerForPrimary if this member is hosting a real
* bucket.
- *
+ *
* @param member the member who is not primary
*/
public void removePrimary(InternalDistributedMember member) {
@@ -912,7 +912,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the ProxyBucketRegion which owns this advisor.
- *
+ *
* @return the ProxyBucketRegion which owns this advisor
*/
public ProxyBucketRegion getProxyBucketRegion() {
@@ -942,7 +942,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if this advisor has been closed.
- *
+ *
* @return true if this advisor has been closed
*/
protected boolean isClosed() {
@@ -953,7 +953,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if this member is currently marked as primary.
- *
+ *
* @return true if this member is currently marked as primary
*/
public boolean isPrimary() {
@@ -964,7 +964,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if this member is currently volunteering for primary.
- *
+ *
* @return true if this member is currently volunteering for primary
*/
protected boolean isVolunteering() {
@@ -975,7 +975,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if this member is currently attempting to become primary.
- *
+ *
* @return true if this member is currently attempting to become primary
*/
protected boolean isBecomingPrimary() {
@@ -987,7 +987,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if this member is currently hosting real bucket.
- *
+ *
* @return true if this member is currently hosting real bucket
*/
public boolean isHosting() {
@@ -1022,7 +1022,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Makes this <code>BucketAdvisor</code> become the primary if it is already a secondary.
- *
+ *
* @param isRebalance true if directed to become primary by rebalancing
* @return true if this advisor succeeds in becoming the primary
*/
@@ -1129,7 +1129,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Check the primary member shortcut. Does not query the advisor. Should only be used when the
* advisor should not be consulted directly.
- *
+ *
* @return the member or null if no primary exists
*/
public InternalDistributedMember basicGetPrimaryMember() {
@@ -1138,7 +1138,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Invoked when the primary lock has been acquired by this VM.
- *
+ *
* @return true if successfully changed state to IS_PRIMARY
*/
protected boolean acquiredPrimaryLock() {
@@ -1235,7 +1235,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* Lazily gets the lock for acquiring primary lock. Caller must handle null. If DLS, Cache, or
* DistributedSystem are shutting down then null will be returned. If DLS does not yet exist and
* createDLS is false then null will be returned.
- *
+ *
* @param createDLS true will create DLS if it does not exist
* @return distributed lock indicating primary member or null
*/
@@ -1373,7 +1373,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Wait briefly for a primary member to be identified.
- *
+ *
* @param timeout time in milliseconds to wait for a primary
* @return the primary bucket host
*/
@@ -1448,11 +1448,11 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* How long to wait, in millisecs, for redundant buckets to exist
*/
- private final static long BUCKET_REDUNDANCY_WAIT = 15000L; // 15 seconds
+ private static final long BUCKET_REDUNDANCY_WAIT = 15000L; // 15 seconds
/**
* Wait the desired redundancy to be met.
- *
+ *
* @param minRedundancy the amount of desired redundancy.
* @return true if desired redundancy is detected
*/
@@ -1486,7 +1486,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
}
}
- private final static long BUCKET_STORAGE_WAIT =
+ private static final long BUCKET_STORAGE_WAIT =
Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "BUCKET_STORAGE_WAIT", 15000).longValue(); // 15
// seconds
@@ -1548,7 +1548,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Invoked when real bucket is created for hosting in this VM.
- *
+ *
* @param value true to begin hosting; false to end hosting
*/
protected void setHosting(boolean value) {
@@ -1685,7 +1685,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Sets primaryMember and notifies all. Caller must be synced on this.
- *
+ *
* @param id the member to use as primary for this bucket
*/
void setPrimaryMember(InternalDistributedMember id) {
@@ -1739,7 +1739,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* <p>
* The user of this BucketAdvisor should simply assume that the first profile is primary until the
* dust settles, leaving only one primary profile.
- *
+ *
* @return zero or greater array of primary members
*/
private InternalDistributedMember[] findPrimaryMembers() {
@@ -1761,7 +1761,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Searches through profiles to find first profile that is flagged as primary and sets
* {@link #primaryMember} to it. Caller must synchronize on this BucketAdvisor.
- *
+ *
* @return true if a primary member was found and used
* @see #findAndSetPrimaryMember()
*/
@@ -1782,7 +1782,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the current redundancy of the this bucket, including the locally hosted bucket if it
* exists.
- *
+ *
* @return current number of hosts of this bucket ; -1 if there are no hosts
*/
public int getBucketRedundancy() {
@@ -1806,7 +1806,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Get the number of members that are hosting the bucket, and have finished initialization.
- *
+ *
* This method is currently only used to check the bucket redundancy just before creating the
* bucket. If it is used more frequently, it might be better to cache this count.
*/
@@ -1870,7 +1870,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns string representation of the primary state value.
- *
+ *
* @param value the primary state to return string for
* @return string representation of primaryState
*/
@@ -1900,7 +1900,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Requests change to the requested primary state. Controls all state changes pertaining to
* primary state. Caller must be synchronized on this.
- *
+ *
* @param requestedState primaryState to change to
* @return true if the requestedState change was completed
* @throws IllegalStateException if an illegal state change was attempted
@@ -2218,7 +2218,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* returns the set of all the members in the system which require both DistributedCacheOperation
* messages and notification-only partition messages
- *
+ *
* @return a set of recipients requiring both cache-op and notification messages
* @since GemFire 5.7
*/
@@ -2430,7 +2430,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Handles the actual volunteering to become primary bucket. Ensures that only one thread is ever
* volunteering at one time.
- *
+ *
*/
class VolunteeringDelegate {
/**
@@ -2444,7 +2444,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if this delegate is aggressively trying to become the primary even if another
* member is already the primary.
- *
+ *
* @return true if this aggressively trying to become the primary
*/
boolean isAggressive() {
@@ -2483,7 +2483,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Reserves this delegate for the current thread to call becomePrimary. Necessary because caller
* of doVolunteerForPrimary must not be synchronized on BucketAdvisor.
- *
+ *
* @return true if successfully reserved for becomePrimary
*/
boolean reserveForBecomePrimary() {
@@ -2622,7 +2622,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Called from catch blocks in {@link #doVolunteerForPrimary()}. Handles the exception properly
* based on advisor settings and shutdown condition.
- *
+ *
* @param e the RuntimeException that was caught while volunteering
* @param loggit true if message should be logged if shutdown condition is not met
*/
@@ -2722,9 +2722,9 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* {@link BucketAdvisor#getVolunteeringQueue()}. A number of threads equal to
* {@link RegionAdvisor#VOLUNTEERING_THREAD_COUNT} are permitted to consume from the queue by
* acquiring permits from {@link BucketAdvisor#getVolunteeringSemaphore()}.
- *
+ *
* @param volunteeringTask the task to queue and then execute in waiting thread pool
- *
+ *
* @throws InterruptedException
*/
private void execute(Runnable volunteeringTask) throws InterruptedException {
@@ -2755,7 +2755,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Returns the runnable used to consume the volunteering queue. The executing thread(s) will
* consume from the queue until it is empty.
- *
+ *
* @return runnable for consuming the volunteering queue
*/
private Runnable consumeQueue() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketDump.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketDump.java
index 80b5869..acc4a4b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketDump.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketDump.java
@@ -26,8 +26,8 @@ import org.apache.geode.internal.cache.versions.VersionTag;
/**
* This class is used for getting the contents of buckets and then optionally compare them. It may
* contain the region version vector for the bucket as well as all of the entries.
- *
- *
+ *
+ *
*/
public class BucketDump {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
index f77791e..4814e6f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
@@ -13,13 +13,13 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
/**
* A version of ForceReattemptException that should be used when the target bucket can't be found.
- *
+ *
*
*/
public class BucketNotFoundException extends ForceReattemptException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java
index 423fb64..9972453 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java
@@ -194,7 +194,7 @@ public class BucketPersistenceAdvisor extends PersistenceAdvisorImpl {
/**
* Wait for there to be initialized copies of this bucket. Get the latest membership view from
* those copies.
- *
+ *
*/
public void initializeMembershipView() {
MembershipChangeListener listener = new MembershipChangeListener();
@@ -322,7 +322,7 @@ public class BucketPersistenceAdvisor extends PersistenceAdvisorImpl {
/**
* Callers should have already verified that debug output is enabled.
- *
+ *
* @param infoMsg
*/
public void dump(String infoMsg) {
@@ -367,7 +367,7 @@ public class BucketPersistenceAdvisor extends PersistenceAdvisorImpl {
/**
* Wait for this bucket to be recovered from disk, at least to the point where it starts doing a
* GII.
- *
+ *
* This method will throw an exception if the recovery thread encountered an exception.
*/
public void waitForPrimaryPersistentRecovery() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRedundancyTracker.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRedundancyTracker.java
index 2883744..f46ef0c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRedundancyTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRedundancyTracker.java
@@ -68,7 +68,7 @@ class BucketRedundancyTracker {
/**
* Provides the current redundancy of the bucket for this tracker
- *
+ *
* @return number of redundant copies of the bucket for this tracker
*/
int getCurrentRedundancy() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
index 72de15b..07c27da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.internal.cache;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
import org.apache.geode.cache.partition.PartitionListener;
@@ -30,9 +39,9 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.BucketAdvisor.BucketProfile;
import org.apache.geode.internal.cache.CreateRegionProcessor.CreateRegionReplyProcessor;
-import org.apache.geode.internal.cache.event.EventSequenceNumberHolder;
import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
import org.apache.geode.internal.cache.control.MemoryEvent;
+import org.apache.geode.internal.cache.event.EventSequenceNumberHolder;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.partitioned.Bucket;
import org.apache.geode.internal.cache.partitioned.DestroyMessage;
@@ -60,23 +69,15 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
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.logging.log4j.Logger;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
/**
* The storage used for a Partitioned Region. This class asserts distributed scope as well as a
* replicate data policy It does not support transactions
- *
+ *
* Primary election for a BucketRegion can be found in the
* {@link org.apache.geode.internal.cache.BucketAdvisor} class
- *
+ *
* @since GemFire 5.1
*
*/
@@ -145,7 +146,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
* assumption is that remote access is much more frequent. TODO Unused, but keeping for
* potential performance boost when local Bucket access de-serializes the entry (which could
* hurt perf.)
- *
+ *
* @return the de-serialized value
*/
public Object getDeserialized(boolean copyOnRead) {
@@ -375,7 +376,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* Search the CM for keys. If found any, return the first found one Otherwise, save the keys into
* the CM, and return null The thread will acquire the lock before searching.
- *
+ *
* @return first key found in CM null means not found
*/
private LockObject searchAndLock(Object keys[]) {
@@ -739,7 +740,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* lock this bucket and, if present, its colocated "parent"
- *
+ *
* @param tryLock - whether to use tryLock (true) or a blocking lock (false)
* @return true if locks were obtained and are still held
*/
@@ -1117,7 +1118,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* Creates an event for the EVICT_DESTROY operation so that events will fire for Partitioned
* Regions.
- *
+ *
* @param key - the key that this event is related to
* @return an event for EVICT_DESTROY
*/
@@ -1286,7 +1287,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
* This method is called when a miss from a get ends up finding an object through a cache loader
* or from a server. In that case we want to make sure that we don't move this bucket while
* putting the value in the ache.
- *
+ *
* @see LocalRegion#basicPutEntry(EntryEventImpl, long)
*/
@Override
@@ -1369,7 +1370,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* Return true if this bucket has been destroyed. Don't bother checking to see if the PR that owns
* this bucket was destroyed; that has already been checked.
- *
+ *
* @since GemFire 6.0
*/
public boolean isBucketDestroyed() {
@@ -1422,7 +1423,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* Horribly plagiarized from the similar method in LocalRegion
- *
+ *
* @param clientEvent holder for client version tag
* @param returnTombstones whether Token.TOMBSTONE should be returned for destroyed entries
* @return serialized form if present, null if the entry is not in the cache, or INVALID or
@@ -1476,7 +1477,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
* Return serialized form of an entry
* <p>
* Horribly plagiarized from the similar method in LocalRegion
- *
+ *
* @param clientEvent holder for the entry's version information
* @return serialized (byte) form
* @throws IOException if the result is not serializable
@@ -1540,10 +1541,10 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* Tell the peers that this VM has destroyed the region.
- *
+ *
* Also marks the local disk files as to be deleted before sending the message to peers.
- *
- *
+ *
+ *
* @param rebalance true if this is due to a rebalance removing the bucket
*/
public void removeFromPeersAdvisors(boolean rebalance) {
@@ -1638,7 +1639,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.LocalRegion#invokeDestroyCallbacks(org.apache.geode.internal.
* cache.EnumListenerEvent, org.apache.geode.internal.cache.EntryEventImpl, boolean)
@@ -1669,7 +1670,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.LocalRegion#invokeInvalidateCallbacks(org.apache.geode.internal
* .cache.EnumListenerEvent, org.apache.geode.internal.cache.EntryEventImpl, boolean)
@@ -1700,7 +1701,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.LocalRegion#invokePutCallbacks(org.apache.geode.internal.cache.
* EnumListenerEvent, org.apache.geode.internal.cache.EntryEventImpl, boolean)
@@ -1736,7 +1737,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* perform adjunct messaging for the given operation and return a set of members that should be
* attached to the operation's reply processor (if any)
- *
+ *
* @param event the event causing this messaging
* @param cacheOpRecipients set of receiver which got cacheUpdateOperation.
* @param adjunctRecipients recipients that must unconditionally get the event
@@ -1821,7 +1822,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* create a PutAllPRMessage for notify-only and send it to all adjunct nodes. return a set of
* members that should be attached to the operation's reply processor (if any)
- *
+ *
* @param dpao DistributedPutAllOperation object for PutAllMessage
* @param cacheOpRecipients set of receiver which got cacheUpdateOperation.
* @param adjunctRecipients recipients that must unconditionally get the event
@@ -1871,7 +1872,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/**
* create a RemoveAllPRMessage for notify-only and send it to all adjunct nodes. return a set of
* members that should be attached to the operation's reply processor (if any)
- *
+ *
* @param op DistributedRemoveAllOperation object for RemoveAllMessage
* @param cacheOpRecipients set of receiver which got cacheUpdateOperation.
* @param adjunctRecipients recipients that must unconditionally get the event
@@ -2012,9 +2013,9 @@ public class BucketRegion extends DistributedRegion implements Bucket {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.Bucket#getBucketOwners()
- *
+ *
* @since GemFire 5.9
*/
public Set getBucketOwners() {
@@ -2454,4 +2455,3 @@ public class BucketRegion extends DistributedRegion implements Bucket {
super.postDestroyRegion(destroyDiskRegion, event);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionEvictior.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionEvictior.java
index d574d70..f74d596 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionEvictior.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionEvictior.java
@@ -15,15 +15,16 @@
package org.apache.geode.internal.cache;
import java.util.concurrent.Callable;
+
import org.apache.geode.cache.Region;
/**
- *
+ *
* Takes delta to be evicted and tries to evict the least no of LRU entry which would make
* evictedBytes more than or equal to the delta
- *
+ *
* @since GemFire 6.0
- *
+ *
*/
public class BucketRegionEvictior implements Callable<Object> {
private LocalRegion region;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
index 2900a2e..69c5714 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -59,7 +59,7 @@ import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
/**
- *
+ *
*/
public class BucketRegionQueue extends AbstractBucketRegionQueue {
@@ -505,7 +505,7 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
/**
* It removes the first key from the queue.
- *
+ *
* @return Returns the key for which value was destroyed.
* @throws ForceReattemptException
*/
@@ -519,7 +519,7 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
/**
* It removes the first key from the queue.
- *
+ *
* @return Returns the value.
* @throws InterruptedException
* @throws ForceReattemptException
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java
index d0e2312..6766894 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java
@@ -23,8 +23,8 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* Represents the {@link ServerLocation} of a {@link BucketRegion}
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
@SuppressWarnings("serial")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation66.java
index 9052481..bc82b15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation66.java
@@ -23,8 +23,8 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* Represents the {@link ServerLocation} of a {@link BucketRegion}
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
@SuppressWarnings("serial")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
index 0c8f5fb..5b1f504 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
* class is used exclusively by the Oplog Compactor for rolling the entries. The reason for this
* class is to reuse the underlying byte array for rolling multiple entries there by reducing the
* garbage.
- *
+ *
* @since GemFire 5.5
*/
public class BytesAndBitsForCompactor {
@@ -73,7 +73,7 @@ public class BytesAndBitsForCompactor {
}
/**
- *
+ *
* @param data byte array storing the data
* @param userBits byte with appropriate bits set
* @param validLength The number of bytes representing the data , starting from 0 as offset
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java
index b420543..70dcf5e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java
@@ -15,10 +15,11 @@
package org.apache.geode.internal.cache;
-import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import java.io.Serializable;
import java.util.List;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+
/**
* Class <code>CacheClientStatus</code> provides status about a client from the server's
* perspective. This class is used by the monitoring tool.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
index 3f0a572..11a571c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache;
+import java.util.List;
+
import org.apache.geode.cache.client.internal.InternalClientCache;
import org.apache.geode.internal.cache.xmlcache.CacheServerCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -22,12 +24,10 @@ import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import java.util.List;
-
/**
* This is helper class used by CacheFactory to pass the cache configuration values to cache
* creation code.
- *
+ *
* @since GemFire 6.6
*/
public class CacheConfig {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
index d933019..4ca7ed7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
@@ -22,28 +22,28 @@ import org.apache.geode.internal.cache.CreateRegionProcessor.CreateRegionReplyPr
/**
* Distributed cache object (typically a <code>Region</code>) which uses a
* {@link CacheDistributionAdvisor}.
- *
+ *
* @since GemFire 5.1
*/
public interface CacheDistributionAdvisee extends DistributionAdvisee {
/**
* Returns the <code>CacheDistributionAdvisor</code> that provides advice for this advisee.
- *
+ *
* @return the <code>CacheDistributionAdvisor</code>
*/
public CacheDistributionAdvisor getCacheDistributionAdvisor();
/**
* Returns the <code>Cache</code> associated with this cache object.
- *
+ *
* @return the Cache
*/
public InternalCache getCache();
/**
* Returns the <code>RegionAttributes</code> associated with this advisee.
- *
+ *
* @return the <code>RegionAttributes</code> of this advisee
*/
public RegionAttributes getAttributes();
@@ -51,15 +51,15 @@ public interface CacheDistributionAdvisee extends DistributionAdvisee {
/**
* notifies the advisee that a new remote member has registered a profile showing that it is now
* initialized
- *
+ *
* @param profile the remote member's profile
*/
public void remoteRegionInitialized(CacheProfile profile);
/**
* Allow this advisee to know the CreateRegionReplyProcessor that is creating it.
- *
+ *
* @param processor the CreateRegionReplyProcessor that is creating the advisee
*/
- default public void registerCreateRegionReplyProcessor(CreateRegionReplyProcessor processor) {}
+ public default void registerCreateRegionReplyProcessor(CreateRegionReplyProcessor processor) {}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
index 5e877ad..d5be376 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
@@ -136,7 +136,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Returns a the set of members that either want all events or are caching data.
- *
+ *
* @param excludeInRecovery if true then members in recovery are excluded
*/
private Set adviseAllEventsOrCached(final boolean excludeInRecovery)
@@ -180,7 +180,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide recipient information for TX lock and commit.
- *
+ *
* @return Set of Serializable members that the current transaction will be distributed to.
* Currently this is any other member who has this region defined. No reference to Set
* kept by advisor so caller is free to modify it
@@ -224,7 +224,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide recipient information for netLoad
- *
+ *
* @return Set of Serializable members that have a CacheLoader installed; no reference to Set kept
* by advisor so caller is free to modify it
*/
@@ -262,7 +262,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Same as adviseCacheOp but only includes members that are playing the specified role.
- *
+ *
* @since GemFire 5.0
*/
public Set adviseCacheOpRole(final Role role) {
@@ -306,7 +306,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide recipient information for netWrite
- *
+ *
* @return Set of Serializable member ids that have a CacheWriter installed; no reference to Set
* kept by advisor so caller is free to modify it
*/
@@ -340,7 +340,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide recipient information for netSearch
- *
+ *
* @return Set of Serializable member ids that have the region and are have storage (no need to
* search an empty cache)
*/
@@ -448,7 +448,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* returns the set of all the members in the system which requires old values and are not yet
* finished with initialization (including GII).
- *
+ *
* @since GemFire 5.5
*/
public Set adviseRequiresOldValueInCacheOp() {
@@ -534,7 +534,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
* Whether the region has completed initialization, including GII. This information may be
* incorrect for a PartitionedRegion, but may be relied upon for DistributedRegions (including
* BucketRegions)
- *
+ *
* @since GemFire prpersist this field is now overloaded for partitioned regions with
* persistence. In the case of pr persistence, this field indicates that the region has
* finished recovery from disk.
@@ -701,7 +701,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Sets the SubscriptionAttributes for the region that this profile is on
- *
+ *
* @since GemFire 5.0
*/
public void setSubscriptionAttributes(SubscriptionAttributes sa) {
@@ -797,7 +797,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Attempts to process this message with the specified <code>CacheDistributionAdvisee</code>.
- *
+ *
* @param cda the CacheDistributionAdvisee to apply this profile to
* @param isRealRegion true if CacheDistributionAdvisee is a real region
*/
@@ -998,7 +998,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide only the new replicates given a set of existing memberIds
- *
+ *
* @param oldRecipients the <code>Set</code> of memberIds that have received the message
* @return the set of new replicate's memberIds
* @since GemFire 5.1
@@ -1023,7 +1023,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide all the replicates including persistent replicates.
- *
+ *
* @return the set of replicate's memberIds
* @since GemFire 5.8
*/
@@ -1042,7 +1042,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide only the preloadeds given a set of existing memberIds
- *
+ *
* @return the set of preloaded's memberIds
* @since GemFire prPersistSprint1
*/
@@ -1061,7 +1061,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide only the empty's (having DataPolicy.EMPTY) given a set of existing memberIds
- *
+ *
* @return the set of replicate's memberIds
* @since GemFire 5.8
*/
@@ -1080,7 +1080,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
/**
* Provide only the normals (having DataPolicy.NORMAL) given a set of existing memberIds
- *
+ *
* @return the set of normal's memberIds
* @since GemFire 5.8
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheLifecycleListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheLifecycleListener.java
index e0f1d99..b0b30d6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheLifecycleListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheLifecycleListener.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.cache;
/**
* Defines callbacks that are invoked when an {@code InternalCache} is created or closed.
- *
+ *
* @see GemFireCacheImpl#addCacheLifecycleListener(CacheLifecycleListener)
* @see GemFireCacheImpl#removeCacheLifecycleListener(CacheLifecycleListener)
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
index bd04722..f2979e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.RegionEvent;
* documentation for class CacheObserverHolder for details. Also the callback is issed only if the
* boolean ISSUE_CALLBACKS_TO_CACHE_OBSERVER present in org.apache.geode.internal.cache.LocalRegion
* is made true
- *
+ *
*/
public interface CacheObserver {
@@ -43,7 +43,7 @@ public interface CacheObserver {
* callback to test flushing efficieny. This callback is issued just before the flushing of the
* buffer that is before writing data to the Oplog, but after setting the logical offsets in the
* DiskIds contained in the PendingWrite Buffer
- *
+ *
*/
void goingToFlush();
@@ -51,26 +51,26 @@ public interface CacheObserver {
* called immediately after bytes are written to the disk Region. In case of asynch mode, it gets
* called immedaitely after the asynch writer has written it to disk & just before releasing the
* ByteBuffer to the pool.
- *
+ *
*/
public void afterWritingBytes();
/**
- *
+ *
* Compacting is about to compact
*/
public void beforeGoingToCompact();
/**
* Just finished Compacting
- *
+ *
*/
public void afterHavingCompacted();
/**
* Callback just after calculating the conflated byte buffer. This function can get called only in
* the asynch mode where conflation can happen
- *
+ *
* @param origBB Original ByteBuffer object for the operation without considering conflation
* @param conflatedBB Resultant ByteBuffer object after conflation
*/
@@ -82,10 +82,10 @@ public interface CacheObserver {
* of thread performing the operation & to -1 for an asynch mode of operation as in case of asynch
* mode of operation the actual offset is determined only when asynch writer performs the write
* operation.
- *
+ *
* @param offset A non negative number for synch mode of operation indicating the start position
* in the Oplog for the operation & -1 for asynch mode of operation
- *
+ *
*/
public void afterSettingOplogOffSet(long offset);
@@ -93,7 +93,7 @@ public interface CacheObserver {
* Callback given by the thread performing the operation which causes the switching of the Oplog.
* This function gets invoked before a new Oplog gets created. Thus if the compacting is on , this
* function will get called before the compacter thread gets notified
- *
+ *
*/
public void beforeSwitchingOplog();
@@ -102,8 +102,8 @@ public interface CacheObserver {
* This function gets invoked after a new Oplog gets created. Thus if the compacting is on , this
* function will get called after the compacter thread has been notified & the switching thread
* has been able to create a new Oplog
- *
- *
+ *
+ *
*/
public void afterSwitchingOplog();
@@ -116,7 +116,7 @@ public interface CacheObserver {
* Callback given immediately before any thread invokes ComplexDiskRegion.OplogCompactor's
* stopCompactor method. This method normally gets invoked by clear/destory/close methods of the
* region.
- *
+ *
*/
public void beforeStoppingCompactor();
@@ -124,14 +124,14 @@ public interface CacheObserver {
* Callback given immediately after any thread invokes ComplexDiskRegion.OplogCompactor's
* stopCompactor method. This method normally gets invoked by clear/destory/close methods of the
* region.
- *
+ *
*/
public void afterStoppingCompactor();
/**
* Callback given immediately after the ComplexDiskRegion.OplogCompactor's stopCompactor method
* signals the compactor to stop.
- *
+ *
*/
public void afterSignallingCompactor();
@@ -163,14 +163,14 @@ public interface CacheObserver {
/**
* Invoked by the compactor thread just before deleting a compacted oplog
- *
+ *
* @param compactedOplog
*/
public void beforeDeletingCompactedOplog(Oplog compactedOplog);
/**
* Invoked just before deleting an empty oplog
- *
+ *
* @param emptyOplog
*/
public void beforeDeletingEmptyOplog(Oplog emptyOplog);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverAdapter.java
index c792d4f..3558c35 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverAdapter.java
@@ -23,14 +23,14 @@ import org.apache.geode.cache.RegionEvent;
* CacheObserver. See the documentation for class CacheObserverHolder for details. Also the callback
* is issed only if the boolean ISSUE_CALLBACKS_TO_CACHE_OBSERVER present in
* org.apache.geode.internal.cache.LocalRegion is made true
- *
+ *
*/
public class CacheObserverAdapter implements CacheObserver {
/**
* Called just after the region is cleared & before Listener callback is issued. The call to this
* method is synchronous
- *
+ *
* @param event RegionEvent object
*/
public void afterRegionClear(RegionEvent event) {}
@@ -57,7 +57,7 @@ public class CacheObserverAdapter implements CacheObserver {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.CacheObserver#afterConflation(java.nio.ByteBuffer,
* java.nio.ByteBuffer)
*/
@@ -67,7 +67,7 @@ public class CacheObserverAdapter implements CacheObserver {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.CacheObserver#afterSettingOplogOffSet()
*/
public void afterSettingOplogOffSet(long offset) {
@@ -88,7 +88,7 @@ public class CacheObserverAdapter implements CacheObserver {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.CacheObserver#beforeStoppingCompacter()
*/
public void beforeStoppingCompactor() {
@@ -114,7 +114,7 @@ public class CacheObserverAdapter implements CacheObserver {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.CacheObserver#afterSwitchingWriteAndFlushMaps()
*/
public void afterSwitchingWriteAndFlushMaps() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
index 701c93e..eff21d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
@@ -15,7 +15,7 @@
/*
* Created on Sep 12, 2005
*
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -24,23 +24,23 @@ package org.apache.geode.internal.cache;
* Distributed/Local Region when events like clear take place. There can be only one such observer
* at a time. If no observer is needed, this member variable should point to an object with
* 'do-nothing' methods, such as CacheObserverAdapter.
- *
+ *
* Code which wishes to observe events during Region clear should do so using the following
* technique:
- *
+ *
* class MyCacheObserver extends CacheObserverAdapter { // ... override methods of interest ... }
- *
+ *
* CacheObserver old = CacheObserverHolder.setInstance(new MyCacheObserver());
* org.apache.geode.internal.cache.LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER=true;
- *
+ *
* try { Call region methods here } finally { // reset to the original CacheObserver.
* CacheObserverHolder.setInstance(old); }
- *
+ *
* The Region code will call methods on this static member using the following technique:
- *
+ *
* CacheObserver observer = CacheObserverHolder.getInstance(); try {
* observer.startMethod(arguments); doSomething(); } finally { observer.stopMethod(arguments); }
- *
+ *
*/
public class CacheObserverHolder {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
index 5667808..724cebe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
@@ -16,9 +16,9 @@
package org.apache.geode.internal.cache;
import org.apache.geode.*;
-import org.apache.geode.internal.*;
import org.apache.geode.distributed.internal.PoolStatHelper;
import org.apache.geode.distributed.internal.QueueStatHelper;
+import org.apache.geode.internal.*;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
@@ -71,11 +71,11 @@ public class CachePerfStats {
protected static final int eventQueueThrottleCountId;
protected static final int eventThreadsId;
protected static final int missesId;
- protected final static int queryExecutionsId;
- protected final static int queryExecutionTimeId;
- protected final static int queryResultsHashCollisionsId;
- protected final static int queryResultsHashCollisionProbeTimeId;
- protected final static int partitionedRegionQueryRetriesId;
+ protected static final int queryExecutionsId;
+ protected static final int queryExecutionTimeId;
+ protected static final int queryResultsHashCollisionsId;
+ protected static final int queryResultsHashCollisionProbeTimeId;
+ protected static final int partitionedRegionQueryRetriesId;
protected static final int txSuccessLifeTimeId;
protected static final int txFailedLifeTimeId;
@@ -655,7 +655,7 @@ public class CachePerfStats {
/**
* Returns the current NanoTime or, if clock stats are disabled, zero.
- *
+ *
* @since GemFire 5.0
*/
public static long getStatTime() {
@@ -1369,7 +1369,7 @@ public class CachePerfStats {
/**
* Returns the Statistics instance that stores the cache perf stats.
- *
+ *
* @since GemFire 3.5
*/
public Statistics getStats() {
@@ -1403,7 +1403,7 @@ public class CachePerfStats {
/**
* Returns a helper object so that the event pool can record its stats to the proper cache perf
* stats.
- *
+ *
* @since GemFire 3.5
*/
public PoolStatHelper getEventPoolHelper() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java
index 06cff6f..5d4e84b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerAdvisor.java
@@ -114,7 +114,7 @@ public class CacheServerAdvisor extends GridAdvisor {
* Used to process an incoming cache server profile. Any controller in this vm needs to be told
* about this incoming new cache server. The reply needs to contain any controller(s) that exist
* in this vm.
- *
+ *
* @since GemFire 5.7
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index 0cf7081..51ac9ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelCriterion;
@@ -70,6 +69,7 @@ import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -80,7 +80,7 @@ import org.apache.geode.management.membership.ClientMembershipListener;
/**
* An implementation of the{@code CacheServer} interface that delegates most of the heavy lifting to
* an {@link Acceptor}.
- *
+ *
* @since GemFire 4.0
*/
@SuppressWarnings("deprecation")
@@ -104,14 +104,14 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* The advisor used by this cache server.
- *
+ *
* @since GemFire 5.7
*/
private volatile CacheServerAdvisor advisor;
/**
* The monitor used to monitor load on this bridge server and distribute load to the locators
- *
+ *
* @since GemFire 5.7
*/
private volatile LoadMonitor loadMonitor;
@@ -128,7 +128,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Needed because this guy is an advisee
- *
+ *
* @since GemFire 5.7
*/
private int serialNumber; // changed on each start
@@ -398,7 +398,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Gets the address that this bridge server can be contacted on from external processes.
- *
+ *
* @since GemFire 5.7
*/
public String getExternalAddress() {
@@ -526,7 +526,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Test method used to access the internal acceptor
- *
+ *
* @return the internal acceptor
*/
@Override
@@ -558,7 +558,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* create client subscription
- *
+ *
* @return client subscription name
* @since GemFire 5.7
*/
@@ -654,7 +654,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Generates the name for the client subscription using the given id.
- *
+ *
* @return String
* @since GemFire 5.7
*/
@@ -690,7 +690,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Returns the underlying{@code InternalDistributedSystem} connection.
- *
+ *
* @return the underlying{@code InternalDistributedSystem}
*/
@Override
@@ -708,7 +708,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
return getName();
}
- private final static AtomicInteger profileSN = new AtomicInteger();
+ private static final AtomicInteger profileSN = new AtomicInteger();
private static int createSerialNumber() {
return profileSN.incrementAndGet();
@@ -763,7 +763,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Registers a new{@code InterestRegistrationListener} with the set of
* {@code InterestRegistrationListener}s.
- *
+ *
* @param listener The{@code InterestRegistrationListener} to register
* @throws IllegalStateException if the BridgeServer has not been started
* @since GemFire 5.8Beta
@@ -780,9 +780,9 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Unregisters an existing{@code InterestRegistrationListener} from the set of
* {@code InterestRegistrationListener}s.
- *
+ *
* @param listener The{@code InterestRegistrationListener} to unregister
- *
+ *
* @since GemFire 5.8Beta
*/
@Override
@@ -792,9 +792,9 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* Returns a read-only set of{@code InterestRegistrationListener}s registered with this notifier.
- *
+ *
* @return a read-only set of{@code InterestRegistrationListener}s registered with this notifier
- *
+ *
* @since GemFire 5.8Beta
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
index 5faa72b..ee2e8ea 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
@@ -480,7 +480,7 @@ public class CacheServerLauncher {
* VM will be placed in a special {@linkplain #startLogFileName log file}.
*
* See #getStartOptions
- *
+ *
* @see OSProcess#bgexec(String[], File, File, boolean, Map)
*/
public void start(final String[] args) throws Exception {
@@ -1193,7 +1193,7 @@ public class CacheServerLauncher {
/**
* Reads {@link DistributedSystem#PROPERTY_FILE} and determines if the
* {@link ConfigurationProperties#LOG_FILE} property is set to stdout
- *
+ *
* @return true if the logging would go to stdout
*/
private static boolean isLoggingToStdOut() {
@@ -1281,7 +1281,7 @@ public class CacheServerLauncher {
/**
* A List implementation that disallows null values.
- *
+ *
* @param <E> the Class type for the List elements.
*/
protected static class ListWrapper<E> extends AbstractList<E> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
index 00d07a0..1cb7175 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
@@ -19,14 +19,14 @@ import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
/**
* Interface for a service that is linked to a cache.
- *
+ *
* These services are loaded during cache initialization using the java ServiceLoader and can be
* retrieved from the cache by calling Cache.getService(YourInterface.class)
*/
public interface CacheService {
/**
* Initialize the service with a cache.
- *
+ *
* Services are initialized in random order, fairly early on in cache initialization. In
* particular, the cache.xml has not yet been parsed.
*/
@@ -39,7 +39,7 @@ public interface CacheService {
/**
* Returns the MBean associated with this server
- *
+ *
* @return the MBean associated with this server
*/
public CacheServiceMBeanBase getMBean();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServiceProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServiceProfile.java
index ac6d8f6..e576bf8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServiceProfile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServiceProfile.java
@@ -25,7 +25,7 @@ public interface CacheServiceProfile {
/**
* Return the id of this profile
- *
+ *
* @return the id of this profile
*/
String getId();
@@ -40,7 +40,7 @@ public interface CacheServiceProfile {
/**
* Answers the missing profile message to be returned when a profile exists in one member but not
* another
- *
+ *
* @param existsInThisMember Whether or not the profile exists in this member
* @return the missing profile message to be returned when a profile exists in one member but not
* another
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
index 6d5b397..89ac0a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache;
import org.apache.geode.cache.*;
import org.apache.geode.internal.InternalStatisticsDisabledException;
-// import org.apache.geode.InternalGemFireException;
-// import org.apache.geode.internal.util.Callable;
-// import org.apache.geode.util.concurrent.locks.Lock;
/**
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
index 6ba8c5a..8027ddf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
@@ -33,7 +33,7 @@ public interface CachedDeserializable extends Sizeable {
/**
* Returns the raw byte[] that represents this cache value.
- *
+ *
* @return the raw byte[] that represents this cache value
*/
public byte[] getSerializedValue();
@@ -41,7 +41,7 @@ public interface CachedDeserializable extends Sizeable {
/**
* Gets a deserialized value for reading. Differs from getDeserializedValue by leaving the value
* in a form that will optimize future calls.
- *
+ *
* @since GemFire 4.0
*/
public Object getDeserializedForReading();
@@ -49,7 +49,7 @@ public interface CachedDeserializable extends Sizeable {
/**
* Gets the string form of the cached object. If an exception is thrown while converting to a
* string then the exception will be caught and put in the returned string.
- *
+ *
* @return a string that represents the cached object.
* @since GemFire 6.6
*/
@@ -58,7 +58,7 @@ public interface CachedDeserializable extends Sizeable {
/**
* Always makes a copy of the deserialized object and returns it. Leaves the value in a form that
* will optimize future calls.
- *
+ *
* @param r the region that owns this object or null if no owner
* @param re the region entry that owns this object or null if no owner
* @return the deserialized object for this cache value
@@ -67,7 +67,7 @@ public interface CachedDeserializable extends Sizeable {
/**
* Returns the deserialized object for this cache value.
- *
+ *
* @param r the region that owns this object or null if no owner
* @param re the region entry that owns this object or null if no owner
* @return the deserialized object for this cache value
@@ -87,7 +87,7 @@ public interface CachedDeserializable extends Sizeable {
* {@link DataSerializer#readByteArray(java.io.DataInput)} 2) de-serialize the byte array using
* {@link BlobHelper#deserializeBlob(byte[])} into an object. The idea is to delay
* de-serialization until the last possible moment to provide better parallelism
- *
+ *
* @param out the stream to write on
* @throws IOException
*/
@@ -97,7 +97,7 @@ public interface CachedDeserializable extends Sizeable {
* Sets the serialized value of the Object in the wrapper along with appropriate user bit & valid
* length. If the Object is already in a serialized form then the byte array is set in the wrapper
* along with boolean reusable as false
- *
+ *
* @param wrapper object of type BytesAndBitsForCompactor
*/
public void fillSerializedValue(BytesAndBitsForCompactor wrapper, byte userBits);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java
index c332db3..bf5b784 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializableFactory.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache;
+import java.io.IOException;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -25,11 +27,9 @@ import org.apache.geode.internal.cache.lru.Sizeable;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.PdxInstance;
-import java.io.IOException;
-
/**
* Produces instances that implement CachedDeserializable.
- *
+ *
* @since GemFire 5.0.2
*
*/
@@ -258,7 +258,7 @@ public class CachedDeserializableFactory {
/**
* Return how much memory this object will consume if it is in serialized form
- *
+ *
* @since GemFire 6.1.2.9
*/
public static int calcSerializedMemSize(Object o) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
index 30168ff..184ae1a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
@@ -18,18 +18,18 @@ package org.apache.geode.internal.cache;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Operation;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-// import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
/**
* Class <code>ClientRegionEventImpl</code> is a region event with the client's host and port for
* notification purposes.
- *
- *
+ *
+ *
* @since GemFire 5.1
*/
public class ClientRegionEventImpl extends RegionEventImpl {
@@ -43,7 +43,7 @@ public class ClientRegionEventImpl extends RegionEventImpl {
/**
* To be called from the Distributed Message without setting EventID
- *
+ *
* @param region
* @param op
* @param callbackArgument
@@ -66,7 +66,7 @@ public class ClientRegionEventImpl extends RegionEventImpl {
/**
* sets The membershipId originating this event
- *
+ *
*/
protected void setContext(ClientProxyMembershipID contx) {
this.context = contx;
@@ -74,7 +74,7 @@ public class ClientRegionEventImpl extends RegionEventImpl {
/**
* Returns The context originating this event
- *
+ *
* @return The context originating this event
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
index debb97f..1c4ebaa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
@@ -20,9 +20,9 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* This interface is used by testing/debugging code to be notified of different client/server
* events. See the documentation for class ClientServerObserverHolder for details.
- *
+ *
* @since GemFire 5.1
- *
+ *
*/
public interface ClientServerObserver {
/**
@@ -52,21 +52,21 @@ public interface ClientServerObserver {
/**
* Invoked by CacheClientUpdater just before invoking endpointDied for fail over
- *
+ *
* @param location ServerLocation which has failed
*/
public void beforeFailoverByCacheClientUpdater(ServerLocation location);
/**
* Invoked before sending an instantiator message to server
- *
+ *
* @param eventId
*/
public void beforeSendingToServer(EventID eventId);
/**
* Invoked after sending an instantiator message to server
- *
+ *
* @param eventId
*/
public void afterReceivingFromServer(EventID eventId);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java
index 11691c4..1d99721 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
/**
* This class provides 'do-nothing' implementations of all of the methods of interface
* ClientServerObserver. See the documentation for class ClientServerObserverHolder for details.
- *
+ *
* @since GemFire 5.1
*/
public class ClientServerObserverAdapter implements ClientServerObserver {
@@ -55,7 +55,7 @@ public class ClientServerObserverAdapter implements ClientServerObserver {
/**
* Invoked before sending an instantiator message to server
- *
+ *
* @param eventId
*/
public void beforeSendingToServer(EventID eventId) {
@@ -64,7 +64,7 @@ public class ClientServerObserverAdapter implements ClientServerObserver {
/**
* Invoked after sending an instantiator message to server
- *
+ *
* @param eventId
*/
public void afterReceivingFromServer(EventID eventId) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
index 3964cd7..c89f235 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.query.internal.Support;
* This class is intended to hold a single 'observer' which will receive callbacks. There can be
* only one such observer at a time. If no observer is needed, this member variable should point to
* an object with 'do-nothing' methods, such as ClientServerObserverAdapter.
- *
+ *
* @since GemFire 5.1
*/
public class ClientServerObserverHolder {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java
index a55a9ee..cca7856 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -21,7 +21,7 @@ import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
* Configuration parameters for client subscription
*/
public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
@@ -56,7 +56,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Returns the capacity of the client client queue. will be in MB for eviction-policy mem else
* number of entries
- *
+ *
* @see #DEFAULT_CAPACITY
* @since GemFire 5.7
*/
@@ -67,7 +67,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Sets the capacity of the client client queue. will be in MB for eviction-policy mem else number
* of entries
- *
+ *
* @see #DEFAULT_CAPACITY
* @since GemFire 5.7
*/
@@ -78,7 +78,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Returns the eviction policy that is executed when capacity of the client client queue is
* reached.
- *
+ *
* @see #DEFAULT_EVICTION_POLICY
* @since GemFire 5.7
*/
@@ -88,7 +88,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Sets the eviction policy that is executed when capacity of the client client queue is reached.
- *
+ *
* @see #DEFAULT_EVICTION_POLICY
* @since GemFire 5.7
*/
@@ -98,7 +98,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Sets the overflow directory for a client client queue
- *
+ *
* @param overflowDirectory the overflow directory for a client queue's overflowed entries
* @since GemFire 5.7
* @deprecated as of prPersistSprint2
@@ -116,7 +116,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Answers the overflow directory for a client queue's overflowed client queue entries.
- *
+ *
* @return the overflow directory for a client queue's overflowed entries
* @since GemFire 5.7
* @deprecated as of prPersistSprint2
@@ -144,7 +144,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* get the diskStoreName for overflow
- *
+ *
* @since GemFire prPersistSprint2
*/
public String getDiskStoreName() {
@@ -153,7 +153,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
/**
* Sets the disk store name for overflow
- *
+ *
* @param diskStoreName
* @since GemFire prPersistSprint2
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
index 6fe459e..5c2762a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
@@ -108,4 +108,3 @@ public class CloseCacheMessage extends HighPriorityDistributionMessage implement
out.writeInt(this.processorId);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
index 2bbe009..62bfa2b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
@@ -60,7 +60,7 @@ public class ClusterConfigurationLoader {
/**
* Deploys the jars received from shared configuration, it undeploys any other jars that were not
* part of shared configuration
- *
+ *
* @param cache Cache of this member
* @param response {@link ConfigurationResponse} received from the locators
*/
@@ -153,7 +153,7 @@ public class ClusterConfigurationLoader {
/***
* Apply the gemfire properties cluster configuration on this member
- *
+ *
* @param response {@link ConfigurationResponse} containing the requested {@link Configuration}
* @param config this member's config
*/
@@ -201,7 +201,7 @@ public class ClusterConfigurationLoader {
* Request the shared configuration for group(s) from locator(s) this member is bootstrapped with.
*
* This will request the group config this server belongs plus the "cluster" config
- *
+ *
* @param config this member's configuration.
* @return {@link ConfigurationResponse}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationHelper.java
index ed08175..f3b6174 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationHelper.java
@@ -185,7 +185,7 @@ public class ColocationHelper {
/**
* Returns true if there are regions that are persisted on this member and were previously
* colocated with the given region, but have not yet been created.
- *
+ *
* @param region The parent region
* @return true if there are any child regions that are persisted on this member, but have not yet
* been created.
@@ -276,7 +276,7 @@ public class ColocationHelper {
* getAllColocationRegions(customerPR) --> List{orderPR, shipmentPR}<br>
* getAllColocationRegions(orderPR) --> List{customerPR, shipmentPR}<br>
* getAllColocationRegions(shipmentPR) --> List{customerPR, orderPR}<br>
- *
+ *
* @return List of all partitioned regions (excluding self) in a colocated chain
* @since GemFire 5.8Beta
*/
@@ -309,7 +309,7 @@ public class ColocationHelper {
/**
* gets local data of colocated regions on a particular data store
- *
+ *
* @return map of region name to local colocated regions
* @since GemFire 5.8Beta
*/
@@ -366,7 +366,7 @@ public class ColocationHelper {
* getColocatedChildRegions(customerPR) will return List{orderPR}<br>
* getColocatedChildRegions(orderPR) will return List{shipmentPR}<br>
* getColocatedChildRegions(shipmentPR) will return empty List{}<br>
- *
+ *
* @return list of all child partitioned regions colocated with the region
* @since GemFire 5.8Beta
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java
index b9489e0..f397e40 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java
@@ -85,7 +85,7 @@ public class ColocationLogger implements Runnable {
/**
* Writes a log entry every SLEEP_PERIOD when there are missing colocated child regions for this
* region.
- *
+ *
* @throws InterruptedException
*/
private void run2() throws InterruptedException {
@@ -157,7 +157,7 @@ public class ColocationLogger implements Runnable {
/**
* Write the a logger warning for a PR that has colocated child regions that are missing.
- *
+ *
* @param region the parent region that has missing child regions
*/
private void logMissingRegions(PartitionedRegion region) {
@@ -182,13 +182,13 @@ public class ColocationLogger implements Runnable {
/*
* Test hook to allow unit test tests to run faster by tweak the interval between log messages
*/
- public synchronized static int testhookSetLogInterval(int sleepMillis) {
+ public static synchronized int testhookSetLogInterval(int sleepMillis) {
int currentSleep = LOG_INTERVAL;
LOG_INTERVAL = sleepMillis;
return currentSleep;
}
- public synchronized static void testhookResetLogInterval() {
+ public static synchronized void testhookResetLogInterval() {
LOG_INTERVAL = DEFAULT_LOG_INTERVAL;
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java
index f1f86c5..3d6fa7f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.distributed.internal.ReplyException;
import java.util.*;
+import org.apache.geode.distributed.internal.ReplyException;
+
/**
* Contains exceptions generated when attempting to process a commit operation.
*
@@ -64,4 +65,3 @@ public class CommitReplyException extends ReplyException {
return super.toString() + " with exceptions: " + this.exceptions;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
index 4598bf9..e0da134 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
@@ -20,8 +20,8 @@ import org.apache.geode.internal.cache.persistence.DiskRegionView;
/**
* Contract that must be implemented by oplogs so that they can be compacted.
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
index f5ae58b..9d945d2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
@@ -20,50 +20,50 @@ import java.io.Serializable;
/**
* Interface <code>Conflatable</code> is used by the bridge server client notification mechanism to
* conflate messages being sent from the server to the client.
- *
- *
+ *
+ *
* @since GemFire 4.2
*/
public interface Conflatable extends Serializable {
/**
* Returns whether the object should be conflated
- *
+ *
* @return whether the object should be conflated
*/
public boolean shouldBeConflated();
/**
* Returns the name of the region for this <code>Conflatable</code>
- *
+ *
* @return the name of the region for this <code>Conflatable</code>
*/
public String getRegionToConflate();
/**
* Returns the key for this <code>Conflatable</code>
- *
+ *
* @return the key for this <code>Conflatable</code>
*/
public Object getKeyToConflate();
/**
* Returns the value for this <code>Conflatable</code>
- *
+ *
* @return the value for this <code>Conflatable</code>
*/
public Object getValueToConflate();
/**
* Sets the latest value for this <code>Conflatable</code>
- *
+ *
* @param value The latest value
*/
public void setLatestValue(Object value);
/**
* Return this event's identifier
- *
+ *
* @return EventID object uniquely identifying the Event
*/
public EventID getEventId();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java
index a10dee7..3a24e56 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ControllerAdvisor.java
@@ -106,7 +106,7 @@ public class ControllerAdvisor extends GridAdvisor {
* Used to process an incoming connection controller profile. Any controller or bridge server in
* this vm needs to be told about this incoming new controller. The reply needs to contain any
* controller(s) that exist in this vm and any bridge servers that exist in this vm.
- *
+ *
* @since GemFire 5.7
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java
index 01a16e4..e35005e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java
@@ -18,8 +18,8 @@ import java.io.*;
/**
* A data input stream that counts the bytes it plans on reading.
- *
- *
+ *
+ *
* @since GemFire prPersistSprint2
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
index ee4e2df..5680472 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
@@ -440,7 +440,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
/**
* Attempts to process this message with the specified <code>CacheDistributionAdvisee</code>.
- *
+ *
* @param cda the CacheDistributionAdvisee to apply this profile to
* @param isRealRegion true if CacheDistributionAdvisee is a real region
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CustomEntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CustomEntryExpiryTask.java
index 838fa78..e8cc209 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CustomEntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CustomEntryExpiryTask.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.ExpirationAttributes;
/**
* Remembers the expiration attributes returned from the customer's CustomExpiry callback, if any.
- *
+ *
* @since GemFire 8.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
index b0f063e..61b5c11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
@@ -19,7 +19,7 @@ import org.apache.geode.GemFireCheckedException;
/**
* This exception is meant to represent the class of exceptions that occur when our assumption about
* where the data lives is incorrect.
- *
+ *
* @see ForceReattemptException
* @see PrimaryBucketException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
index 0af8840..e427000 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
@@ -46,15 +46,15 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* 2) To inform the other nodes that {@link org.apache.geode.internal.cache.PartitionedRegion} is
* closed/locally destroyed or cache is closed on a node<br>
* This results in updating of the RegionAdvisor of the remote nodes.
- *
+ *
* Sending this message should flush all previous {@link org.apache.geode.cache.Region} operations,
* which means this operation should not over-ride
* {@link org.apache.geode.internal.cache.partitioned.PartitionMessage#getProcessorId()}. It is
* critical guarantee delivery of events sent prior to this message.
- *
+ *
* A standard {@link ReplyMessage} is used to send the reply, however any exception that it carries
* is ignored, preventing interuption after sending this message.
- *
+ *
* @since GemFire 5.0
*/
public class DestroyPartitionedRegionMessage extends PartitionMessage {
@@ -77,7 +77,7 @@ public class DestroyPartitionedRegionMessage extends PartitionMessage {
public DestroyPartitionedRegionMessage() {}
/**
- *
+ *
* @param recipients the set of members on which the partitioned region should be destoryed
* @param region the partitioned region
* @param processor the processor that the reply will use to notify of the reply.
@@ -94,7 +94,7 @@ public class DestroyPartitionedRegionMessage extends PartitionMessage {
}
/**
- *
+ *
* @param recipients set of members who have the PartitionedRegion defined.
* @param r the PartitionedRegion to destroy on each member
* @return the response on which to wait for the confirmation
@@ -214,10 +214,10 @@ public class DestroyPartitionedRegionMessage extends PartitionMessage {
/**
* The response on which to wait for all the replies. This response ignores any exceptions
* received from the "far side"
- *
+ *
* @since GemFire 5.0
*/
- static public class DestroyPartitionedRegionResponse extends ReplyProcessor21 {
+ public static class DestroyPartitionedRegionResponse extends ReplyProcessor21 {
public DestroyPartitionedRegionResponse(InternalDistributedSystem system, Set initMembers) {
super(system, initMembers);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
index 53efa4f..e923678 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
-// import org.apache.geode.internal.*;
-// import org.apache.geode.distributed.internal.*;
import java.util.concurrent.RejectedExecutionException;
import org.apache.logging.log4j.Logger;
@@ -51,7 +49,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- *
+ *
*/
public class DestroyRegionOperation extends DistributedCacheOperation {
@@ -87,7 +85,7 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
/**
* Creates new instance of DestroyRegionOperation
- *
+ *
* @param notifyOfRegionDeparture was added to fix bug 41111. If false then don't deliver
* afterRemoteRegionDeparture events.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyedEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyedEntry.java
index a43e93b..51a2b79 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyedEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyedEntry.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Region;
/**
* Represents a destroyed entry that can be returned from an <code>Iterator</code> instead of null.
* All methods throw {@link EntryDestroyedException} except for {@link #isDestroyed()}.
- *
+ *
*/
public class DestroyedEntry implements Region.Entry<Object, Object> {
private final String msg;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DirectReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DirectReplyMessage.java
index 633b381..2f9600d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DirectReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DirectReplyMessage.java
@@ -19,8 +19,8 @@ import org.apache.geode.distributed.internal.DistributionMessage;
/**
* A message that can reply directly to the sender
- *
- *
+ *
+ *
*
*/
public interface DirectReplyMessage {
@@ -37,7 +37,7 @@ public interface DirectReplyMessage {
* calling {@link DistributionMessage#getReplySender(org.apache.geode.distributed.internal.DM)}
* and using the result to send the reply. the ReplySender determines whether to reply directly or
* through the shared channel.
- *
+ *
* @return true if a direct acknowledgement is allowed
* @see org.apache.geode.distributed.internal.direct.DirectChannel
*/
@@ -47,7 +47,7 @@ public interface DirectReplyMessage {
* Called on the sending side. This method is invoked if the message will end up using the shared
* channel. The message is expected to register the processor and send it's id to the receiving
* side.
- *
+ *
*/
void registerProcessor();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DirectoryHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DirectoryHolder.java
index 10c9c19..16b3baf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DirectoryHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DirectoryHolder.java
@@ -22,9 +22,9 @@ import org.apache.geode.StatisticsFactory;
/**
* A holder for a disk Directory. Used for maintaining the available space and updating disk
* statistics
- *
+ *
* @since GemFire 5.1
- *
+ *
*/
public class DirectoryHolder {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
index edd69a3..25c5c36 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
@@ -15,8 +15,6 @@
package org.apache.geode.internal.cache;
import org.apache.geode.*;
-// import org.apache.geode.internal.NanoTimer;
-// import org.apache.geode.cache.Region;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskId.java
index 40136a9..c28474d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskId.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* <li>The length of the byte array (which represent the value)on disk
* <li>Userbits of the value
* </ul>
- *
+ *
* @since GemFire 5.1
*/
@@ -35,7 +35,7 @@ public abstract class DiskId {
// @todo this field could be an int for an overflow only region
/**
* id consists of most significant 1 byte = users bits 2-8 bytes = oplog id least significant.
- *
+ *
* The highest bit in the oplog id part is set to 1 if the oplog id is negative.
*/
private long id;
@@ -88,7 +88,7 @@ public abstract class DiskId {
/**
* Setter for oplog offset of an entry
- *
+ *
* @param offsetInOplog - offset in oplog where the entry is stored.
*/
public abstract void setOffsetInOplog(long offsetInOplog);
@@ -140,7 +140,7 @@ public abstract class DiskId {
/**
* Return true if entry is schedule to be async written to disk. Return false if it has already
* been written or was never modified.
- *
+ *
* @since GemFire prPersistSprint1
*/
public boolean isPendingAsync() {
@@ -220,7 +220,7 @@ public abstract class DiskId {
* Creates appropriate instance of DiskId depending upon the maxOplogSize set by the user. If the
* maxOplogSize (in bytes) is greater than Integer.MAX_VALUE, LongOplogOffsetDiskId will be
* created and for maxOplogSize lesser than that, IntOplogOffsetDiskId will be created.
- *
+ *
* @return the disk-id instance created.
*/
public static DiskId createDiskId(long maxOplogSize, boolean isPersistenceType,
@@ -259,7 +259,7 @@ public abstract class DiskId {
/**
* Test method to verify if the passed DiskId is an instance of PersistenceWithIntOffset.
- *
+ *
* @param diskId - the DiskId instance
* @return true if the given DiskId is an instance of PersistenceWithIntOffset
*/
@@ -269,7 +269,7 @@ public abstract class DiskId {
/**
* Test method to verify if the passed DiskId is an instance of PersistenceWithLongOffset.
- *
+ *
* @param diskId - the DiskId instance
* @return true if the given DiskId is an instance of PersistenceWithLongOffset
*/
@@ -279,7 +279,7 @@ public abstract class DiskId {
/**
* Test method to verify if the passed DiskId is an instance of OverflowOnlyWithIntOffset.
- *
+ *
* @param diskId - the DiskId instance
* @return true if the given DiskId is an instance of OverflowOnlyWithIntOffset
*/
@@ -289,7 +289,7 @@ public abstract class DiskId {
/**
* Test method to verify if the passed DiskId is an instance of PersistenceWithLongOffset.
- *
+ *
* @param diskId - the DiskId instance
* @return true if the given DiskId is an instance of LongOplogOffsetDiskId
*/
@@ -299,8 +299,8 @@ public abstract class DiskId {
/**
* Inner class implementation of DiskId which stores offset in oplog as 'int' field.
- *
- *
+ *
+ *
*/
protected abstract static class IntOplogOffsetDiskId extends DiskId {
/**
@@ -318,7 +318,7 @@ public abstract class DiskId {
/**
* Setter for oplog offset of an entry
- *
+ *
* @param offsetInOplog - offset in oplog where the entry is stored.
*/
@Override
@@ -329,8 +329,8 @@ public abstract class DiskId {
/**
* Inner class implementation of DiskId which stores offset in oplog as 'long' field.
- *
- *
+ *
+ *
*/
protected abstract static class LongOplogOffsetDiskId extends DiskId {
/**
@@ -348,7 +348,7 @@ public abstract class DiskId {
/**
* Setter for oplog offset of an entry
- *
+ *
* @param offsetInOplog - offset in oplog where the entry is stored.
*/
@Override
@@ -394,13 +394,13 @@ public abstract class DiskId {
protected static final class OverflowOnlyWithIntOffset extends OverflowOnlyWithIntOffsetNoLL {
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry prev;
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry next;
@@ -463,13 +463,13 @@ public abstract class DiskId {
protected static final class OverflowOnlyWithLongOffset extends OverflowOnlyWithLongOffsetNoLL {
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry prev;
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry next;
@@ -536,13 +536,13 @@ public abstract class DiskId {
protected static final class PersistenceWithIntOffset extends PersistenceWithIntOffsetNoLL {
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry prev;
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry next;
@@ -610,13 +610,13 @@ public abstract class DiskId {
protected static final class PersistenceWithLongOffset extends PersistenceWithLongOffsetNoLL {
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry prev;
/**
* Used by DiskRegion for compaction
- *
+ *
* @since GemFire prPersistSprint1
*/
private DiskEntry next;
@@ -642,4 +642,3 @@ public abstract class DiskId {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
index 33aa0b5..c8be24a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
@@ -120,35 +120,35 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Written to IF Used to say that persistent member id is online. Byte Format: RegionId 4:
* blobLength blobLength: member bytes 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_ONLINE_MEMBER_ID = 59;
/**
* Written to IF Used to say that persistent member id is offline. Byte Format: RegionId 4:
* blobLength blobLength: member bytes 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_OFFLINE_MEMBER_ID = 60;
/**
* Written to IF Used to say that persistent member id no longer exists. Byte Format: RegionId 4:
* blobLength blobLength: member bytes 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_RM_MEMBER_ID = 61;
/**
* Written to IF. Used to record the persistent member id of this file. Byte Format: RegionId 4:
* blobLength blobLength: member bytes 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_MY_MEMBER_INITIALIZING_ID = 62;
/**
* Written to IF. Used to record the previous my member id completed initialization. Byte Format:
* RegionId 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_MY_MEMBER_INITIALIZED_ID = 63;
@@ -156,42 +156,42 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Written to IF. Used to record create of region Byte Format: RegionId 4: nameLength nameLength:
* name bytes 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_CREATE_REGION_ID = 64;
/**
* Written to IF. Used to record begin of destroy of region Byte Format: RegionId 1:
* EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_BEGIN_DESTROY_REGION_ID = 65;
/**
* Written to IF. Used to record clear of region Byte Format: RegionId 8: oplogEntryId 1:
* EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_CLEAR_REGION_ID = 66;
/**
* Written to IF. Used to record that the end of a destroy region. Byte Format: RegionId 1:
* EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_END_DESTROY_REGION_ID = 67;
/**
* Written to IF. Used to record that a region is about to be partially destroyed Byte Format:
* RegionId 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_BEGIN_PARTIAL_DESTROY_REGION_ID = 68;
/**
* Written to IF. Used to record that a region is partially destroyed Byte Format: RegionId 1:
* EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint1
*/
public static final byte IFREC_END_PARTIAL_DESTROY_REGION_ID = 69;
@@ -221,16 +221,16 @@ public class DiskInitFile implements DiskInitFileInterpreter {
* 4: lruLimit (int) // no need to ObjectSize during recovery since all data is in blob form 4:
* concurrencyLevel (int) 4: initialCapacity (int) 4: loadFactor (float) 1: statisticsEnabled
* (boolean) 1: isBucket (boolean) 1: EndOfRecordMarker
- *
+ *
* Used to read the region configuration for 6.5 disk stores.
- *
+ *
*/
public static final byte IFREC_REGION_CONFIG_ID = 74;
/*
* Written to IF Used to say that persistent member id is offline and has the same data on disk as
* this member Byte Format: RegionId 4: blobLength blobLength: member bytes 1: EndOfRecordMarker
- *
+ *
* @since GemFire prPersistSprint3
*/
public static final byte IFREC_OFFLINE_AND_EQUAL_MEMBER_ID = 75;
@@ -266,7 +266,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Maps a member id (either a disk store ID or a distributed system id plus a byte) to a single
* integer, which can be used in oplogs.
- *
+ *
* Byte Format: 4: the number assigned to this id. variable: serialized object representing the
* ID. variable: pr name 1: EndOfRecord
*/
@@ -274,7 +274,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Written to IF Used to say that a disk store has been revoked Byte Format: variable: a
* PersistentMemberPattern
- *
+ *
* @since GemFire 7.0
*/
public static final byte IFREC_REVOKE_DISK_STORE_ID = 81;
@@ -282,7 +282,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Written gemfire version to IF Byte Format: 1: version byte from Version.GFE_CURRENT.ordinal 1:
* EndOfRecord
- *
+ *
* @since GemFire 7.0
*/
public static final byte IFREC_GEMFIRE_VERSION = 82;
@@ -290,7 +290,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Written to IF. Used to record clear of using an RVV Byte Format: RegionId variable: serialized
* RVV 1: EndOfRecordMarker
- *
+ *
* @since GemFire 7.0
*/
public static final byte IFREC_CLEAR_REGION_WITH_RVV_ID = 83;
@@ -301,7 +301,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
* concurrencyLevel (int) 4: initialCapacity (int) 4: loadFactor (float) 1: statisticsEnabled
* (boolean) 1: isBucket (boolean) variable: partitionName (utf) 4: startingBucketId (int)
* variable: compressorClassName (utf) 1: versioned (boolean) 1: EndOfRecordMarker
- *
+ *
*/
public static final byte IFREC_REGION_CONFIG_ID_80 = 88;
@@ -309,7 +309,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
* Persist oplog file magic number. Written once at the beginning of every oplog file; CRF, DRF,
* KRF, and IF. Followed by 6 byte magic number. Each oplog type has a different magic number
* Followed by EndOfRecord Fix for bug 43824
- *
+ *
* @since GemFire 8.0
*/
public static final byte OPLOG_MAGIC_SEQ_ID = 89;
@@ -321,7 +321,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
* (boolean) 1: isBucket (boolean) variable: partitionName (utf) 4: startingBucketId (int)
* variable: compressorClassName (utf) 1: versioned (boolean) 1: offHeap (boolean) added in 9.0 1:
* EndOfRecordMarker
- *
+ *
* @since Geode 1.0
*/
public static final byte IFREC_REGION_CONFIG_ID_90 = 90;
@@ -382,9 +382,9 @@ public class DiskInitFile implements DiskInitFileInterpreter {
private final Set<PersistentMemberPattern> revokedMembers =
new HashSet<PersistentMemberPattern>();
- transient private long nextSeekPosition;
+ private transient long nextSeekPosition;
- transient private boolean gotEOF;
+ private transient boolean gotEOF;
private void lock(boolean useBackupLock) {
if (useBackupLock) {
@@ -1306,14 +1306,14 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Returns the bytes used to represent a class in an oplog.
*/
- static private byte[] classToBytes(Class c) {
+ private static byte[] classToBytes(Class c) {
return classNameToBytes(c.getName());
}
/**
* Returns the bytes used to represent a class in an oplog.
*/
- static private byte[] classNameToBytes(String cn) {
+ private static byte[] classNameToBytes(String cn) {
return cn.getBytes(); // use default encoder
}
@@ -2387,7 +2387,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Additional flags for a disk region that are persisted in its meta-data.
- *
+ *
* @since GemFire 7.0
*/
public enum DiskRegionFlag {
@@ -2463,7 +2463,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
/**
* Returns a map of region_name->(pr_buckets|replicated_region)
- *
+ *
* @param regName
*/
private Map<String, List<PlaceHolderDiskRegion>> getRegionsToDump(String regName) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
index 7b8b17c..360c0a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
@@ -18,15 +18,17 @@ import java.util.EnumSet;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import joptsimple.internal.Strings;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.compression.Compressor;
-import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
import org.apache.geode.internal.cache.DiskStoreImpl.AsyncDiskEntry;
import org.apache.geode.internal.cache.InitialImageOperation.GIIStatus;
import org.apache.geode.internal.cache.LocalRegion.RegionEntryCallback;
+import org.apache.geode.internal.cache.entries.DiskEntry;
+import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.persistence.BytesAndBits;
import org.apache.geode.internal.cache.persistence.DiskExceptionHandler;
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
@@ -34,7 +36,6 @@ import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
-import joptsimple.internal.Strings;
/**
* Represents a (disk-based) persistent store for region data. Used for both persistent recoverable
@@ -354,7 +355,7 @@ public class DiskRegion extends AbstractDiskRegion {
/**
* Returns the value of the key/value pair with the given diskId. Updates all of the necessary
* {@linkplain DiskRegionStats statistics}
- *
+ *
* @see #getBytesAndBitsWithoutLock(DiskId, boolean, boolean)
*/
Object get(DiskId id) {
@@ -365,7 +366,7 @@ public class DiskRegion extends AbstractDiskRegion {
* Gets the Object from the OpLog . It can be invoked from OpLog , if by the time a get operation
* reaches the OpLog, the entry gets compacted or if we allow concurrent put & get operations. It
* will also minimize the synch lock on DiskId
- *
+ *
* @param id DiskId object for the entry
* @return value of the entry
*/
@@ -393,12 +394,12 @@ public class DiskRegion extends AbstractDiskRegion {
/**
* Asif: THIS SHOULD ONLY BE USED FOR TESTING PURPOSES AS IT IS NOT THREAD SAFE
- *
+ *
* Returns the object stored on disk with the given id. This method is used for testing purposes
* only. As such, it bypasses the buffer and goes directly to the disk. This is not a thread safe
* function , in the sense, it is possible that by the time the OpLog is queried , data might move
* HTree with the oplog being destroyed
- *
+ *
* @return null if entry has nothing stored on disk (id == INVALID_ID)
* @throws IllegalArgumentException If <code>id</code> is less than zero, no action is taken.
*/
@@ -435,7 +436,7 @@ public class DiskRegion extends AbstractDiskRegion {
/**
* Get serialized form of data off the disk
- *
+ *
* @param id
* @since GemFire 5.7
*/
@@ -512,7 +513,7 @@ public class DiskRegion extends AbstractDiskRegion {
/**
* Returns true if the state of the specified entry was recovered from disk. If so it will also
* set it to no longer be recovered.
- *
+ *
* @since GemFire prPersistSprint1
*/
public boolean testIsRecoveredAndClear(RegionEntry re) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java
index 5031ac7..90b48c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java
@@ -27,7 +27,7 @@ import org.apache.geode.cache.DiskStoreFactory;
/**
* Creates an attribute object for DiskStore.
* </p>
- *
+ *
* @since GemFire prPersistSprint2
*/
public class DiskStoreAttributes implements Serializable, DiskStore {
@@ -73,7 +73,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getAllowForceCompaction()
*/
public boolean getAllowForceCompaction() {
@@ -82,7 +82,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getAutoCompact()
*/
public boolean getAutoCompact() {
@@ -91,7 +91,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getCompactionThreshold()
*/
public int getCompactionThreshold() {
@@ -100,7 +100,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getDiskDirSizes()
*/
public int[] getDiskDirSizes() {
@@ -111,7 +111,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getDiskDirs()
*/
public File[] getDiskDirs() {
@@ -122,7 +122,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getMaxOplogSize()
*/
public long getMaxOplogSize() {
@@ -139,7 +139,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getName()
*/
public String getName() {
@@ -148,7 +148,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getQueueSize()
*/
public int getQueueSize() {
@@ -157,7 +157,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getTimeInterval()
*/
public long getTimeInterval() {
@@ -166,7 +166,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.DiskStore#getWriteBufferSize()
*/
public int getWriteBufferSize() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreBackup.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreBackup.java
index 53c5ca1..9b005ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreBackup.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreBackup.java
@@ -40,7 +40,7 @@ public class DiskStoreBackup {
/**
* Add the oplog to the list of deferred deletes.
- *
+ *
* @return true if the delete has been deferred. False if this oplog should be deleted
* immediately.
*/
@@ -55,7 +55,7 @@ public class DiskStoreBackup {
/**
* Add the oplog to the list of deferred deletes.
- *
+ *
* @return true if the delete has been deferred. False if this oplog should be deleted
* immediately.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
index d6d55d6..d09e70e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
@@ -18,8 +18,8 @@ import java.io.File;
import java.util.Arrays;
import org.apache.geode.GemFireIOException;
-import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
@@ -29,7 +29,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
/**
* Implementation of DiskStoreFactory
- *
+ *
* @since GemFire prPersistSprint2
*/
public class DiskStoreFactoryImpl implements DiskStoreFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index 86009dd..cc66ca7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -79,10 +79,10 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.ExportDiskRegion.ExportWriter;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.entries.DiskEntry.RecoveredEntry;
-import org.apache.geode.internal.cache.ExportDiskRegion.ExportWriter;
import org.apache.geode.internal.cache.lru.LRUAlgorithm;
import org.apache.geode.internal.cache.lru.LRUStatistics;
import org.apache.geode.internal.cache.persistence.BytesAndBits;
@@ -155,7 +155,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Kept for backwards compat. Should use allowForceCompaction api/dtd instead.
*/
- private final static boolean ENABLE_NOTIFY_TO_ROLL =
+ private static final boolean ENABLE_NOTIFY_TO_ROLL =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ENABLE_NOTIFY_TO_ROLL");
public static final String RECOVER_VALUE_PROPERTY_NAME =
@@ -337,10 +337,10 @@ public class DiskStoreImpl implements DiskStore {
/**
* The unique id for this disk store.
- *
+ *
* Either set during recovery of an existing disk store when the IFREC_DISKSTORE_ID record is read
* or when a new init file is created.
- *
+ *
*/
private DiskStoreID diskStoreID;
@@ -676,7 +676,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Stores a key/value pair from a region entry on disk. Updates all of the necessary
* {@linkplain DiskRegionStats statistics}and invokes {@link Oplog#create}or {@link Oplog#modify}.
- *
+ *
* @param entry The entry which is going to be written to disk
* @throws RegionClearedException If a clear operation completed before the put operation
* completed successfully, resulting in the put operation to abort.
@@ -786,7 +786,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Returns the value of the key/value pair with the given diskId. Updates all of the necessary
* {@linkplain DiskRegionStats statistics}
- *
+ *
*/
Object get(DiskRegion dr, DiskId id) {
acquireReadLock(dr);
@@ -844,7 +844,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* This method was added to fix bug 40192. It is like getBytesAndBits except it will return
* Token.REMOVE_PHASE1 if the htreeReference has changed (which means a clear was done).
- *
+ *
* @return an instance of BytesAndBits or Token.REMOVED_PHASE1
*/
Object getRaw(DiskRegionView dr, DiskId id) {
@@ -868,7 +868,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Given a BytesAndBits object convert it to the relevant Object (deserialize if necessary) and
* return the object
- *
+ *
* @return the converted object
*/
static Object convertBytesAndBitsIntoObject(BytesAndBits bb) {
@@ -890,7 +890,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Given a BytesAndBits object get the serialized blob
- *
+ *
* @return the converted object
*/
static Object convertBytesAndBitsToSerializedForm(BytesAndBits bb) {
@@ -917,7 +917,7 @@ public class DiskStoreImpl implements DiskStore {
* Gets the Object from the OpLog . It can be invoked from OpLog , if by the time a get operation
* reaches the OpLog, the entry gets compacted or if we allow concurrent put & get operations. It
* will also minimize the synch lock on DiskId
- *
+ *
* @param id DiskId object for the entry
* @return value of the entry or CLEAR_BB if it is detected that the entry was removed by a
* concurrent region clear.
@@ -1003,12 +1003,12 @@ public class DiskStoreImpl implements DiskStore {
/**
* Asif: THIS SHOULD ONLY BE USED FOR TESTING PURPOSES AS IT IS NOT THREAD SAFE
- *
+ *
* Returns the object stored on disk with the given id. This method is used for testing purposes
* only. As such, it bypasses the buffer and goes directly to the disk. This is not a thread safe
* function , in the sense, it is possible that by the time the OpLog is queried , data might move
* HTree with the oplog being destroyed
- *
+ *
* @return null if entry has nothing stored on disk (id == INVALID_ID)
* @throws IllegalArgumentException If {@code id} is less than zero, no action is taken.
*/
@@ -1043,9 +1043,9 @@ public class DiskStoreImpl implements DiskStore {
/**
* Removes the key/value pair with the given id on disk.
- *
+ *
* @param async true if called by the async flusher thread
- *
+ *
* @throws RegionClearedException If a clear operation completed before the put operation
* completed successfully, resulting in the put operation to abort.
* @throws IllegalArgumentException If {@code id} is {@linkplain #INVALID_ID invalid}or is less
@@ -1116,12 +1116,12 @@ public class DiskStoreImpl implements DiskStore {
/**
* This function is having a default visiblity as it is used in the OplogJUnitTest for a bug
* verification of Bug # 35012
- *
+ *
* All callers must have {@link #releaseWriteLock(DiskRegion)} in a matching finally block.
- *
+ *
* Note that this is no longer implemented by getting a write lock but instead locks the same lock
* that acquireReadLock does.
- *
+ *
* @since GemFire 5.1
*/
private void acquireWriteLock(DiskRegion dr) {
@@ -1130,10 +1130,10 @@ public class DiskStoreImpl implements DiskStore {
}
/**
- *
+ *
* This function is having a default visiblity as it is used in the OplogJUnitTest for a bug
* verification of Bug # 35012
- *
+ *
* @since GemFire 5.1
*/
@@ -1146,7 +1146,7 @@ public class DiskStoreImpl implements DiskStore {
* All callers must have {@link #releaseReadLock(DiskRegion)} in a matching finally block. Note
* that this is no longer implemented by getting a read lock but instead locks the same lock that
* acquireWriteLock does.
- *
+ *
* @since GemFire 5.1
*/
void acquireReadLock(DiskRegion dr) {
@@ -1217,7 +1217,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Get serialized form of data off the disk
- *
+ *
* @since GemFire 5.7
*/
public Object getSerializedData(DiskRegion dr, DiskId id) {
@@ -2020,7 +2020,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* get the directory which has the info file
- *
+ *
* @return directory holder which has the info file
*/
DirectoryHolder getInfoFileDir() {
@@ -2039,7 +2039,7 @@ public class DiskStoreImpl implements DiskStore {
}
/**
- *
+ *
* @return boolean indicating whether the disk region compaction is on or not
*/
boolean isCompactionEnabled() {
@@ -2064,7 +2064,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* All the oplogs except the current one are destroyed.
- *
+ *
* @param rvv if not null, clear the region using a version vector Clearing with a version vector
* only removes entries less than the version vector, which allows for a consistent clear
* across members.
@@ -2146,7 +2146,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* It invokes appropriate methods of super & current class to clear the Oplogs.
- *
+ *
* @param rvv if not null, clear the region using the version vector
*/
void clear(LocalRegion region, DiskRegion dr, RegionVersionVector rvv) {
@@ -2601,7 +2601,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Destroy all the oplogs
- *
+ *
*/
private void destroyAllOplogs() {
persistentOplogs.destroyAllOplogs();
@@ -2651,7 +2651,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* gets the available oplogs to be compacted from the LinkedHashMap
- *
+ *
* @return Oplog[] returns the array of oplogs to be compacted if present else returns null
*/
CompactableOplog[] getOplogToBeCompacted() {
@@ -2702,15 +2702,15 @@ public class DiskStoreImpl implements DiskStore {
// hook that notifies them every time an oplog is created.
/**
* Used by tests to confirm stat size.
- *
+ *
*/
final AtomicLong undeletedOplogSize = new AtomicLong();
/**
* Compacts oplogs
- *
+ *
* @since GemFire 5.1
- *
+ *
*/
class OplogCompactor implements Runnable {
/** boolean for the thread to continue compaction* */
@@ -3511,7 +3511,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Destroy a region which has not been created.
- *
+ *
* @param regName the name of the region to destroy
*/
public void destroyRegion(String regName) {
@@ -4067,7 +4067,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Use this method to destroy a region in an offline disk store.
- *
+ *
* @param dsName the name of the disk store
* @param dsDirs the directories that that the disk store wrote files to
* @param regName the name of the region to destroy
@@ -4227,7 +4227,7 @@ public class DiskStoreImpl implements DiskStore {
}
/**
- *
+ *
* @return true if KRF files are used on this disk store's oplogs
*/
boolean couldHaveKrf() {
@@ -4476,7 +4476,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Update the on disk GC version for the given member, only if the disk has actually recorded all
* of the updates including that member.
- *
+ *
* @param diskRVV the RVV for what has been persisted
* @param inMemoryRVV the RVV of what is in memory
* @param member The member we're trying to update
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
index ac72361..410bc3a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
@@ -64,7 +64,7 @@ public class DiskStoreMonitor {
/**
* Validates the warning percent.
- *
+ *
* @param val the value to check
*/
public static void checkWarning(float val) {
@@ -77,7 +77,7 @@ public class DiskStoreMonitor {
/**
* Validates the critical percent.
- *
+ *
* @param val the value to check
*/
public static void checkCritical(float val) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
index 4da8283..39738af 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
@@ -15,7 +15,6 @@
package org.apache.geode.internal.cache;
import org.apache.geode.*;
-// import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
index d5893d4..246996d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
@@ -14,23 +14,23 @@
*/
package org.apache.geode.internal.cache;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
/**
* Implementation of DiskWriteAttributes
- *
+ *
* @see AttributesFactory#setDiskWriteAttributes
* @see RegionAttributes#getDiskWriteAttributes
* @see Region#writeToDisk
- *
- *
+ *
+ *
* @since GemFire 5.1
*/
@SuppressWarnings({"deprecation", "unused"})
@@ -80,7 +80,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/**
* Default disk directory size in megabytes
- *
+ *
* @since GemFire 5.1
*/
public static final int DEFAULT_DISK_DIR_SIZE = DiskStoreFactory.DEFAULT_DISK_DIR_SIZE;
@@ -102,7 +102,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/////////////////////// Constructors ///////////////////////
/**
- *
+ *
* Creates a new <code>DiskWriteAttributes</code> object using the properties specified. The
* properties that can be specified are:
* <ul>
@@ -123,7 +123,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
* The above properties are case sensitive and if a propery which is not in the list above is
* passed no action is taken. If a property which is present above is not specified then the
* following default values will be uses
- *
+ *
* <ul>
* <li>synchronous = false
* <li>auto-compact = true
@@ -133,9 +133,9 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
* <li>time-interval = 1000 milliseconds
* <li>byte-threshold = 0 bytes
* </ul>
- *
+ *
* @param properties
- *
+ *
* @throws IllegalArgumentException If any of the properties specified are not in the expected
* format.
* @throws IllegalStateException if max-oplog-size is set to infinity(0) and compaction is set to
@@ -215,12 +215,12 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/**
* Verifys if the propertyString passed is a valid boolean value or null else throws an
* IllegalArgument exception
- *
+ *
* @param propertyString
* @param property
* @throws IllegalArgumentException if the property string passed does not represent a boolean or
* null
- *
+ *
*/
private void verifyBooleanString(String propertyString, String property) {
if (!(propertyString.equalsIgnoreCase("true") || propertyString.equalsIgnoreCase("false"))) {
@@ -233,7 +233,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/**
* Verifys if the string passed, is in a number format which is acceptable and returns the long
* value of the string.
- *
+ *
* @param propertyString
* @param property
* @return the long value of the string
@@ -260,7 +260,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/**
* Verifys if the string passed, is in a number format which is acceptable and returns the int
* value of the string.
- *
+ *
* @param propertyString
* @param property
* @return the int value of the string
@@ -360,9 +360,9 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
- *
+ *
* Note that we just need to make sure that equal objects return equal hashcodes; nothing really
* elaborate is done here.
*/
@@ -403,7 +403,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/**
* Get the default max oplog size limit in megabytes
- *
+ *
* @return the default max oplog size limit in megabytes
*/
public static int getDefaultMaxOplogSizeLimit() {
@@ -411,9 +411,9 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
}
/**
- *
+ *
* Returns the default compaction oplog value
- *
+ *
* @return the default compaction oplog value
*/
public static boolean getDefaultRollOplogsValue() {
@@ -421,9 +421,9 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
}
/**
- *
+ *
* Gets the default max oplog size in megabytes
- *
+ *
* @return the default max oplog size in megabytes
*/
public static int getDefaultMaxOplogSize() {
@@ -432,7 +432,7 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
/**
* Returns a default instance of DiskWriteAttributes
- *
+ *
* @return the default DiskWriteAttributes instance
*/
public static DiskWriteAttributes getDefaultAsyncInstance() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
index 4d85578..f2d34f9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
@@ -139,7 +139,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateStub#putEntry(org.apache.geode
* .internal.cache.EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
*/
@@ -160,7 +160,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#putEntryOnRemote(org
* .apache.geode.internal.cache.EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long,
* boolean)
@@ -183,7 +183,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#destroyExistingEntry
* (org.apache.geode.internal.cache.EntryEventImpl, boolean, java.lang.Object)
*/
@@ -196,7 +196,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#destroyOnRemote(java .lang.Integer,
* org.apache.geode.internal.cache.EntryEventImpl, java.lang.Object)
*/
@@ -209,7 +209,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#invalidateExistingEntry
* (org.apache.geode.internal.cache.EntryEventImpl, boolean, boolean)
*/
@@ -223,7 +223,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#invalidateOnRemote
* (org.apache.geode.internal.cache.EntryEventImpl, boolean, boolean)
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXAdjunctCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXAdjunctCommitMessage.java
index 4899e1f..1f33685 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXAdjunctCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXAdjunctCommitMessage.java
@@ -17,7 +17,9 @@ package org.apache.geode.internal.cache;
import java.util.Collections;
import java.util.Iterator;
+
import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
index db9ca0b..5dc9e7e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
@@ -95,7 +95,7 @@ public class DistTXCommitMessage extends TXMessage {
if (txStateProxy != null) {
/*
* [DISTTX] TODO See how other exceptions are caught and send on wire, than throwing?
- *
+ *
* This can be spared since it will be programming bug
*/
if (!txStateProxy.isDistTx() || txStateProxy.isCreatedOnDistTxCoordinator()) {
@@ -169,7 +169,7 @@ public class DistTXCommitMessage extends TXMessage {
/**
* This message is used for the reply to a Dist Tx Phase Two commit operation: a commit from a
* stub to the tx host. This is the reply to a {@link DistTXCommitMessage}.
- *
+ *
*/
public static class DistTXCommitReplyMessage extends ReplyMessage {
private transient TXCommitMessage commitMessage;
@@ -198,7 +198,7 @@ public class DistTXCommitMessage extends TXMessage {
* Return the value from the get operation, serialize it bytes as late as possible to avoid
* making un-neccesary byte[] copies. De-serialize those same bytes as late as possible to avoid
* using precious threads (aka P2P readers).
- *
+ *
* @param recipient the origin VM that performed the get
* @param processorId the processor on which the origin thread is waiting
* @param val the raw value that will eventually be serialized
@@ -214,7 +214,7 @@ public class DistTXCommitMessage extends TXMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -269,9 +269,9 @@ public class DistTXCommitMessage extends TXMessage {
/**
* Reply processor which collects all CommitReplyExceptions for Dist Tx and emits a detailed
* failure exception if problems occur
- *
+ *
* @see TXCommitMessage.CommitReplyProcessor
- *
+ *
* [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
*/
public static class DistTxCommitReplyProcessor extends ReplyProcessor21 {
@@ -358,7 +358,7 @@ public class DistTXCommitMessage extends TXMessage {
/**
* An Exception that collects many remote CommitExceptions
- *
+ *
* @see TXCommitMessage.CommitExceptionCollectingException
*/
public static class DistTxCommitExceptionCollectingException extends ReplyException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
index 9550bd0..ee51eb9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
@@ -25,9 +25,9 @@ import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
/**
* [DISTTX] For Distributed Transaction
- *
+ *
* An entity that works as stub for DistTX on Coordinator.
- *
+ *
*/
public interface DistTXCoordinatorInterface extends TXStateInterface {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
index c298570..7762b99 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
/**
- *
+ *
*/
public class DistTXRollbackMessage extends TXMessage {
@@ -159,7 +159,7 @@ public class DistTXRollbackMessage extends TXMessage {
* Return the value from the get operation, serialize it bytes as late as possible to avoid
* making un-neccesary byte[] copies. De-serialize those same bytes as late as possible to avoid
* using precious threads (aka P2P readers).
- *
+ *
* @param recipient the origin VM that performed the get
* @param processorId the processor on which the origin thread is waiting
* @param val the raw value that will eventually be serialized
@@ -175,7 +175,7 @@ public class DistTXRollbackMessage extends TXMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -278,9 +278,9 @@ public class DistTXRollbackMessage extends TXMessage {
/**
* Reply processor which collects all CommitReplyExceptions for Dist Tx and emits a detailed
* failure exception if problems occur
- *
+ *
* @see TXCommitMessage.CommitReplyProcessor
- *
+ *
* [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
*/
public static class DistTxRollbackReplyProcessor extends ReplyProcessor21 {
@@ -367,7 +367,7 @@ public class DistTXRollbackMessage extends TXMessage {
/**
* An Exception that collects many remote CommitExceptions
- *
+ *
* @see TXCommitMessage.CommitExceptionCollectingException
*/
public static class DistTxRollbackExceptionCollectingException extends ReplyException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXState.java
index 8e2e618..92fa408 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXState.java
@@ -38,16 +38,16 @@ import org.apache.geode.internal.cache.TXEntryState.DistTxThinEntryState;
import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
import org.apache.geode.internal.cache.partitioned.RemoveAllPRMessage;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.internal.cache.tx.DistTxKeyInfo;
import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
+import org.apache.geode.internal.cache.tx.DistTxKeyInfo;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.offheap.annotations.Released;
/**
* TxState on a data node VM
- *
- *
+ *
+ *
*/
public class DistTXState extends TXState {
@@ -150,9 +150,9 @@ public class DistTXState extends TXState {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#commit()
- *
+ *
* Take Locks Does conflict check on primary ([DISTTX] TODO on primary only) Invoke TxWriter
*/
@Override
@@ -241,9 +241,9 @@ public class DistTXState extends TXState {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#commit()
- *
+ *
* Apply changes release locks
*/
@Override
@@ -313,7 +313,7 @@ public class DistTXState extends TXState {
/**
* this builds a new DistTXAdjunctCommitMessage and returns it
- *
+ *
* @return the new message
*/
protected TXCommitMessage buildMessageForAdjunctReceivers() {
@@ -355,10 +355,10 @@ public class DistTXState extends TXState {
}
/*
* Handle Put Operations meant for secondary.
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.PutMessage.
* operateOnPartitionedRegion(DistributionManager, PartitionedRegion, long)
- *
+ *
* [DISTTX] TODO need to handle other operations
*/
for (DistTxEntryEvent dtop : secondaryTransactionalOperations) {
@@ -418,11 +418,11 @@ public class DistTXState extends TXState {
/**
* Apply the individual tx op on secondary
- *
+ *
* Calls local function such as putEntry instead of putEntryOnRemote as for this
* {@link DistTXStateOnCoordinator} as events will always be local. In parent {@link DistTXState}
* class will call remote version of functions
- *
+ *
*/
protected boolean applyIndividualOp(DistTxEntryEvent dtop) throws DataLocationException {
boolean result = true;
@@ -471,7 +471,7 @@ public class DistTXState extends TXState {
/**
* For Dist Tx
- *
+ *
* @param updatingTxState if updating TxState during Commit Phase
*/
private void setUpdatingTxStateDuringPreCommit(boolean updatingTxState)
@@ -515,10 +515,10 @@ public class DistTXState extends TXState {
* [DISTTX] Note: This has been overridden here to associate DistKeyInfo with event to disable
* primary check(see DistKeyInfo.setCheckPrimary(false)) when this gets called on secondary of a
* PR
- *
+ *
* For TX this needs to be a PR passed in as region
- *
- *
+ *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#postPutAll(org.apache
* .gemfire.internal.cache.DistributedPutAllOperation, java.util.Map,
* org.apache.geode.internal.cache.LocalRegion)
@@ -626,7 +626,7 @@ public class DistTXState extends TXState {
* is set to null in @see TXManagerImpl.commit() and thus when basicDestroy will be
* called will be called as in i.e. @see LocalRegion.basicDestroy, they will not found a
* TxState with call for getDataView()
- *
+ *
* [DISTTX] TODO verify if this is correct to call destroyExistingEntry directly?
*/
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
index 4517eb8..dcfb456 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
@@ -28,8 +28,8 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* TxState on TX coordinator, created when coordinator is also a data node
- *
- *
+ *
+ *
*/
public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoordinatorInterface {
@@ -99,7 +99,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateStub#putEntry(org.apache.geode
* .internal.cache.EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
*/
@@ -126,7 +126,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#putEntryOnRemote(org
* .apache.geode.internal.cache.EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long,
* boolean)
@@ -154,7 +154,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#destroyExistingEntry
* (org.apache.geode.internal.cache.EntryEventImpl, boolean, java.lang.Object)
*/
@@ -173,7 +173,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#destroyOnRemote(java .lang.Integer,
* org.apache.geode.internal.cache.EntryEventImpl, java.lang.Object)
*/
@@ -192,7 +192,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#invalidateExistingEntry
* (org.apache.geode.internal.cache.EntryEventImpl, boolean, boolean)
*/
@@ -207,7 +207,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#invalidateOnRemote
* (org.apache.geode.internal.cache.EntryEventImpl, boolean, boolean)
*/
@@ -320,7 +320,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
/**
* {@inheritDoc}
- *
+ *
*/
@Override
protected boolean applyIndividualOp(DistTxEntryEvent dtop) throws DataLocationException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImpl.java
index c29d629..32f23ac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImpl.java
@@ -20,7 +20,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
*
*/
public abstract class DistTXStateProxyImpl extends TXStateProxyImpl {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
index aa40508..3d50fca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
@@ -20,9 +20,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.geode.cache.CommitConflictException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
index a2d2e9d..fb29e11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
@@ -97,14 +97,14 @@ public abstract class DistributedCacheOperation {
/**
* Deserialization policy: do not deserialize (for byte array, null or cases where the value
* should stay serialized)
- *
+ *
* @since GemFire 5.7
*/
public static final byte DESERIALIZATION_POLICY_NONE = (byte) 0;
/**
* Deserialization policy: deserialize lazily (for all other objects)
- *
+ *
* @since GemFire 5.7
*/
public static final byte DESERIALIZATION_POLICY_LAZY = (byte) 2;
@@ -184,7 +184,7 @@ public abstract class DistributedCacheOperation {
* Return true if this operation needs to check for reliable delivery. Return false if not.
* Currently the only case it doesn't need to be is a DestroyRegionOperation doing a "local"
* destroy.
- *
+ *
* @since GemFire 5.0
*/
boolean isOperationReliable() {
@@ -731,7 +731,7 @@ public abstract class DistributedCacheOperation {
/**
* Get the adjunct receivers for a partitioned region operation
- *
+ *
* @param br the PR bucket
* @param cacheOpReceivers the receivers of the CacheOperationMessage for this op
* @param twoMessages PR members that are creating the bucket and need both cache op and adjunct
@@ -884,21 +884,21 @@ public abstract class DistributedCacheOperation {
internalBeforePutOutgoing = beforePutOutgoing;
}
- public static abstract class CacheOperationMessage extends SerialDistributionMessage
+ public abstract static class CacheOperationMessage extends SerialDistributionMessage
implements MessageWithReply, DirectReplyMessage, OldValueImporter {
- protected final static short POSSIBLE_DUPLICATE_MASK = POS_DUP;
- protected final static short OLD_VALUE_MASK = DistributionMessage.UNRESERVED_FLAGS_START;
- protected final static short DIRECT_ACK_MASK = (OLD_VALUE_MASK << 1);
- protected final static short FILTER_INFO_MASK = (DIRECT_ACK_MASK << 1);
- protected final static short CALLBACK_ARG_MASK = (FILTER_INFO_MASK << 1);
- protected final static short DELTA_MASK = (CALLBACK_ARG_MASK << 1);
- protected final static short NEEDS_ROUTING_MASK = (DELTA_MASK << 1);
- protected final static short VERSION_TAG_MASK = (NEEDS_ROUTING_MASK << 1);
- protected final static short PERSISTENT_TAG_MASK = (VERSION_TAG_MASK << 1);
- protected final static short UNRESERVED_FLAGS_START = (PERSISTENT_TAG_MASK << 1);
+ protected static final short POSSIBLE_DUPLICATE_MASK = POS_DUP;
+ protected static final short OLD_VALUE_MASK = DistributionMessage.UNRESERVED_FLAGS_START;
+ protected static final short DIRECT_ACK_MASK = (OLD_VALUE_MASK << 1);
+ protected static final short FILTER_INFO_MASK = (DIRECT_ACK_MASK << 1);
+ protected static final short CALLBACK_ARG_MASK = (FILTER_INFO_MASK << 1);
+ protected static final short DELTA_MASK = (CALLBACK_ARG_MASK << 1);
+ protected static final short NEEDS_ROUTING_MASK = (DELTA_MASK << 1);
+ protected static final short VERSION_TAG_MASK = (NEEDS_ROUTING_MASK << 1);
+ protected static final short PERSISTENT_TAG_MASK = (VERSION_TAG_MASK << 1);
+ protected static final short UNRESERVED_FLAGS_START = (PERSISTENT_TAG_MASK << 1);
- private final static int INHIBIT_NOTIFICATIONS_MASK = 0x400;
+ private static final int INHIBIT_NOTIFICATIONS_MASK = 0x400;
public boolean needsRouting;
@@ -981,7 +981,7 @@ public abstract class DistributedCacheOperation {
/**
* process a reply
- *
+ *
* @return true if the reply-processor should continue to process this response
*/
boolean processReply(ReplyMessage reply, CacheOperationReplyProcessor processor) {
@@ -993,7 +993,7 @@ public abstract class DistributedCacheOperation {
/**
* Add the cache event's old value to this message. We must propagate the old value when the
* receiver is doing GII and has listeners (CQs) that require the old value.
- *
+ *
* @since GemFire 5.5
* @param event the entry event that contains the old value
*/
@@ -1010,7 +1010,7 @@ public abstract class DistributedCacheOperation {
/**
* Insert this message's oldValue into the given event. This fixes bug 38382 by propagating old
* values with Entry level CacheOperationMessages during initial image transfer
- *
+ *
* @since GemFire 5.5
*/
public void setOldValueInEvent(EntryEventImpl event) {
@@ -1029,7 +1029,7 @@ public abstract class DistributedCacheOperation {
/**
* Sets a flag in the message indicating that this message contains delta bytes.
- *
+ *
* @since GemFire 6.1
*/
protected void setHasDelta(boolean flag) {
@@ -1261,7 +1261,7 @@ public abstract class DistributedCacheOperation {
* Ensure that a version tag has been recorded in the region's version vector. This makes note
* that the event has been received and processed but probably didn't affect the cache's state
* or it would have been recorded earlier.
- *
+ *
* @param tag the version information
* @param r the affected region
*/
@@ -1535,7 +1535,7 @@ public abstract class DistributedCacheOperation {
}
/** Custom subclass that keeps all ReplyExceptions */
- static private class ReliableCacheReplyProcessor extends CacheOperationReplyProcessor {
+ private static class ReliableCacheReplyProcessor extends CacheOperationReplyProcessor {
private final Set failedMembers;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
index b00612a..a1e79b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
@@ -32,8 +32,8 @@ import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionTag;
/**
- *
- *
+ *
+ *
*/
public class DistributedClearOperation extends DistributedCacheOperation {
public static enum OperationType {
@@ -74,7 +74,7 @@ public class DistributedClearOperation extends DistributedCacheOperation {
/**
* obtain locks on version generation in other members have them do a state-flush back to this
* member
- *
+ *
* @param recipients
*/
public static void lockAndFlushToOthers(RegionEventImpl regionEvent,
@@ -112,7 +112,7 @@ public class DistributedClearOperation extends DistributedCacheOperation {
/**
* Creates new instance of DistributedClearOperation
- *
+ *
* @param recipients
*/
private DistributedClearOperation(OperationType op, RegionEventImpl event,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index 37a6703..9b3effd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.Externalizable;
@@ -29,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
@@ -63,7 +62,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
/**
* Handles distribution of a Region.putall operation.
- *
+ *
* @since GemFire 5.0
*/
public class DistributedPutAllOperation extends AbstractUpdateOperation {
@@ -633,7 +632,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
* from a server may have null IDs because they were operations performed by that server. We
* transmit them as nulls to cut costs, but have to do the swap on the receiving end (in the
* client)
- *
+ *
* @param sender
*/
public void replaceNullIDs(DistributedMember sender) {
@@ -828,7 +827,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
/**
* Create PutAllPRMessage for notify only (to adjunct nodes)
- *
+ *
* @param bucketId create message to send to this bucket
* @return PutAllPRMessage
*/
@@ -850,7 +849,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
/**
* Create PutAllPRMessages for primary buckets out of dpao
- *
+ *
* @return a HashMap contain PutAllPRMessages, key is bucket id
*/
public HashMap createPRMessages() {
@@ -1017,7 +1016,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
/**
* version tags are gathered from local operations and remote operation responses. This method
* gathers all of them and stores them in the given list.
- *
+ *
* @param list
*/
protected void fillVersionedObjectList(VersionedObjectList list) {
@@ -1085,7 +1084,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
/**
* Does the "put" of one entry for a "putall" operation. Note it calls back to
* AbstractUpdateOperation.UpdateMessage#basicOperationOnRegion
- *
+ *
* @param entry the entry being put
* @param rgn the region the entry is put in
*/
@@ -1109,7 +1108,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
/**
* create an event for a PutAllEntryData element
- *
+ *
* @param entry
* @param sender
* @param context
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index c2fdb9b..0d64f36 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -268,7 +268,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Record the event state from image provider
- *
+ *
* @param provider the member that provided the initial image and event state
*/
protected void recordEventStateFromImageProvider(InternalDistributedMember provider) {
@@ -277,7 +277,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Intended for used during construction of a DistributedRegion
- *
+ *
* @return the advisor to be used by the region
*/
protected CacheDistributionAdvisor createDistributionAdvisor(
@@ -583,7 +583,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Throws RegionAccessException if required roles are missing and the LossAction is NO_ACCESS
- *
+ *
* @throws RegionAccessException if required roles are missing and the LossAction is NO_ACCESS
*/
@Override
@@ -606,7 +606,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Throws RegionAccessException is required roles are missing and the LossAction is either
* NO_ACCESS or LIMITED_ACCESS.
- *
+ *
* @throws RegionAccessException if required roles are missing and the LossAction is either
* NO_ACCESS or LIMITED_ACCESS
*/
@@ -677,7 +677,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
* Called when we do a distributed operation and don't have anyone to distributed it too. Since
* this is only called when no distribution was done (i.e. no recipients) we do not check
* isMissingRequiredRoles because it might not longer be true due to race conditions
- *
+ *
* @return false if this region has at least one required role and queuing is configured. Returns
* true if sending to no one is ok.
* @throws RoleException if a required role is missing and the LossAction is either NO_ACCESS or
@@ -698,7 +698,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* returns true if this Region does not distribute its operations to other members.
- *
+ *
* @since GemFire 6.0
* @see HARegion#localDestroyNoCallbacks(Object)
*/
@@ -741,7 +741,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Performs the resumption action when reliability is resumed.
- *
+ *
* @return true if asynchronous resumption is triggered
*/
private boolean resumeReliability(InternalDistributedMember id, Set newlyAcquiredRoles) {
@@ -840,7 +840,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Called when reliability is lost. If MembershipAttributes are configured with
* {@link LossAction#RECONNECT}then DistributedSystem reconnect will be called asynchronously.
- *
+ *
* @return true if asynchronous resumption is triggered
*/
private boolean lostReliability(final InternalDistributedMember id, final Set newlyMissingRoles) {
@@ -1016,7 +1016,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Called while NOT holding lock on parent's subregions
- *
+ *
* @throws IllegalStateException if region is not compatible with a region in another VM.
*/
@Override
@@ -1676,7 +1676,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* decide if InvalidateRegionOperation should be sent to peers. broken out so that BucketRegion
* can override
- *
+ *
* @return true if {@link InvalidateRegionOperation} should be distributed, false otherwise
*/
protected boolean shouldDistributeInvalidateRegion(RegionEventImpl event) {
@@ -1686,7 +1686,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Distribute the invalidate of a region given its event. This implementation sends the invalidate
* to peers.
- *
+ *
* @since GemFire 5.7
*/
protected void distributeInvalidateRegion(RegionEventImpl event) {
@@ -2700,9 +2700,9 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* If this region's scope is GLOBAL, get a distributed lock on the given key, and return the Lock.
* The sender is responsible for unlocking.
- *
+ *
* @return the acquired Lock if the region is GLOBAL, otherwise null.
- *
+ *
* @throws NullPointerException if key is null
*/
private Lock getDistributedLockIfGlobal(Object key) throws TimeoutException {
@@ -2753,7 +2753,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Checks if the entry is a valid entry
- *
+ *
* @return true if entry not null or entry is not removed
*/
protected boolean checkEntryNotValid(RegionEntry mapEntry) {
@@ -3185,7 +3185,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* If this region's scope is GLOBAL, get the region distributed lock. The sender is responsible
* for unlocking.
- *
+ *
* @return the acquired Lock if the region is GLOBAL and not already suspend, otherwise null.
*/
private Lock getRegionDistributedLockIfGlobal() throws TimeoutException {
@@ -3201,7 +3201,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Distribute the PutAllOp. This implementation distributes it to peers.
- *
+ *
* @return token >0 means startOperation finished distribution
* @since GemFire 5.7
*/
@@ -3259,7 +3259,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Returns the missing required roles after waiting up to the timeout
- *
+ *
* @throws IllegalStateException if region is not configured with required roles
*/
public Set waitForRequiredRoles(long timeout) throws InterruptedException {
@@ -3379,7 +3379,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Used to get membership events from our advisor to implement RegionMembershipListener
* invocations.
- *
+ *
* @since GemFire 5.0
*/
protected class AdvisorListener implements MembershipListener {
@@ -3537,7 +3537,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Used to bootstrap txState.
- *
+ *
* @return member with primary bucket for partitionedRegions
*/
@Override
@@ -3584,7 +3584,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
* Execute the provided named function in all locations that contain the given keys. So function
* can be executed on just one fabric node, executed in parallel on a subset of nodes in parallel
* across all the nodes.
- *
+ *
* @since GemFire 5.8
*/
@Override
@@ -3826,7 +3826,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
/**
* Fetch Version for the given key from a remote replicate member.
- *
+ *
* @throws EntryNotFoundException if the entry is not found on replicate member
* @return VersionTag for the key
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
index a01e613..766e252 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -281,7 +281,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
/**
* check to see if the distributed system is closing
- *
+ *
* @return true if the distributed system is closing
*/
private boolean checkDSClosing(DistributionManager dm) {
@@ -405,7 +405,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TransactionMessage#canStartRemoteTransaction()
*/
public boolean canStartRemoteTransaction() {
@@ -414,7 +414,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TransactionMessage#getTXUniqId()
*/
public int getTXUniqId() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 8ea4f97..b4b40dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -22,6 +22,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.cache.DataPolicy;
@@ -51,13 +53,12 @@ import org.apache.geode.internal.logging.LogService;
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.logging.log4j.Logger;
/**
* Handles distribution of a Region.removeAll operation.
*
* TODO: extend DistributedCacheOperation instead of AbstractUpdateOperation
- *
+ *
* @since GemFire 8.1
*/
public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
@@ -605,7 +606,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
/**
* Create RemoveAllPRMessage for notify only (to adjunct nodes)
- *
+ *
* @param bucketId create message to send to this bucket
* @return RemoveAllPRMessage
*/
@@ -627,7 +628,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
/**
* Create RemoveAllPRMessages for primary buckets out of this op
- *
+ *
* @return a HashMap contain RemoveAllPRMessages, key is bucket id
*/
public HashMap<Integer, RemoveAllPRMessage> createPRMessages() {
@@ -794,7 +795,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
/**
* version tags are gathered from local operations and remote operation responses. This method
* gathers all of them and stores them in the given list.
- *
+ *
* @param list
*/
protected void fillVersionedObjectList(VersionedObjectList list) {
@@ -865,7 +866,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
/**
* Does the "remove" of one entry for a "removeAll" operation. Note it calls back to
* AbstractUpdateOperation.UpdateMessage#basicOperationOnRegion
- *
+ *
* @param entry the entry being removed
* @param rgn the region the entry is removed from
*/
@@ -902,7 +903,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
/**
* create an event for a RemoveAllEntryData element
- *
+ *
* @param entry
* @param sender
* @param context
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
index e19e771..09be32d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.internal.cache;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.BufferUnderflowException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.CacheEvent;
@@ -25,17 +33,9 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.SerializationVersions;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataSerializable;
+import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.VersionSource;
-import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.BufferUnderflowException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
/**
*
@@ -89,7 +89,7 @@ public class DistributedTombstoneOperation extends DistributedCacheOperation {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.DistributedCacheOperation#getLocalFilterRouting(org.apache.
* geode.internal.cache.FilterRoutingInfo)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DynamicRegionFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DynamicRegionFactoryImpl.java
index 81bb7fb..259db0e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DynamicRegionFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DynamicRegionFactoryImpl.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.DynamicRegionFactory;
/**
* This class provides non-published methods that allow the cache to initialize and close the
* factory.
- *
+ *
* @since GemFire 4.3
*/
public class DynamicRegionFactoryImpl extends DynamicRegionFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
index cb3ec00..28ce183 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
@@ -16,12 +16,12 @@
package org.apache.geode.internal.cache;
import java.util.*;
-import org.apache.geode.cache.*;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentMap;
+
+import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
/**
* Interface for accessing extended features of a ConcurrentMap used for the entries of a Region.
@@ -77,7 +77,7 @@ public interface EntriesMap extends ConcurrentMap {
/**
* Returns the value of an entry as it resides in the VM.
- *
+ *
* @return the value or EntryEvent.NOT_AVAILABLE token if it's not in the VM or null if the entry
* doesn't exist.
*
@@ -118,7 +118,7 @@ public interface EntriesMap extends ConcurrentMap {
/**
* Gets the value for this entry. For DiskRegions, faults in value and returns it
- *
+ *
* @param map the map this entry came from
*/
Object getValue(EntriesMap map);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 599c76d..533eb32 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -17,6 +17,15 @@ package org.apache.geode.internal.cache;
import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.function.Function;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CopyHelper;
import org.apache.geode.DataSerializer;
import org.apache.geode.DeltaSerializationException;
@@ -76,14 +85,6 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
-import org.apache.logging.log4j.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.function.Function;
/**
* Implementation of an entry event
@@ -181,7 +182,7 @@ public class EntryEventImpl
private transient boolean isPendingSecondaryExpireDestroy = false;
- public final static Object SUSPECT_TOKEN = new Object();
+ public static final Object SUSPECT_TOKEN = new Object();
public EntryEventImpl() {
// do nothing
@@ -359,9 +360,9 @@ public class EntryEventImpl
/**
* Creates and returns an EntryEventImpl. Generates and assigns a bucket id to the EntryEventImpl
* if the region parameter is a PartitionedRegion.
- *
+ *
* Called by BridgeEntryEventImpl to use existing EventID
- *
+ *
* {@link EntryEventImpl#EntryEventImpl(LocalRegion, Operation, Object, Object, Object, boolean, DistributedMember, boolean, EventID)}
*/
@Retained
@@ -376,7 +377,7 @@ public class EntryEventImpl
/**
* Creates and returns an EntryEventImpl. Generates and assigns a bucket id to the EntryEventImpl
* if the region parameter is a PartitionedRegion.
- *
+ *
* {@link EntryEventImpl#EntryEventImpl(LocalRegion, Operation, Object, boolean, DistributedMember, boolean, boolean)}
*/
@Retained
@@ -390,10 +391,10 @@ public class EntryEventImpl
/**
* Creates and returns an EntryEventImpl. Generates and assigns a bucket id to the EntryEventImpl
* if the region parameter is a PartitionedRegion.
- *
+ *
* This creator does not specify the oldValue as this will be filled in later as part of an
* operation on the region, or lets it default to null.
- *
+ *
* {@link EntryEventImpl#EntryEventImpl(LocalRegion, Operation, Object, Object, Object, boolean, DistributedMember, boolean, boolean)}
*/
@Retained
@@ -668,7 +669,7 @@ public class EntryEventImpl
/**
* Return the event id, if any
- *
+ *
* @return null if no event id has been set
*/
public EventID getEventId() {
@@ -853,7 +854,7 @@ public class EntryEventImpl
/**
* Note if v might be an off-heap reference that you did not retain for this EntryEventImpl then
* call retainsAndSetOldValue instead of this method.
- *
+ *
* @param v the caller should have already retained this off-heap reference.
*/
@Released(ENTRY_EVENT_OLD_VALUE)
@@ -947,7 +948,7 @@ public class EntryEventImpl
/**
* Added this function to expose isCopyOnRead function to the child classes of EntryEventImpl
- *
+ *
*/
protected boolean isRegionCopyOnRead() {
return getRegion().isCopyOnRead();
@@ -992,7 +993,7 @@ public class EntryEventImpl
/**
* Invoke the given function with a lock if the given value is offheap.
- *
+ *
* @return the value returned from invoking the function
*/
private <T, R> R callWithOffHeapLock(T value, Function<T, R> function) {
@@ -1086,7 +1087,7 @@ public class EntryEventImpl
/**
* Returns the value of the EntryEventImpl field. This is for internal use only. Customers should
* always call {@link #getCallbackArgument}
- *
+ *
* @since GemFire 5.5
*/
public Object getRawCallbackArgument() {
@@ -1140,7 +1141,7 @@ public class EntryEventImpl
/**
* Implement this interface if you want to call {@link #exportNewValue}.
- *
+ *
*
*/
public interface NewValueImporter {
@@ -1153,14 +1154,14 @@ public class EntryEventImpl
* Only return true if the importer can use the value before the event that exported it is
* released. If false is returned then off-heap values will be copied to the heap for the
* importer.
- *
+ *
* @return true if the importer can deal with the value being an unretained OFF_HEAP_REFERENCE.
*/
boolean isUnretainedNewReferenceOk();
/**
* Import a new value that is currently in object form.
- *
+ *
* @param nv the new value to import; unretained if isUnretainedNewReferenceOk returns true
* @param isSerialized true if the imported new value represents data that needs to be
* serialized; false if the imported new value is a simple sequence of bytes.
@@ -1169,7 +1170,7 @@ public class EntryEventImpl
/**
* Import a new value that is currently in byte array form.
- *
+ *
* @param nv the new value to import
* @param isSerialized true if the imported new value represents data that needs to be
* serialized; false if the imported new value is a simple sequence of bytes.
@@ -1226,7 +1227,7 @@ public class EntryEventImpl
/**
* Implement this interface if you want to call {@link #exportOldValue}.
- *
+ *
*
*/
public interface OldValueImporter {
@@ -1238,7 +1239,7 @@ public class EntryEventImpl
/**
* Only return true if the importer can use the value before the event that exported it is
* released.
- *
+ *
* @return true if the importer can deal with the value being an unretained OFF_HEAP_REFERENCE.
*/
boolean isUnretainedOldReferenceOk();
@@ -1252,7 +1253,7 @@ public class EntryEventImpl
/**
* Import an old value that is currently in object form.
- *
+ *
* @param ov the old value to import; unretained if isUnretainedOldReferenceOk returns true
* @param isSerialized true if the imported old value represents data that needs to be
* serialized; false if the imported old value is a simple sequence of bytes.
@@ -1261,7 +1262,7 @@ public class EntryEventImpl
/**
* Import an old value that is currently in byte array form.
- *
+ *
* @param ov the old value to import
* @param isSerialized true if the imported old value represents data that needs to be
* serialized; false if the imported old value is a simple sequence of bytes.
@@ -1321,7 +1322,7 @@ public class EntryEventImpl
/**
* If the new value is stored off-heap return a retained OFF_HEAP_REFERENCE (caller must release).
- *
+ *
* @return a retained OFF_HEAP_REFERENCE if the new value is off-heap; otherwise returns null
*/
@Retained(ENTRY_EVENT_NEW_VALUE)
@@ -1331,7 +1332,7 @@ public class EntryEventImpl
/**
* If the old value is stored off-heap return a retained OFF_HEAP_REFERENCE (caller must release).
- *
+ *
* @return a retained OFF_HEAP_REFERENCE if the old value is off-heap; otherwise returns null
*/
@Retained(ENTRY_EVENT_OLD_VALUE)
@@ -1383,7 +1384,7 @@ public class EntryEventImpl
/**
* Forces this entry's new value to be in serialized form.
- *
+ *
* @since GemFire 5.0.2
*/
public void makeSerializedNewValue() {
@@ -1485,7 +1486,7 @@ public class EntryEventImpl
/**
* Put a newValue into the given, write synced, existing, region entry. Sets oldValue in event if
* hasn't been set yet.
- *
+ *
* @param oldValueForDelta Used by Delta Propagation feature
*/
void putExistingEntry(final LocalRegion owner, final RegionEntry reentry, boolean requireOldValue,
@@ -1981,7 +1982,7 @@ public class EntryEventImpl
* Serialize an object into a <code>byte[]</code> . If the byte array provided by the wrapper is
* sufficient to hold the data, it is used otherwise a new byte array gets created & its reference
* is stored in the wrapper. The User Bit is also appropriately set as Serialized
- *
+ *
* @param wrapper Object of type BytesAndBitsForCompactor which is used to fetch the serialized
* data. The byte array of the wrapper is used if possible else a the new byte array
* containing the data is set in the wrapper.
@@ -2150,7 +2151,7 @@ public class EntryEventImpl
DataSerializer.writeLong(tailKey, out);
}
- private static abstract class EventFlags {
+ private abstract static class EventFlags {
private static final short FLAG_ORIGIN_REMOTE = 0x01;
// localInvalid: true if a null new value should be treated as a local
// invalid.
@@ -2289,7 +2290,7 @@ public class EntryEventImpl
/**
* dispatch listener events for this event
- *
+ *
* @param notifyGateways pass the event on to WAN queues
*/
public void invokeCallbacks(InternalRegion rgn, boolean skipListeners, boolean notifyGateways) {
@@ -2323,7 +2324,7 @@ public class EntryEventImpl
/**
* Used to store next region version generated for a change on this entry by phase-1 commit on the
* primary.
- *
+ *
* Not to be used in fromData and toData
*/
protected transient long nextRegionVersion = -1L;
@@ -2338,7 +2339,7 @@ public class EntryEventImpl
/**
* Return true if this event came from a server by the client doing a get.
- *
+ *
* @since GemFire 5.7
*/
public boolean isFromServer() {
@@ -2349,7 +2350,7 @@ public class EntryEventImpl
* Sets the fromServer flag to v. This must be set to true if an event comes from a server while
* the affected region entry is not locked. Among other things it causes version conflict checks
* to be performed to protect against overwriting a newer version of the entry.
- *
+ *
* @since GemFire 5.7
*/
public void setFromServer(boolean v) {
@@ -2359,7 +2360,7 @@ public class EntryEventImpl
/**
* If true, the region associated with this event had already applied the operation it
* encapsulates when an attempt was made to apply the event.
- *
+ *
* @return the possibleDuplicate
*/
public boolean isPossibleDuplicate() {
@@ -2369,7 +2370,7 @@ public class EntryEventImpl
/**
* If the operation encapsulated by this event has already been seen by the region to which it
* pertains, this flag should be set to true.
- *
+ *
* @param possibleDuplicate the possibleDuplicate to set
*/
public void setPossibleDuplicate(boolean possibleDuplicate) {
@@ -2418,7 +2419,7 @@ public class EntryEventImpl
/**
* This method returns the delta bytes used in Delta Propagation feature. <B>For internal delta,
* see getRawNewValue().</B>
- *
+ *
* @return delta bytes
*/
public byte[] getDeltaBytes() {
@@ -2503,7 +2504,7 @@ public class EntryEventImpl
/**
* this method joins together version tag timestamps and the "lastModified" timestamps generated
* and stored in entries. If a change does not already carry a lastModified timestamp
- *
+ *
* @return the timestamp to store in the entry
*/
public long getEventTime(long suggestedTime) {
@@ -2683,7 +2684,7 @@ public class EntryEventImpl
/**
* Returns whether this event is on the PDX type region.
- *
+ *
* @return whether this event is on the PDX type region
*/
public boolean isOnPdxTypeRegion() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 294f221..3ed9d09 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -19,15 +19,16 @@ package org.apache.geode.internal.cache;
* EntryExpiryTask represents a timeout event for a region entry.
*/
+import java.util.concurrent.locks.Lock;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.offheap.annotations.Released;
-import org.apache.logging.log4j.Logger;
-
-import java.util.concurrent.locks.Lock;
public class EntryExpiryTask extends ExpiryTask {
@@ -68,7 +69,7 @@ public class EntryExpiryTask extends ExpiryTask {
/**
* Returns the tasks region entry if it "checks" out. The check is to see if the region entry
* still exists.
- *
+ *
* @throws EntryNotFoundException if the task no longer has a region entry or if the region entry
* it has is removed.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryOperationImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryOperationImpl.java
index d515ab5..5db3866 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryOperationImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryOperationImpl.java
@@ -19,11 +19,11 @@ import org.apache.geode.cache.Operation;
import org.apache.geode.cache.Region;
/**
- *
+ *
* Gemfire Context passed to <code>PartitionResolver</code> to compute the data location
- *
+ *
* @since GemFire 5.8
- *
+ *
*/
public class EntryOperationImpl implements EntryOperation {
@@ -49,7 +49,7 @@ public class EntryOperationImpl implements EntryOperation {
/**
* Returns the region to which this cached object belongs or the region that raised this event for
* <code>RegionEvent</code>s.
- *
+ *
* @return the region associated with this object or the region that raised this event.
*/
public Region getRegion() {
@@ -58,7 +58,7 @@ public class EntryOperationImpl implements EntryOperation {
/**
* Return a description of the operation that triggered this event.
- *
+ *
* @return the operation that triggered this event.
* @since GemFire 5.8Beta
*/
@@ -68,7 +68,7 @@ public class EntryOperationImpl implements EntryOperation {
/**
* Returns the key.
- *
+ *
* @return the key
*/
public Object getKey() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java
index 00e9c67..794a938 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A Region.Entry implementation for remote entries and all PR entries
- *
+ *
* @since GemFire 5.1
*/
public class EntrySnapshot implements Region.Entry, DataSerializable {
@@ -52,7 +52,7 @@ public class EntrySnapshot implements Region.Entry, DataSerializable {
/**
* creates a new Entry that wraps the given RegionEntry object for the given storage Region
- *
+ *
* @param allowTombstones TODO
*/
public EntrySnapshot(RegionEntry regionEntry, LocalRegion dataRegion, LocalRegion region,
@@ -77,7 +77,7 @@ public class EntrySnapshot implements Region.Entry, DataSerializable {
/**
* Used by unit tests. Only available on PR. If, at the time this entry was created, it was
* initialized from a local data store then this method returns true.
- *
+ *
* @since GemFire 6.0
*/
public boolean wasInitiallyLocal() {
@@ -132,7 +132,7 @@ public class EntrySnapshot implements Region.Entry, DataSerializable {
/**
* Makes a copy, if copy-on-get is enabled, of the specified object.
- *
+ *
* @since GemFire 4.0
*/
private Object conditionalCopy(Object o) {
@@ -206,7 +206,7 @@ public class EntrySnapshot implements Region.Entry, DataSerializable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Region.Entry#isLocal()
*/
public boolean isLocal() {
@@ -228,7 +228,7 @@ public class EntrySnapshot implements Region.Entry, DataSerializable {
/**
* get the underlying RegionEntry object, which will not be fully functional if isLocal() returns
* false
- *
+ *
* @return the underlying RegionEntry for this Entry
*/
public RegionEntry getRegionEntry() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java
index 1b36d9c..a754635 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java
@@ -33,7 +33,7 @@ public abstract class EnumListenerEvent {
/**
* Invoke the correct listener method for this event.
- *
+ *
* @since GemFire 5.0
*/
public abstract void dispatchEvent(CacheEvent event, CacheListener listener);
@@ -386,9 +386,9 @@ public abstract class EnumListenerEvent {
}
/**
- *
+ *
* This method returns the EnumListenerEvent object corresponding to the cCode given.
- *
+ *
* The mapping of cCode to EnumListenerEvent is :
* <ul>
* <li>1 - AFTER_CREATE
@@ -409,7 +409,7 @@ public abstract class EnumListenerEvent {
* <li>16 - AFTER_REGISTER_DATASERIALIZER
* <li>17 - AFTER_TOMBSTONE_EXPIRATION
* </ul>
- *
+ *
* @param eventCode the eventCode corresponding to the EnumListenerEvent object desired
* @return the EnumListenerEvent object corresponding to the cCode
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
index 4833ea1..9208963 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
@@ -27,7 +27,6 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.geode.internal.InternalDataSerializer;
import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
@@ -38,6 +37,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.cache.ha.HARegionQueue;
@@ -99,7 +99,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* the distributed system associated with the static client_side_event_identity
*/
- private volatile static DistributedSystem system = null;
+ private static volatile DistributedSystem system = null;
/**
* the membership id of the distributed system in this client (if running in a client) that is
@@ -110,7 +110,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* this form of client ID is used in event identifiers to reduce the size of the ID
*/
- private volatile static byte[] client_side_event_identity = null;
+ private static volatile byte[] client_side_event_identity = null;
/**
* An array containing the helper class objects which are used to create optimized byte array for
@@ -142,7 +142,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* constructor for creating an event ID originating in the local cache
- *
+ *
* @param sys the local distributed system
*/
public EventID(DistributedSystem sys) {
@@ -159,7 +159,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Convert a ClientProxyMembershipID distribted member ID array into one usable by EventIDs
- *
+ *
* @param client the client's ID
* @return a byte array that may be used in EventID formation
*/
@@ -177,7 +177,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Returns the thread id used by the calling thread for its event ids
- *
+ *
* @since GemFire 5.7
*/
public static long getThreadId() {
@@ -188,7 +188,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Returns the next reservable sequence id used by the calling thread for its event ids. Note that
* the returned id is not yet reserved by the calling thread.
- *
+ *
* @since GemFire 5.7
*/
public static long getSequenceId() {
@@ -198,7 +198,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Reserves and returns a sequence id for the calling thread to be used for an event id.
- *
+ *
* @since GemFire 5.7
*/
public static long reserveSequenceId() {
@@ -227,7 +227,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
* seq. ids. This is used by the QRM thread and by ServerConnection threads that have cached their
* client ID byte arrays. It is also used by many unit test methods to create fake event
* identifiers.
- *
+ *
* @param memId - membership id for this entry - must be created by EventID.getMembershipID()
* @param threadId - thread id for this entry
* @param seqId - sequence id for this entry
@@ -264,7 +264,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Default constructor used for deserialization of EventID object
- *
+ *
*/
public EventID() {}
@@ -288,7 +288,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
* starting in v6.5 this method returns a somewhat crippled Identifier. It is missing any durable
* attributes and roles information but contains all other info about the member. This fixes bug
* #39361.
- *
+ *
* @return the member that initiated this event
*/
public InternalDistributedMember getDistributedMember() {
@@ -327,7 +327,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Returns a byte[] whose contents are calculated by calling
* {@link #getOptimizedByteArrayForEventID}
- *
+ *
* @since GemFire 5.7
*/
public byte[] calcBytes() {
@@ -422,7 +422,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* check to see if membership ID byte arrays are equal
*/
- static public boolean equalMembershipIds(byte[] m1, byte[] m2) {
+ public static boolean equalMembershipIds(byte[] m1, byte[] m2) {
int sizeDifference = Math.abs(m1.length - m2.length);
if (sizeDifference != 0 && sizeDifference != NULL_90_MEMBER_DATA_LENGTH) {
return false;
@@ -444,7 +444,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* GEODE-3072 - v1.0.0 memberIDs in EventIDs may have trailing bytes that should be ignored
*/
- static private boolean nullUUIDCheck(byte[] memberID, int position) {
+ private static boolean nullUUIDCheck(byte[] memberID, int position) {
if (position < 0) {
return false;
}
@@ -462,7 +462,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* form the hashcode for the memberID byte array
*/
- static public int hashCodeMemberId(byte[] memberID) {
+ public static int hashCodeMemberId(byte[] memberID) {
if (memberID.length < (NULL_90_MEMBER_DATA_LENGTH + MINIMIM_ID_LENGTH)
|| !nullUUIDCheck(memberID, memberID.length - NULL_90_MEMBER_DATA_LENGTH)) {
return Arrays.hashCode(memberID);
@@ -574,7 +574,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Returns the number of bytes needed to store the given value. This calculation is needed to
* create the optimized byte-array for an eventId, which will be sent across the network
- *
+ *
* @param id - the long value ( threadId or sequenceId in this context)
* @return - the number of byte taken by this value
*/
@@ -602,7 +602,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
* This function returns the optimal byte-array for the eventId.
* <p>
* This is public for unit testing purposes only
- *
+ *
* @param threadId - the long value of threadId
* @param sequenceId - the long value of sequenceId
* @return - the optimized byte-array representing the eventId
@@ -627,7 +627,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
* Reads the optimized byte-array representation of an eventId and returns the long value of
* threadId or sequenceId ( the first invocation of this method on bytebuffer returns the threadId
* and the second returns the sequenceId.
- *
+ *
* @param buffer - the byte-buffer wrapping the optimized byte-array for the eventId
* @return - long value of threadId or sequenceId
*/
@@ -641,14 +641,14 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Abstract helper class used to create optimized byte-array for the eventid, which will be sent
* across the network.
- *
+ *
*/
- protected static abstract class AbstractEventIDByteArrayFiller {
+ protected abstract static class AbstractEventIDByteArrayFiller {
/**
* This method adds to the byte-buffer, the token indicating the type of the passed 'id'
* (threadId or sequenceId) and the optimal byte array representing the id depending on the
* value of the 'id'.
- *
+ *
* @param buffer - the byte buffer wrapping the byte array for the event id
* @param id - the long value of threadId or sequenceId
*/
@@ -656,7 +656,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Reads the given buffer and returns the value as long.
- *
+ *
* @param buffer - the byte-buffer containing the eventId parts which needs to be read
* @return - the long value of id (threadId or sequenceId).
*/
@@ -667,12 +667,12 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* The token to indicate that given id ( threadId or sequenceId) is of type <code>Byte</code>
*/
- static private final byte EVENTID_BYTE = 0;
+ private static final byte EVENTID_BYTE = 0;
/**
* Writes the given 'id' to the given buffer as 'byte' preceeded by a token indicating that it
* is written as 'byte' type.
- *
+ *
* @param buffer - the buffer in which id is to be written
* @param id - the threadId or sequenceId to be written
*/
@@ -684,10 +684,10 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Reads the byte value of id from the buffer and returns it as long.
- *
+ *
* @param buffer - the buffer from which 'id'(threadId or sequenceId) is to be read
* @return - the value of the id as long
- *
+ *
*/
@Override
public long read(ByteBuffer buffer) {
@@ -701,12 +701,12 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* The token to indicate that given id ( threadId or sequenceId) is of type <code>Short</code>
*/
- static private final byte EVENTID_SHORT = 1;
+ private static final byte EVENTID_SHORT = 1;
/**
* Writes the given 'id' to the given buffer as 'short' preceeded by a token indicating that it
* is written as 'short' type.
- *
+ *
* @param buffer - the buffer in which id is to be written
* @param id - the threadId or sequenceId to be written
*/
@@ -718,10 +718,10 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Reads the short value of id from the buffer and returns it as long.
- *
+ *
* @param buffer - the buffer from which 'id'(threadId or sequenceId) is to be read
* @return - the value of the id as long
- *
+ *
*/
@Override
public long read(ByteBuffer buffer) {
@@ -734,12 +734,12 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* The token to indicate that given id ( threadId or sequenceId) is of type <code>Integer</code>
*/
- static private final byte EVENTID_INT = 2;
+ private static final byte EVENTID_INT = 2;
/**
* Writes the given 'id' to the given buffer as 'int' preceeded by a token indicating that it is
* written as 'int' type.
- *
+ *
* @param buffer - the buffer in which id is to be written
* @param id - the threadId or sequenceId to be written
*/
@@ -751,10 +751,10 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Reads the int value of id from the buffer and returns it as long.
- *
+ *
* @param buffer - the buffer from which 'id'(threadId or sequenceId) is to be read
* @return - the value of the id as long
- *
+ *
*/
@Override
public long read(ByteBuffer buffer) {
@@ -767,12 +767,12 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* The token to indicate that given id ( threadId or sequenceId) is of type <code>Long</code>
*/
- static private final byte EVENTID_LONG = 3;
+ private static final byte EVENTID_LONG = 3;
/**
* Writes the given 'id' to the given buffer as 'long' preceeded by a token indicating that it
* is written as 'long' type.
- *
+ *
* @param buffer - the buffer in which id is to be written
* @param id - the threadId or sequenceId to be written
*/
@@ -784,10 +784,10 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/**
* Reads the long value of id from the buffer and returns it.
- *
+ *
* @param buffer - the buffer from which 'id'(threadId or sequenceId) is to be read
* @return - the value of the id as long
- *
+ *
*/
@Override
public long read(ByteBuffer buffer) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventIDHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventIDHolder.java
index 9dc588e..05a4c68 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventIDHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventIDHolder.java
@@ -22,7 +22,7 @@ public class EventIDHolder extends EntryEventImpl {
/*
* This constructor is used to create a bridge event in server-side command classes. Events
* created with this are not intended to be used in cache operations.
- *
+ *
* @param id the identity of the client's event
*/
public EventIDHolder(EventID id) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java
index ec427bb..5106ddd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventStateHelper.java
@@ -14,16 +14,6 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.cache.CreateRegionProcessor.CreateRegionReplyMessage;
-import org.apache.geode.internal.cache.event.EventSequenceNumberHolder;
-import org.apache.geode.internal.cache.InitialImageOperation.RegionStateMessage;
-import org.apache.geode.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
-import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -33,9 +23,19 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.cache.CreateRegionProcessor.CreateRegionReplyMessage;
+import org.apache.geode.internal.cache.InitialImageOperation.RegionStateMessage;
+import org.apache.geode.internal.cache.event.EventSequenceNumberHolder;
+import org.apache.geode.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
+import org.apache.geode.internal.cache.ha.ThreadIdentifier;
+
/**
* A helper class for serializing the event state map.
- *
+ *
* TODO - Store the event state map in DataSerializable object that keeps the map in this compressed
* format in memory.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
index f569ff7..4ace4f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
@@ -39,12 +39,12 @@ import org.apache.geode.internal.cache.lru.MemLRUCapacityController;
* {@link org.apache.geode.cache.EvictionAction}. The algorithms used to determine when to perform
* the <code>EvictionAction</code> are enumerated in the
* {@link org.apache.geode.cache.EvictionAlgorithm} class.
- *
+ *
* @see org.apache.geode.cache.EvictionAlgorithm
* @see org.apache.geode.cache.AttributesFactory
* @see org.apache.geode.cache.RegionAttributes
* @see org.apache.geode.cache.AttributesMutator
- *
+ *
* @since GemFire 5.0
*/
public class EvictionAttributesImpl extends EvictionAttributes
@@ -94,7 +94,7 @@ public class EvictionAttributesImpl extends EvictionAttributes
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.EvictionAttributes#getObjectSizer()
*/
@Override
@@ -104,7 +104,7 @@ public class EvictionAttributesImpl extends EvictionAttributes
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.EvictionAttributes#getAlgorithm()
*/
@Override
@@ -130,7 +130,7 @@ public class EvictionAttributesImpl extends EvictionAttributes
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.EvictionAttributes#getMaximum()
*/
@Override
@@ -144,7 +144,7 @@ public class EvictionAttributesImpl extends EvictionAttributes
/**
* Sets the {@link EvictionAction} on the {@link EvictionAttributesImpl} that the given
* {@link EvictionAlgorithm} uses to perform the eviction.
- *
+ *
* @param action the {@link EvictionAction} used by the {@link EvictionAction}
* @return the instance of {@link EvictionAttributesMutator} on which this method was called
*/
@@ -159,7 +159,7 @@ public class EvictionAttributesImpl extends EvictionAttributes
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.EvictionAttributes#getAction()
*/
@Override
@@ -169,9 +169,9 @@ public class EvictionAttributesImpl extends EvictionAttributes
/**
* Build the appropriate eviction controller using the attributes provided.
- *
+ *
* @return the super of the eviction controller or null if no {@link EvictionAction} is set.
- *
+ *
* @see EvictionAttributes
*/
public LRUAlgorithm createEvictionController(Region region, boolean isOffHeap) {
@@ -215,7 +215,7 @@ public class EvictionAttributesImpl extends EvictionAttributes
/**
* Returns true if this object uses a LIFO algorithm
- *
+ *
* @since GemFire 5.7
*/
public boolean isLIFO() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpirationScheduler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpirationScheduler.java
index 0a87c4c..0b18d01 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpirationScheduler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpirationScheduler.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.cache;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -21,9 +25,6 @@ import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.util.concurrent.atomic.AtomicInteger;
/**
* ExpirationScheduler uses a single instance of java.util.Timer (and therefore a single thread) per
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 6fcaa52..6e2cc9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -174,7 +174,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Added for GEODE-3764.
- *
+ *
* @return true if other members last access time indicates we have expired
*/
protected boolean isIdleExpiredOnOthers() throws EntryNotFoundException {
@@ -208,7 +208,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Test method that causes expiration to be suspended until permitExpiration is called.
- *
+ *
* @since GemFire 5.0
*/
public static void suspendExpiration() {
@@ -227,7 +227,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Wait until permission is given for expiration to be done. Tests are allowed to suspend
* expiration.
- *
+ *
* @since GemFire 5.0
*/
private void waitOnExpirationSuspension() {
@@ -266,7 +266,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Why did this expire?
- *
+ *
* @return the action to perform or null if NONE
*/
protected ExpirationAction getAction() {
@@ -430,7 +430,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Reschedule (or not) this task for later consideration
*/
- abstract protected void reschedule() throws CacheException;
+ protected abstract void reschedule() throws CacheException;
@Override
public String toString() {
@@ -498,7 +498,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Returns the current time in milliseconds. If the current thread has set the now thread local
* then that time is return. Otherwise now is calculated and returned.
- *
+ *
* @return the current time in milliseconds
*/
protected long getNow() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
index a77c4fe..4fd59d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
@@ -75,7 +75,7 @@ public class ExportDiskRegion extends ValidatingDiskRegion {
/**
* Write a batch of entries to the export system. The value in RecoveredEntry is will not be
* null, so there is no need to fault in the value in the implementor
- *
+ *
* @throws IOException
*/
public void writeBatch(Map<Object, RecoveredEntry> entries) throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
index 3ab0a75..7f1118f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -78,10 +78,10 @@ import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
/**
* FilterProfile represents a distributed system member and is used for two purposes: processing
* client-bound events, and providing information for profile exchanges.
- *
+ *
* FilterProfiles represent client IDs, including durable Queue IDs, with long integers. This
* reduces the size of routing information when sent over the network.
- *
+ *
* @since GemFire 6.5
*/
public class FilterProfile implements DataSerializableFixedID {
@@ -819,7 +819,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* adds a new CQ to this profile during a delta operation or deserialization
- *
+ *
* @param serverCqName the query objects' name
* @param ServerCQ the new query object
* @param addToCqMap whether to add the query to this.cqs
@@ -1087,7 +1087,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* get local routing information
- *
+ *
* @param part1Info routing information for peers, if any
* @param event the event to process
* @return routing information for clients connected to this server
@@ -1121,7 +1121,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* get continuous query routing information
- *
+ *
* @param event the event to process
* @param peerProfiles the profiles getting this event
* @param frInfo the routing table to update
@@ -1273,7 +1273,7 @@ public class FilterProfile implements DataSerializableFixedID {
* Fills in the routing information for clients that have registered interest in the given event.
* The routing information is stored in the given FilterRoutingInfo object for use in message
* delivery.
- *
+ *
* @param event the event being applied to the cache
* @param profiles the profiles of members having the affected region
* @param filterRoutingInfo the routing object that is modified by this method (may be null)
@@ -1374,7 +1374,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* get the clients interested in the given event that are attached to this server.
- *
+ *
* @param event the entry event being applied to the cache
* @param akc allKeyClients collection
* @param koi keysOfInterest collection
@@ -1677,7 +1677,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* given a collection of on-wire identifiers, this returns a set of the client/server identifiers
* for each client or durable queue
- *
+ *
* @param integerIDs the integer ids of the clients/queues
* @return the translated identifiers
*/
@@ -1688,7 +1688,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* given a collection of on-wire identifiers, this returns a set of the CQ identifiers they
* correspond to
- *
+ *
* @param integerIDs the integer ids of the clients/queues
* @return the translated identifiers
*/
@@ -1698,7 +1698,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* given an on-wire filter ID, find and return the corresponding cq name
- *
+ *
* @param integerID the on-wire ID
* @return the translated id
*/
@@ -1727,7 +1727,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the filter profile messages received while members cache profile exchange was in
* progress.
- *
+ *
* @param member whose messages are returned.
* @return filter profile messages that are queued for the member.
*/
@@ -1743,7 +1743,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Removes the filter profile messages from the queue that are received while the members cache
* profile exchange was in progress.
- *
+ *
* @param member whose messages are returned.
* @return filter profile messages that are queued for the member.
*/
@@ -1814,7 +1814,7 @@ public class FilterProfile implements DataSerializableFixedID {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionMessage#process(org.apache.geode.
* distributed.internal.DistributionManager)
*/
@@ -1945,7 +1945,7 @@ public class FilterProfile implements DataSerializableFixedID {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
@@ -2046,7 +2046,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* given a collection of on-wire identifiers, this returns a set of the real identifiers (e.g.,
* client IDs or durable queue IDs)
- *
+ *
* @param integerIDs the integer ids
* @return the translated identifiers
*/
@@ -2079,7 +2079,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns true if the client is interested in all keys.
- *
+ *
* @param id client identifier.
* @return true if client is interested in all keys.
*/
@@ -2093,7 +2093,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns true if the client is interested in all keys, for which updates are sent as
* invalidates.
- *
+ *
* @param id client identifier
* @return true if client is interested in all keys.
*/
@@ -2106,7 +2106,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the set of client interested keys.
- *
+ *
* @param id client identifier
* @return client interested keys.
*/
@@ -2123,7 +2123,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the set of client interested keys for which updates are sent as invalidates.
- *
+ *
* @param id client identifier
* @return client interested keys.
*/
@@ -2140,7 +2140,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the set of client interested patterns.
- *
+ *
* @param id client identifier
* @return client interested patterns.
*/
@@ -2161,7 +2161,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the set of client interested patterns for which updates are sent as invalidates.
- *
+ *
* @param id client identifier
* @return client interested patterns.
*/
@@ -2182,7 +2182,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the set of client interested filters.
- *
+ *
* @param id client identifier
* @return client interested filters.
*/
@@ -2199,7 +2199,7 @@ public class FilterProfile implements DataSerializableFixedID {
/**
* Returns the set of client interested filters for which updates are sent as invalidates.
- *
+ *
* @param id client identifier
* @return client interested filters.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index 0dd24f6..99589c3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.VersionedDataSerializable;
/**
* This class is used to hold the information about the servers and their Filters (CQs and Interest
* List) that are satisfied by the cache update operation.
- *
+ *
* @since GemFire 6.5
*/
public class FilterRoutingInfo implements VersionedDataSerializable {
@@ -67,7 +67,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Sets the local CQ filter information.
- *
+ *
* @param cqInfo map of server side CQ Name to CQ event type.
*/
public void setLocalCqInfo(HashMap cqInfo) {
@@ -80,7 +80,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Sets the local Interest information.
- *
+ *
* @param clients interested clients with receiveValues=true.
* @param clientsInv interested clients with receiveValues=false;
*/
@@ -103,7 +103,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Returns local Filter information.
- *
+ *
* @return FilterInfo local filter info having CQs and interested client info.
*/
public FilterInfo getLocalFilterInfo() {
@@ -112,7 +112,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Sets CQ routing information.
- *
+ *
* @param member for which CQs are satisfied.
* @param cqInfo map of server side CQ Name to CQ event type.
*/
@@ -127,7 +127,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Sets interested clients routing information
- *
+ *
* @param member on which the client interests are satisfied
* @param clients Set containing interested clients with receiveValues=true
* @param clientsInv Set containing interested clients with receiveValues=false
@@ -154,7 +154,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Returns the members list that has filters satisfied.
- *
+ *
* @return the members who have filter routing information
*/
public Set<InternalDistributedMember> getMembers() {
@@ -163,7 +163,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Returns true if the local filter information is set.
- *
+ *
* @return whether there is local routing information in this object
*/
public boolean hasLocalFilterInfo() {
@@ -172,7 +172,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Returns true if there is any member with filters satisfied.
- *
+ *
* @return true if we have any filter information in this object
*/
public boolean hasMemberWithFilterInfo() {
@@ -181,7 +181,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* Returns the Filter Information for the member.
- *
+ *
* @param member the member whose filter information is desired
* @return the filter information for the given member
*/
@@ -192,7 +192,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
/**
* This adds the filter information from the given routing object to this object's tables. This is
* used to merge routing information for putAll operations.
- *
+ *
* @param eventRouting the routing information for a single putAll event
*/
public void addFilterInfo(FilterRoutingInfo eventRouting) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java
index ddc6925..bedd04d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FindRemoteTXMessage.java
@@ -66,7 +66,7 @@ public class FindRemoteTXMessage extends HighPriorityDistributionMessage
/**
* Asks all the peers if they host a transaction for the given txId
- *
+ *
* @param txId the transaction id
* @return reply processor containing memberId of the member that hosts the transaction and a
* recently committed transactionMessage if any
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java
index b38b4fe..c548bf5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java
@@ -15,25 +15,25 @@
package org.apache.geode.internal.cache;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.distributed.internal.DistributionConfig;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
/**
* Internal implementation of {@link FixedPartitionAttributes}.
- *
+ *
* @since GemFire 6.6
*/
public class FixedPartitionAttributesImpl extends FixedPartitionAttributes
implements DataSerializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 7435010874879693776L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceReattemptException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceReattemptException.java
index 30938f2..882ecb5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceReattemptException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceReattemptException.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.Assert;
/**
* Indicates that the current partitioned region operation failed. It is only thrown in a context
* where the higher level operation needs to instigate a retry of some sort.
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.PartitionMessage
* @since GemFire 5.0
*/
@@ -40,7 +40,7 @@ public class ForceReattemptException extends DataLocationException {
/**
* Used when constructing the error: sets the expected hash.
- *
+ *
* @param h the hash to use
*/
public void setHash(int h) {
@@ -51,7 +51,7 @@ public class ForceReattemptException extends DataLocationException {
/**
* Fetch the hash for this exception
- *
+ *
* @return the expected hash
*/
public boolean hasHash() {
@@ -67,7 +67,7 @@ public class ForceReattemptException extends DataLocationException {
/**
* If possible, validate the given key's hashCode against any that was returned by the peer.
- *
+ *
* @param key the key on the current host. If null, no check is done.
* @throws PartitionedRegionException if the keys disagree.
*/
@@ -89,7 +89,7 @@ public class ForceReattemptException extends DataLocationException {
/**
* Reattempt required due to an underlying error
- *
+ *
* @param message describes the context
* @param cause the underlying cause
*/
@@ -99,7 +99,7 @@ public class ForceReattemptException extends DataLocationException {
/**
* Reattempt required due to detected condition
- *
+ *
* @param message describes the condition
*/
public ForceReattemptException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
index 7725036..ccd541e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
@@ -24,14 +24,14 @@
*/
package org.apache.geode.internal.cache;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.AbstractQueue;
import java.util.Collection;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
/**
* The only difference between this class on LinkedBlockingQueue is the new method {@link #forcePut}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
index 1cc7eeb..4e005ad 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
@@ -24,7 +24,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
*
*/
public class FunctionStreamingOrderedReplyMessage extends FunctionStreamingReplyMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java
index 2db5c17..1cf639c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.cache;
/**
- *
+ *
*
*/
public interface GatewayEventFilter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 64efb10..e8aac76 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -79,12 +79,6 @@ import com.sun.jna.Platform;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.query.internal.InternalQueryService;
-import org.apache.geode.cache.query.internal.MethodInvocationAuthorizer;
-import org.apache.geode.cache.query.internal.RestrictedMethodInvocationAuthorizer;
-import org.apache.geode.internal.cache.event.EventTrackerExpiryTask;
-import org.apache.geode.internal.cache.wan.GatewaySenderQueueEntrySynchronizationListener;
-import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.ForcedDisconnectException;
@@ -139,7 +133,10 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.DefaultQueryService;
+import org.apache.geode.cache.query.internal.InternalQueryService;
+import org.apache.geode.cache.query.internal.MethodInvocationAuthorizer;
import org.apache.geode.cache.query.internal.QueryMonitor;
+import org.apache.geode.cache.query.internal.RestrictedMethodInvocationAuthorizer;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.CqServiceProvider;
import org.apache.geode.cache.server.CacheServer;
@@ -180,6 +177,7 @@ import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
import org.apache.geode.internal.cache.control.ResourceAdvisor;
+import org.apache.geode.internal.cache.event.EventTrackerExpiryTask;
import org.apache.geode.internal.cache.execute.util.FindRestEnabledServersFunction;
import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
@@ -200,6 +198,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor;
+import org.apache.geode.internal.cache.wan.GatewaySenderQueueEntrySynchronizationListener;
import org.apache.geode.internal.cache.wan.WANServiceProvider;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
@@ -217,6 +216,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.offheap.MemoryAllocator;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.internal.sequencelog.SequenceLoggerImpl;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.internal.util.concurrent.FutureResult;
@@ -438,7 +438,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* conflict resolver for WAN, if any
- *
+ *
* GuardedBy {@link #allGatewayHubsLock}
*/
private GatewayConflictResolver gatewayConflictResolver;
@@ -499,7 +499,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* DistributedLockService for GatewaySenders. Remains null until the first GatewaySender is
* created. Destroyed by GemFireCache when closing the cache.
- *
+ *
* GuardedBy gatewayLockServiceLock
*/
private volatile DistributedLockService gatewayLockService;
@@ -578,7 +578,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* {@link ExtensionPoint} support.
- *
+ *
* @since GemFire 8.1
*/
private final SimpleExtensionPoint<Cache> extensionPoint = new SimpleExtensionPoint<>(this, this);
@@ -609,14 +609,14 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
* kernel data, shared memory, and memory-mapped files. All mapped pages are guaranteed to be
* resident in RAM when the call returns successfully; the pages are guaranteed to stay in RAM
* until later unlocked.
- *
+ *
* @param flags MCL_CURRENT 1 - Lock all pages which are currently mapped into the address space
* of the process.
- *
+ *
* MCL_FUTURE 2 - Lock all pages which will become mapped into the address space of the
* process in the future. These could be for instance new pages required by a growing heap
* and stack as well as new memory mapped files or shared memory regions.
- *
+ *
* @return 0 if success, non-zero if error and errno set
*/
private static native int mlockall(int flags);
@@ -692,7 +692,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Returns an existing instance. If a cache does not exist throws a cache closed exception.
- *
+ *
* @return the existing cache
* @throws CacheClosedException if an existing cache can not be found.
*/
@@ -802,7 +802,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Creates a new instance of GemFireCache and populates it according to the {@code cache.xml}, if
* appropriate.
- *
+ *
* @param typeRegistry: currently only unit tests set this parameter to a non-null value
*/
private GemFireCacheImpl(boolean isClient, PoolFactory pf, InternalDistributedSystem system,
@@ -982,7 +982,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Used by Hydra tests to get handle of Rest Agent
- *
+ *
* @return RestAgent
*/
@Override
@@ -1382,7 +1382,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
* @throws RegionExistsException If the declarative caching XML file describes a region that
* already exists (including the root region).
* @throws GatewayException If a {@code GatewayException} is thrown while initializing the cache.
- *
+ *
* @see #loadCacheXml
*/
private void initializeDeclarativeCache()
@@ -1998,7 +1998,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Gets or lazily creates the GatewaySender distributed lock service.
- *
+ *
* @return the GatewaySender distributed lock service
*/
@Override
@@ -2784,7 +2784,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Get the list of all instances of properties for Declarables with the given class name.
- *
+ *
* @param className Class name of the declarable
* @return List of all instances of properties found for the given declarable
*/
@@ -2803,7 +2803,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Get the properties for the given declarable.
- *
+ *
* @param declarable The declarable
* @return Properties found for the given declarable
*/
@@ -2825,7 +2825,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
* All entry and region operations should be using this time rather than
* System.currentTimeMillis(). Specially all version stamps/tags must be populated with this
* timestamp.
- *
+ *
* @return distributed cache time.
*/
@Override
@@ -3923,7 +3923,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Returns List of GatewaySender (excluding the senders for internal use)
- *
+ *
* @return List List of GatewaySender objects
*/
@Override
@@ -3939,7 +3939,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Returns List of all GatewaySenders (including the senders for internal use)
- *
+ *
* @return List List of GatewaySender objects
*/
@Override
@@ -4485,7 +4485,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Returns the QueryMonitor instance based on system property MAX_QUERY_EXECUTION_TIME.
- *
+ *
* @since GemFire 6.0
*/
@Override
@@ -5148,7 +5148,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Add to the map of declarable properties. Any properties that exactly match existing properties
* for a class in the list will be discarded (no duplicate Properties allowed).
- *
+ *
* @param mapOfNewDeclarableProps Map of the declarable properties to add
*/
public void addDeclarableProperties(final Map<Declarable, Properties> mapOfNewDeclarableProps) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
index f2be3c0..12acc2e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
@@ -297,7 +297,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
/**
* Tell local controllers about the received profile. Also if exchange profiles then add each
* local controller to reply.
- *
+ *
* @since GemFire 5.7
*/
protected void tellLocalControllers(boolean removeProfile, boolean exchangeProfiles,
@@ -322,7 +322,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
/**
* Tell local bridge servers about the received profile. Also if exchange profiles then add each
* local bridge server to reply.
- *
+ *
* @since GemFire 5.7
*/
protected void tellLocalBridgeServers(boolean removeProfile, boolean exchangeProfiles,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
index baddff8..f82aaea 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
@@ -52,9 +52,9 @@ import org.apache.geode.internal.offheap.annotations.Released;
/**
* This region is being implemented to suppress distribution of puts and to allow localDestroys on
* mirrored regions.
- *
+ *
* @since GemFire 4.3
- *
+ *
*/
public class HARegion extends DistributedRegion {
private static final Logger logger = LogService.getLogger();
@@ -106,7 +106,7 @@ public class HARegion extends DistributedRegion {
/**
* Updates never distributed from buckets.
- *
+ *
* @since GemFire 5.7
*/
@Override
@@ -121,7 +121,7 @@ public class HARegion extends DistributedRegion {
/**
* void implementation over-riding the method to allow localDestroy on mirrored regions
- *
+ *
* @param event
*/
@Override
@@ -133,7 +133,7 @@ public class HARegion extends DistributedRegion {
/**
* Overriding this method so as to allow expiry action of local invalidate even if the scope is
* distributed mirrored.
- *
+ *
* <p>
* author Asif
*/
@@ -168,7 +168,7 @@ public class HARegion extends DistributedRegion {
* Before invalidating , check if the entry being invalidated has a key as Long . If yes check if
* the key is still present in availableIDs . If yes remove & allow invalidation to proceed. But
* if the key (Long)is absent do not allow invalidation to proceed.
- *
+ *
* <p>
* author Asif
*/
@@ -239,9 +239,9 @@ public class HARegion extends DistributedRegion {
}
/**
- *
+ *
* Returns an instance of HARegion after it has properly initialized
- *
+ *
* @param regionName name of the region to be created
* @param cache the cache that owns this region
* @param ra attributes of the region
@@ -286,7 +286,7 @@ public class HARegion extends DistributedRegion {
/**
* This method is used to set the HARegionQueue owning the HARegion. It is set after the
* HARegionQueue is properly constructed
- *
+ *
* @param hrq The owning HARegionQueue instance
*/
public void setOwner(HARegionQueue hrq) {
@@ -309,7 +309,7 @@ public class HARegion extends DistributedRegion {
/**
* This method is overriden so as to make isOriginRemote true always so that the operation is
* never propagated to other nodes
- *
+ *
* @see org.apache.geode.internal.cache.AbstractRegion#destroyRegion()
*/
@Override
@@ -347,7 +347,7 @@ public class HARegion extends DistributedRegion {
* @return the deserialized value
* @see LocalRegion#findObjectInSystem(KeyInfo, boolean, TXStateInterface, boolean, Object,
* boolean, boolean, ClientProxyMembershipID, EntryEventImpl, boolean)
- *
+ *
*/
@Override
protected Object findObjectInSystem(KeyInfo keyInfo, boolean isCreate, TXStateInterface txState,
@@ -448,7 +448,7 @@ public class HARegion extends DistributedRegion {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.LocalRegion#getEventState()
*/
@Override
@@ -462,9 +462,9 @@ public class HARegion extends DistributedRegion {
/*
* Record cache event state for a potential initial image provider. This is used to install event
* state when the sender is selected as initial image provider.
- *
+ *
* @param sender
- *
+ *
* @param eventState
*/
@Override
@@ -507,7 +507,7 @@ public class HARegion extends DistributedRegion {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.CacheDistributionAdvisor#adviseInitialImage(org.apache.geode.
* internal.cache.CacheDistributionAdvisor.InitialImageAdvice)
@@ -554,7 +554,7 @@ public class HARegion extends DistributedRegion {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile#fromData(java.io.
* DataInput)
@@ -569,7 +569,7 @@ public class HARegion extends DistributedRegion {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile#toData(java.io.
* DataOutput)
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/IdentityArrayList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/IdentityArrayList.java
index 70048a1..8d17518 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/IdentityArrayList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/IdentityArrayList.java
@@ -21,8 +21,8 @@ package org.apache.geode.internal.cache;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
-import java.util.RandomAccess;
import java.util.NoSuchElementException;
+import java.util.RandomAccess;
import it.unimi.dsi.fastutil.objects.AbstractObjectList;
import it.unimi.dsi.fastutil.objects.AbstractObjectListIterator;
@@ -34,8 +34,8 @@ import it.unimi.dsi.fastutil.objects.ObjectList;
import it.unimi.dsi.fastutil.objects.ObjectListIterator;
/**
- *
- *
+ *
+ *
* A type-specific array-based list; provides some additional methods that use polymorphism to avoid
* (un)boxing.
*
@@ -68,7 +68,7 @@ public class IdentityArrayList<K> extends AbstractObjectList<K>
private static final long serialVersionUID = 449125332499184497L;
/** The initial default capacity of an array list. */
- public final static int DEFAULT_INITIAL_CAPACITY = 16;
+ public static final int DEFAULT_INITIAL_CAPACITY = 16;
/**
* Whether the backing array was passed to <code>wrap()</code>. In this case, we must reallocate
@@ -199,7 +199,7 @@ public class IdentityArrayList<K> extends AbstractObjectList<K>
* If this array list was created by wrapping a given array, it is guaranteed that the type of the
* returned array will be the same. Otherwise, the returned array will be of type {@link Object
* Object[]} (in spite of the declared return type).
- *
+ *
* <strong>Warning</strong>: This behaviour may cause (unfathomable) run-time errors if a method
* expects an array actually of type <code>K[]</code>, but this methods returns an array of type
* {@link Object Object[]}.
@@ -392,7 +392,7 @@ public class IdentityArrayList<K> extends AbstractObjectList<K>
/**
* Trims the backing array if it is too large.
- *
+ *
* If the current array length is smaller than or equal to <code>n</code>, this method does
* nothing. Otherwise, it trims the array length to the maximum between <code>n</code> and
* {@link #size()}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
index 189c855..f64a673 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
/**
* State object used during getInitialImage Locked during clean up of destroyed tokens.
- *
+ *
*/
public interface ImageState /* extends Lock */ {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java
index 4fa4c6c..a6d0181 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.cache;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.Collections;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
index 0db871a..5b73e30 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageFlowControl.java
@@ -31,19 +31,19 @@ import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.MembershipListener;
import org.apache.geode.distributed.internal.ProcessorKeeper21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.i18n.StringId;
/**
* This class keeps track of how many InitialImageMessages are in flight between the initial image
* provider and the image target.
- *
+ *
* The provider is responsible for calling acquirePermit before sending an initial image chunk. The
* acquire will block if two many messages are in flight.
- *
+ *
* The initial image target sends FlowControlPermitMessage to the image provider after each
* processed chunk. Upon receiving the FlowControlPermit message, the provider will increase the
* number of permits available.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index 02a3650..e1e391e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -15,6 +15,13 @@
package org.apache.geode.internal.cache;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.*;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.RegionDestroyedException;
@@ -47,16 +54,10 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.sequencelog.EntryLogger;
import org.apache.geode.internal.sequencelog.RegionLogger;
import org.apache.geode.internal.util.ObjectIntProcedure;
-import org.apache.logging.log4j.Logger;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Handles requests for an initial image from a cache peer
- *
+ *
*/
public class InitialImageOperation {
private static final Logger logger = LogService.getLogger();
@@ -147,7 +148,7 @@ public class InitialImageOperation {
}
/** a flag for inhibiting the use of StateFlushOperation before gii */
- private final static ThreadLocal inhibitStateFlush = new ThreadLocal() {
+ private static final ThreadLocal inhibitStateFlush = new ThreadLocal() {
@Override
protected Object initialValue() {
return Boolean.valueOf(false);
@@ -192,7 +193,7 @@ public class InitialImageOperation {
/**
* Fetch an initial image from a single recipient
- *
+ *
* @param recipientSet list of candidates to fetch from
* @param targetReinitialized true if candidate should wait until initialized before responding
* @param advice
@@ -716,7 +717,7 @@ public class InitialImageOperation {
/**
* transfer interest/cq registrations from the image provider to this VM
- *
+ *
* @param recipient
* @return whether the operation succeeded in transferring anything
*/
@@ -751,7 +752,7 @@ public class InitialImageOperation {
/**
* Called from separate thread when reply is processed.
- *
+ *
* @param entries entries to add to the region
* @return false if should abort (region was destroyed or cache was closed)
*/
@@ -1008,7 +1009,7 @@ public class InitialImageOperation {
/**
* Compare the received RVV with local RVV and return a set of keys for unfinished operations.
- *
+ *
* @param remoteRVV RVV from provider
* @param localRVV RVV recovered from disk
* @return set for keys of unfinished operations.
@@ -1227,7 +1228,7 @@ public class InitialImageOperation {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.distributed.internal.ReplyProcessor21#process(org.apache.geode.distributed.
* internal.DistributionMessage)
@@ -1838,7 +1839,7 @@ public class InitialImageOperation {
* chunk and an int indicating whether it is the last chunk (positive means last chunk, zero
* otherwise). The return value of proc indicates whether to continue to the next chunk (true)
* or abort (false).
- *
+ *
* @param versionVector requester's region version vector
* @param unfinishedKeys keys of unfinished operation (persistent region only)
* @param flowControl
@@ -2353,7 +2354,7 @@ public class InitialImageOperation {
/**
* RVVReplyMessage transmits the GII provider's RVV to requester
- *
+ *
*/
public static class RVVReplyMessage extends ReplyMessage {
@@ -2416,7 +2417,7 @@ public class InitialImageOperation {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
@Override
@@ -2891,7 +2892,7 @@ public class InitialImageOperation {
* <p>
* Defaults to invalid, not serialized, not local invalid. The "invalid" flag is not used. When
* invalid, localInvalid is false and the values is null.
- *
+ *
* @see EntryBits
*/
private byte entryBits = 0;
@@ -3042,7 +3043,7 @@ public class InitialImageOperation {
/**
* InitialImageOperation.Entry list
- *
+ *
*/
// List<Entry> entries;
@@ -3132,7 +3133,7 @@ public class InitialImageOperation {
}
/**
- *
+ *
* @return whether the source region had concurrency checks enabled
*/
public boolean isRegionVersioned() {
@@ -3144,7 +3145,7 @@ public class InitialImageOperation {
* from a server may have null IDs because they were operations performed by that server. We
* transmit them as nulls to cut costs, but have to do the swap on the receiving end (in the
* client)
- *
+ *
* @param sender
*/
public void replaceNullIDs(DistributedMember sender) {
@@ -3314,7 +3315,7 @@ public class InitialImageOperation {
/**
* EventStateMessage transmits the cache's memberId:threadId sequence# information so that a cache
* receiving an initial image will know what events that image represents.
- *
+ *
*/
public static class RegionStateMessage extends ReplyMessage {
@@ -3410,7 +3411,7 @@ public class InitialImageOperation {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
@Override
@@ -3631,7 +3632,7 @@ public class InitialImageOperation {
/**
* Registers the filters associated with this client on current cache region.
- *
+ *
* @param region
*/
public void registerFilters(LocalRegion region) {
@@ -3968,7 +3969,7 @@ public class InitialImageOperation {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
@Override
@@ -3977,10 +3978,10 @@ public class InitialImageOperation {
}
}
- public static abstract class GIITestHook implements Runnable, Serializable {
- final private GIITestHookType type;
- final private String region_name;
- volatile public boolean isRunning;
+ public abstract static class GIITestHook implements Runnable, Serializable {
+ private final GIITestHookType type;
+ private final String region_name;
+ public volatile boolean isRunning;
public GIITestHook(GIITestHookType type, String region_name) {
this.type = type;
@@ -4292,4 +4293,3 @@ public class InitialImageOperation {
internalAfterSavedRVVEnd = null;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InterestEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InterestEvent.java
index e7c8d34..458505f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InterestEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InterestEvent.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache;
+import java.io.IOException;
+
import org.apache.geode.internal.cache.tier.sockets.CacheServerHelper;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.IOException;
-
public class InterestEvent {
private Object key;
@@ -35,7 +35,7 @@ public class InterestEvent {
/**
* Returns the key.
- *
+ *
* @return the key
*/
public Object getKey() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
index 6f921dc..2dc6faa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
@@ -26,14 +26,14 @@ import org.apache.geode.internal.cache.versions.VersionTag;
public interface InternalCacheEvent extends CacheEvent {
/**
* Answers true if this event should generate user callbacks.
- *
+ *
* @return true if this event will generate user callbacks
*/
public boolean isGenerateCallbacks();
/**
* Answers true if this event is from a client
- *
+ *
* @deprecated as of 5.7 use {@link #hasClientOrigin} instead.
*/
@Deprecated
@@ -41,7 +41,7 @@ public interface InternalCacheEvent extends CacheEvent {
/**
* Answers true if this event is from a client
- *
+ *
* @since GemFire 5.7
*/
public boolean hasClientOrigin();
@@ -53,14 +53,14 @@ public interface InternalCacheEvent extends CacheEvent {
/**
* Returns the Operation type.
- *
+ *
* @return eventType
*/
public EnumListenerEvent getEventType();
/**
* sets the event type
- *
+ *
* @param operation the operation performed by this event
*/
public void setEventType(EnumListenerEvent operation);
@@ -72,7 +72,7 @@ public interface InternalCacheEvent extends CacheEvent {
/**
* set the client routing information for this event
- *
+ *
* @param info TODO
*/
public void setLocalFilterInfo(FilterInfo info);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
index 4b8d71e..bcc28ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
@@ -61,7 +61,7 @@ public interface InternalDataView {
/**
* Invalidate the entry
- *
+ *
* @see Region#invalidate(Object)
* @param event
* @param invokeCallbacks
@@ -72,7 +72,7 @@ public interface InternalDataView {
/**
* get the entry count
- *
+ *
* @param localRegion
* @return the entry count
*/
@@ -110,7 +110,7 @@ public interface InternalDataView {
/**
* get entry for the key. Called only on farside.
- *
+ *
* @param key
* @param localRegion
* @param allowTombstones
@@ -121,7 +121,7 @@ public interface InternalDataView {
/**
* Put or create an entry in the data view.
- *
+ *
* @param event specifies the new or updated value
* @param ifNew
* @param ifOld
@@ -136,7 +136,7 @@ public interface InternalDataView {
/**
* Put or create an entry in the data view. Called only on the farside.
- *
+ *
* @param event specifies the new or updated value
* @param ifNew
* @param ifOld
@@ -152,7 +152,7 @@ public interface InternalDataView {
/**
* Destroy an entry in the data view. Called only on the farside.
- *
+ *
* @param event
* @param cacheWrite TODO
* @param expectedOldValue
@@ -163,7 +163,7 @@ public interface InternalDataView {
/**
* Invalidate an entry in the data view. Called only on farside.
- *
+ *
* @param event
* @param invokeCallbacks
* @param forceNewEntry
@@ -198,7 +198,7 @@ public interface InternalDataView {
/**
- *
+ *
* @param key
* @param currRgn
* @param rememberReads
@@ -209,7 +209,7 @@ public interface InternalDataView {
boolean allowTombstones);
/**
- *
+ *
* @param keyInfo
* @param currRgn
* @param rememberReads
@@ -225,14 +225,14 @@ public interface InternalDataView {
Set getAdditionalKeysForIterator(LocalRegion currRgn);
/**
- *
+ *
* @param currRegion
* @return set of keys in the region
*/
Collection<?> getRegionKeysForIteration(LocalRegion currRegion);
/**
- *
+ *
* @param localRegion
* @param key
* @param doNotLockEntry
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
index 58d1780..b9ddd8a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
* An internal version of Region Attributes that allows for additional information to be passed to
* the Region constructors, typically for internal purposes, for example internally GemFire may need
* use a Region and flag it for internal use only.
- *
+ *
* @since GemFire 4.2.3
*/
public class InternalRegionArguments {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
index 30edda4..6ca8d78 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
@@ -36,8 +36,8 @@ import org.apache.geode.internal.offheap.annotations.Retained;
/**
* Handles distribution messaging for invalidating an entry in a region.
- *
- *
+ *
+ *
*/
public class InvalidateOperation extends DistributedCacheOperation {
private static final Logger logger = LogService.getLogger();
@@ -196,5 +196,3 @@ public class InvalidateOperation extends DistributedCacheOperation {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
index ebc4a00..5a68443 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
@@ -13,10 +13,15 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Operation;
@@ -25,11 +30,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.internal.cache.partitioned.PartitionMessage;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Set;
-
/**
*
*/
@@ -38,7 +38,7 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
private Object callbackArg;
/**
- *
+ *
*/
public InvalidatePartitionedRegionMessage() {}
@@ -58,7 +58,7 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.partitioned.PartitionMessage#operateOnPartitionedRegion(org.
* apache.geode.distributed.internal.DistributionManager,
@@ -77,7 +77,7 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
@@ -86,7 +86,7 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.PartitionMessage#fromData(java.io.DataInput)
*/
@Override
@@ -97,7 +97,7 @@ public class InvalidatePartitionedRegionMessage extends PartitionMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.PartitionMessage#toData(java.io.DataOutput)
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
index 9339456..2dafc70 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
@@ -19,10 +19,11 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.*;
+
+import org.apache.geode.DataSerializer;
import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.DataSerializer;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
index aa7671e..01bf26c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java
index 063e0ae..d2bb9b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.InternalStatisticsDisabledException;
/**
* Sends the region name and key of the entry that we want the last access time for. If for any
* reason this message can not obtain the last access time then zero will be returned.
- *
+ *
* @since Geode 1.4
*/
public class LatestLastAccessTimeMessage<K> extends PooledDistributionMessage
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
index 231e83f..5ffa93b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.Version;
/**
* Operation that determines the latest last access time for a given region and key
- *
+ *
* @since Geode 1.4
*/
public class LatestLastAccessTimeOperation<K> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java
index b211875..fd48c31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* Processes the replies from a LatestLastAccessTimeMessage. This reply processor only keeps the
* largest value returned. It waits for every recipient to respond.
- *
+ *
* @since Geode 1.4
*/
public class LatestLastAccessTimeReplyProcessor extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
index a631c7c..1c46b26 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
@@ -15,7 +15,7 @@
/**
* The LoaderHelperFactory inspiration came from a need to allow Partitioned Regions to generate a
* LoaderHelper that was outside the context of the Region the loader invoked from.
- *
+ *
* @since GemFire 5.0
*/
package org.apache.geode.internal.cache;
@@ -25,7 +25,7 @@ import org.apache.geode.cache.LoaderHelper;
/**
* The LoaderHelperFactory creates a LoaderHelper class which is used by a
* {@link org.apache.geode.cache.CacheLoader}.
- *
+ *
* @since GemFire 5.0
*/
public interface LoaderHelperFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java
index 1fb430c..d3459c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java
@@ -15,12 +15,9 @@
package org.apache.geode.internal.cache;
-// import org.apache.geode.*;
import org.apache.geode.cache.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-// import java.io.*;
-// import java.util.Set;
import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Provides a set of APIs to help the implementation of the <code>CacheLoader</code> load method. An
@@ -149,7 +146,7 @@ public class LoaderHelperImpl implements LoaderHelper {
/**
* Return the argument object for the load method that was passed in from application code. This
* object is passed in as <i>aLoaderArgument</i> in {@link Region#get(Object, Object) get}.
- *
+ *
* @return the argument or null if one was not supplied
*/
public Object getArgument() {
@@ -162,4 +159,3 @@ public class LoaderHelperImpl implements LoaderHelper {
+ getArgument();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java
index f1db32f..f06a143 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java
@@ -67,15 +67,15 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- *
+ *
*
*/
public class LocalDataSet implements Region, QueryExecutor {
private static final Logger logger = LogService.getLogger();
- final private PartitionedRegion proxy;
- final private Set<Integer> buckets;
+ private final PartitionedRegion proxy;
+ private final Set<Integer> buckets;
private InternalRegionFunctionContext rfContext;
public LocalDataSet(PartitionedRegion pr, Set<Integer> buckets) {
@@ -166,7 +166,7 @@ public class LocalDataSet implements Region, QueryExecutor {
* not support equijoin queries on PartitionedRegions unless they are colocated and the the
* colocated columns ACTUALLY EXIST IN WHERE CLAUSE , AND IN CASE OF MULTI COLUMN PARTITIONING ,
* SHOULD HAVE AND CLAUSE.
- *
+ *
* If not , this method will return wrong results. We DO NOT DETECT COLOCATION CRITERIA IN THE
* MULTI REGION PR BASED QUERIES.
*/
@@ -580,7 +580,7 @@ public class LocalDataSet implements Region, QueryExecutor {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#putIfAbsent(java.lang.Object, java.lang.Object)
*/
public Object putIfAbsent(Object key, Object value) {
@@ -589,7 +589,7 @@ public class LocalDataSet implements Region, QueryExecutor {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#remove(java.lang.Object, java.lang.Object)
*/
public boolean remove(Object key, Object value) {
@@ -598,7 +598,7 @@ public class LocalDataSet implements Region, QueryExecutor {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object)
*/
public Object replace(Object key, Object value) {
@@ -607,7 +607,7 @@ public class LocalDataSet implements Region, QueryExecutor {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object,
* java.lang.Object)
*/
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 74bdb52..16e4cef 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
@@ -54,6 +54,8 @@ import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.CopyHelper;
@@ -220,7 +222,6 @@ import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
import org.apache.geode.internal.util.concurrent.StoppableReadWriteLock;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.logging.log4j.Logger;
/**
* Implementation of a local scoped-region. Note that this class has a different meaning starting
@@ -237,7 +238,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Internal interface used to simulate failures when performing entry operations
- *
+ *
* @since GemFire 5.7
*/
public interface TestCallable {
@@ -521,14 +522,14 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* ThreadLocal used to set the current region being initialized.
- *
+ *
* Currently used by the OpLog layer.
*/
private static final ThreadLocal<LocalRegion> initializingRegion = new ThreadLocal<LocalRegion>();
/**
* Get the current initializing region as set in the ThreadLocal.
- *
+ *
* Note that this value is cleared after the initialization of LocalRegion is done so is valid
* only for the duration of region creation and initialization.
*/
@@ -745,7 +746,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Test hook - returns the version stamp for an entry in the form of a version tag
- *
+ *
* @return the entry version information
*/
public VersionTag getVersionTag(Object key) {
@@ -1143,7 +1144,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Fetch the de-serialized value from non-transactional state.
- *
+ *
* @param keyInfo to which the value is associated
* @param updateStats true if the entry stats should be updated.
* @param disableCopyOnRead if true then disable copy on read
@@ -1311,7 +1312,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* The result of this operation may be an off-heap reference that the caller must release.
- *
+ *
* @param opScopeIsLocal if true then just check local storage for a value; if false then try to
* find the value if it is not local
*/
@@ -1379,7 +1380,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Update region and potentially entry stats for the miss case
- *
+ *
* @param re optional region entry, fetched if null
* @param key the key used to fetch the region entry
*/
@@ -1398,7 +1399,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* optimized to only allow one thread to do a search/load, other threads wait on a future
- *
+ *
* @param isCreate true if call found no entry; false if updating an existing entry
* @param localValue the value retrieved from the region for this object.
* @param disableCopyOnRead if true then do not make a copy
@@ -1731,7 +1732,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Just like getEntry but also updates the stats that get would have depending on a flag. See bug
* 42410. Also skips discovering JTA
- *
+ *
* @return the entry if it exists; otherwise null.
*/
public Entry accessEntry(Object key, boolean updateStats) {
@@ -1856,7 +1857,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Flavor of keys that will not do repeatable read
- *
+ *
* @since GemFire 5.5
*/
public Set testHookKeys() {
@@ -1876,7 +1877,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* return a set of the keys in this region
- *
+ *
* @param allowTombstones whether destroyed entries should be included
* @return the keys
*/
@@ -1995,7 +1996,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Convenience method to get region name for logging/exception messages. if this region is an
* instanceof bucket region, it returns the bucket region name
- *
+ *
* @return name of the region or the owning partitioned region
*/
public String getDisplayName() {
@@ -2725,7 +2726,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* This method should be called when the caller cannot locate an entry and that condition is
* unexpected. This will first double check the cache and region state before throwing an
* EntryNotFoundException. EntryNotFoundException should be a last resort exception.
- *
+ *
* @param entryKey the missing entry's key.
*/
void checkEntryNotFound(Object entryKey) {
@@ -2736,11 +2737,11 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
}
/**
- *
+ *
* Search for the value in a server (if one exists), then try a loader.
- *
+ *
* If we find a value, we put it in the cache.
- *
+ *
* @param preferCD return the CacheDeserializable, if that's what the value is.
* @param requestingClient the client making the request, if any
* @param clientEvent the client's event, if any. If not null, we set the version tag
@@ -2875,7 +2876,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* Returns true if the cache already has this key as an invalid entry with a version >= the one in
* the given event. This is used in cache-miss processing to avoid overwriting the entry when it
* is not necessary, so that we avoid invoking cache listeners.
- *
+ *
* @return whether the entry is already invalid
*/
private boolean alreadyInvalid(Object key, EntryEventImpl event) {
@@ -3027,7 +3028,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Destroy an entry on the server given its event.
- *
+ *
* @since GemFire 5.7
*/
void serverDestroy(EntryEventImpl event, Object expectedOldValue) {
@@ -3268,7 +3269,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* remove any tombstones from the given member that are <= the given version
- *
+ *
* @param eventID event identifier for the GC operation
* @param clientRouting routing info (if null a routing is computed)
*/
@@ -3303,7 +3304,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* pass tombstone garbage-collection info to clients
- *
+ *
* @param eventID the ID of the event (see bug #50683)
* @param routing routing info (routing is computed if this is null)
*/
@@ -3423,7 +3424,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* This is a test hook method used to find out what keys the current tx has read or written.
- *
+ *
* @return an unmodifiable set of keys that have been read or written by the transaction on this
* thread.
* @throws IllegalStateException if not tx in progress
@@ -3504,7 +3505,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Does a get that attempts to not fault values in from disk or make the entry the most recent in
* the LRU.
- *
+ *
* @param adamant fault in and affect LRU as a last resort
* @param allowTombstone also return Token.TOMBSTONE if the entry is deleted
* @param serializedFormOkay if the serialized form can be returned
@@ -4852,23 +4853,23 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Fix up our RVV by iterating over the entries in the region and making sure they are applied to
* the RVV.
- *
+ *
* If we failed to do a GII, we may have applied the RVV from a remote member. That RVV may not
* have seen some of the events in our local RVV. Those entries were supposed to be replaced with
* the results of the GII. However, if we failed the GII, those entries may still be in the cache,
* but are no longer reflected in the local RVV. This method iterates over those keys and makes
* sure their versions are applied to the local RVV.
- *
+ *
* TODO - this method should probably rebuild the RVV from scratch, instead of starting with the
* existing RVV. By starting with the existing RVV, we may claim to have entries that we actually
* don't have. Unfortunately, we can't really rebuild the RVV from scratch because we will end up
* with huge exception lists.
- *
+ *
* However, if we are in the state of recovering from disk with an untrusted RVV, we must be newer
* than any other surviving members. So they shouldn't have any entries in their cache that match
* entries that we failed to receive through the GII but are reflected in our current RVV. So it
* should be safe to start with the current RVV.
- *
+ *
*/
void repairRVV() {
RegionVersionVector rvv = this.getVersionVector();
@@ -5423,7 +5424,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Clear the region from a server request.
- *
+ *
* @param callbackArgument The callback argument. This is currently null since
* {@link java.util.Map#clear} supports no parameters.
* @param processedMarker Whether the marker has been processed (for durable clients)
@@ -5658,7 +5659,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Checks to see if the event should be rejected because of sick state either due to exceeding
* local critical threshold or a remote member exceeding critical threshold
- *
+ *
* @param key the key for the operation
* @throws LowMemoryException if the target member for this operation is sick
*/
@@ -5786,7 +5787,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* To lower latency, PRs generate the local filter routing in DistributedCacheOperation after
* message distribution and before waiting for responses.
- *
+ *
* Warning: Even if you comment out bucket condition in following method, getLocalRoutingInfo()
* does NOT process CQs for bucket regions internally. See
* {@link FilterProfile#getFilterRoutingInfoPart2(FilterRoutingInfo, CacheEvent)} .
@@ -5930,7 +5931,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* Record the event state encapsulated in the given Map.
* <p>
* This is intended for state transfer during GII.
- *
+ *
* @param provider the member that provided this state
* @param state a Map obtained from getEventState()
*/
@@ -5971,7 +5972,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* has the Region's event state seen this event?
- *
+ *
* @return true if the Region's event state has seen the event
*/
public boolean hasSeenEvent(EntryEventImpl event) {
@@ -5980,7 +5981,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* tries to find the version tag for a event
- *
+ *
* @return the version tag, if known. Null if not
*/
public VersionTag findVersionTagForEvent(EventID eventId) {
@@ -5989,7 +5990,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* tries to find the version tag for a replayed client event
- *
+ *
* @return the version tag, if known. Null if not
*/
public VersionTag findVersionTagForClientBulkOp(EventID eventId) {
@@ -6001,7 +6002,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* Event, not an ID, but with transactions we do not have an event at the time the check needs to
* be made. Consequently, this method may cause events to be recorded that would otherwise be
* ignored.
- *
+ *
* @param eventID the identifier of the event
* @return true if the Region's event state has seen the event
*/
@@ -6012,7 +6013,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* A routine to provide synchronization running based on <memberShipID, threadID> of the
* requesting client for the region's event state
- *
+ *
* @param task - a Runnable to wrap the processing of the bulk op
* @param eventId - the base event ID of the bulk op
*
@@ -6420,7 +6421,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Do the expensive work of discovering an existing JTA transaction Only needs to be called at
* Region.Entry entry points e.g. Region.put, Region.invalidate, etc.
- *
+ *
* @since GemFire tx
*/
void discoverJTA() {
@@ -6570,7 +6571,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Creates an event for EVICT_DESTROY operations. It is intended that this method be overridden to
* allow for special handling of Partitioned Regions.
- *
+ *
* @param key - the key that this event is related to
* @return an event for EVICT_DESTROY
*/
@@ -7207,7 +7208,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Release the client connection pool if we have one
- *
+ *
* @since GemFire 5.7
*/
private void detachPool() {
@@ -7379,7 +7380,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* For each region entry in this region call the callback
- *
+ *
* @since GemFire prPersistSprint2
*/
@Override
@@ -7391,7 +7392,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Used by {@link #foreachRegionEntry}.
- *
+ *
* @since GemFire prPersistSprint2
*/
public interface RegionEntryCallback {
@@ -7604,7 +7605,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Returns the object sizer on this region or null if it has no sizer.
- *
+ *
* @since GemFire 6.1.2.9
*/
public ObjectSizer getObjectSizer() {
@@ -7867,7 +7868,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Returns the entry's RegionEntry if it "checks" out. The check is to see if the region entry
* still exists.
- *
+ *
* @throws EntryNotFoundException if the RegionEntry has been removed.
*/
private RegionEntry getCheckedRegionEntry() throws EntryNotFoundException {
@@ -8027,7 +8028,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Used by unit tests to get access to the EntryExpiryTask of the given key. Returns null if the
* entry exists but does not have an expiry task.
- *
+ *
* @throws EntryNotFoundException if no entry exists key.
*/
public EntryExpiryTask getEntryExpiryTask(Object key) {
@@ -8698,7 +8699,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* To get the value from region in serialized form
- *
+ *
* @return {@link VMCachedDeserializable}
*/
public Object getRawValue() {
@@ -8819,7 +8820,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* returns an estimate of the number of entries in this region. This method should be preferred
* over size() for hdfs regions where an accurate size is not needed. This method is not supported
* on a client
- *
+ *
* @return the estimated size of this region
*/
public int sizeEstimate() {
@@ -9307,7 +9308,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Called on a bridge server when it has a received a putAll command from a client.
- *
+ *
* @param map a map of key->value for the entries we are putting
* @param retryVersions a map of key->version tag. If any of the entries are the result of a
* retried client event, we need to make sure we send the original version tag along with
@@ -9345,7 +9346,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Called on a bridge server when it has a received a removeAll command from a client.
- *
+ *
* @param keys a collection of the keys we are putting
* @param retryVersions a collection of version tags. If the client is retrying a key then that
* keys slot will be non-null in this collection. Note that keys and retryVersions are
@@ -9979,7 +9980,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* This performs the putAll operation for a specific key and value
- *
+ *
* @param key the cache key
* @param value the cache value
* @param putallOp the DistributedPutAllOperation associated with the event
@@ -10255,7 +10256,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* This method determines whether this region should synchronize with peer replicated regions when
* the given member has crashed.
- *
+ *
* @param id the crashed member
* @return true if synchronization should be attempted
*/
@@ -10267,7 +10268,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* forces the diskRegion to switch the oplog
- *
+ *
* @since GemFire 5.1
*/
@Override
@@ -10279,7 +10280,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* TODO: return value is never used
- *
+ *
* @deprecated as of prPersistSprint1 use forceCompaction instead
*/
@Deprecated
@@ -10293,7 +10294,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
FilterProfile filterProfile;
/**
- *
+ *
* @return int array containing the IDs of the oplogs which will potentially get rolled else null
* if no oplogs were available at the time of signal or region is not having disk
* persistence. Pls note that the actual number of oplogs rolled may be more than what is
@@ -10368,7 +10369,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* A convenience method to get the PartitionedRegion for a Bucket
- *
+ *
* @return If this is an instance of {@link BucketRegion}, returns the {@link PartitionedRegion}
* otherwise throws an IllegalArgumentException
*/
@@ -10492,7 +10493,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Called by ccn when a client goes away
- *
+ *
* @since GemFire 5.7
*/
void cleanupForClient(CacheClientNotifier clientNotifier, ClientProxyMembershipID client) {
@@ -10629,7 +10630,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* Execute the provided named function in all locations that contain the given keys. So function
* can be executed on just one fabric node, executed in parallel on a subset of nodes in parallel
* across all the nodes.
- *
+ *
* @since GemFire 5.8Beta
*/
public ResultCollector executeFunction(final DistributedRegionFunctionExecutor execution,
@@ -10799,7 +10800,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Fetch the Region which stores the given key The resulting Region will be used for a read
* operation e.g. Region.get
- *
+ *
* @param entryKey key to evaluate to determine the returned region
* @return region that stores the key
*/
@@ -10810,7 +10811,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Fetch the Region which stores the given key. The resulting Region will be used for a write
* operation e.g. Region.put
- *
+ *
* @param entryKey key to evaluate to determine the returned region
* @return region that stores the key
*/
@@ -10832,7 +10833,7 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Used to bootstrap txState.
- *
+ *
* @return localMember for local and distributedRegions, member with parimary bucket for
* partitionedRegions
*/
@@ -11462,14 +11463,14 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* If the specified key is not already associated with a value, associate it with the given value.
* This is equivalent to
- *
+ *
* <pre>
* if (!region.containsKey(key))
* return region.put(key, value);
* else
* return region.get(key);
* </pre>
- *
+ *
* Except that the action is performed atomically.
*
* <i>Note that if this method returns null then there is no way to determine definitely whether
@@ -11950,10 +11951,10 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
/**
* Return an IndexMap that is persisted to the disk store used by this region.
- *
+ *
* This IndexMap should be used as the backing map for any regions that are using the Soplog
* persistence.
- *
+ *
* Calling this method may create a branch new index map on disk, or it may recover an index map
* that was previously persisted, depending on whether the index previously existed.
*
@@ -11962,14 +11963,14 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
* @param indexName the name of the index
* @param indexedExpression the index expression
* @param fromClause the from clause.
- *
+ *
* @return The index map.
- *
+ *
* @throws IllegalStateException if this region is not using soplog persistence
- *
+ *
* @throws IllegalStateException if this index was previously persisted with a different
* expression or from clause.
- *
+ *
*/
public IndexMap getIndexMap(String indexName, String indexedExpression, String fromClause) {
return new IndexMapImpl();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
index 90289b0..eed6176 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
@@ -27,13 +27,13 @@ import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
/**
- *
+ *
* @since GemFire 6.0tx
*/
public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getDeserializedValue(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -46,7 +46,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#txDestroyExistingEntry(org.apache.geode.
* internal.cache.EntryEventImpl, boolean)
*/
@@ -59,7 +59,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#txInvalidateExistingEntry(org.apache.geode.
* internal.cache.EntryEventImpl, boolean, boolean)
@@ -86,7 +86,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#entryCount(org.apache.geode.internal.cache.
* LocalRegion)
@@ -97,7 +97,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getValueInVM(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -107,7 +107,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#containsKey(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -117,7 +117,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#containsValueForKey(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -127,7 +127,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getEntry(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -142,7 +142,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#putEntry(org.apache.geode.internal.cache.
* EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
*/
@@ -155,7 +155,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#isStatsDeferred()
*/
public boolean isDeferredStats() {
@@ -164,7 +164,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#findObject(org.apache.geode.internal.cache.
* LocalRegion, java.lang.Object, java.lang.Object, boolean, boolean, java.lang.Object)
@@ -179,7 +179,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getEntryForIterator(org.apache.geode.internal.
* cache.LocalRegion, java.lang.Object, boolean)
@@ -195,7 +195,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getKeyForIterator(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -220,7 +220,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getAdditionalKeysForIterator(org.apache.geode.
* internal.cache.LocalRegion)
@@ -231,7 +231,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getSerializedValue(org.apache.geode.internal.
* cache.BucketRegion, java.lang.Object, java.lang.Object)
@@ -255,7 +255,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#invalidateOnRemote(org.apache.geode.internal.
* cache.EntryEventImpl, boolean, boolean)
@@ -267,7 +267,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getBucketKeys(int)
*/
public Set getBucketKeys(LocalRegion localRegion, int bucketId, boolean allowTombstones) {
@@ -276,7 +276,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getEntryOnRemote(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -300,7 +300,7 @@ public class LocalRegionDataView implements InternalDataView {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getRegionKeysForIteration(org.apache.geode.
* internal.cache.LocalRegion)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
index e7fb017..0acd8ba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
@@ -360,7 +360,7 @@ public class MemberFunctionStreamingMessage extends DistributionMessage
/**
* check to see if the distributed system is closing
- *
+ *
* @return true if the distributed system is closing
*/
private boolean checkDSClosing(DistributionManager dm) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
index 8062d26..dff4e9b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
@@ -17,11 +17,11 @@ package org.apache.geode.internal.cache;
import java.io.*;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.ExternalizableDSFID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
/**
* Stores information about a PartitionedRegion singleton instance running inside a virtual machine.
@@ -36,7 +36,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
* Node maintains a field for maxMemory (fixed) to enable other Nodes to determine whether the Node
* should be the target of a canRebalance request. If the Node's maxMemory is 0, then the Node is
* advertising that it never should receive a request to rebalance.
- *
+ *
*/
public class Node extends ExternalizableDSFID {
private InternalDistributedMember memberId;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java
index d30d849..0682d88 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
index 4137af4..2a15195 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
@@ -16,11 +16,11 @@ package org.apache.geode.internal.cache;
/**
* Enumerated type for an event operation.
- *
- *
- *
+ *
+ *
+ *
* @see org.apache.geode.cache.Operation
- *
+ *
* @since GemFire 6.6
*/
public class OpType {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
index 25a3278..edc6906 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -79,13 +79,13 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.Sendable;
import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.internal.cache.entries.DiskEntry.Helper.Flushable;
-import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
import org.apache.geode.internal.cache.DiskStoreImpl.OplogCompactor;
import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
import org.apache.geode.internal.cache.DistributedRegion.DiskPosition;
+import org.apache.geode.internal.cache.entries.DiskEntry;
+import org.apache.geode.internal.cache.entries.DiskEntry.Helper.Flushable;
+import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
import org.apache.geode.internal.cache.persistence.BytesAndBits;
@@ -120,7 +120,7 @@ import org.apache.geode.pdx.internal.PdxWriterImpl;
/**
* Implements an operation log to write to disk. As of prPersistSprint2 this file only supports
* persistent regions. For overflow only regions see {@link OverflowOplog}.
- *
+ *
* @since GemFire 5.1
*/
public class Oplog implements CompactableOplog, Flushable {
@@ -199,7 +199,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Set to true once compact is called on this oplog.
- *
+ *
* @since GemFire prPersistSprint1
*/
private volatile boolean compacting = false;
@@ -234,7 +234,7 @@ public class Oplog implements CompactableOplog, Flushable {
* Written to CRF. Followed by 8 bytes which is the BASE_ID to use for any NEW_ENTRY records. 1:
* EndOfRecord Only needs to be written once per oplog and must preceed any OPLOG_NEW_ENTRY_0ID
* records.
- *
+ *
* @since GemFire prPersistSprint1
*/
private static final byte OPLOG_NEW_ENTRY_BASE_ID = 63;
@@ -507,7 +507,7 @@ public class Oplog implements CompactableOplog, Flushable {
* Persist oplog file magic number. Written once at the beginning of every oplog file; CRF, DRF,
* KRF, IF and IRF. Followed by 6 byte magic number. Each oplog type has a different magic number
* Followed by EndOfRecord Fix for bug 43824
- *
+ *
* @since GemFire 8.0
*/
static final byte OPLOG_MAGIC_SEQ_ID = 92;
@@ -556,10 +556,10 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Creates new {@code Oplog} for the given region.
- *
+ *
* @param oplogId int identifying the new oplog
* @param dirHolder The directory in which to create new Oplog
- *
+ *
* @throws DiskAccessException if the disk files can not be initialized
*/
Oplog(long oplogId, PersistentOplogSet parent, DirectoryHolder dirHolder) {
@@ -626,7 +626,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* A copy constructor used for creating a new oplog based on the previous Oplog. This constructor
* is invoked only from the function switchOplog
- *
+ *
* @param oplogId integer identifying the new oplog
* @param dirHolder The directory in which to create new Oplog
* @param prevOplog The previous oplog
@@ -792,7 +792,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Write the RVV record for the given regions.
- *
+ *
* @param olf the oplog to write to
* @param diskRegions the set of disk regions we should write the RVV of
* @param writeGCRVV true to write write the GC RVV
@@ -1175,7 +1175,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Given a set of Oplog file names return a Set of the oplog files that match those names that are
* managed by this Oplog.
- *
+ *
* @param oplogFileNames a Set of operation log file names.
*/
Set<String> gatherMatchingOplogFiles(Set<String> oplogFileNames) {
@@ -1207,7 +1207,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Returns a map of baseline oplog files to copy that match this oplog's files for a currently
* running backup.
- *
+ *
* @param baselineOplogFiles a List of files to match this oplog's filenames against.
* @return a map of baslineline oplog files to copy. May be empty if total current set for this
* oplog does not match the baseline.
@@ -1255,7 +1255,7 @@ public class Oplog implements CompactableOplog, Flushable {
* Returns the unserialized bytes and bits for the given Entry. If Oplog is destroyed while
* querying, then the DiskRegion is queried again to obatin the value This method should never get
* invoked for an entry which has been destroyed
- *
+ *
* @since GemFire 3.2.1
* @param id The DiskId for the entry @param offset The offset in this OpLog where the entry is
* present. @param faultingIn @param bitOnly boolean indicating whether to extract just the
@@ -1324,7 +1324,7 @@ public class Oplog implements CompactableOplog, Flushable {
* only. As such, it bypasses the buffer and goes directly to the disk. This is not a thread safe
* function , in the sense, it is possible that by the time the OpLog is queried , data might move
* HTree with the oplog being destroyed
- *
+ *
* @param id A DiskId object for which the value on disk will be fetched
*/
@Override
@@ -1408,19 +1408,19 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Used during recovery to calculate the OplogEntryId of the next NEW_ENTRY record.
- *
+ *
* @since GemFire prPersistSprint1
*/
private long recoverNewEntryId = DiskStoreImpl.INVALID_ID;
/**
* Used during writing to remember the last MOD_ENTRY OplogEntryId written to this oplog.
- *
+ *
* @since GemFire prPersistSprint1
*/
private long writeModEntryId = DiskStoreImpl.INVALID_ID;
/**
* Used during recovery to calculate the OplogEntryId of the next MOD_ENTRY record.
- *
+ *
* @since GemFire prPersistSprint1
*/
private long recoverModEntryId = DiskStoreImpl.INVALID_ID;
@@ -1434,13 +1434,13 @@ public class Oplog implements CompactableOplog, Flushable {
private long recoverDelEntryIdHWM = DiskStoreImpl.INVALID_ID;
/**
* Used during writing to remember the last DEL_ENTRY OplogEntryId written to this oplog.
- *
+ *
* @since GemFire prPersistSprint1
*/
private long writeDelEntryId = DiskStoreImpl.INVALID_ID;
/**
* Used during recovery to calculate the OplogEntryId of the next DEL_ENTRY record.
- *
+ *
* @since GemFire prPersistSprint1
*/
private long recoverDelEntryId = DiskStoreImpl.INVALID_ID;
@@ -2232,7 +2232,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Recovers one oplog
- *
+ *
* @param latestOplog - true if this oplog is the latest oplog in the disk store.
*/
long recoverCrf(OplogEntryIdSet deletedIds, boolean recoverValues, boolean recoverValuesSync,
@@ -2457,7 +2457,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Reads an oplog entry of type Create
- *
+ *
* @param dis DataInputStream from which the oplog is being read
* @param opcode byte whether the id is short/int/long
*/
@@ -2643,7 +2643,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Reads an oplog entry of type Modify
- *
+ *
* @param dis DataInputStream from which the oplog is being read
* @param opcode byte whether the id is short/int/long
*/
@@ -2864,7 +2864,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Reads an oplog entry of type ModifyWithKey
- *
+ *
* @param dis DataInputStream from which the oplog is being read
* @param opcode byte whether the id is short/int/long
*/
@@ -3055,7 +3055,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Reads an oplog entry of type Delete
- *
+ *
* @param dis DataInputStream from which the oplog is being read
* @param opcode byte whether the id is short/int/long
* @param parent instance of disk region
@@ -3363,7 +3363,7 @@ public class Oplog implements CompactableOplog, Flushable {
* Destroys this oplog. First it will call close which will cleanly close all Async threads and
* then the oplog file will be deleted. The deletion of lock files will be taken care of by the
* close.
- *
+ *
*/
public void destroy() {
lockCompactor();
@@ -3399,7 +3399,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* A check to confirm that the oplog has been closed because of the cache being closed
- *
+ *
*/
private void checkClosed() {
getParent().getCancelCriterion().checkCancelInProgress(null);
@@ -3445,7 +3445,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* This function records all the data for the current op into this.opState.
- *
+ *
* @param opCode The int value identifying whether it is create/modify or delete operation
* @param entry The DiskEntry object being operated upon
* @param value The byte array representing the value
@@ -3494,7 +3494,7 @@ public class Oplog implements CompactableOplog, Flushable {
* Modified the code so as to reuse the already created ByteBuffer during transition. Creates a
* key/value pair from a region entry on disk. Updates all of the necessary
* {@linkplain DiskStoreStats statistics} and invokes basicCreate
- *
+ *
* @param entry The DiskEntry object for this key/value pair.
* @param value byte array representing the value
*/
@@ -3558,7 +3558,7 @@ public class Oplog implements CompactableOplog, Flushable {
* A helper function which identifies whether to create the entry in the current oplog or to make
* the switch to the next oplog. This function enables us to reuse the byte buffer which got
* created for an oplog which no longer permits us to use itself
- *
+ *
* @param entry DiskEntry object representing the current Entry
*/
private void basicCreate(DiskRegion dr, DiskEntry entry, ValueWrapper value, byte userBits,
@@ -3748,7 +3748,7 @@ public class Oplog implements CompactableOplog, Flushable {
* directory. If the operation causing the switching is on an Entry which already is referencing
* the oplog to be compacted, then the compactor thread will skip compaction that entry & the
* switching thread will roll the entry explicitly.
- *
+ *
* @param lengthOfOperationCausingSwitch length of the operation causing the switch
* @param entryCausingSwitch DiskEntry object operation on which caused the switching of Oplog.
* This can be null if the switching has been invoked by the forceRolling which does not
@@ -4131,7 +4131,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Create the KRF file for this oplog. It is ok for this method to be async. finishKRF will be
* called and it must block until KRF generation is complete.
- *
+ *
* @param cancel if true then prevent the krf from being created if possible
*/
void createKrf(boolean cancel) {
@@ -4261,7 +4261,7 @@ public class Oplog implements CompactableOplog, Flushable {
* oplog being compacted. Attempt is made to retrieve the value from in memory , if available,
* else from asynch buffers ( if asynch mode is enabled), else from the Oplog being compacted. It
* is invoked from switchOplog as well as OplogCompactor's compact function.
- *
+ *
* @param entry DiskEntry being compacted referencing the Oplog being compacted
* @param wrapper Object of type BytesAndBitsForCompactor. The data if found is set in the wrapper
* Object. The wrapper Object also contains the user bit associated with the entry
@@ -4416,9 +4416,9 @@ public class Oplog implements CompactableOplog, Flushable {
* Modified the code so as to reuse the already created ByteBuffer during transition. Minimizing
* the synchronization allowing multiple put operations for different entries to proceed
* concurrently for asynch mode
- *
+ *
* @param entry DiskEntry object representing the current Entry
- *
+ *
* @param value byte array representing the value
*/
public void modify(InternalRegion region, DiskEntry entry, ValueWrapper value, boolean async) {
@@ -4588,7 +4588,7 @@ public class Oplog implements CompactableOplog, Flushable {
* the switch to the next oplog. This function enables us to reuse the byte buffer which got
* created for an oplog which no longer permits us to use itself. It will also take acre of
* compaction if required
- *
+ *
* @param entry DiskEntry object representing the current Entry
*/
private void basicModify(DiskRegionView dr, DiskEntry entry, ValueWrapper value, byte userBits,
@@ -4901,7 +4901,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Removes the key/value pair with the given id on disk.
- *
+ *
* @param entry DiskEntry object on which remove operation is called
*/
public void remove(InternalRegion region, DiskEntry entry, boolean async, boolean isClear) {
@@ -5039,7 +5039,7 @@ public class Oplog implements CompactableOplog, Flushable {
* to make the switch to the next oplog. This function enables us to reuse the byte buffer which
* got created for an oplog which no longer permits us to use itself. It will also take acre of
* compaction if required
- *
+ *
* @param entry DiskEntry object representing the current Entry
*/
private void basicRemove(DiskRegionView dr, DiskEntry entry, boolean async, boolean isClear)
@@ -5301,7 +5301,7 @@ public class Oplog implements CompactableOplog, Flushable {
* asynch write because the fault in operations can clash with the asynch writing. Write the
* specified bytes to the oplog. Note that since extending a file is expensive this code will
* possibly write OPLOG_EXTEND_SIZE zero bytes to reduce the number of times the file is extended.
- *
+ *
*
* @param olf the file to write the bytes to
* @return The long offset at which the data present in the ByteBuffer gets written to
@@ -5383,7 +5383,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* If crfRAF has been closed then attempt to reopen the oplog for this read. Verify that this only
* happens when test methods are invoked.
- *
+ *
* @return true if oplog file is open and can be read from; false if not
*/
private boolean reopenFileIfClosed() throws IOException {
@@ -5501,7 +5501,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Extracts the Value byte array & UserBit from the OpLog
- *
+ *
* @param offsetInOplog The starting position from which to read the data in the opLog
* @param bitOnly boolean indicating whether the value needs to be extracted along with the
* UserBit or not.
@@ -5557,7 +5557,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Extracts the Value byte array & UserBit from the OpLog and inserts it in the wrapper Object of
* type BytesAndBitsForCompactor which is passed
- *
+ *
* @param offsetInOplog The starting position from which to read the data in the opLog
* @param bitOnly boolean indicating whether the value needs to be extracted along with the
* UserBit or not.
@@ -5823,7 +5823,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Helper function for the test
- *
+ *
* @return FileChannel object representing the Oplog
*/
UninterruptibleFileChannel getFileChannel() {
@@ -5838,7 +5838,7 @@ public class Oplog implements CompactableOplog, Flushable {
* The current size of Oplog. It may be less than the actual Oplog file size ( in case of asynch
* writing as it also takes into account data present in asynch buffers which will get flushed in
* course of time o
- *
+ *
* @return long value indicating the current size of the oplog.
*/
long getOplogSize() {
@@ -5957,7 +5957,7 @@ public class Oplog implements CompactableOplog, Flushable {
createKrf(true);
}
- private final static ThreadLocal isCompactorThread = new ThreadLocal();
+ private static final ThreadLocal isCompactorThread = new ThreadLocal();
private boolean calledByCompactorThread() {
if (!this.compacting)
@@ -6399,7 +6399,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Method to be used only for testing
- *
+ *
* @param ch Object to replace the channel in the Oplog.crf
* @return original channel object
*/
@@ -7087,7 +7087,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Adds any live entries in this list to liveEntries and returns the index of the next free
* slot.
- *
+ *
* @param liveEntries the array to fill with the live entries
* @param idx the first free slot in liveEntries
* @param drv the disk region these entries are on
@@ -7110,7 +7110,7 @@ public class Oplog implements CompactableOplog, Flushable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.DiskEntry#getVersionStamp()
*/
@Override
@@ -7464,7 +7464,7 @@ public class Oplog implements CompactableOplog, Flushable {
}
@Override
- synchronized public boolean testAndSetUnrecovered() {
+ public synchronized boolean testAndSetUnrecovered() {
boolean result = !this.unrecovered;
if (result) {
this.unrecovered = true;
@@ -7474,12 +7474,12 @@ public class Oplog implements CompactableOplog, Flushable {
}
@Override
- synchronized public boolean getUnrecovered() {
+ public synchronized boolean getUnrecovered() {
return this.unrecovered;
}
@Override
- synchronized public boolean testAndSetRecovered(DiskRegionView dr) {
+ public synchronized boolean testAndSetRecovered(DiskRegionView dr) {
boolean result = this.unrecovered;
if (result) {
this.unrecovered = false;
@@ -7626,7 +7626,7 @@ public class Oplog implements CompactableOplog, Flushable {
* Return true if we are the first guy to set it to true
*/
@Override
- synchronized public boolean testAndSetUnrecovered() {
+ public synchronized boolean testAndSetUnrecovered() {
boolean result = super.testAndSetUnrecovered();
if (result) {
this.liveEntries.clear();
@@ -7830,7 +7830,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Used in offline mode to prevent pdx deserialization of keys. The raw bytes are a serialized
* pdx.
- *
+ *
* @since GemFire 6.6
*/
private static class RawByteKey implements Sendable {
@@ -7864,7 +7864,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Enumeration of operation log file types.
- *
+ *
*/
enum OplogFileType {
OPLOG_CRF, // Creates and updates
@@ -7874,7 +7874,7 @@ public class Oplog implements CompactableOplog, Flushable {
/**
* Enumeration of the possible results of the okToSkipModifyRecord
- *
+ *
*
*/
private static enum OkToSkipResult {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OrderedTombstoneMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OrderedTombstoneMap.java
index 048a977..fd1b63c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OrderedTombstoneMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OrderedTombstoneMap.java
@@ -28,20 +28,20 @@ import org.apache.geode.internal.cache.versions.VersionTag;
* This class is used for sorting tombstones by region version number. Because two tombstones with
* different members are not comparable, the iterator on this class tries to return the tombstones
* in the order of the timestamps of the tombstones.
- *
+ *
* The class maintains a map, per member, of the tombstones sorted by the version tag.
- *
+ *
* When removing entries, we pick from the sorted map that has the lowest timestamp.
- *
+ *
* This map is not threadsafe.
- *
+ *
*
*/
public class OrderedTombstoneMap<T> {
/**
* A map of member id-> sort map of version tag-> region entry
- *
+ *
*/
private Map<VersionSource, TreeMap<VersionTag, T>> tombstoneMap = new HashMap();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplog.java
index 1104eb8..381be2b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplog.java
@@ -28,15 +28,16 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.distributed.OplogCancelledException;
import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.cache.DiskStoreImpl.OplogCompactor;
+import org.apache.geode.internal.cache.Oplog.OplogDiskEntry;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.Flushable;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
-import org.apache.geode.internal.cache.DiskStoreImpl.OplogCompactor;
-import org.apache.geode.internal.cache.Oplog.OplogDiskEntry;
import org.apache.geode.internal.cache.persistence.BytesAndBits;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -47,7 +48,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* An oplog used for overflow-only regions. For regions that are persistent (i.e. they can be
* recovered) see {@link Oplog}.
- *
+ *
* @since GemFire prPersistSprint2
*/
class OverflowOplog implements CompactableOplog, Flushable {
@@ -101,7 +102,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* A copy constructor used for creating a new oplog based on the previous Oplog. This constructor
* is invoked only from the function switchOplog
- *
+ *
* @param oplogId integer identifying the new oplog
* @param dirHolder The directory in which to create new Oplog
*/
@@ -235,7 +236,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* Returns the unserialized bytes and bits for the given Entry. If Oplog is destroyed while
* querying, then the DiskRegion is queried again to obatin the value This method should never get
* invoked for an entry which has been destroyed
- *
+ *
* @since GemFire 3.2.1
* @param id The DiskId for the entry @param offset The offset in this OpLog where the entry is
* present. @param faultingIn @param bitOnly boolean indicating whether to extract just the
@@ -310,7 +311,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* only. As such, it bypasses the buffer and goes directly to the disk. This is not a thread safe
* function , in the sense, it is possible that by the time the OpLog is queried , data might move
* HTree with the oplog being destroyed
- *
+ *
* @param id A DiskId object for which the value on disk will be fetched
*/
public BytesAndBits getNoBuffer(DiskRegion dr, DiskId id) {
@@ -391,7 +392,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* Destroys this oplog. First it will call close which will cleanly close all Async threads. The
* deletion of lock files will be taken care of by the close. Close will also take care of
* deleting the files if it is overflow only mode
- *
+ *
*/
public void destroy() {
if (!this.closed) {
@@ -406,7 +407,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* A check to confirm that the oplog has been closed because of the cache being closed
- *
+ *
*/
private void checkClosed() {
this.parent.getCancelCriterion().checkCancelInProgress(null);
@@ -453,7 +454,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* Modified the code so as to reuse the already created ByteBuffer during transition. Minimizing
* the synchronization allowing multiple put operations for different entries to proceed
* concurrently for asynch mode
- *
+ *
* @param entry DiskEntry object representing the current Entry
* @param value byte array representing the value
* @return true if modify was done; false if this file did not have room
@@ -501,7 +502,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* the switch to the next oplog. This function enables us to reuse the byte buffer which got
* created for an oplog which no longer permits us to use itself. It will also take acre of
* compaction if required
- *
+ *
* @param entry DiskEntry object representing the current Entry
* @return true if modify was done; false if this file did not have room
*/
@@ -568,7 +569,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* Removes the key/value pair with the given id on disk.
- *
+ *
* @param entry DiskEntry object on which remove operation is called
*/
public void remove(DiskRegion dr, DiskEntry entry) {
@@ -592,7 +593,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* A helper function which identifies whether to record a removal of entry in the current oplog or
* to make the switch to the next oplog. This function enables us to reuse the byte buffer which
* got created for an oplog which no longer permits us to use itself.
- *
+ *
* @param entry DiskEntry object representing the current Entry
*/
private void basicRemove(DiskRegion dr, DiskEntry entry)
@@ -677,7 +678,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* Method to be used only for testing
- *
+ *
* @param ch Object to replace the channel in the Oplog.crf
* @return original channel object
*/
@@ -736,7 +737,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* asynch write because the fault in operations can clash with the asynch writing. Write the
* specified bytes to the oplog. Note that since extending a file is expensive this code will
* possibly write OPLOG_EXTEND_SIZE zero bytes to reduce the number of times the file is extended.
- *
+ *
*
* @return The long offset at which the data present in the ByteBuffer gets written to
*/
@@ -868,7 +869,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* Extracts the Value byte array & UserBit from the OpLog
- *
+ *
* @param offsetInOplog The starting position from which to read the data in the opLog
* @param bitOnly boolean indicating whether the value needs to be extracted along with the
* UserBit or not.
@@ -956,7 +957,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* Helper function for the test
- *
+ *
* @return FileChannel object representing the Oplog
*/
FileChannel getFileChannel() {
@@ -972,7 +973,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* The current size of Oplog. It may be less than the actual Oplog file size ( in case of asynch
* writing as it also takes into account data present in asynch buffers which will get flushed in
* course of time o
- *
+ *
* @return long value indicating the current size of the oplog.
*/
long getOplogSize() {
@@ -1344,7 +1345,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
* oplog being compacted. Attempt is made to retrieve the value from in memory , if available,
* else from asynch buffers ( if asynch mode is enabled), else from the Oplog being compacted. It
* is invoked from switchOplog as well as OplogCompactor's compact function.
- *
+ *
* @param entry DiskEntry being compacted referencing the Oplog being compacted
* @param wrapper Object of type BytesAndBitsForCompactor. The data if found is set in the wrapper
* Object. The wrapper Object also contains the user bit associated with the entry
@@ -1401,7 +1402,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
/**
* Extracts the Value byte array & UserBit from the OpLog and inserts it in the wrapper Object of
* type BytesAndBitsForCompactor which is passed
- *
+ *
* @param offsetInOplog The starting position from which to read the data in the opLog
* @param bitOnly boolean indicating whether the value needs to be extracted along with the
* UserBit or not.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
index f8e2108..833d550 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
@@ -15,6 +15,17 @@
package org.apache.geode.internal.cache;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheClosedException;
@@ -48,16 +59,6 @@ import org.apache.geode.internal.cache.persistence.PersistentStateListener;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
/**
* This class provides the redundancy management for partitioned region. It will provide the
@@ -70,7 +71,7 @@ import java.util.concurrent.atomic.AtomicLong;
* gracefully. i.e. Cache.close()</br>
* <br>
* (4) Redundancy management at random node failure.</br>
- *
+ *
*/
public class PRHARedundancyProvider {
private static final Logger logger = LogService.getLogger();
@@ -120,7 +121,7 @@ public class PRHARedundancyProvider {
/**
* Constructor for PRHARedundancyProvider.
- *
+ *
* @param region The PartitionedRegion for which the HA redundancy is required to be managed.
*/
public PRHARedundancyProvider(final PartitionedRegion region) {
@@ -137,7 +138,7 @@ public class PRHARedundancyProvider {
/**
* Display bucket allocation status
- *
+ *
* @param prRegion the given region
* @param allStores the list of available stores. If null, unknown.
* @param alreadyUsed stores allocated; only used if allStores != null
@@ -170,12 +171,12 @@ public class PRHARedundancyProvider {
return sb.toString();
}
- static public final StringId TIMEOUT_MSG =
+ public static final StringId TIMEOUT_MSG =
LocalizedStrings.PRHARedundancyProvider_IF_YOUR_SYSTEM_HAS_SUFFICIENT_SPACE_PERHAPS_IT_IS_UNDER_MEMBERSHIP_OR_REGION_CREATION_STRESS;
/**
* Indicate a timeout due to excessive retries among available peers
- *
+ *
* @param allStores all feasible stores. If null, we don't know.
* @param alreadyUsed those that have already accepted, only used if allStores != null
* @param opString description of the operation which timed out
@@ -207,7 +208,7 @@ public class PRHARedundancyProvider {
/**
* This is for FPR, for given partition, we have to return the set of datastores on which the
* given partition is defined
- *
+ *
* @param partitionName name of the partition for which datastores need to be found out
*/
private Set<InternalDistributedMember> getFixedPartitionStores(String partitionName) {
@@ -229,13 +230,13 @@ public class PRHARedundancyProvider {
/**
* Signature string indicating that not enough stores are available.
*/
- static public final StringId INSUFFICIENT_STORES_MSG =
+ public static final StringId INSUFFICIENT_STORES_MSG =
LocalizedStrings.PRHARedundancyProvider_CONSIDER_STARTING_ANOTHER_MEMBER;
/**
* Signature string indicating that there are enough stores available.
*/
- static public final StringId SUFFICIENT_STORES_MSG =
+ public static final StringId SUFFICIENT_STORES_MSG =
LocalizedStrings.PRHARRedundancyProvider_FOUND_A_MEMBER_TO_HOST_A_BUCKET;
/**
@@ -247,7 +248,7 @@ public class PRHARedundancyProvider {
/**
* Indicate that we are unable to allocate sufficient stores and the timeout period has passed
- *
+ *
* @param allStores stores we know about
* @param alreadyUsed ones already committed
* @param onlyLog true if only a warning log messages should be generated.
@@ -280,7 +281,7 @@ public class PRHARedundancyProvider {
/**
* Create a single copy of this bucket on one node. The bucket must already be locked.
- *
+ *
* @param bucketId The bucket we are working on
* @param newBucketSize size to create it
* @param excludedMembers
@@ -412,7 +413,7 @@ public class PRHARedundancyProvider {
public static final long INSUFFICIENT_LOGGING_THROTTLE_TIME = TimeUnit.SECONDS.toNanos(
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "InsufficientLoggingThrottleTime", 2)
.intValue());
- public volatile static boolean TEST_MODE = false;
+ public static volatile boolean TEST_MODE = false;
// since 6.6, please use the distributed system property enforce-unique-host instead.
// public static final boolean ENFORCE_UNIQUE_HOST_STORAGE_ALLOCATION =
// DistributionConfig.DEFAULT_ENFORCE_UNIQUE_HOST;
@@ -474,15 +475,15 @@ public class PRHARedundancyProvider {
* BucketBackupMessage is sent to the nodes to make copies of a bucket that was only partially
* created. Other VMs are informed of bucket creation through updates through their
* {@link BucketAdvisor.BucketProfile}s.
- *
+ *
* <p>
* This method is synchronized to enforce a single threaded ordering, allowing for a more accurate
* picture of bucket distribution in the face of concurrency. See bug 37275.
* </p>
- *
+ *
* This method is now slightly misnamed. Another member could be in the process of creating this
* same bucket at the same time.
- *
+ *
* @param bucketId Id of the bucket to be created.
* @param newBucketSize size of the first entry.
* @param startTime a time stamp prior to calling the method, used to update bucket creation stats
@@ -731,7 +732,7 @@ public class PRHARedundancyProvider {
/**
* Figure out which member should be primary for a bucket among the members that have created the
* bucket, and tell that member to become the primary.
- *
+ *
* @param acceptedMembers The members that now host the bucket
*/
private void endBucketCreation(int bucketId,
@@ -889,10 +890,10 @@ public class PRHARedundancyProvider {
/**
* Get buddy data stores on the same Host as the accepted member
- *
+ *
* @return set of members on the same host, not including accepted member
* @since GemFire 5.9
- *
+ *
*/
private Set<InternalDistributedMember> getBuddyMembersInZone(
final InternalDistributedMember acceptedMember,
@@ -911,7 +912,7 @@ public class PRHARedundancyProvider {
/**
* Early check for resources. This code may be executed for every put operation if there are no
* datastores present, limit excessive logging.
- *
+ *
* @since GemFire 5.8
*/
private void earlySufficientStoresCheck(String partitionName) {
@@ -928,7 +929,7 @@ public class PRHARedundancyProvider {
/**
* Limit the frequency for logging the {@link #INSUFFICIENT_STORES_MSG} message to once per PR
* after which once every {@link #INSUFFICIENT_LOGGING_THROTTLE_TIME} second
- *
+ *
* @return true if it's time to log
* @since GemFire 5.8
*/
@@ -948,7 +949,7 @@ public class PRHARedundancyProvider {
* Compute timeout for waiting for a bucket. Prefer
* {@link #DATASTORE_DISCOVERY_TIMEOUT_MILLISECONDS} over
* {@link PartitionedRegion#getRetryTimeout()}
- *
+ *
* @return the milliseconds to wait for a bucket creation operation
*/
private long computeTimeout() {
@@ -964,7 +965,7 @@ public class PRHARedundancyProvider {
/**
* Check to determine that there are enough datastore VMs to start the bucket creation processes.
* Log a warning or throw an exception indicating when there are not enough datastore VMs.
- *
+ *
* @param allStores All known data store instances (including local)
* @param loggedInsufficentStores indicates whether a warning has been logged
* @return true when a warning has been logged, false if a warning should be logged.
@@ -1001,7 +1002,7 @@ public class PRHARedundancyProvider {
/**
* Clean up locally created bucket and tell other VMs to attempt recovering redundancy
- *
+ *
* @param buck the bucket identifier
*/
private void cleanUpBucket(int buck) {
@@ -1023,7 +1024,7 @@ public class PRHARedundancyProvider {
/**
* Creates bucket with ID bucketId on targetNode. This method will also create the bucket for all
* of the child colocated PRs.
- *
+ *
* @param bucketId
* @param targetNMember
* @param isRebalance true if bucket creation is directed by rebalancing
@@ -1127,7 +1128,7 @@ public class PRHARedundancyProvider {
/**
* Creates bucket with ID bucketId on targetNode.
- *
+ *
* @param bucketId
* @param targetNMember
* @param newBucketSize
@@ -1228,7 +1229,7 @@ public class PRHARedundancyProvider {
* Select the member with which is hosting the same bucketid for the PR it is colocated with In
* case of primary it returns the same node whereas in case of secondary it will return the least
* loaded datastore which is hosting the bucketid.
- *
+ *
* @param alreadyUsed
* @param bucketId
* @param prName
@@ -1267,10 +1268,10 @@ public class PRHARedundancyProvider {
/**
* Select the member with the fewest buckets, among those with the fewest randomly select one.
- *
+ *
* Under concurrent access, the data that this method uses, may be somewhat volatile, note that
* createBucketAtomically synchronizes to enhance the consistency of the data used in this method.
- *
+ *
* @param candidates ArrayList of InternalDistributedMember, potential datastores
* @param alreadyUsed data stores already in use
* @return a member with the fewest buckets or null if no datastores
@@ -1410,16 +1411,16 @@ public class PRHARedundancyProvider {
/**
* Log bucket allocation in the log files in this format:
- *
+ *
* <pre>
* member1: +5/20
* member2: -10/5
* </pre>
- *
+ *
* After the member name, the +/- indicates whether or not this bucket is already hosted on the
* given member. This is followed by the number of hosted primaries followed by the number of
* hosted non-primary buckets.
- *
+ *
* @param prefix first part of message to print
* @param dataStores list of stores
* @param existingStores to mark those already in use
@@ -1492,7 +1493,7 @@ public class PRHARedundancyProvider {
* Verifies the members and removes the members that are either not present in the
* DistributedSystem or are no longer part of the PartitionedRegion (close/localDestroy has been
* performed.) .
- *
+ *
* @param members collection of members to scan and modify
*/
void verifyBucketNodes(Collection<InternalDistributedMember> members, String partitionName) {
@@ -1701,19 +1702,19 @@ public class PRHARedundancyProvider {
/*
* Spawn a separate thread for bucket that we previously hosted to recover that bucket.
- *
+ *
* That thread will get to the point at which it has determined that at least one member
* (possibly the local member) has fully initialized the bucket, at which it will count down the
* someMemberRecoveredLatch latch on the bucket.
- *
+ *
* Once at least one copy of each bucket has been created in the distributed system, the
* initPRInternals method will exit. Some of the threads spawned here will still be doing GII's
* in the background. This allows the system to become usable as fast as possible.
- *
+ *
* If we used a bounded thread pool here, we end up waiting for some buckets to finish there GII
* before returning from initPRInternals. In the future maybe we could let the create bucket
* return and pass the GII task to a separate thread pool.
- *
+ *
*/
for (final ProxyBucketRegion proxyBucket : proxyBucketArray) {
if (proxyBucket.getPersistenceAdvisor().wasHosting()) {
@@ -1772,7 +1773,7 @@ public class PRHARedundancyProvider {
* Check to see if any colocated region of the current region is persistent. It's not enough to
* check just the leader region, because a child region might be a persistent parallel WAN queue,
* which is allowed.
- *
+ *
* @return the most senior region in the colocation chain (closest to the leader) that is
* persistent.
*/
@@ -1818,7 +1819,7 @@ public class PRHARedundancyProvider {
/**
* Creates and fills in a PartitionMemberDetails for the partitioned region.
- *
+ *
* @param internal true if internal-only details should be included
* @param loadProbe the LoadProbe to use
* @return PartitionRegionInfo for the partitioned region
@@ -1902,7 +1903,7 @@ public class PRHARedundancyProvider {
/**
* Creates and fills in a PartitionMemberDetails for the local member.
- *
+ *
* @param internal true if internal-only details should be included
* @param loadProbe the LoadProbe to use
* @return PartitionMemberDetails for the local member
@@ -2029,9 +2030,9 @@ public class PRHARedundancyProvider {
}
private static class ManageBucketRsp {
- final static ManageBucketRsp NO = new ManageBucketRsp("NO");
- final static ManageBucketRsp YES = new ManageBucketRsp("YES");
- final static ManageBucketRsp NO_INITIALIZING = new ManageBucketRsp("NO_INITIALIZING");
+ static final ManageBucketRsp NO = new ManageBucketRsp("NO");
+ static final ManageBucketRsp YES = new ManageBucketRsp("YES");
+ static final ManageBucketRsp NO_INITIALIZING = new ManageBucketRsp("NO_INITIALIZING");
public static final ManageBucketRsp CLOSED = new ManageBucketRsp("CLOSED");
private final String name;
@@ -2063,7 +2064,7 @@ public class PRHARedundancyProvider {
}
}
- static private class BucketMembershipObserverResults {
+ private static class BucketMembershipObserverResults {
final boolean problematicDeparture;
final InternalDistributedMember primary;
@@ -2131,7 +2132,7 @@ public class PRHARedundancyProvider {
* Wait for expected number of owners to be recognized. When the expected number have been seen,
* then fetch the primary and report it. If while waiting for the owners to be recognized there
* is a departure which compromises redundancy
- *
+ *
* @param expectedCount the number of bucket owners to wait for
* @param expectedOwners the list of owners used when a departure is detected
* @return if no problematic departures are detected, the primary
@@ -2208,7 +2209,7 @@ public class PRHARedundancyProvider {
/**
* This class extends MembershipListener to perform cleanup when a node leaves DistributedSystem.
- *
+ *
*/
protected class PRMembershipListener implements MembershipListener {
public void memberDeparted(final InternalDistributedMember id, final boolean crashed) {
@@ -2256,7 +2257,7 @@ public class PRHARedundancyProvider {
/**
* This class extends MembershipListener to start redundancy recovery when a persistent member is
* revoked
- *
+ *
*/
protected class PRPersistenceListener extends PersistentStateListener.PersistentStateAdapter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
index 0be8cf1..7534750 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
@@ -64,16 +64,16 @@ import org.apache.geode.internal.logging.LogService;
* This class takes the responsibility of executing the query on a data store for the buckets
* specified in bucketList. It contains a {@code PRQueryExecutor} thread-pool executor that takes a
* {@code Callable} task identified by {@code PartitionedRegion}, queryString and bucketId.
- *
+ *
* The QueryTasks add results directly to a results queue. The BucketQueryResult is used not only to
* indicate completion, and holds an exception if there one occurred while processing a query.
*/
public class PRQueryProcessor {
private static final Logger logger = LogService.getLogger();
- final static int BUCKET_QUERY_TIMEOUT = 60;
+ static final int BUCKET_QUERY_TIMEOUT = 60;
- public final static int NUM_THREADS =
+ public static final int NUM_THREADS =
getInteger(DistributionConfig.GEMFIRE_PREFIX + "PRQueryProcessor.numThreads", 1);
/* For Test purpose */
@@ -120,7 +120,7 @@ public class PRQueryProcessor {
/**
* Executes a pre-compiled query on a data store. Adds result objects to resultQueue
- *
+ *
* @return boolean true if the result is a struct type
* @throws ForceReattemptException if query should be tried again
*/
@@ -436,8 +436,8 @@ public class PRQueryProcessor {
/**
* A ThreadPool ( Fixed Size ) with an executor service to execute the query execution spread over
* buckets.
- *
- *
+ *
+ *
*/
static class PRQueryExecutor {
@@ -522,7 +522,7 @@ public class PRQueryProcessor {
/**
* Implementation of call-able task to execute query on a bucket region. This task will be
* generated by the PRQueryProcessor.
- *
+ *
*/
@SuppressWarnings("synthetic-access")
private class QueryTask implements Callable {
@@ -572,7 +572,7 @@ public class PRQueryProcessor {
/**
* Encapsulates the result for the query on the bucket.
- *
+ *
*/
private class BucketQueryResult {
@@ -616,4 +616,3 @@ public class PRQueryProcessor {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionAttributesImpl.java
index 161562a..e97e983 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionAttributesImpl.java
@@ -39,14 +39,14 @@ import org.apache.geode.cache.partition.PartitionListener;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.offheap.OffHeapStorage;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.offheap.OffHeapStorage;
/**
* Internal implementation of PartitionAttributes. New attributes existing only in this class and
* not in {@link PartitionAttributes} are for internal use only.
- *
+ *
* @since GemFire 5.5
*/
public class PartitionAttributesImpl implements PartitionAttributes, Cloneable, DataSerializable {
@@ -180,7 +180,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
/**
* Constructs an instance of {@code PartitionAttributes} with default settings.
- *
+ *
* @see PartitionAttributesFactory
*/
public PartitionAttributesImpl() {
@@ -238,7 +238,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
* Returns localMaxMemory that must not be a temporary placeholder for offHeapLocalMaxMemory if
* off-heap. This must return the true final value of localMaxMemory which requires the
* DistributedSystem to be created if off-heap. See bug #52003.
- *
+ *
* @throws IllegalStateException if off-heap and the actual value is not yet known (because the
* DistributedSystem has not yet been created)
* @see #getLocalMaxMemoryForValidation()
@@ -273,7 +273,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
* DistributedSystem is created). Returned value may be the temporary placeholder representing
* offHeapLocalMaxMemory which cannot be calculated until the DistributedSystem is created. See
* bug #52003.
- *
+ *
* @see #OFF_HEAP_LOCAL_MAX_MEMORY_PLACEHOLDER
* @see #getLocalMaxMemory()
*/
@@ -488,7 +488,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
/**
* Set local properties
- *
+ *
* @deprecated use {@link #setLocalMaxMemory(int)} in GemFire 5.1 and later releases
* @param localProps those properties for the local VM
*/
@@ -503,7 +503,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
/**
* Set global properties
- *
+ *
* @deprecated use {@link #setTotalMaxMemory(long)} and {@link #setTotalNumBuckets(int)} in
* GemFire 5.1 and later releases
* @param globalProps those properties for the entire Partitioned Region
@@ -553,7 +553,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
* </ul>
* NOTE: validation that depends on more than one attribute can not be done in this method. That
* validation needs to be done in validateWhenAllAttributesAreSet
- *
+ *
* @throws IllegalStateException if the attributes are not consistent with each other.
*/
public void validateAttributes() {
@@ -642,13 +642,13 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
* This method used to be called when the RegionAttributes were created. But this was too early
* since the region we are colocated with might not exist (yet). So it is now called when the PR
* using these attributes is created. See bug 47197.
- *
+ *
* 1. region passed in setColocatedWith should exist.<br>
* 2. region passed should be of a PartitionedRegion <br>
* 3. Custom partitioned should be enabled for colocated regions <br>
* 4. totalNumBuckets should be same for colocated regions<br>
* 5. redundancy of colocated regions should be same<br>
- *
+ *
* @since GemFire 5.8Beta
*/
void validateColocation() {
@@ -687,7 +687,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
* Added for bug 45749. The attributes in pa are merged into this. Only attributes explicitly set
* in pa will be merged into this. Any attribute set in pa will take precedence over an attribute
* in this.
- *
+ *
* @param pa the attributes to merge into this.
* @since GemFire 7.0
*/
@@ -748,7 +748,7 @@ public class PartitionAttributesImpl implements PartitionAttributes, Cloneable,
* is available. This method must be called before any instances of PartitionAttributesImpl are
* created. Specify the value the same way the off-heap memory property is specified. So, "100m" =
* 100 megabytes, etc.
- *
+ *
* @param newTestAvailableOffHeapMemory The new test value for available off-heap memory.
*/
public static void setTestAvailableOffHeapMemory(final String newTestAvailableOffHeapMemory) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
index 7812a3d..799d8d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
@@ -18,21 +18,21 @@
*/
package org.apache.geode.internal.cache;
-import java.util.*;
import java.io.*;
+import java.util.*;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.ExternalizableDSFID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.cache.PartitionAttributes;
-import org.apache.geode.internal.cache.PartitionAttributesImpl;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.partition.PartitionListener;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.ExternalizableDSFID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
import org.apache.geode.internal.util.Versionable;
import org.apache.geode.internal.util.VersionedArrayList;
@@ -166,7 +166,7 @@ public class PartitionRegionConfig extends ExternalizableDSFID implements Versio
/**
* Returns a the list of nodes that participate in the PartitionedRegion
- *
+ *
* @return a copy of the list of nodes that the caller is free to modify
*/
Set<Node> getNodes() {
@@ -178,7 +178,7 @@ public class PartitionRegionConfig extends ExternalizableDSFID implements Versio
/**
* Return a safe, light weight size of the nodes
- *
+ *
* @return number of VMs that participate in the PartitionedRegion
*/
int getNumberOfNodes() {
@@ -326,7 +326,7 @@ public class PartitionRegionConfig extends ExternalizableDSFID implements Versio
/**
* This method returns true is a node has taken a responsibility of destroying the
* PartitionedRegion globally
- *
+ *
* @return true, if a node has taken a responsibility of destroying the PartitionedRegion globally
* else it returns false
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
index 8245fdd..9f08f99 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
@@ -36,8 +36,8 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- *
- *
+ *
+ *
*/
public class PartitionRegionConfigValidator {
@@ -205,7 +205,7 @@ public class PartitionRegionConfigValidator {
/**
* The 2nd step of Eviction Attributes validation to ensure that all VMs are reasonably similar to
* prevent weird config. issues.
- *
+ *
* @param prconfEa the eviction attributes currently used by other VMs
* @see AttributesFactory#validateAttributes(RegionAttributes)
* @see #validateEvictionAttributesAgainstLocalMaxMemory()
@@ -258,7 +258,7 @@ public class PartitionRegionConfigValidator {
* The 3rd step of EvictionAttributes validation, where mutation is acceptible This should be done
* before buckets are created. Validate EvictionAttributes with respect to localMaxMemory
* potentially changing the eviction attributes.
- *
+ *
* @see AttributesFactory#validateAttributes(RegionAttributes)
* @see #validateDistributedEvictionAttributes(EvictionAttributes)
*/
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 7720bfa..1dfd34f 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
@@ -317,7 +317,7 @@ public class PartitionedRegion extends LocalRegion
private volatile Region<String, PartitionRegionConfig> prRoot;
/**
- *
+ *
* PartitionedRegionDataStore class takes care of data storage for the PR. This will contain the
* bucket Regions to store data entries for PR*
*/
@@ -357,13 +357,13 @@ public class PartitionedRegion extends LocalRegion
/**
* Ratio of currently allocated memory to maxMemory that triggers rebalance activity.
*/
- final static float rebalanceThreshold = 0.75f;
+ static final float rebalanceThreshold = 0.75f;
/** The maximum memory allocated for this node in Mb */
final int localMaxMemory;
/** The maximum milliseconds for retrying operations */
- final private int retryTimeout;
+ private final int retryTimeout;
/**
* The statistics for this PR
@@ -396,7 +396,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Flag to indicate whether region is closed
- *
+ *
*/
public volatile boolean isClosed = false;
@@ -408,7 +408,7 @@ public class PartitionedRegion extends LocalRegion
/**
* the thread locally destroying this pr. not volatile, so always check isLocallyDestroyed before
* checking locallyDestroyingThread
- *
+ *
* Concurrency: {@link #isLocallyDestroyed} is volatile
*/
Thread locallyDestroyingThread;
@@ -537,7 +537,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Return canonical representation for a bucket (for logging)
- *
+ *
* @param bucketId the bucket
* @return a String representing this PR and the bucket
*/
@@ -577,13 +577,13 @@ public class PartitionedRegion extends LocalRegion
public static class PRIdMap extends HashMap {
private static final long serialVersionUID = 3667357372967498179L;
- public final static String DESTROYED = "Partitioned Region Destroyed";
+ public static final String DESTROYED = "Partitioned Region Destroyed";
- final static String LOCALLY_DESTROYED = "Partitioned Region Is Locally Destroyed";
+ static final String LOCALLY_DESTROYED = "Partitioned Region Is Locally Destroyed";
- final static String FAILED_REGISTRATION = "Partitioned Region's Registration Failed";
+ static final String FAILED_REGISTRATION = "Partitioned Region's Registration Failed";
- public final static String NO_PATH_FOUND = "NoPathFound";
+ public static final String NO_PATH_FOUND = "NoPathFound";
private volatile boolean cleared = true;
@@ -964,7 +964,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Initializes the PartitionedRegion meta data, adding this Node and starting the service on this
* node (if not already started). Made this synchronized for bug 41982
- *
+ *
* @return true if initialize was done; false if not because it was destroyed
*/
private synchronized boolean initPRInternals(InternalRegionArguments internalRegionArgs) {
@@ -1275,7 +1275,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method initializes the partitionedRegionDataStore for this PR.
- *
+ *
* @param ra Region attributes
*/
private void initializeDataStore(RegionAttributes ra) {
@@ -1291,10 +1291,10 @@ public class PartitionedRegion extends LocalRegion
/**
* Register this PartitionedRegion by: 1) Create a PartitionRegionConfig and 2) Bind it into the
* allPartitionedRegion system wide Region.
- *
+ *
* @param storesData which indicates whether the instance in this cache stores data, effecting the
* Nodes PRType
- *
+ *
* @see Node#setPRType(int)
*/
private void registerPartitionedRegion(boolean storesData) {
@@ -1680,7 +1680,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Checks if a key is contained remotely.
- *
+ *
* @param targetNode the node where bucket region for the key exists.
* @param bucketId the bucket id for the key.
* @param key the key, whose value needs to be checks
@@ -1805,9 +1805,9 @@ public class PartitionedRegion extends LocalRegion
/**
* Executes a query on this PartitionedRegion. The restrictions have already been checked. The
* query is a SELECT expression, and the only region it refers to is this region.
- *
+ *
* @see DefaultQuery#execute()
- *
+ *
* @since GemFire 5.1
*/
public Object executeQuery(DefaultQuery query, Object[] parameters, Set buckets)
@@ -1824,7 +1824,7 @@ public class PartitionedRegion extends LocalRegion
/**
* If ForceReattemptException is thrown then the caller must loop and call us again.
- *
+ *
* @throws ForceReattemptException if one of the buckets moved out from under us
*/
private Object doExecuteQuery(DefaultQuery query, Object[] parameters, Set buckets)
@@ -2142,7 +2142,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Create PutAllPRMsgs for each bucket, and send them.
- *
+ *
* @param putAllOp DistributedPutAllOperation object.
* @param successfulPuts not used in PartitionedRegion.
*/
@@ -2708,7 +2708,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Performs the {@link Operation#UPDATE put} operation in the bucket on the remote VM and invokes
* "put" callbacks
- *
+ *
* @param targetNode the VM in whose {@link PartitionedRegionDataStore} contains the bucket
* @param bucketId the identity of the bucket
* @param event the event that contains the key and value
@@ -2720,7 +2720,7 @@ public class PartitionedRegion extends LocalRegion
* @see LocalRegion#virtualPut(EntryEventImpl, boolean, boolean, Object, boolean, long, boolean)
* @return false if ifNew is true and there is an existing key, or ifOld is true and there is no
* existing entry; otherwise return true.
- *
+ *
*/
private boolean putInBucket(final InternalDistributedMember targetNode, final Integer bucketId,
final EntryEventImpl event, final boolean ifNew, boolean ifOld, Object expectedOldValue,
@@ -2932,7 +2932,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Find an existing live Node that owns the bucket, or create the bucket and return one of its
* owners.
- *
+ *
* @param retryTime the RetryTimeKeeper to track retry times
* @param event the event used to get the entry size in the event a new bucket should be created
* @param bucketId the identity of the bucket should it be created
@@ -2958,7 +2958,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Get the serialized size of an {@code EntryEventImpl}
- *
+ *
* @param eei the entry from whcih to fetch the size
* @return the size of the serialized entry
*/
@@ -2993,7 +2993,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Fetch the primary Node returning if the redundancy for the Node is satisfied
- *
+ *
* @param bucketId the identity of the bucket
* @param snoozer a RetryTimeKeeper to track how long we may wait until the bucket is ready
* @return the primary member's id or null if there is no storage
@@ -3046,7 +3046,7 @@ public class PartitionedRegion extends LocalRegion
/**
* wait until there is a primary or there is no storage
- *
+ *
* @param bucketId the id of the target bucket
* @param readOrWrite a string used in log messages
* @return the primary member's id or null if there is no storage
@@ -3133,9 +3133,9 @@ public class PartitionedRegion extends LocalRegion
/**
* Gets the Node for reading a specific bucketId. This method gives priority to local node to
* speed up operation and avoid remote calls.
- *
+ *
* @param bucketId identifier for bucket
- *
+ *
* @return the primary member's id or null if there is no storage
*/
public InternalDistributedMember getNodeForBucketRead(int bucketId) {
@@ -3152,7 +3152,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Gets the Node for reading or performing a load from a specific bucketId.
- *
+ *
* @return the member from which to read or load
* @since GemFire 5.7
*/
@@ -3172,7 +3172,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Puts the key/value pair into the remote target that is managing the key's bucket.
- *
+ *
* @param recipient the member to receive the message
* @param event the event prompting this action
* @param ifNew the mysterious ifNew parameter
@@ -3220,7 +3220,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Create a bucket for the provided bucket identifier in an atomic fashion.
- *
+ *
* @param bucketId the bucket identifier for the bucket that needs creation
* @param snoozer tracking object used to determine length of time t for bucket creation
* @return a selected Node on which to perform bucket operations
@@ -3318,7 +3318,7 @@ public class PartitionedRegion extends LocalRegion
* Execute the provided named function in all locations that contain the given keys. So function
* can be executed on just one fabric node, executed in parallel on a subset of nodes in parallel
* across all the nodes.
- *
+ *
* @since GemFire 6.0
*/
public ResultCollector executeFunction(final Function function,
@@ -3519,7 +3519,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Single key execution on single node
- *
+ *
* @since GemFire 6.0
*/
private ResultCollector executeOnSingleNode(final Function function,
@@ -3767,7 +3767,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Executes function on all bucket nodes
- *
+ *
* @return ResultCollector
* @since GemFire 6.0
*/
@@ -4090,7 +4090,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Get the DistributedMember identifier for the vm containing a key
- *
+ *
* @param key the key to look for
* @return The ID of the DistributedMember holding the key, or null if there is no current mapping
* for the key
@@ -4102,7 +4102,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Investigate the local cache to determine if it contains a the key
- *
+ *
* @param key The key
* @return true if the key exists
* @see LocalRegion#containsKey(Object)
@@ -4113,7 +4113,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Fetch a value from the local cache
- *
+ *
* @param key The kye
* @return the value associated with that key
* @see LocalRegion#get(Object, Object, boolean, EntryEventImpl)
@@ -4129,7 +4129,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Fetch the local cache's key set
- *
+ *
* @return A set of keys
* @see LocalRegion#keys()
*/
@@ -4140,7 +4140,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Get a random set of keys from a randomly selected bucket using the provided
* {@code Random} number generator.
- *
+ *
* @return A set of keys from a randomly chosen bucket or {@link Collections#EMPTY_SET}
*/
public Set getSomeKeys(Random rnd) throws IOException, ClassNotFoundException {
@@ -4198,10 +4198,10 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Get all entries for all copies of a bucket
- *
+ *
* This method will not work correctly if membership in the distributed system changes while the
* result is being calculated.
- *
+ *
* @return a List of HashMaps, each map being a copy of the entries in a bucket
*/
public List<BucketDump> getAllBucketEntries(final int bucketId) throws ForceReattemptException {
@@ -4282,7 +4282,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Fetch the keys for the given bucket identifier, if the bucket is local or remote.
- *
+ *
* @return A set of keys from bucketNum or {@link Collections#EMPTY_SET}if no keys can be found.
*/
public Set getBucketKeys(int bucketNum) {
@@ -4292,7 +4292,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Fetch the keys for the given bucket identifier, if the bucket is local or remote. This version
* of the method allows you to retrieve Tombstone entries as well as undestroyed entries.
- *
+ *
* @param allowTombstones whether to include destroyed entries in the result
* @return A set of keys from bucketNum or {@link Collections#EMPTY_SET}if no keys can be found.
*/
@@ -4733,7 +4733,7 @@ public class PartitionedRegion extends LocalRegion
* Test Method: Get all {@link InternalDistributedMember}s known by this instance of the
* PartitionedRegion. Note: A member is recognized as such when it partiticpates as a "data
* store".
- *
+ *
* @return a {@code HashSet} of {@link InternalDistributedMember}s or an empty {@code HashSet}
*/
public Set<InternalDistributedMember> getAllNodes() {
@@ -4762,7 +4762,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Gets the remote object with the given key.
- *
+ *
* @param targetNode the Node hosting the key
* @param bucketId the id of the bucket the key hashed into
* @param key the key
@@ -4820,7 +4820,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns Partitioned Region data store associated with this Partitioned Region
- *
+ *
* @return PartitionedRegionDataStore
*/
public PartitionedRegionDataStore getDataStore() {
@@ -4835,7 +4835,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Grab the PartitionedRegionID Lock, this MUST be done in a try block since it may throw an
* exception
- *
+ *
* @return true if the lock was acquired
*/
private static boolean grabPRIDLock(final DistributedLockService lockService) {
@@ -5027,7 +5027,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns PartitionedRegion associated with a PartitionedRegion ID from prIdToPR map.
- *
+ *
* @param prid Partitioned Region ID
* @return PartitionedRegion
*/
@@ -5041,7 +5041,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Verify that the given prId is correct for the given region name in this vm
- *
+ *
* @param sender the member requesting validation
* @param prId the ID being used for the pr by the sender
* @param regionId the regionIdentifier used for prId by the sender
@@ -5105,7 +5105,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns prId
- *
+ *
* @return partitionedRegionId
*/
public int getPRId() {
@@ -5114,7 +5114,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Updates local cache with a new value.
- *
+ *
* @param key the key
* @param value the value
* @param newVersion the new version of the key
@@ -5125,7 +5125,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns total number of buckets for this PR
- *
+ *
* @return totalNumberOfBuckets
*/
public int getTotalNumberOfBuckets() {
@@ -5406,7 +5406,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Destroy the entry on the remote node.
- *
+ *
* @param recipient the member id of the receiver of the message
* @param bucketId the idenity of the bucket
* @param event the event prompting this request
@@ -5445,7 +5445,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This is getter method for local max memory.
- *
+ *
* @return local max memory for this PartitionedRegion
*/
public int getLocalMaxMemory() {
@@ -5454,7 +5454,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This is getter method for redundancy.
- *
+ *
* @return redundancy for this PartitionedRegion
*/
public int getRedundantCopies() {
@@ -5559,7 +5559,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Called after the cache close has closed all regions. This clean up static pr resources.
- *
+ *
* @since GemFire 5.0
*/
static void afterRegionsClosedByCacheClose(InternalCache cache) {
@@ -5783,7 +5783,7 @@ public class PartitionedRegion extends LocalRegion
/**
* invalidates the remote object with the given key.
- *
+ *
* @param recipient the member id of the recipient of the operation
* @param bucketId the id of the bucket the key hashed into
* @throws EntryNotFoundException if the entry does not exist in this region
@@ -5818,7 +5818,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Calculate the number of times we attempt to commumnicate with a data store. Beware that this
* method is called very frequently so it absolutely must perform well.
- *
+ *
* @return the number of times to attempt to communicate with a data store
*/
private int calcRetry() {
@@ -5827,7 +5827,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Creates the key/value pair into the remote target that is managing the key's bucket.
- *
+ *
* @param recipient member id of the recipient of the operation
* @param bucketId the id of the bucket that the key hashed to
* @param event the event prompting this request
@@ -5882,10 +5882,10 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns set of all the entries of this PartitionedRegion(locally or remotely).
* Currently, it throws UnsupportedOperationException
- *
+ *
* @param recursive boolean flag to indicate whether subregions should be considered or not.
* @return set of all the entries of this PartitionedRegion
- *
+ *
* OVERRIDES
*/
@Override
@@ -5904,7 +5904,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Set view of entries. This currently extends the keySet iterator and performs individual
* getEntry() operations using the keys
- *
+ *
* @since GemFire 5.1
*/
protected class PREntriesSet extends KeysSet {
@@ -5949,9 +5949,9 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns set of all the keys of this PartitionedRegion(locally or remotely).
- *
+ *
* @return set of all the keys of this PartitionedRegion
- *
+ *
* OVERRIDES
*/
@Override
@@ -5994,7 +5994,7 @@ public class PartitionedRegion extends LocalRegion
volatile Iterator currentBucketI = null;
int currentBucketId = -1;
volatile Object currentKey = null;
- final protected Set<Integer> bucketSet;
+ protected final Set<Integer> bucketSet;
boolean allowTombstones;
public KeysSetIterator(Set<Integer> bucketSet, boolean allowTombstones) {
@@ -6140,7 +6140,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method returns collection of all the values of this PartitionedRegion(locally or
* remotely).
- *
+ *
* @return collection of all the values of this PartitionedRegion
*/
@Override
@@ -6155,7 +6155,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Set view of values. This currently extends the keySet iterator and performs individual get()
* operations using the keys
- *
+ *
* @since GemFire 5.1
*/
protected class ValuesSet extends KeysSet {
@@ -6412,7 +6412,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Checks if a key is contained remotely.
- *
+ *
* @param targetNode the node where bucket region for the key exists.
* @param bucketId the bucket id for the key.
* @param key the key, whose value needs to be checks
@@ -6431,14 +6431,14 @@ public class PartitionedRegion extends LocalRegion
/**
* Returns whether there is a valid (non-null) value present for the specified key, locally or
* remotely. This method is equivalent to:
- *
+ *
* <pre>
* Entry e = getEntry(key);
* return e != null && e.getValue() != null;
* </pre>
- *
+ *
* This method does not consult localCache, even if enabled.
- *
+ *
* @param key the key to check for a valid value
* @return true if there is an entry in this region for the specified key and it has a valid value
* OVERRIDES
@@ -6477,7 +6477,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Checks if this instance contains a value for the key remotely.
- *
+ *
* @param targetNode the node where bucket region for the key exists.
* @param bucketId the bucket id for the key.
* @param key the key, whose value needs to be checks
@@ -6498,7 +6498,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Get the VSD statistics type
- *
+ *
* @return the statistics instance specific to this Partitioned Region
*/
public PartitionedRegionStats getPrStats() {
@@ -6585,7 +6585,7 @@ public class PartitionedRegion extends LocalRegion
* node. It returns size of all the buckets "primarily" hosted on that node. Here "primarily"
* means that for a given bucketID that node comes first in the node list. This selective counting
* ensures that redundant bucket size is added only once.
- *
+ *
* @return the size of all the buckets hosted on the target node.
*/
private Map<Integer, SizeEntry> getSizeRemotely(Set targetNodes, boolean estimate) {
@@ -6614,7 +6614,7 @@ public class PartitionedRegion extends LocalRegion
/**
* A simple container class that holds the lock name and the service that created the lock,
* typically used for locking buckets, but not restricted to that usage.
- *
+ *
* @since GemFire 5.0
*/
static class BucketLock {
@@ -6650,7 +6650,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Attempts to lock the given name (provided during construction) uninterruptibly
- *
+ *
* @return true if the lock was acquired, otherwise false.
*/
public boolean tryLock() {
@@ -6829,7 +6829,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Ask the grantor who has the lock
- *
+ *
* @return the ID of the member holding the lock
*/
public DistributedMember queryLock() {
@@ -6998,7 +6998,7 @@ public class PartitionedRegion extends LocalRegion
* destroys the bucket regions. <br>
* sends destroyPartitionedRegionMessage to other VMs so that they update their RegionAdvisor <br>
* Sends BackupBucketMessage to other nodes
- *
+ *
* @param event the region event
*/
private void closePartitionedRegion(RegionEventImpl event) {
@@ -7282,9 +7282,9 @@ public class PartitionedRegion extends LocalRegion
* Sends destroyRegionMessage to other nodes <br>
* Removes it from allPartitionedRegions <br>
* Destroys bucket2node region
- *
+ *
* @param event the RegionEvent that triggered this operation
- *
+ *
* @see #destroyPartitionedRegionLocally(boolean)
* @see #destroyPartitionedRegionGlobally(RegionEventImpl)
* @see #destroyCleanUp(RegionEventImpl, int[])
@@ -7357,7 +7357,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method destroys the PartitionedRegion globally. It sends destroyRegion message to other
* nodes and handles cleaning up of the data stores and meta-data.
- *
+ *
* @param event the RegionEvent which triggered this global destroy operation
* @return true if the region was found globally.
*/
@@ -7401,9 +7401,9 @@ public class PartitionedRegion extends LocalRegion
* Sends DestroyRegionMessage to other nodes <br>
* Removes this PartitionedRegion from allPartitionedRegions <br>
* Destroys bucket2node region <br>
- *
+ *
* @param event the RegionEvent that triggered the region clean up
- *
+ *
* @see DestroyPartitionedRegionMessage
*/
private void destroyCleanUp(RegionEventImpl event, int serials[]) {
@@ -7438,7 +7438,7 @@ public class PartitionedRegion extends LocalRegion
* message is also sent in close/localDestroyRegion operation. When it is sent in Cache
* close/Region close/localDestroyRegion operations, it results in updating of RegionAdvisor on
* recipient nodes.
- *
+ *
* @param event the destruction event
* @param serials the bucket serials hosted locally
* @see Region#destroyRegion()
@@ -7496,9 +7496,9 @@ public class PartitionedRegion extends LocalRegion
* destroyPartitionedRegion Method and removes the entry from prIdMap and cleans the data store
* buckets. It first checks whether this PartitionedRegion is already locally destroyed. If it is,
* this call returns, else if process with the removal from prIdMap and dataStore cleanup.
- *
+ *
* @return wether local destroy happened
- *
+ *
* @see #destroyPartitionedRegion(RegionEventImpl)
*/
boolean destroyPartitionedRegionLocally(boolean removeFromDisk) {
@@ -7535,7 +7535,7 @@ public class PartitionedRegion extends LocalRegion
/**
* This method is invoked from recursiveDestroyRegion method of LocalRegion. This method checks
* the region type and invokes the relevant method.
- *
+ *
* @param destroyDiskRegion - true if the contents on disk should be destroyed
* @param event the RegionEvent
*/
@@ -7675,7 +7675,7 @@ public class PartitionedRegion extends LocalRegion
* destroyPartitionedRegionLocally call as a pure precautionary measure. If it is not null, we
* check if this call is intended for this region only and there is no new PartitionedRegion
* creation with the same name. This check fixes, bug # 34621.
- *
+ *
* @return true, if it is eligible for the region destroy
*/
private boolean checkIfAlreadyDestroyedOrOldReference() {
@@ -7790,7 +7790,7 @@ public class PartitionedRegion extends LocalRegion
* Invoke the CacheWriter before the detroy operation occurs. Each BucketRegion delegates to the
* CacheWriter on the PartitionedRegion meaning that CacheWriters on a BucketRegion should only be
* used for internal purposes.
- *
+ *
* @see BucketRegion#cacheWriteBeforeDestroy(EntryEventImpl, Object)
*/
@Override
@@ -7833,7 +7833,7 @@ public class PartitionedRegion extends LocalRegion
* Send a message to all PartitionedRegion participants, telling each member of the
* PartitionedRegion with a datastore to dump the contents of the buckets to the system.log and
* validate that the meta-data for buckets agrees with the data store's perspective
- *
+ *
* @param distribute true will distributed a DumpBucketsMessage to PR nodes
* @see #validateAllBuckets()
*/
@@ -7861,7 +7861,7 @@ public class PartitionedRegion extends LocalRegion
* Send a message to all PartitionedRegion participants, telling each member of the
* PartitionedRegion with a datastore to validate that the meta-data for buckets agrees with the
* data store's perspective
- *
+ *
* @see #dumpAllBuckets(boolean)
*/
public void validateAllBuckets() throws ReplyException {
@@ -8045,7 +8045,7 @@ public class PartitionedRegion extends LocalRegion
/**
* finds all the keys matching the given regular expression (or all keys if regex is ".*")
- *
+ *
* @param regex the regular expression
* @param allowTombstones whether to include destroyed entries
* @param collector object that will receive the keys as they arrive
@@ -8057,7 +8057,7 @@ public class PartitionedRegion extends LocalRegion
/**
* finds all the keys in the given list that are present in the region
- *
+ *
* @param keyList the key list
* @param allowTombstones whether to return destroyed entries
* @param collector object that will receive the keys as they arrive
@@ -8069,7 +8069,7 @@ public class PartitionedRegion extends LocalRegion
/**
* finds all the keys matching the given interest type and passes them to the given collector
- *
+ *
* @param allowTombstones whether to return destroyed entries
*/
private void _getKeysWithInterest(int interestType, Object interestArg, boolean allowTombstones,
@@ -8145,7 +8145,7 @@ public class PartitionedRegion extends LocalRegion
/**
* SetCollector is implemented by classes that want to receive chunked results from queries like
* getKeysWithRegEx. The implementor creates a method, receiveSet, that consumes the chunks.
- *
+ *
* @since GemFire 5.1
*/
public interface SetCollector {
@@ -8154,7 +8154,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Returns the index flag
- *
+ *
* @return true if the partitioned region is indexed else false
*/
public boolean isIndexed() {
@@ -8163,7 +8163,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Returns the map containing all the indexes on this partitioned region.
- *
+ *
* @return Map of all the indexes created.
*/
public Map getIndex() {
@@ -8180,7 +8180,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Returns the a PartitionedIndex on this partitioned region.
- *
+ *
* @return Index
*/
public PartitionedIndex getIndex(String indexName) {
@@ -8198,7 +8198,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Gets a collecion of all the indexes created on this pr.
- *
+ *
* @return collection of all the indexes
*/
public Collection getIndexes() {
@@ -8221,14 +8221,14 @@ public class PartitionedRegion extends LocalRegion
/**
* Creates the actual index on this partitioned regions.
- *
+ *
* @param remotelyOriginated true if the index is created because of a remote index creation call
* @param indexType the type of index created.
* @param indexName the name for the index to be created
* @param indexedExpression expression for index creation.
* @param fromClause the from clause for index creation
* @param imports class to be imported for fromClause.
- *
+ *
* @return Index an index created on this region.
* @throws ForceReattemptException indicating the operation failed to create a remote index
* @throws IndexCreationException if the index is not created properly
@@ -8568,7 +8568,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Explicitly sends an index creation message to a newly added node to the system on prs.
- *
+ *
* @param idM id on the newly added node.
*/
public void sendIndexCreationMsg(InternalDistributedMember idM) {
@@ -8704,9 +8704,9 @@ public class PartitionedRegion extends LocalRegion
/**
* Removes a particular index on this partitioned regions instance.
- *
+ *
* @param ind Index to be removed.
- *
+ *
*/
public int removeIndex(Index ind, boolean remotelyOriginated)
throws CacheException, ForceReattemptException {
@@ -8801,7 +8801,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Gets and removes index by name.
- *
+ *
* @param indexName name of the index to be removed.
*/
public int removeIndex(String indexName) throws CacheException, ForceReattemptException {
@@ -8861,7 +8861,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test Method: Fetch the given bucket's meta-data from each member hosting buckets
- *
+ *
* @param bucketId the identity of the bucket
* @return list of arrays, each array element containing a {@link DistributedMember} and a
* {@link Boolean} the boolean denotes if the member is hosting the bucket and believes it
@@ -8907,7 +8907,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Return the primary for the local bucket. Returns null if no primary can be found within
* {@link DistributionConfig#getMemberTimeout}.
- *
+ *
* @return the primary bucket member
*/
public InternalDistributedMember getBucketPrimary(int bucketId) {
@@ -8934,7 +8934,7 @@ public class PartitionedRegion extends LocalRegion
/**
* get the total retry interval, in milliseconds, for operations concerning this partitioned
* region
- *
+ *
* @return millisecond retry timeout interval
*/
public int getRetryTimeout() {
@@ -8956,7 +8956,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Used to get membership events from our advisor to implement RegionMembershipListener
* invocations. This is copied almost in whole from DistributedRegion
- *
+ *
* @since GemFire 5.7
*/
protected class AdvisorListener implements MembershipListener {
@@ -9106,7 +9106,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Changes the timeToLive expiration attributes for the partitioned region as a whole
- *
+ *
* @param timeToLive the expiration attributes for the region timeToLive
* @return the previous value of region timeToLive
* @throws IllegalArgumentException if timeToLive is null or if the ExpirationAction is
@@ -9130,7 +9130,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Changes the idleTimeout expiration attributes for the region as a whole. Resets the
* {@link CacheStatistics#getLastAccessedTime} for the region.
- *
+ *
* @param idleTimeout the ExpirationAttributes for this region idleTimeout
* @return the previous value of region idleTimeout
* @throws IllegalArgumentException if idleTimeout is null or if the ExpirationAction is
@@ -9153,7 +9153,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Changes the timeToLive expiration attributes for values in this region.
- *
+ *
* @param timeToLive the timeToLive expiration attributes for entries
* @return the previous value of entry timeToLive
* @throws IllegalArgumentException if timeToLive is null or if the ExpirationAction is
@@ -9188,7 +9188,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Changes the custom timeToLive for values in this region
- *
+ *
* @param custom the new CustomExpiry
* @return the old CustomExpiry
*/
@@ -9203,7 +9203,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Changes the idleTimeout expiration attributes for values in the region.
- *
+ *
* @param idleTimeout the idleTimeout expiration attributes for entries
* @return the previous value of entry idleTimeout
* @throws IllegalArgumentException if idleTimeout is null or if the ExpirationAction is
@@ -9230,7 +9230,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Changes the CustomExpiry for idleTimeout for values in the region
- *
+ *
* @param custom the new CustomExpiry
* @return the old CustomExpiry
*/
@@ -9670,16 +9670,16 @@ public class PartitionedRegion extends LocalRegion
* For the very first member, FPR's first partition has starting bucket id as 0 and other
* partitions have starting bucket id as the sum of previous partition's starting bucket id and
* previous partition's num-buckets.
- *
+ *
* For other members, all partitions defined previously with assigned starting bucket ids are
* fetched from the metadata PartitionRegionConfig. Now for each partition defined for this
* member, if this partition is already available in the list of the previously defined partitions
* then starting bucket id is directly assigned from the same previously defined partition.
- *
+ *
* And if the partition on this member is not available in the previously defined partitions then
* new starting bucket id is calculated as the sum of the largest starting bucket id from
* previously defined partitions and corresponding num-buckets of the partition.
- *
+ *
* This data of the partitions (FixedPartitionAttributes with starting bucket id for the Fixed
* Partitioned Region) is stored in metadata for each member.
*/
@@ -9724,7 +9724,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Returns the local BucketRegion given the key. Returns null if no BucketRegion exists.
- *
+ *
* @since GemFire 6.1.2.9
*/
public BucketRegion getBucketRegion(Object key) {
@@ -9748,7 +9748,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Test hook to return the per entry overhead for a bucket region. Returns -1 if no buckets exist
* in this vm.
- *
+ *
* @since GemFire 6.1.2.9
*/
public int getPerEntryLRUOverhead() {
@@ -9914,7 +9914,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Updates the entry version timestamp of the remote object with the given key.
- *
+ *
* @param recipient the member id of the recipient of the operation
* @param bucketId the id of the bucket the key hashed into
* @throws EntryNotFoundException if the entry does not exist in this region
@@ -10011,4 +10011,3 @@ public class PartitionedRegion extends LocalRegion
return logger;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
index 2c7916a..e315e15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
@@ -23,13 +23,13 @@ import org.apache.geode.internal.cache.partitioned.Bucket;
/**
* This class encapsulates the Bucket Related heuristics/algos for a PR.
- *
- *
+ *
+ *
*/
public class PartitionedRegionBucketMgmtHelper {
/**
- *
+ *
* @param b Bucket to evaluate
* @param moveSource
* @return true if it is allowed to be recovered
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index 17421b3..a4cf98a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -110,7 +110,7 @@ import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock
* org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue; accessed via accessor of
* PartitionedRegion or PartionService thread which will handle remote calls to this DataStore from
* other nodes participating in this PartitionedRegion.
- *
+ *
*/
public class PartitionedRegionDataStore implements HasCachePerfStats {
private static final Logger logger = LogService.getLogger();
@@ -121,7 +121,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Total memory used by this partition. Only used for statistics.
*/
- final private AtomicLong bytesInUse = new AtomicLong(0);
+ private final AtomicLong bytesInUse = new AtomicLong(0);
/**
* CacheLoader of this PRDataStore
@@ -156,7 +156,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
*/
private final long maximumLocalBytes;
- final private CachePerfStats bucketStats;
+ private final CachePerfStats bucketStats;
/**
* The keysOfInterest contains a set of all keys in which any client has interest in this PR.
@@ -185,7 +185,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Creates PartitionedRegionDataStore for dataStorage of PR and starts a PartitionService to
* handle remote operations on this DataStore from other participating nodes.
- *
+ *
* @param pr PartitionedRegion associated with this DataStore.
*/
PartitionedRegionDataStore(final PartitionedRegion pr) {
@@ -212,7 +212,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* This method creates a PartitionedRegionDataStore be invoking the PRDS Constructor.
- *
+ *
* @param cache
* @param pr
* @param pa
@@ -251,7 +251,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Test to determine if this data store is managing a bucket
- *
+ *
* @param bucketId the id of the bucket
* @return true if the provided bucket is being managed
*/
@@ -291,7 +291,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Try to grab buckets for all the colocated regions /* In case we can't grab buckets there is no
* going back
- *
+ *
* @param creationRequestor
* @param isDiskRecovery
*/
@@ -344,7 +344,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Attempts to map a bucket id to this node. Creates real storage for the bucket by adding a new
* Region to bucket2Map. Bucket creation is done under the d-lock on b2n region.
- *
+ *
* @param possiblyFreeBucketId the identity of the bucket + @param mustBeNew boolean enforcing
* that the bucket must not already exist
* @param sender the member requesting the bucket
@@ -629,7 +629,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Returns false if this region is colocated and parent bucket does not exist.
- *
+ *
* @return true if ok to make bucket
*/
private boolean okToCreateChildBucket(int bucketId) {
@@ -672,7 +672,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* This method creates bucket regions, based on redundancy level. If redundancy level is: a) = 1
* it creates a local region b) >1 it creates a distributed region
- *
+ *
* @param bucketId
* @return @throws CacheException
*/
@@ -966,9 +966,9 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Gets the total amount of memory in bytes allocated for all values for this PR in this VM. This
* is the current memory (MB) watermark for data in this PR.
- *
+ *
* If eviction to disk is enabled, this does not reflect the size of entries on disk.
- *
+ *
* @return the total memory size in bytes for all the Map's values
*/
public long currentAllocatedMemory() {
@@ -978,7 +978,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks if this PartitionedRegionDataStore has the capacity to handle the bucket creation
* request. If so, creates the real storage for the bucket.
- *
+ *
* @param bucketId the bucket id
* @param size the size in bytes of the bucket to create locally
* @param forceCreation ignore local maximum buckets check
@@ -1035,7 +1035,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Determine if the ratio of buckets this VM should host is appropriate given its localMaxMemory
* setting as compared to others
- *
+ *
* @return true if this data store can host another bucket
*/
boolean canAccommodateAnotherBucket() {
@@ -1086,7 +1086,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks if this PartitionedRegionDataStore has the capacity to handle the rebalancing size.
- *
+ *
* @param size the size in bytes of the bucket to be rebalanced
* @return true if size can be accommodated without exceeding ratioFull
*/
@@ -1100,7 +1100,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Handles rebalance by accepting new bucket contents and storing it.
- *
+ *
* @param bucketId the id of the bucket to rebalance
* @param obj the contents of the bucket
* @param regionName the name of the PR
@@ -1115,7 +1115,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* storage for the bucket and a bucket2Node Region mapping. These two operations are done as a
* logical unit so that the node can immediately begin handling remote requests once the
* bucket2Node mapping becomes visible.
- *
+ *
* @param bucketId the bucket id
*/
boolean handleRemoteCreateBackupRegion(int bucketId) {
@@ -1124,7 +1124,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Return the size in bytes for a given bucket.
- *
+ *
* @param bucketId
* @return size in bytes
*/
@@ -1142,7 +1142,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Querys the buckets in this data store for query specified by queryPredicate.
- *
+ *
* @param query
* @param parameters the parameters to be used to execute the query
* @param buckets to be queried
@@ -1154,11 +1154,11 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* PRQueryResultCollector resultCollector) throws QueryException, InterruptedException {
* Assert.assertTrue(!buckets.isEmpty(), "bucket list can not be empty. ");
* invokeBucketReadHook();
- *
+ *
* // Check if QueryMonitor is enabled, if so add query to be monitored. QueryMonitor queryMonitor
* = null; if( GemFireCacheImpl.getInstance() != null) { queryMonitor =
* GemFireCacheImpl.getInstance().getQueryMonitor(); }
- *
+ *
* try { if (queryMonitor != null) { // Add current thread to be monitored by QueryMonitor.
* queryMonitor.monitorQueryThread(Thread.currentThread(), query); } new PRQueryProcessor(this,
* query, parameters, buckets).executeQuery(resultCollector); } finally { if (queryMonitor !=
@@ -1167,7 +1167,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* This method returns name of this Partitioned Region
- *
+ *
* @return Partitioned Region name
*/
private String getName() {
@@ -1188,7 +1188,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* 3) If it finds the bucket region from step 1, it tries to put the key-value on the region. <br>
* 4) updateBucket2Size if bucket is on more than 1 node or else bucket listeners would take care
* of size update. <br>
- *
+ *
* @param bucketId the bucket id of the key
* @param event the operation event
* @param ifNew whether a create must be performed
@@ -1275,7 +1275,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks whether there is room in this Map to accommodate more data.
- *
+ *
* @param bytes the size to check in bytes
*/
boolean canAccommodateMoreBytesSafely(int bytes) {
@@ -1326,7 +1326,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* 2) Invokes destroy on that bucket region <br>
* 3) updateBucket2Size if bucket is on more than 1 node or else bucket listners would take care
* of size update.
- *
+ *
* @param bucketId for the key
* @param event the event causing this action
* @param expectedOldValue if non-null, then only succeed if current value
@@ -1396,7 +1396,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* the b2n region (if removeBucketMapping is true). It locallyDestroys the bucket region and
* cleans up the localBucketRegion map to avoid any stale references to locally destroyed bucket
* region.
- *
+ *
* @param removeBucketMapping
*/
void cleanUp(boolean removeBucketMapping, boolean removeFromDisk) {
@@ -1513,29 +1513,29 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Removes a redundant bucket hosted by this data store. The rebalancer invokes this method
* directly or sends this member a message to invoke it.
- *
+ *
* From the spec:
- *
+ *
* How to Remove a Redundant Bucket
- *
+ *
* This operation is done by the rebalancer (REB) and can only be done on non-primary buckets. If
* you want to remove a primary bucket first send one of its peers "become primary" and then send
* it "unhost" (we could offer a "unhost" option on "become primary" or a "becomePrimary" option
* on "create redundant"). The member that has the bucket being removed is called the bucket host
* (BH).
- *
+ *
* 1. REB sends an "unhostBucket" message to BH. This message will be rejected if the member finds
* itself to be the primary or if he doesn't host the bucket by sending a failure reply to REB. 2.
* BH marks itself as "not-hosting". This causes any read operations that come in to not start and
* retry. BH also updates the advisor to know that it is no longer hosting the bucket. 3. BH then
* waits for any in-progress reads (which read ops to wait for are TBD) to complete. 4. BH then
* removes the bucket region from its cache. 5. BH then sends a success reply to REB.
- *
+ *
* This method is now also used by the PartitionManager. For the PartitionManager, it does remove
* the primary bucket.
- *
+ *
* @param bucketId the id of the bucket to remove
- *
+ *
* @return true if the bucket was removed; false if unable to remove or if bucket is not hosted
*/
public boolean removeBucket(int bucketId, boolean forceRemovePrimary) {
@@ -1711,7 +1711,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Create a new backup of the bucket, allowing redundancy to be exceeded. All colocated child
* buckets will also be created.
- *
+ *
* @param bucketId the bucket to create
* @param isRebalance true if bucket creation is directed by rebalancing
* @return true if the bucket and its colocated chain of children are created
@@ -1724,10 +1724,10 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Moves the bucket from the <code>source</code> member to this datastore.
- *
+ *
* If the bucket is the leader bucket then it will recursively create all colocated children and
* then remove all colocated children as well from the <code>source</code> member.
- *
+ *
* @param bucketId the bucket to move
* @param source the member to move the bucket from
* @return true if bucket was successfully moved to this datastore
@@ -1772,7 +1772,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Fetch a BucketRegion, but do not return until it is initialized
- *
+ *
* @param key optional for error reporting; if none, no key available.
* @param bucketId the bucket to fetch
* @return the region
@@ -1804,7 +1804,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Returns the local BucketRegion given an bucketId. Returns null if no BucketRegion exists.
- *
+ *
* @since GemFire 6.1.2.9
*/
public BucketRegion getLocalBucketById(Integer bucketId) {
@@ -1828,7 +1828,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Test hook to return the per entry overhead for a bucket region. PRECONDITION: a bucket must
* exist and be using LRU.
- *
+ *
* @since GemFire 6.1.2.9
*/
public int getPerEntryLRUOverhead() {
@@ -1839,7 +1839,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Fetch a BucketRegion, but do not return until it is initialized and the primary is known.
- *
+ *
* @see #getInitializedBucketForId(Object, Integer)
* @param key
* @param bucketId
@@ -1855,7 +1855,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks if this instance contains a value for the key locally.
- *
+ *
* @param bucketId for the key
* @param key the key, whose value needs to be checks
* @throws ForceReattemptException if bucket region is null
@@ -1906,7 +1906,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks if this instance contains a key.
- *
+ *
* @param bucketId the bucketId for the key
* @param key the key to look for
* @throws ForceReattemptException if bucket region is null
@@ -1966,7 +1966,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Returns value corresponding to this key.
- *
+ *
* @param key the key to look for
* @param preferCD
* @param requestingClient the client making the request, or null
@@ -1987,7 +1987,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Returns value corresponding to this key.
- *
+ *
* @param key the key to look for
* @param preferCD
* @param requestingClient the client making the request, or null
@@ -2036,7 +2036,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Return a value from the bucket region, always serialized
- *
+ *
* @param keyInfo TODO
* @param clientEvent a "client" event that will hold version information about the entry
* @param returnTombstones TODO
@@ -2080,7 +2080,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Finds the local bucket corresponding to the given key and retrieves the key's Region.Entry
- *
+ *
* @param key the key to look for
* @param access true if caller wants last accessed time updated
* @param allowTombstones whether a tombstoned entry can be returned
@@ -2145,7 +2145,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Handle a remote request for keys for the provided bucketId
- *
+ *
* @param bucketId
* @param interestType
* @param interestArg
@@ -2194,7 +2194,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* Get the local keys for a given bucket. This operation should be as efficient as possible, by
* avoiding making copies of the returned set. The returned set can and should reflect concurrent
* changes (no ConcurrentModificationExceptions).
- *
+ *
* @param bucketId
* @param allowTombstones whether to include destroyed entries in the result
* @return The <code>Set</code> of keys for bucketId or {@link Collections#EMPTY_SET} if no keys
@@ -2257,7 +2257,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* will create an entry <br>
* 5) updateBucket2Size if bucket is on more than 1 node or else bucket listners would take care
* of size update. <br>
- *
+ *
* @param bucketRegion the bucket to do the create in
* @param event the particulars of the operation
* @param ifNew whether a new entry can be created
@@ -2310,7 +2310,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* step 2 in step 5 <br>
* 5) updateBucket2Size if bucket is on more than 1 node or else bucket listners would take care
* of size update. <br>
- *
+ *
* @param bucketId the bucketId for the key
* @param event the event that prompted this action
* @throws ForceReattemptException if bucket region is null
@@ -2351,8 +2351,8 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* 3) Get the nodeList for the bucket ID from Bucket2Node region. <br>
* 4) If first node from the node list is current node, increment the size counter. <br>
* 5) Step#4 takes care of the problem of recounting the size of redundant buckets. <br>
- *
- *
+ *
+ *
* @return the map of bucketIds and their associated sizes, or {@link Collections#EMPTY_MAP}when
* the size is zero
*/
@@ -2402,7 +2402,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* This method iterates over localBucket2RegionMap and returns collective size of the primary
* bucket regions.
- *
+ *
* @return the map of bucketIds and their associated sizes, or {@link Collections#EMPTY_MAP}when
* the size is zero
*/
@@ -2420,7 +2420,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* This calculates size of all the primary bucket regions for the list of bucketIds.
- *
+ *
* @param bucketIds
* @return the size of all the primary bucket regions for the list of bucketIds.
*/
@@ -2525,10 +2525,10 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* Test class and method for visiting Entries NOTE: This class will only give a partial view if a
* visited bucket is moved by a rebalance while a visit is in progress on that bucket.
*/
- protected static abstract class EntryVisitor {
- abstract public void visit(Integer bucketId, Region.Entry re);
+ protected abstract static class EntryVisitor {
+ public abstract void visit(Integer bucketId, Region.Entry re);
- abstract public void finishedVisiting();
+ public abstract void finishedVisiting();
}
private void visitEntries(final EntryVisitor knock) {
@@ -2549,7 +2549,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Return the list of PartitionedRegion entries contained in this data store
- *
+ *
* @return a List of all entries gathered across all buckets in this data store
*/
public List getEntries() {
@@ -2571,7 +2571,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Dump all the entries in all the buckets to the logger, validate that the
* bucket-to-node meta region contains all bhe buckets managed by this data store
- *
+ *
* @param validateOnly only perform bucket-to-node validation
*/
public void dumpEntries(final boolean validateOnly) {
@@ -2619,7 +2619,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Dump all the bucket names in this data store to the logger
- *
+ *
*/
public void dumpBuckets() {
final StringBuffer buf = new StringBuffer("Buckets in ").append(this).append("\n");
@@ -2635,7 +2635,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Return the list of all the bucket names in this data store.
- *
+ *
*/
public List getLocalBucketsListTestOnly() {
final List bucketList = new ArrayList();
@@ -2650,7 +2650,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Return the list of all the primary bucket ids in this data store.
- *
+ *
*/
public List getLocalPrimaryBucketsListTestOnly() {
final List primaryBucketList = new ArrayList();
@@ -2669,7 +2669,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Return the list of all the non primary bucket ids in this data store.
- *
+ *
*/
public List getLocalNonPrimaryBucketsListTestOnly() {
final List nonPrimaryBucketList = new ArrayList();
@@ -2688,7 +2688,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* <i>Test Method</i> Dump the entries in this given bucket to the logger
- *
+ *
* @param bucketId the id of the bucket to dump
* @param bucket the Region containing the bucket data
*/
@@ -2713,7 +2713,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Fetch the entries for the given bucket
- *
+ *
* @param bucketId the id of the bucket
* @return a Map containing all the entries
*/
@@ -2735,7 +2735,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Return a set of local buckets. Iterators may include entries with null values (but non-null
* keys).
- *
+ *
* @return an unmodifiable set of Map.Entry objects
*/
public Set<Map.Entry<Integer, BucketRegion>> getAllLocalBuckets() {
@@ -2748,7 +2748,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Returns a set of local buckets.
- *
+ *
* @return an unmodifiable set of BucketRegion
*/
public Set<BucketRegion> getAllLocalBucketRegions() {
@@ -2855,11 +2855,11 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks for RegionDestroyedException in case of remoteEvent & localDestroy OR isClosed throws a
* ForceReattemptException
- *
+ *
* @param br the bucket that we are trying to operate on
* @param isOriginRemote true the event we are processing has a remote origin.
* @param rde
- *
+ *
*/
public void checkRegionDestroyedOnBucket(final BucketRegion br, final boolean isOriginRemote,
RegionDestroyedException rde) throws ForceReattemptException {
@@ -2889,7 +2889,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Create a redundancy bucket on this member
- *
+ *
* @param bucketId the id of the bucket to create
* @param moveSource the member id of where the bucket is being copied from, if this is a bucket
* move. Setting this field means that we are allowed to go over redundancy.
@@ -2958,7 +2958,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
/**
* Checks consistency of bucket and meta data before attempting to grab the bucket.
- *
+ *
* @param buckId
* @return false if bucket should not be grabbed, else true. TODO prpersist - move this to
* BucketRegion
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java
index 9477280..aa95d54 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java
@@ -28,7 +28,7 @@ public class PartitionedRegionException extends CacheRuntimeException {
/**
* Creates a new instance of PartitionedRegionException
- *
+ *
* @param msg
*/
public PartitionedRegionException(String msg) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
index 9a403da..efdbd0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
@@ -113,7 +113,7 @@ public class PartitionedRegionHelper {
/**
* This function is used for cleaning the config meta data for the failed or closed
* PartitionedRegion node.
- *
+ *
* @param failedNode The failed PartitionedRegion Node
* @param regionIdentifier The PartitionedRegion for which the cleanup is required
* @param cache GemFire cache.
@@ -126,7 +126,7 @@ public class PartitionedRegionHelper {
/**
* This function is used for cleaning the config meta data for the failed or closed
* PartitionedRegion node.
- *
+ *
* @param failedNode The failed PartitionedRegion Node
* @param regionIdentifier The PartitionedRegion for which the cleanup is required
* @param cache GemFire cache.
@@ -194,7 +194,7 @@ public class PartitionedRegionHelper {
* Return a region that is the root for all PartitionedRegion meta data on this Node. The main
* administrative Regions contained within are <code>allPartitionedRegion</code> (Scope
* DISTRIBUTED_ACK) and <code>bucket2Node</code> (Scope DISTRIBUTED_ACK) and dataStore regions.
- *
+ *
* @return a GLOBLAL scoped root region used for PartitionedRegion administration
*/
public static LocalRegion getPRRoot(final InternalCache cache, boolean createIfAbsent) {
@@ -419,7 +419,7 @@ public class PartitionedRegionHelper {
* Runs hashCode() on given key producing a long value and then finds absolute value of the
* modulus with bucketSize. For better key distribution, possibly use MD5 or SHA or any unique ID
* generator for the hash function.
- *
+ *
* @param pr the partitioned region on which to operate
* @param key the key on which to determine the hash key
* @return the bucket id the key hashes to
@@ -429,10 +429,10 @@ public class PartitionedRegionHelper {
* public static int getHashKey(PartitionedObject key) { PartitionedRegion pRegion =
* (PartitionedRegion)entryOp.getRegion(); RoutingResolver resolver =
* pRegion.getRoutingResolver();
- *
+ *
* int totalNumberOfBuckets = pRegion.getTotalNumberOfBuckets(); Object resolveKey = null; if
* (resolver == null) { resolveKey = key; } else {
- *
+ *
* //resolveKey = resolver.getPartitionKey(key); resolveKey =
* resolver.getRoutingObject((EntryOperation)key); } int hc = resolveKey.hashCode(); int bucketId
* = hc % totalNumberOfBuckets; // Force positive bucket ids only return Math.abs(bucketId); // We
@@ -441,7 +441,7 @@ public class PartitionedRegionHelper {
* totalNumberOfBuckets; }
**/
- static private PartitionResolver getResolver(PartitionedRegion pr, Object key,
+ private static PartitionResolver getResolver(PartitionedRegion pr, Object key,
Object callbackArgument) {
// First choice is one associated with the region
PartitionResolver result = pr.getPartitionResolver();
@@ -467,7 +467,7 @@ public class PartitionedRegionHelper {
* Runs hashCode() on given key/routing object producing a long value and then finds absolute
* value of the modulus with bucketSize. For better key distribution, possibly use MD5 or SHA or
* any unique ID generator for the hash function.
- *
+ *
* @param pr the partitioned region on which to operate
* @param operation operation
* @param key the key on which to determine the hash key
@@ -491,7 +491,7 @@ public class PartitionedRegionHelper {
* Runs hashCode() on given key/routing object producing a long value and then finds absolute
* value of the modulus with bucketSize. For better key distribution, possibly use MD5 or SHA or
* any unique ID generator for the hash function.
- *
+ *
* @param event entry event created for this entry operation
* @return the bucket id the key/routing object hashes to
*/
@@ -503,7 +503,7 @@ public class PartitionedRegionHelper {
* Runs hashCode() on given key/routing object producing a long value and then finds absolute
* value of the modulus with bucketSize. For better key distribution, possibly use MD5 or SHA or
* any unique ID generator for the hash function.
- *
+ *
* @param event entry event created for this entry operation; can be null
* @param pr the partitioned region on which to operate
* @param operation operation
@@ -672,7 +672,7 @@ public class PartitionedRegionHelper {
/**
* Find a ProxyBucketRegion by parsing the region fullPath
- *
+ *
* @param fullPath full region path to parse
* @param postInit true if caller should wait for bucket initialization to complete
* @return ProxyBucketRegion as Bucket or null if not found
@@ -721,12 +721,12 @@ public class PartitionedRegionHelper {
}
- private final static String BUCKET_FULL_PATH_PREFIX =
+ private static final String BUCKET_FULL_PATH_PREFIX =
PR_ROOT_REGION_NAME + Region.SEPARATOR + BUCKET_REGION_PREFIX;
/**
* Get the bucket string by parsing the region fullPath
- *
+ *
* @param bucketFullPath full region path to parse
* @return the bucket string or null if no bucket string is present
*/
@@ -806,7 +806,7 @@ public class PartitionedRegionHelper {
* This method returns true if the last region in provided fullPath is a sub-region else it
* returns false. If fullPath is "/REGION1" it would return false and if it is "/REGION1/REGION2",
* it would return true, which means that Region2 is a sub-region.
- *
+ *
* @param fullPath full path of the region
* @return true if given full path has sub-regions else return false
*/
@@ -824,7 +824,7 @@ public class PartitionedRegionHelper {
/**
* Utility method to print warning when nodeList in b2n region is found empty. This will signify
* potential data loss scenario.
- *
+ *
* @param bucketId Id of Bucket whose nodeList in b2n is empty.
* @param callingMethod methodName of the calling method.
*/
@@ -855,7 +855,7 @@ public class PartitionedRegionHelper {
/**
* Utility method to print a collection.
- *
+ *
* @return String
*/
public static String printCollection(Collection c) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
index ac9ee84..3438dfc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.internal.cache;
+import java.util.*;
+import java.util.concurrent.*;
+
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CopyHelper;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.query.*;
@@ -33,17 +40,11 @@ import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.internal.cache.partitioned.StreamingPartitionOperation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.*;
/**
* This class sends the query on various <code>PartitionedRegion</code> data store nodes and
* collects the results back, does the union of all the results.
- *
+ *
* revamped with streaming of results retry logic
*/
public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation {
@@ -51,7 +52,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
/**
* An ArrayList which might be unconsumable.
- *
+ *
* @since GemFire 6.6.2
*/
public static class MemberResultsList extends ArrayList {
@@ -68,7 +69,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
/**
* Simple testing interface
- *
+ *
* @since GemFire 6.0
*/
public interface TestHook {
@@ -97,7 +98,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
/**
* Construct a PartitionedRegionQueryEvaluator
- *
+ *
* @param sys the distributed system
* @param pr the partitioned region
* @param query the query
@@ -248,7 +249,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
/**
* Returns normally if succeeded to get data, otherwise throws an exception
- *
+ *
* @param th a test hook
* @return true if parts of the query need to be retried, otherwise false
*/
@@ -727,7 +728,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
/**
* Adds all counts from all member buckets to cumulative results.
- *
+ *
* @param limit
*/
private void addTotalCountForMemberToResults(int limit) {
@@ -886,7 +887,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
/**
* Executes query on local data store.
- *
+ *
* @throws QueryException, InterruptedException
* @return true if the local query needs to be retried, otherwise false
*/
@@ -993,7 +994,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
* This class is used to accumulate information about indexes used in multipleThreads and results
* gained from buckets. In future this can be used for adding for more information to final query
* running info from pool threads.
- *
+ *
* @since GemFire 6.6
*/
public static class PRQueryResultCollector {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTracker.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTracker.java
index 1ff8bc9..54941bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTracker.java
@@ -15,10 +15,11 @@
package org.apache.geode.internal.cache;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
/**
* Keeps track redundancy statistics across the buckets of a given {@link PartitionedRegion}
@@ -75,7 +76,7 @@ class PartitionedRegionRedundancyTracker {
/**
* Updates the count of copies for the bucket with the least copies if a new low has been reached
- *
+ *
* @param bucketCopies number of copies of a bucket remaining
*/
synchronized void reportBucketCount(int bucketCopies) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
index 535e877..08434c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
@@ -31,118 +31,118 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
* Represents a statistics type that can be archived to vsd. Loading of this class automatically
* triggers statistics archival.
* <p>
- *
+ *
* A singleton instance can be requested with the initSingleton(...) and getSingleton() methods.
* <p>
- *
+ *
* Individual instances can be created with the constructor.
* <p>
- *
+ *
* To manipulate the statistic values, use (inc|dec|set|get)<fieldName> methods.
- *
+ *
* @since GemFire 5.0
*/
public class PartitionedRegionStats {
private static final StatisticsType type;
- private final static int dataStoreEntryCountId;
- private final static int dataStoreBytesInUseId;
- private final static int bucketCountId;
-
- private final static int putsCompletedId;
- private final static int putOpsRetriedId;
- private final static int putRetriesId;
-
- private final static int createsCompletedId;
- private final static int createOpsRetriedId;
- private final static int createRetriesId;
-
- private final static int preferredReadLocalId;
- private final static int preferredReadRemoteId;
-
- private final static int getsCompletedId;
- private final static int getOpsRetriedId;
- private final static int getRetriesId;
-
- private final static int destroysCompletedId;
- private final static int destroyOpsRetriedId;
- private final static int destroyRetriesId;
-
- private final static int invalidatesCompletedId;
- private final static int invalidateOpsRetriedId;
- private final static int invalidateRetriesId;
-
- private final static int containsKeyCompletedId;
- private final static int containsKeyOpsRetriedId;
- private final static int containsKeyRetriesId;
-
- private final static int containsValueForKeyCompletedId;
-
- private final static int partitionMessagesSentId;
- private final static int partitionMessagesReceivedId;
- private final static int partitionMessagesProcessedId;
-
- private final static int putTimeId;
- private final static int createTimeId;
- private final static int getTimeId;
- private final static int destroyTimeId;
- private final static int invalidateTimeId;
- private final static int containsKeyTimeId;
- private final static int containsValueForKeyTimeId;
- private final static int partitionMessagesProcessingTimeId;
-
- private final static String PUTALLS_COMPLETED = "putAllsCompleted";
- private final static String PUTALL_MSGS_RETRIED = "putAllMsgsRetried";
- private final static String PUTALL_RETRIES = "putAllRetries";
- private final static String PUTALL_TIME = "putAllTime";
-
- private final static int fieldId_PUTALLS_COMPLETED;
- private final static int fieldId_PUTALL_MSGS_RETRIED;
- private final static int fieldId_PUTALL_RETRIES;
- private final static int fieldId_PUTALL_TIME;
-
- private final static String REMOVE_ALLS_COMPLETED = "removeAllsCompleted";
- private final static String REMOVE_ALL_MSGS_RETRIED = "removeAllMsgsRetried";
- private final static String REMOVE_ALL_RETRIES = "removeAllRetries";
- private final static String REMOVE_ALL_TIME = "removeAllTime";
-
- private final static int fieldId_REMOVE_ALLS_COMPLETED;
- private final static int fieldId_REMOVE_ALL_MSGS_RETRIED;
- private final static int fieldId_REMOVE_ALL_RETRIES;
- private final static int fieldId_REMOVE_ALL_TIME;
-
- private final static int volunteeringInProgressId; // count of volunteering in progress
- private final static int volunteeringBecamePrimaryId; // ended as primary
- private final static int volunteeringBecamePrimaryTimeId; // time spent that ended as primary
- private final static int volunteeringOtherPrimaryId; // ended as not primary
- private final static int volunteeringOtherPrimaryTimeId; // time spent that ended as not primary
- private final static int volunteeringClosedId; // ended as closed
- private final static int volunteeringClosedTimeId; // time spent that ended as closed
-
- private final static int applyReplicationCompletedId;
- private final static int applyReplicationInProgressId;
- private final static int applyReplicationTimeId;
- private final static int sendReplicationCompletedId;
- private final static int sendReplicationInProgressId;
- private final static int sendReplicationTimeId;
- private final static int putRemoteCompletedId;
- private final static int putRemoteInProgressId;
- private final static int putRemoteTimeId;
- private final static int putLocalCompletedId;
- private final static int putLocalInProgressId;
- private final static int putLocalTimeId;
-
- private final static int totalNumBucketsId; // total number of buckets
- private final static int primaryBucketCountId; // number of hosted primary buckets
- private final static int volunteeringThreadsId; // number of threads actively volunteering
- private final static int lowRedundancyBucketCountId; // number of buckets currently without full
+ private static final int dataStoreEntryCountId;
+ private static final int dataStoreBytesInUseId;
+ private static final int bucketCountId;
+
+ private static final int putsCompletedId;
+ private static final int putOpsRetriedId;
+ private static final int putRetriesId;
+
+ private static final int createsCompletedId;
+ private static final int createOpsRetriedId;
+ private static final int createRetriesId;
+
+ private static final int preferredReadLocalId;
+ private static final int preferredReadRemoteId;
+
+ private static final int getsCompletedId;
+ private static final int getOpsRetriedId;
+ private static final int getRetriesId;
+
+ private static final int destroysCompletedId;
+ private static final int destroyOpsRetriedId;
+ private static final int destroyRetriesId;
+
+ private static final int invalidatesCompletedId;
+ private static final int invalidateOpsRetriedId;
+ private static final int invalidateRetriesId;
+
+ private static final int containsKeyCompletedId;
+ private static final int containsKeyOpsRetriedId;
+ private static final int containsKeyRetriesId;
+
+ private static final int containsValueForKeyCompletedId;
+
+ private static final int partitionMessagesSentId;
+ private static final int partitionMessagesReceivedId;
+ private static final int partitionMessagesProcessedId;
+
+ private static final int putTimeId;
+ private static final int createTimeId;
+ private static final int getTimeId;
+ private static final int destroyTimeId;
+ private static final int invalidateTimeId;
+ private static final int containsKeyTimeId;
+ private static final int containsValueForKeyTimeId;
+ private static final int partitionMessagesProcessingTimeId;
+
+ private static final String PUTALLS_COMPLETED = "putAllsCompleted";
+ private static final String PUTALL_MSGS_RETRIED = "putAllMsgsRetried";
+ private static final String PUTALL_RETRIES = "putAllRetries";
+ private static final String PUTALL_TIME = "putAllTime";
+
+ private static final int fieldId_PUTALLS_COMPLETED;
+ private static final int fieldId_PUTALL_MSGS_RETRIED;
+ private static final int fieldId_PUTALL_RETRIES;
+ private static final int fieldId_PUTALL_TIME;
+
+ private static final String REMOVE_ALLS_COMPLETED = "removeAllsCompleted";
+ private static final String REMOVE_ALL_MSGS_RETRIED = "removeAllMsgsRetried";
+ private static final String REMOVE_ALL_RETRIES = "removeAllRetries";
+ private static final String REMOVE_ALL_TIME = "removeAllTime";
+
+ private static final int fieldId_REMOVE_ALLS_COMPLETED;
+ private static final int fieldId_REMOVE_ALL_MSGS_RETRIED;
+ private static final int fieldId_REMOVE_ALL_RETRIES;
+ private static final int fieldId_REMOVE_ALL_TIME;
+
+ private static final int volunteeringInProgressId; // count of volunteering in progress
+ private static final int volunteeringBecamePrimaryId; // ended as primary
+ private static final int volunteeringBecamePrimaryTimeId; // time spent that ended as primary
+ private static final int volunteeringOtherPrimaryId; // ended as not primary
+ private static final int volunteeringOtherPrimaryTimeId; // time spent that ended as not primary
+ private static final int volunteeringClosedId; // ended as closed
+ private static final int volunteeringClosedTimeId; // time spent that ended as closed
+
+ private static final int applyReplicationCompletedId;
+ private static final int applyReplicationInProgressId;
+ private static final int applyReplicationTimeId;
+ private static final int sendReplicationCompletedId;
+ private static final int sendReplicationInProgressId;
+ private static final int sendReplicationTimeId;
+ private static final int putRemoteCompletedId;
+ private static final int putRemoteInProgressId;
+ private static final int putRemoteTimeId;
+ private static final int putLocalCompletedId;
+ private static final int putLocalInProgressId;
+ private static final int putLocalTimeId;
+
+ private static final int totalNumBucketsId; // total number of buckets
+ private static final int primaryBucketCountId; // number of hosted primary buckets
+ private static final int volunteeringThreadsId; // number of threads actively volunteering
+ private static final int lowRedundancyBucketCountId; // number of buckets currently without full
// redundancy
- private final static int noCopiesBucketCountId; // number of buckets currently without any
+ private static final int noCopiesBucketCountId; // number of buckets currently without any
// redundancy
- private final static int configuredRedundantCopiesId;
- private final static int actualRedundantCopiesId;
+ private static final int configuredRedundantCopiesId;
+ private static final int actualRedundantCopiesId;
private static final int getEntriesCompletedId;
private static final int getEntryTimeId;
@@ -577,7 +577,7 @@ public class PartitionedRegionStats {
/**
* This method sets the end time for putAll and updates the counters
- *
+ *
* @param start
*/
public void endPutAll(long start) {
@@ -614,7 +614,7 @@ public class PartitionedRegionStats {
/**
* This method sets the end time for putAll and updates the counters
- *
+ *
* @param start
* @param numInc
*/
@@ -955,7 +955,7 @@ public class PartitionedRegionStats {
/**
* Statistic to track the {@link Region#getEntry(Object)} call
- *
+ *
* @param startTime the time the getEntry operation started
*/
public void endGetEntry(long startTime) {
@@ -964,7 +964,7 @@ public class PartitionedRegionStats {
/**
* This method sets the end time for update and updates the counters
- *
+ *
* @param start
* @param numInc
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PeerTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PeerTXStateStub.java
index 80a2fc6..eeac0b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PeerTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PeerTXStateStub.java
@@ -50,7 +50,7 @@ public class PeerTXStateStub extends TXStateStub {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#rollback()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
index a5ca6e9..c3cd934 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
@@ -14,23 +14,6 @@
*/
package org.apache.geode.internal.cache;
-import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import org.apache.geode.cache.DiskAccessException;
-import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
-import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.persistence.DiskRegionView;
-import org.apache.geode.internal.cache.persistence.DiskStoreFilter;
-import org.apache.geode.internal.cache.persistence.OplogType;
-import org.apache.geode.internal.cache.versions.RegionVersionVector;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.sequencelog.EntryLogger;
-import org.apache.logging.log4j.Logger;
-
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
@@ -47,6 +30,24 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.cache.DiskAccessException;
+import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
+import org.apache.geode.internal.cache.entries.DiskEntry;
+import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.internal.cache.persistence.DiskRegionView;
+import org.apache.geode.internal.cache.persistence.DiskStoreFilter;
+import org.apache.geode.internal.cache.persistence.OplogType;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.sequencelog.EntryLogger;
+
public class PersistentOplogSet implements OplogSet {
private static final Logger logger = LogService.getLogger();
@@ -579,7 +580,7 @@ public class PersistentOplogSet implements OplogSet {
* Creates and returns a new oplogEntryId for the given key. An oplogEntryId is needed when
* storing a key/value pair on disk. A new one is only needed if the key is new. Otherwise the
* oplogEntryId already allocated for a key can be reused for the same key.
- *
+ *
* @return A disk id that can be used to access this key/value pair on disk
*/
long newOplogEntryId() {
@@ -590,7 +591,7 @@ public class PersistentOplogSet implements OplogSet {
/**
* Returns the next available DirectoryHolder which has space. If no dir has space then it will
* return one anyway if compaction is enabled.
- *
+ *
* @param minAvailableSpace the minimum amount of space we need in this directory.
*/
DirectoryHolder getNextDir(int minAvailableSpace, boolean checkForWarning) {
@@ -913,7 +914,7 @@ public class PersistentOplogSet implements OplogSet {
/**
* Removes the oplog from the map given the oplogId
- *
+ *
* @param id id of the oplog to be removed from the list
* @return oplog Oplog which has been removed
*/
@@ -1156,5 +1157,3 @@ public class PersistentOplogSet implements OplogSet {
return getParent().isCompactionPossible();
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java
index d55399b..8bf1dac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java
@@ -45,7 +45,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
/**
* Implementation of PoolFactory.
- *
+ *
* @since GemFire 5.7
*/
public class PoolFactoryImpl implements PoolFactory {
@@ -320,7 +320,7 @@ public class PoolFactoryImpl implements PoolFactory {
/**
* Create a new Pool for connecting a client to a set of GemFire Cache Servers. using this
* factory's settings for attributes.
- *
+ *
* @param name the name of the connection pool, used when connecting regions to it
* @throws IllegalStateException if the connection pool name already exists
* @throws IllegalStateException if this factory does not have any locators or servers
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java
index 9b5a153..82f3178 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java
@@ -52,7 +52,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
public class PoolManagerImpl {
private static final Logger logger = LogService.getLogger();
- private final static PoolManagerImpl impl = new PoolManagerImpl(true);
+ private static final PoolManagerImpl impl = new PoolManagerImpl(true);
public static PoolManagerImpl getPMI() {
PoolManagerImpl result = CacheCreation.getCurrentPoolManager();
@@ -89,7 +89,7 @@ public class PoolManagerImpl {
/**
* Creates a new {@link PoolFactory pool factory}, which is used to configure and create new
* {@link Pool}s.
- *
+ *
* @return the new pool factory
*/
public PoolFactory createFactory() {
@@ -99,7 +99,7 @@ public class PoolManagerImpl {
/**
* Find by name an existing connection pool returning the existing pool or <code>null</code> if it
* does not exist.
- *
+ *
* @param name the name of the connection pool
* @return the existing connection pool or <code>null</code> if it does not exist.
*/
@@ -139,7 +139,7 @@ public class PoolManagerImpl {
/**
* This is called by {@link PoolImpl#create}
- *
+ *
* @throws IllegalStateException if a pool with same name is already registered.
*/
public void register(Pool pool) {
@@ -164,7 +164,7 @@ public class PoolManagerImpl {
/**
* This is called by {@link Pool#destroy(boolean)}
- *
+ *
* @return true if pool unregistered from cache; false if someone else already did it
*/
public boolean unregister(Pool pool) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
index 02860e6..7598486 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+
import org.apache.geode.*;
import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-
/**
* GemFire statistics about a Pool
*
@@ -56,20 +56,20 @@ public class PoolStats {
private static final int _CONNECTION_WAIT_IN_PROGRESS;
private static final int _CONNECTION_WAITS;
private static final int _CONNECTION_WAIT_TIME;
- private final static int connectionsId;
- // private final static int conCountId;
- private final static int poolConnectionsId;
- private final static int connectsId;
- private final static int disconnectsId;
- private final static int clientOpInProgressId;
- private final static int clientOpSendInProgressId;
- private final static int clientOpSendId;
- private final static int clientOpSendFailedId;
- private final static int clientOpSendDurationId;
- private final static int clientOpId;
- private final static int clientOpTimedOutId;
- private final static int clientOpFailedId;
- private final static int clientOpDurationId;
+ private static final int connectionsId;
+ // private static final int conCountId;
+ private static final int poolConnectionsId;
+ private static final int connectsId;
+ private static final int disconnectsId;
+ private static final int clientOpInProgressId;
+ private static final int clientOpSendInProgressId;
+ private static final int clientOpSendId;
+ private static final int clientOpSendFailedId;
+ private static final int clientOpSendDurationId;
+ private static final int clientOpId;
+ private static final int clientOpTimedOutId;
+ private static final int clientOpFailedId;
+ private static final int clientOpDurationId;
static {
String statName = "PoolStats";
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProfileExchangeProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProfileExchangeProcessor.java
index cfe2222..a4eb63f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProfileExchangeProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProfileExchangeProcessor.java
@@ -24,8 +24,8 @@ import org.apache.geode.internal.cache.CacheDistributionAdvisor.InitialImageAdvi
* are currently two implementations, one for persistent regions and one of non persistent regions.
* The persistent region implementation will wait for members to come online that may have a later
* copies of the region.
- *
- *
+ *
+ *
*/
public interface ProfileExchangeProcessor {
/** Exchange profiles with other members to initialize the region */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
index 7e60e6a..6cf21da 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
@@ -23,6 +23,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.DiskAccessException;
@@ -54,7 +55,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Empty shell for {@link BucketRegion} which exists only to maintain metadata in the form of a
* {@link BucketAdvisor}
- *
+ *
* @since GemFire 5.1
*/
public class ProxyBucketRegion implements Bucket {
@@ -80,7 +81,7 @@ public class ProxyBucketRegion implements Bucket {
/**
* Constructs a new ProxyBucketRegion which has a BucketAdvisor.
- *
+ *
* @param bid the bucket id
* @param partitionedRegion the PartitionedRegion that owns this bucket
* @param internalRegionArgs the internal args which includes RegionAdvisor
@@ -225,7 +226,7 @@ public class ProxyBucketRegion implements Bucket {
/**
* Notify this proxy of the real bucket as its target. Future calls to this instance will then
* proxy them back to the real bucket.
- *
+ *
* @param br the real bucket which will be the target for this proxy
*/
public void setBucketRegion(BucketRegion br) {
@@ -278,7 +279,7 @@ public class ProxyBucketRegion implements Bucket {
/**
* Get the redundancy of the this bucket, taking into account the local bucket, if any.
- *
+ *
* @return number of redundant copies for a given bucket, or -1 if there are no instances of the
* bucket.
*/
@@ -293,7 +294,7 @@ public class ProxyBucketRegion implements Bucket {
/**
* Returns the real BucketRegion if one has been created. This call will return the bucket even if
* it is still being initialized. Returns null if the bucket has not been created locally.
- *
+ *
* @return the real bucket if currently created or null
*/
public BucketRegion getCreatedBucketRegion() {
@@ -304,7 +305,7 @@ public class ProxyBucketRegion implements Bucket {
* Returns the real BucketRegion that is currently being locally hosted. Returns null if the real
* bucket is null or if it is still being initialized. After the bucket is intialized isHosting
* will be flagged true and future calls to this method will return the bucket.
- *
+ *
* @return the real bucket if currently hosted or null
*/
public BucketRegion getHostedBucketRegion() {
@@ -349,7 +350,7 @@ public class ProxyBucketRegion implements Bucket {
/**
* Returns the total number of datastores hosting an instance of this bucket.
- *
+ *
* @return the total number of datastores hosting an instance of this bucket
*/
public int getBucketOwnersCount() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
index 75c959f..ec64411 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
@@ -51,7 +51,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
/**
* Internal implementation of {@link RegionMap}for regions whose DataPolicy is proxy. Proxy maps are
* always empty.
- *
+ *
* @since GemFire 5.0
*/
class ProxyRegionMap implements RegionMap {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
index 4f2130a..0b08adc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.internal.cache;
+import java.io.Serializable;
+import java.util.*;
+
import org.apache.geode.CancelException;
import org.apache.geode.GemFireException;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import java.io.Serializable;
-import java.util.*;
/**
* This exception is thrown if some sub-ops failed during a bulk operation. Current bulk ops are
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java
index 228b8da..f50bac9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.offheap.annotations.Released;
+import java.io.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
import org.apache.geode.distributed.DistributedMember;
-import java.io.*;
+import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.offheap.annotations.Released;
/**
* Represents a single operation that can be queued for reliable delivery. Instances are owned in
* the context of a region.
- *
+ *
* @since GemFire 5.0
*/
public class QueuedOperation {
@@ -39,7 +40,7 @@ public class QueuedOperation {
/**
* Deserialization policies defined in AbstractUpdateOperation
- *
+ *
* @see org.apache.geode.internal.cache.AbstractUpdateOperation
*/
private final byte deserializationPolicy;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionClearedException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionClearedException.java
index c01cf06..0ae9aa7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionClearedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionClearedException.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache;
/**
* Indicates that a Clear Operation happened while an entry operation was in progress, which would
* result in the ongoing entry operation to abort
- *
+ *
* @since GemFire 5.1
*/
public class RegionClearedException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
index 8edbeac..7834da9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
@@ -58,7 +58,7 @@ public interface RegionEntry {
/**
* Returns true if getLastAccessed, getHitCount, and getMissCount can be called without throwing
* InternalStatisticsDisabledException. Otherwise returns false.
- *
+ *
* @since GemFire 6.0
*/
boolean hasStats();
@@ -97,7 +97,7 @@ public interface RegionEntry {
* Dispatch listener events for the given entry event. If the event is from another member and
* there are already pending events, this will merely queue the event for later dispatch by one of
* those other events.
- *
+ *
* This is done within the RegionEntry synchronization lock.
*/
boolean dispatchListenerEvents(EntryEventImpl event) throws InterruptedException;
@@ -111,7 +111,7 @@ public interface RegionEntry {
/**
* Resets any entry state as needed for a transaction that did a destroy to this entry.
- *
+ *
* @param currentTime Current Cache Time.
*/
void txDidDestroy(long currentTime);
@@ -120,7 +120,7 @@ public interface RegionEntry {
/**
* this is done instead of removePhase2 if the entry needs to be kept for concurrency control
- *
+ *
* @param region the region holding the entry
* @param version whether the operation is from another member or local
*/
@@ -134,7 +134,7 @@ public interface RegionEntry {
* @param region the region
* @param clear - if we removing this entry as a result of a region clear.
* @throws RegionClearedException If operation got aborted due to a clear
- *
+ *
*/
void removePhase1(InternalRegion region, boolean clear) throws RegionClearedException;
@@ -182,7 +182,7 @@ public interface RegionEntry {
/**
* Returns true if this entry has overflowed to disk.
- *
+ *
* @param diskPosition if overflowed then the position of the value is set in dp
*/
boolean isOverflowedToDisk(InternalRegion region, DistributedRegion.DiskPosition diskPosition);
@@ -217,10 +217,10 @@ public interface RegionEntry {
* Obtain, retain and return the value of this entry. WARNING: if a StoredObject is returned and
* it has a refCount then the caller MUST make sure that {@link StoredObject#release()} before the
* returned object is garbage collected.
- *
+ *
* This is only retained in off-heap subclasses. However, it's marked as Retained here so that
* callers are aware that the value may be retained.
- *
+ *
* @param decompress if true returned value will be decompressed if it is compressed
* @return possible OFF_HEAP_OBJECT (caller must release)
*/
@@ -241,7 +241,7 @@ public interface RegionEntry {
/**
* Set the value of this entry and perform checks to see if a GC task needs to be scheduled.
- *
+ *
* @param value the new value for this entry
* @param event the cache event that caused this change
* @throws RegionClearedException thrown if the region is concurrently cleared
@@ -252,7 +252,7 @@ public interface RegionEntry {
/**
* Returns the value as stored by the RegionEntry implementation. For instance, if compressed this
* value would be the compressed form.
- *
+ *
* @since GemFire 8.0
*/
@Retained
@@ -260,7 +260,7 @@ public interface RegionEntry {
/**
* Returns the value of an entry as it resides in the VM.
- *
+ *
* @return the value or EntryEvent.NOT_AVAILABLE token if it's not in the VM or null if the entry
* doesn't exist.
*
@@ -344,7 +344,7 @@ public interface RegionEntry {
/**
* Get the serialized bytes from disk. This method only looks for the value on the disk, ignoring
* heap data.
- *
+ *
* @param region the persistent region
* @return the serialized value from disk
* @since GemFire 5.7
@@ -384,7 +384,7 @@ public interface RegionEntry {
* Event containing this RegionEntry is being passed through dispatchListenerEvent for
* CacheListeners under RegionEntry lock. This is used during deserialization for a
* VMCacheSerializable value contained by this RegionEntry.
- *
+ *
* @return true if Event is being dispatched to CacheListeners.
*/
boolean isCacheListenerInvocationInProgress();
@@ -446,7 +446,7 @@ public interface RegionEntry {
/**
* Decrements the number of transactions that are currently referencing this node.
- *
+ *
* @param region the local region that owns this region entry; null if no local region owner
*/
void decRefCount(NewLRUClockHand lruList, InternalRegion region);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java
index 2ed674f..1e1aa07 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java
@@ -19,7 +19,7 @@ import org.apache.geode.compression.Compressor;
/**
* Provides important contextual information that allows a {@link RegionEntry} to manage its state.
- *
+ *
* @since GemFire 8.0
*/
public interface RegionEntryContext extends HasCachePerfStats {
@@ -28,7 +28,7 @@ public interface RegionEntryContext extends HasCachePerfStats {
/**
* Returns the compressor to be used by this region entry when storing the entry value.
- *
+ *
* @return null if no compressor is assigned or available for the entry.
*/
public Compressor getCompressor();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java
index c30d0c8..85d0c9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java
@@ -26,7 +26,7 @@ package org.apache.geode.internal.cache;
public interface RegionEntryFactory {
/**
* Creates an instance of RegionEntry.
- *
+ *
* @return the created entry
*/
public RegionEntry createEntry(RegionEntryContext context, Object key, Object value);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
index 651ce9b..d48b869 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
@@ -19,24 +19,25 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.lang.ClassNotFoundException;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.*;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
/**
* Implementation of a region event
- *
- *
+ *
+ *
*/
// must be public for DataSerializable to work
public class RegionEventImpl
@@ -69,7 +70,7 @@ public class RegionEventImpl
/**
* Constructor which does not generate EventID
- *
+ *
* @param region
* @param op
* @param callbackArgument
@@ -97,7 +98,7 @@ public class RegionEventImpl
/**
* Constructor which uses the eventID passed
- *
+ *
* @param region
* @param op
* @param callbackArgument
@@ -120,7 +121,7 @@ public class RegionEventImpl
/**
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheEvent#getRegion()
*/
public Region getRegion() {
@@ -165,7 +166,7 @@ public class RegionEventImpl
/**
* Returns the value of the RegionEventImpl field. This is for internal use only. Customers should
* always call {@link #getCallbackArgument}
- *
+ *
* @since GemFire 5.7
*/
public Object getRawCallbackArgument() {
@@ -240,7 +241,7 @@ public class RegionEventImpl
/**
* Returns the Operation type.
- *
+ *
* @return eventType
*/
public EnumListenerEvent getEventType() {
@@ -249,7 +250,7 @@ public class RegionEventImpl
/**
* Sets the operation type.
- *
+ *
* @param eventType
*/
public void setEventType(EnumListenerEvent eventType) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEvictorTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEvictorTask.java
index 96d871d..72eb05b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEvictorTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEvictorTask.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Takes delta to be evicted and tries to evict the least no of LRU entry which would make
* evictedBytes more than or equal to the delta
- *
+ *
* @since GemFire 6.0
*/
public class RegionEvictorTask implements Runnable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionFactoryImpl.java
index 813f3c6..cf094f9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionFactoryImpl.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.RegionShortcut;
/**
* {@code RegionFactoryImpl} extends RegionFactory adding {@link RegionShortcut} support.
- *
+ *
* @since GemFire 6.5
*/
public class RegionFactoryImpl<K, V> extends RegionFactory<K, V> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java
index f0b30b8..4ba924e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java
@@ -19,10 +19,10 @@ import org.apache.geode.cache.RegionAttributes;
/**
* Callback on a cache that receives notifications about region creates.
- *
+ *
* If there are multiple listeners added to a cache they are invoked in a random order. See
* {@link GemFireCacheImpl#addRegionListener(RegionListener)}
- *
+ *
* If any of these callbacks throw an exception, that exception will get thrown out to the user
* creating the region and the region creation will fail.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
index 45aafd7..80ad81b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
@@ -24,11 +24,11 @@ import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.TimeoutException;
import org.apache.geode.cache.TransactionId;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.AbstractRegionMap.ARMLockTestHook;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.lru.LRUMapCallbacks;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionHolder;
import org.apache.geode.internal.cache.versions.VersionSource;
@@ -111,7 +111,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* fetches the entry from the backing ConcurrentHashMap
- *
+ *
* @return the RegionEntry from memory or disk
*/
RegionEntry getEntry(Object key);
@@ -120,7 +120,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* fetches the entry from the backing ConcurrentHashMap.
- *
+ *
* @return the RegionEntry from memory
*/
RegionEntry getEntryInVM(Object key);
@@ -128,7 +128,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* fetches the entry from the backing ConcurrentHashMap only if the entry is considered to be in
* operational data i.e. does not have isMarkedForEviction() bit set.
- *
+ *
* @return the RegionEntry in operational data
*/
RegionEntry getOperationalEntryInVM(Object key);
@@ -142,7 +142,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* Used by disk regions when recovering data from backup. Currently this "put" is done at a very
* low level to keep it from generating events or pushing updates to others.
- *
+ *
* @return the created RegionEntry or null if entry already existed
*/
RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value);
@@ -151,7 +151,7 @@ public interface RegionMap extends LRUMapCallbacks {
* Used by disk regions when recovering data from backup and initRecoveredEntry has already been
* called for the given key. Currently this "put" is done at a very low level to keep it from
* generating events or pushing updates to others.
- *
+ *
* @return the updated RegionEntry
*/
RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value);
@@ -159,7 +159,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* Used to modify an existing RegionEntry or create a new one when processing the values obtained
* during a getInitialImage.
- *
+ *
* @param wasRecovered true if the current entry in the cache was recovered from disk.
* @param entryVersion version information from InitialImageOperation or RegisterInterest
* @param sender the sender of the initial image, if IIO. Not needed on clients
@@ -171,7 +171,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* Destroy an entry the map.
- *
+ *
* @param event indicates entry to destroy as well as data for a <code>CacheCallback</code>
* @param inTokenMode true if destroy is occurring during region initialization
* @param duringRI true if destroy is occurring during register interest
@@ -180,7 +180,7 @@ public interface RegionMap extends LRUMapCallbacks {
* @param expectedOldValue if non-null, only destroy if key exists and value is is equal to
* expectedOldValue
* @return true if the entry was destroyed, false otherwise
- *
+ *
* @see LocalRegion
* @see AbstractRegionMap
* @see CacheCallback
@@ -319,7 +319,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* Removes an entry that was previously destroyed and made into a tombstone.
- *
+ *
* @param re the entry that was destroyed
* @param destroyedVersion the version that was destroyed
* @param isEviction true if the tombstone is being evicted by LRU
@@ -331,7 +331,7 @@ public interface RegionMap extends LRUMapCallbacks {
/**
* Checks to see if the given version is still the version in the map
- *
+ *
* @param re the entry that was destroyed
* @param destroyedVersion the version that was destroyed
* @return true of the tombstone is no longer needed (entry was resurrected or evicted)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java
index 5fc7820..f218433 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java
@@ -27,7 +27,7 @@ package org.apache.geode.internal.cache;
class RegionMapFactory {
/**
* Creates a RegionMap that is stored in the VM.
- *
+ *
* @param owner the region that will be the owner of the map
* @param attrs attributes used to create the map and its entries
*/
@@ -48,7 +48,7 @@ class RegionMapFactory {
/**
* Creates a RegionMap that is stored in the VM. Called during DiskStore recovery before the
* region actually exists.
- *
+ *
* @param owner the place holder disk region that will be the owner of the map until the actual
* region is created.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java
index 36684cd..bfb4291 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java
@@ -15,14 +15,14 @@
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-
import java.util.List;
+import org.apache.geode.cache.*;
+
/**
* Interface <code>RegionQueue</code> is an interface for queue implementations backed by regions.
- *
- *
+ *
+ *
* @since GemFire 4.2
*/
public interface RegionQueue {
@@ -34,9 +34,9 @@ public interface RegionQueue {
/**
* Puts an object onto the tail of the queue
- *
+ *
* @param object The object to put onto the queue
- *
+ *
* @throws InterruptedException
* @throws CacheException
* @return boolean whether object was successfully put onto the queue
@@ -51,9 +51,9 @@ public interface RegionQueue {
/**
* Takes the first object from the head of the queue. This method returns null if there are no
* objects on the queue.
- *
+ *
* @return The object taken
- *
+ *
* @throws CacheException
* @throws InterruptedException
*/
@@ -62,11 +62,11 @@ public interface RegionQueue {
/**
* Takes up to batchSize number of objects from the head of the queue. As soon as it gets a null
* response from a take, it stops taking.
- *
+ *
* @param batchSize The number of objects to take from the queue
- *
+ *
* @return the <code>List</code> of objects taken from the queue
- *
+ *
* @throws CacheException
* @throws InterruptedException
*/
@@ -75,7 +75,7 @@ public interface RegionQueue {
/**
* Removes a single object from the head of the queue without returning it. This method assumes
* that the queue contains at least one object.
- *
+ *
* @throws InterruptedException
* @throws CacheException
*/
@@ -84,7 +84,7 @@ public interface RegionQueue {
/**
* Peeks the first object from the head of the queue without removing it. This method returns null
* if there are no objects on the queue.
- *
+ *
* @return The object peeked
* @throws InterruptedException
* @throws CacheException
@@ -94,9 +94,9 @@ public interface RegionQueue {
/**
* Peeks up to batchSize number of objects from the head of the queue without removing them. As
* soon as it gets a null response from a peek, it stops peeking.
- *
+ *
* @param batchSize The number of objects to peek from the queue
- *
+ *
* @return The list of objects peeked
* @throws InterruptedException
* @throws CacheException
@@ -108,27 +108,27 @@ public interface RegionQueue {
* have elapsed (whichever comes first). If it has peeked batchSize number of elements from the
* queue before timeToWait milliseconds have elapsed, it stops peeking. If timeToWait milliseconds
* elapse before batchSize number of elements has been peeked, it stops.
- *
+ *
* @param batchSize The number of objects to peek from the queue
* @param timeToWait The number of milliseconds to attempt to peek
- *
+ *
* @return The list of objects peeked
* @throws InterruptedException
* @throws CacheException
- *
+ *
*/
public List peek(int batchSize, int timeToWait) throws InterruptedException, CacheException;
/**
* Returns the size of the queue
- *
+ *
* @return the size of the queue
*/
public int size();
/**
* Add a <code>CacheListener</code> to the queue
- *
+ *
* @param listener The <code>CacheListener</code> to add
*/
public void addCacheListener(CacheListener listener);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java
index fc96ca1..5a5a03e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java
@@ -36,7 +36,7 @@ public class RegionQueueException extends CacheException {
/**
* Constructor. Creates an instance of <code>RegionQueueException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
*/
public RegionQueueException(String msg) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionStatus.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionStatus.java
index f808849..3126a60 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionStatus.java
@@ -15,13 +15,12 @@
package org.apache.geode.internal.cache;
+import java.io.Serializable;
+
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
-
import org.apache.geode.internal.cache.lru.LRUStatistics;
-import java.io.Serializable;
-
/**
* Class <code>RegionStatus</code> provides information about <code>Region</code>s. This class is
* used by the monitoring tool.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
index 49f3d6c..87c1c24 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This message is used be a replicate region to send a contains key/value request to another peer.
- *
+ *
* @since GemFire 6.5
*/
public class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDirectReply {
@@ -68,7 +68,7 @@ public class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDir
* {@link org.apache.geode.cache.Region#containsKey(Object)}or
* {@link org.apache.geode.cache.Region#containsValueForKey(Object)} depending on the
* <code>valueCheck</code> argument
- *
+ *
* @param recipient the member that the contains keys/value message is sent to
* @param r the LocalRegion
* @param key the key to be queried
@@ -191,7 +191,7 @@ public class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDir
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -243,7 +243,7 @@ public class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDir
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.RemoteContainsKeyValueMessage.RemoteContainsKeyValueReplyMessage}
- *
+ *
* @since GemFire 6.5
*/
public static class RemoteContainsKeyValueResponse extends RemoteOperationResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
index 081044e..a82ec48 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_BYTES;
+import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_OBJECT;
+import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_SERIALIZED_OBJECT;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -57,10 +62,6 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Unretained;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
-import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_BYTES;
-import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_SERIALIZED_OBJECT;
-import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_OBJECT;
/**
* A class that specifies a destroy operation. Used by ReplicateRegions. Note: The reason for
@@ -68,9 +69,9 @@ import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS
* RemoteDestroyMessage to differentiate an invalidate versus a destroy. The assumption is that
* these operations are used frequently, if they are not then it makes sense to fold the destroy and
* the invalidate into the same message and use an extra bit to differentiate
- *
+ *
* @since GemFire 6.5
- *
+ *
*/
public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
implements OldValueImporter {
@@ -196,7 +197,7 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
/**
* Set the old value for this message, only used if there are cqs registered on one of the bridge
* servers.
- *
+ *
* @param event underlying event.
* @since GemFire 5.5
*/
@@ -296,7 +297,7 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
/**
* Sends a RemoteDestroyMessage {@link org.apache.geode.cache.Region#destroy(Object)}message to
* the recipient
- *
+ *
* @param recipient the recipient of the message
* @param r the ReplicateRegion for which the destroy was performed
* @param event the event causing this message
@@ -505,7 +506,7 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
/**
* Assists the toString method in reporting the contents of this message
- *
+ *
*/
@Override
protected void appendFields(StringBuffer buff) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
index 0c141cc..ec565a6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
@@ -49,7 +49,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* This message is used as the request for a
* {@link org.apache.geode.cache.Region#getEntry(Object)}operation. The reply is sent in a
* {@link org.apache.geode.internal.cache.RemoteFetchEntryMessage.FetchEntryReplyMessage}.
- *
+ *
* @since GemFire 5.1
*/
public class RemoteFetchEntryMessage extends RemoteOperationMessage {
@@ -70,7 +70,7 @@ public class RemoteFetchEntryMessage extends RemoteOperationMessage {
/**
* Sends a LocalRegion {@link org.apache.geode.cache.Region#getEntry(Object)} message
- *
+ *
* @param recipient the member that the getEntry message is sent to
* @param r the Region for which getEntry was performed upon
* @param key the object to which the value should be feteched
@@ -163,7 +163,7 @@ public class RemoteFetchEntryMessage extends RemoteOperationMessage {
/**
* This message is used for the reply to a {@link RemoteFetchEntryMessage}.
- *
+ *
* @since GemFire 5.0
*/
public static class FetchEntryReplyMessage extends ReplyMessage {
@@ -192,7 +192,7 @@ public class RemoteFetchEntryMessage extends RemoteOperationMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -270,7 +270,7 @@ public class RemoteFetchEntryMessage extends RemoteOperationMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.RemoteFetchEntryMessage.FetchEntryReplyMessage}
- *
+ *
*/
public static class FetchEntryResponse extends RemoteOperationResponse {
private volatile EntrySnapshot returnValue;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
index e2125ab..caffe8e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
@@ -41,10 +41,10 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This message is used to request a VersionTag from a remote member.
- *
+ *
* DistributedRegions with DataPolicy EMPTY, NORMAL, PRELOADED, can use this message to fetch
* VersionTag for a key.
- *
+ *
* @since GemFire 7.0
*/
public class RemoteFetchVersionMessage extends RemoteOperationMessage {
@@ -58,7 +58,7 @@ public class RemoteFetchVersionMessage extends RemoteOperationMessage {
/**
* Send RemoteFetchVersionMessage to the recipient for the given key
- *
+ *
* @param recipient
* @param r
* @param key
@@ -142,7 +142,7 @@ public class RemoteFetchVersionMessage extends RemoteOperationMessage {
/**
* This message is used to send a reply for RemoteFetchVersionMessage.
- *
+ *
*/
public static class FetchVersionReplyMessage extends ReplyMessage {
private VersionTag tag;
@@ -207,7 +207,7 @@ public class RemoteFetchVersionMessage extends RemoteOperationMessage {
/**
* A processor to capture the VersionTag returned by RemoteFetchVersion message.
- *
+ *
*/
public static class FetchVersionResponse extends RemoteOperationResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
index 2837be4..9fc2f0e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
@@ -52,9 +52,9 @@ import org.apache.geode.internal.util.BlobHelper;
* This message is used as the request for a
* {@link org.apache.geode.cache.Region#get(Object)}operation. The reply is sent in a
* {@link org.apache.geode.internal.cache.RemoteGetMessage.GetReplyMessage}.
- *
+ *
* Replicate regions can use this message to send a Get request to another peer.
- *
+ *
* @since GemFire 6.5
*/
public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
@@ -180,7 +180,7 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
/**
* Sends a ReplicateRegion {@link org.apache.geode.cache.Region#get(Object)} message
- *
+ *
* @param recipient the member that the get message is sent to
* @param r the ReplicateRegion for which get was performed upon
* @param key the object to which the value should be feteched
@@ -208,10 +208,10 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
* This message is used for the reply to a
* {@link org.apache.geode.cache.Region#get(Object)}operation This is the reply to a
* {@link RemoteGetMessage}.
- *
+ *
* Since the {@link org.apache.geode.cache.Region#get(Object)}operation is used <bold>very </bold>
* frequently the performance of this class is critical.
- *
+ *
* @since GemFire 6.5
*/
public static class GetReplyMessage extends ReplyMessage {
@@ -255,7 +255,7 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
* Return the value from the get operation, serialize it bytes as late as possible to avoid
* making un-neccesary byte[] copies. De-serialize those same bytes as late as possible to avoid
* using precious threads (aka P2P readers).
- *
+ *
* @param recipient the origin VM that performed the get
* @param processorId the processor on which the origin thread is waiting
* @param val the raw value that will eventually be serialized
@@ -271,7 +271,7 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -334,7 +334,7 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.RemoteGetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class RemoteGetResponse extends RemoteOperationResponse {
@@ -369,7 +369,7 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
/**
* De-seralize the value, if the value isn't already a byte array, this method should be called
* in the context of the requesting thread for the best scalability
- *
+ *
* @param preferCD
* @see EntryEventImpl#deserialize(byte[])
* @return the value object
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
index eea654d..0d55f83 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_BYTES;
+import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_SERIALIZED_OBJECT;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -51,9 +54,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.annotations.Released;
-import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_BYTES;
-import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_SERIALIZED_OBJECT;
-
public class RemoteInvalidateMessage extends RemoteDestroyMessage {
private static final Logger logger = LogService.getLogger();
@@ -131,7 +131,7 @@ public class RemoteInvalidateMessage extends RemoteDestroyMessage {
/**
* Sends a transactional RemoteInvalidateMessage
* {@link org.apache.geode.cache.Region#invalidate(Object)}message to the recipient
- *
+ *
* @param recipient the recipient of the message
* @param r the ReplicateRegion for which the invalidate was performed
* @param event the event causing this message
@@ -162,7 +162,7 @@ public class RemoteInvalidateMessage extends RemoteDestroyMessage {
* This method is called upon receipt and make the desired changes to the PartitionedRegion Note:
* It is very important that this message does NOT cause any deadlocks as the sender will wait
* indefinitely for the acknowledgement
- *
+ *
* @throws EntryExistsException
*/
@Override
@@ -290,7 +290,7 @@ public class RemoteInvalidateMessage extends RemoteDestroyMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -370,7 +370,7 @@ public class RemoteInvalidateMessage extends RemoteDestroyMessage {
}
/**
* A processor to capture the value returned by {@link RemoteInvalidateMessage}
- *
+ *
* @since GemFire 6.5
*/
public static class InvalidateResponse extends RemoteOperationResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationException.java
index 516674e..aa8e212 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationException.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.Assert;
/**
* Indicates that the current non-partitioned region operation failed fatally.
- *
+ *
* @see org.apache.geode.internal.cache.RemoteOperationMessage
* @since GemFire 6.5
*/
@@ -39,7 +39,7 @@ public class RemoteOperationException extends DataLocationException {
/**
* Used when constructing the error: sets the expected hash.
- *
+ *
* @param h the hash to use
*/
public void setHash(int h) {
@@ -50,7 +50,7 @@ public class RemoteOperationException extends DataLocationException {
/**
* Fetch the hash for this exception
- *
+ *
* @return the expected hash
*/
public boolean hasHash() {
@@ -66,7 +66,7 @@ public class RemoteOperationException extends DataLocationException {
/**
* If possible, validate the given key's hashCode against any that was returned by the peer.
- *
+ *
* @param key the key on the current host. If null, no check is done.
* @throws PartitionedRegionException if the keys disagree.
*/
@@ -88,7 +88,7 @@ public class RemoteOperationException extends DataLocationException {
/**
* Reattempt required due to an underlying error
- *
+ *
* @param message describes the context
* @param cause the underlying cause
*/
@@ -98,7 +98,7 @@ public class RemoteOperationException extends DataLocationException {
/**
* Reattempt required due to detected condition
- *
+ *
* @param message describes the condition
*/
public RemoteOperationException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessage.java
index 765f707..b73f2af 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessage.java
@@ -51,7 +51,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* The base PartitionedRegion message type upon which other messages should be based.
- *
+ *
* @since GemFire 6.5
*/
public abstract class RemoteOperationMessage extends DistributionMessage
@@ -134,7 +134,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
* Severe alert processing enables suspect processing at the ack-wait-threshold and issuing of a
* severe alert at the end of the ack-severe-alert-threshold. Some messages should not support
* this type of processing (e.g., GII, or DLockRequests)
- *
+ *
* @return whether severe-alert processing may be performed on behalf of this message
*/
@Override
@@ -173,7 +173,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
/**
* check to see if the distributed system is closing
- *
+ *
* @return true if the distributed system is closing
*/
public boolean checkDSClosing(DistributionManager dm) {
@@ -185,7 +185,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
* Upon receipt of the message, both process the message and send an acknowledgement, not
* necessarily in that order. Note: Any hang in this message may cause a distributed deadlock for
* those threads waiting for an acknowledgement.
- *
+ *
* @throws PartitionedRegionException if the region does not exist (typically, if it has been
* destroyed)
*/
@@ -313,7 +313,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
/**
* Send a generic ReplyMessage. This is in a method so that subclasses can override the reply
* message type
- *
+ *
* @param pr the Partitioned Region for the message whose statistics are incremented
* @param startTime the start time of the operation in nanoseconds
* @see PutMessage#sendReply
@@ -331,7 +331,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
* Allow classes that over-ride to choose whether a RegionDestroyException is thrown if no
* partitioned region is found (typically occurs if the message will be sent before the
* PartitionedRegion has been fully constructed.
- *
+ *
* @return true if throwing a {@link RegionDestroyedException} is acceptable
*/
protected boolean failIfRegionMissing() {
@@ -428,7 +428,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
return txMemberId;
}
- private final static String PN_TOKEN = ".cache.";
+ private static final String PN_TOKEN = ".cache.";
@Override
public String toString() {
@@ -448,7 +448,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
/**
* Helper class of {@link #toString()}
- *
+ *
* @param buff buffer in which to append the state of this instance
*/
protected void appendFields(StringBuffer buff) {
@@ -473,7 +473,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
/**
* added to support old value to be written on wire.
- *
+ *
* @param value true or false
* @since GemFire 6.5
*/
@@ -508,7 +508,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
/**
* A processor on which to await a response from the {@link RemoteOperationMessage} recipient,
* capturing any CacheException thrown by the recipient and handle it as an expected exception.
- *
+ *
* @since GemFire 6.5
* @see #waitForCacheException()
*/
@@ -579,7 +579,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage
/**
* Waits for the response from the {@link RemoteOperationMessage}'s recipient
- *
+ *
* @throws CacheException if the recipient threw a cache exception during message processing
*/
public void waitForCacheException()
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessageWithDirectReply.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessageWithDirectReply.java
index 98cbc24..9aa0ec2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessageWithDirectReply.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteOperationMessageWithDirectReply.java
@@ -26,10 +26,10 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* Used for partitioned region messages which support direct ack responses. Direct ack should be
* used for message with a response from a single member, or responses which are small.
- *
+ *
* Messages that extend this class *must* reply using the ReplySender returned by
* {@link DistributionMessage#getReplySender(org.apache.geode.distributed.internal.DM)}
- *
+ *
* Additionally, if the ReplyProcessor used for this message extends PartitionResponse, it should
* pass false for the register parameter of the PartitionResponse.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
index f029c31..29f71ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
@@ -106,7 +106,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
/*
* this is similar to send() but it selects an initialized replicate that is used to proxy the
* message
- *
+ *
*/
public static boolean distribute(EntryEventImpl event, PutAllEntryData[] data, int dataCount) {
boolean successful = false;
@@ -192,14 +192,14 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
/*
* Sends a LocalRegion RemotePutAllMessage to the recipient
- *
+ *
* @param recipient the member to which the put message is sent
- *
+ *
* @param r the LocalRegion for which the put was performed
- *
+ *
* @return the processor used to await acknowledgement that the update was sent, or null to
* indicate that no acknowledgement will be sent
- *
+ *
* @throws ForceReattemptException if the peer is no longer available
*/
public static PutAllResponse send(DistributedMember recipient, EntryEventImpl event,
@@ -338,7 +338,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
* sendMsgByBucket() when processing a msg targeted to local Jvm. LocalRegion Note: It is very
* important that this message does NOT cause any deadlocks as the sender will wait indefinitely
* for the acknowledgment
- *
+ *
* @param r partitioned region eventSender the endpoint server who received request from client
* lastModified timestamp for last modification
* @return If succeeds, return true, otherwise, throw exception
@@ -466,7 +466,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
index 4135752..af2b8ab 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -57,9 +60,6 @@ import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Unretained;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
-
/**
* A Replicate Region update message. Meant to be sent only to the peer who hosts transactional
* data.
@@ -157,7 +157,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
/**
* For put to happen, the old value must be equal to this expectedOldValue.
- *
+ *
* @see PartitionedRegion#replace(Object, Object, Object)
*/
private Object expectedOldValue;
@@ -262,7 +262,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
/**
* this is similar to send() but it selects an initialized replicate that is used to proxy the
* message
- *
+ *
* @param event represents the current operation
* @param lastModified lastModified time
* @param ifNew whether a new entry can be created
@@ -350,7 +350,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
/**
* Sends a ReplicateRegion {@link org.apache.geode.cache.Region#put(Object, Object)} message to
* the recipient
- *
+ *
* @param recipient the member to which the put message is sent
* @param r the PartitionedRegion for which the put was performed
* @param event the event prompting this message
@@ -370,7 +370,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
/**
* Sends a ReplicateRegion {@link org.apache.geode.cache.Region#put(Object, Object)} message to
* the recipient
- *
+ *
* @param recipient the member to which the put message is sent
* @param r the PartitionedRegion for which the put was performed
* @param event the event prompting this message
@@ -845,7 +845,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -988,7 +988,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
/**
* A processor to capture the value returned by {@link RemotePutMessage}
- *
+ *
* @since GemFire 5.1
*/
public static class RemotePutResponse extends RemoteOperationResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
index b998fdf..1a308bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* This message is used be a replicate region to perform region-level ops like clear() and
* invalidateRegion(). It is used when the target region has concurrency control enabled so that
* region-version-vectors must be used to execute these operations.
- *
+ *
* @since GemFire 7.0
*/
public class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply {
@@ -50,7 +50,7 @@ public class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply
// INVALIDATE
}
- transient private DistributedRegion region;
+ private transient DistributedRegion region;
private Operation op;
public RemoteRegionOperation() {}
@@ -157,7 +157,7 @@ public class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
index 4b51705..497bcf5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
@@ -104,7 +104,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
/*
* this is similar to send() but it selects an initialized replicate that is used to proxy the
* message
- *
+ *
*/
public static boolean distribute(EntryEventImpl event, RemoveAllEntryData[] data, int dataCount) {
boolean successful = false;
@@ -187,14 +187,14 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
/*
* Sends a LocalRegion RemoteRemoveAllMessage to the recipient
- *
+ *
* @param recipient the member to which the message is sent
- *
+ *
* @param r the LocalRegion for which the op was performed
- *
+ *
* @return the processor used to await acknowledgement that the message was sent, or null to
* indicate that no acknowledgement will be sent
- *
+ *
* @throws ForceReattemptException if the peer is no longer available
*/
public static RemoveAllResponse send(DistributedMember recipient, EntryEventImpl event,
@@ -328,7 +328,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
* sendMsgByBucket() when processing a msg targeted to local Jvm. LocalRegion Note: It is very
* important that this message does NOT cause any deadlocks as the sender will wait indefinitely
* for the acknowledgment
- *
+ *
* @param r partitioned region
* @param eventSender the endpoint server who received request from client
* @return If succeeds, return true, otherwise, throw exception
@@ -456,7 +456,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
index bb015bf..02ba28c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache;
import java.io.*;
import java.util.*;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Operation;
@@ -87,4 +88,3 @@ public class RoleEventImpl extends RegionEventImpl implements RoleEvent, DataSer
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
index 4e30a34..552048c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
@@ -805,7 +805,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
* Returns an event for listener notification. The event's operation may be altered to conform to
* the ConcurrentMap implementation specification. If the returned value is not == to the event
* parameter then the caller is responsible for releasing it.
- *
+ *
* @param event the original event
* @return the original event or a new event having a change in operation
*/
@@ -953,7 +953,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
/**
* process a QueryMessage netsearch response
- *
+ *
* @param versionTag TODO
*/
protected synchronized void incomingResponse(Object obj, long lastModifiedTime, boolean isPresent,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
index 7f28d5a..56319a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
@@ -27,12 +27,12 @@ import org.apache.geode.distributed.internal.PooledDistributionMessage;
import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Ping to check if a server is alive. It waits for a specified time before returning false.
- *
+ *
*/
public class ServerPingMessage extends PooledDistributionMessage {
private int processorId = 0;
@@ -53,7 +53,7 @@ public class ServerPingMessage extends PooledDistributionMessage {
/**
* Sends a ping message. The pre-GFXD_101 recipients are filtered out and it is assumed that they
* are pingable.
- *
+ *
* @return true if all the recipients are pingable
*/
public static boolean send(InternalCache cache, Set<InternalDistributedMember> recipients) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
index e093d95..6509dea 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
@@ -796,4 +796,3 @@ public class StateFlushOperation {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index 662b557..c927239 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -169,7 +169,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Create and return an eventId given its offset.
- *
+ *
* @since GemFire 5.7
*/
protected EventID getEventId(int eventOffset) {
@@ -781,12 +781,12 @@ public class TXCommitMessage extends PooledDistributionMessage
*
* private boolean shouldSend701Message() { if (this.clientVersion == null &&
* this.getDM().getMembersWithOlderVersion("7.0.1").isEmpty()) { return true; } return false; }
- *
+ *
* public boolean shouldReadShadowKey() { return this.shouldReadShadowKey; }
- *
+ *
* public void setShouldReadShadowKey(boolean shouldReadShadowKey) { this.shouldReadShadowKey =
* shouldReadShadowKey; }
- *
+ *
* public boolean shouldWriteShadowKey() { return this.shouldWriteShadowKey; }
*/
@@ -836,7 +836,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Return true if a distributed ack message is required. On the client side of a transaction, this
* returns false, while returning true elsewhere.
- *
+ *
* @return requires ack message or not
*/
private boolean isAckRequired() {
@@ -846,7 +846,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Indicate whether an ack is required. Defaults to true.
- *
+ *
* @param a true if we require an ack. false if not. false on clients.
*/
public void setAckRequired(boolean a) {
@@ -945,7 +945,7 @@ public class TXCommitMessage extends PooledDistributionMessage
* Combines a set of small TXCommitMessages that belong to one transaction into a txCommitMessage
* that represents an entire transaction. At commit time the txCommitMessage sent to each node can
* be a subset of the transaction, this method will combine those subsets into a complete message.
- *
+ *
* @return the complete txCommitMessage
*/
public static TXCommitMessage combine(Set<TXCommitMessage> msgSet) {
@@ -1129,7 +1129,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Called to setup a region commit so its entryOps can be processed
- *
+ *
* @return true if region should be processed; false if it can be ignored
* @throws CacheClosedException if the cache has been closed
*/
@@ -1209,7 +1209,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Returns the eventId to use for the give farside entry op.
- *
+ *
* @since GemFire 5.7
*/
private EventID getEventId(FarSideEntryOp entryOp) {
@@ -1475,7 +1475,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Holds data that describes a tx entry op on the far side.
- *
+ *
* @since GemFire 5.0
*/
public class FarSideEntryOp implements Comparable {
@@ -1499,7 +1499,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Creates and returns a new instance of a tx entry op on the far side. The "toData" that this
* should match is {@link TXEntryState#toFarSideData}.
- *
+ *
* @param in the data input that is used to read the data for this entry op
* @param largeModCount true if the mod count is a int instead of a byte.
* @param readShadowKey true if a long shadowKey should be read
@@ -1772,7 +1772,7 @@ public class TXCommitMessage extends PooledDistributionMessage
* the origin of the CommitProcess messages departed from the distributed system. The sender of
* this message is attempting to query other potential fellow FarSiders (aka recipients) who may
* have received the CommitProcess message.
- *
+ *
* Since the occurance of this message will be rare (hopefully), it was decided to be general
* about the the tracker key - opting not to have specific messages for each type like
* CommitProcessFor<Lock/TX>Id - and take the performance penalty of an extra call to
@@ -2051,7 +2051,7 @@ public class TXCommitMessage extends PooledDistributionMessage
* been applied to committed state. This was added as the solution to bug 32999 and the recovery
* when the TXLock Lessor (the sending VM) crashes/departs before or while sending the
* TXCommitMessage.
- *
+ *
* @see TXState#commit()
* @see org.apache.geode.internal.cache.locks.TXLockBatch#getBatchId()
*/
@@ -2064,7 +2064,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Reply processor which collects all CommitReplyExceptions and emits a detailed failure exception
* if problems occur
- *
+ *
* @since GemFire 5.7
*/
private class CommitReplyProcessor extends ReliableReplyProcessor21 {
@@ -2131,7 +2131,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* An Exception that collects many remote CommitExceptions
- *
+ *
* @since GemFire 5.7
*/
public static class CommitExceptionCollectingException extends ReplyException {
@@ -2302,7 +2302,7 @@ public class TXCommitMessage extends PooledDistributionMessage
/**
* Disable firing of TX Listeners. Currently on used on clients.
- *
+ *
* @param b disable the listeners
*/
public void setDisableListeners(boolean b) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
index 43165a7..0650748 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
public class TXEntry implements Region.Entry {
/**
- *
+ *
*/
private final LocalRegion localRegion;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
index 2ee3a8c..053dc8c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
@@ -15,6 +15,17 @@
package org.apache.geode.internal.cache;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.TX_ENTRY_STATE;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -33,24 +44,14 @@ 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.pdx.PdxSerializationException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.TX_ENTRY_STATE;
/**
* TXEntryState is the entity that tracks transactional changes, except for those tracked by
* {@link TXEntryUserAttrState}, to an entry.
- *
- *
+ *
+ *
* @since GemFire 4.0
- *
+ *
*/
public class TXEntryState implements Releasable {
private static final Logger logger = LogService.getLogger();
@@ -69,13 +70,13 @@ public class TXEntryState implements Releasable {
protected int modSerialNum;
/**
* Used to remember the event id to use on the farSide for this entry. See bug 39434.
- *
+ *
* @since GemFire 5.7
*/
private int farSideEventOffset = -1;
/**
* Used to remember the event id to use on the nearSide for this entry. See bug 39434.
- *
+ *
* @since GemFire 5.7
*/
private int nearSideEventOffset = -1;
@@ -318,9 +319,9 @@ public class TXEntryState implements Releasable {
/**
* Fetches the current modification serial number from the txState and puts it in this entry.
- *
+ *
* @param modNum the next modified serial number gotten from TXState
- *
+ *
* @since GemFire 5.0
*/
public void updateForWrite(final int modNum) {
@@ -330,7 +331,7 @@ public class TXEntryState implements Releasable {
/**
* Returns true if this entry has been written; false if only read
- *
+ *
* @since GemFire 5.1
*/
public boolean isDirty() {
@@ -339,7 +340,7 @@ public class TXEntryState implements Releasable {
/**
* Return true if entry has an operation.
- *
+ *
* @since GemFire 5.5
*/
public boolean hasOp() {
@@ -474,7 +475,7 @@ public class TXEntryState implements Releasable {
/**
* Returns true if this operation has an event for the tx listener
- *
+ *
* @since GemFire 5.0
*/
boolean isOpAnyEvent(LocalRegion r) {
@@ -648,7 +649,7 @@ public class TXEntryState implements Releasable {
/**
* Calculate and return the event offset based on the sequence id on TXState.
- *
+ *
* @since GemFire 5.7
*/
private static int generateEventOffset(TXState txState) {
@@ -660,7 +661,7 @@ public class TXEntryState implements Releasable {
/**
* Generate offsets for different eventIds; one for nearside and one for farside for the ops for
* this entry.
- *
+ *
* @since GemFire 5.7
*/
private void generateBothEventOffsets(TXState txState) {
@@ -672,7 +673,7 @@ public class TXEntryState implements Releasable {
/**
* Generate the offset for an eventId that will be used for both a farside and nearside op for
* this entry.
- *
+ *
* @since GemFire 5.7
*/
private void generateSharedEventOffset(TXState txState) {
@@ -684,7 +685,7 @@ public class TXEntryState implements Releasable {
/**
* Generate the offset for an eventId that will be used for the nearside op for this entry. No
* farside op will be done.
- *
+ *
* @since GemFire 5.7
*/
private void generateNearSideOnlyEventOffset(TXState txState) {
@@ -709,7 +710,7 @@ public class TXEntryState implements Releasable {
/**
* Calculate (if farside has not already done so) and return then eventID to use for near side op
* applications.
- *
+ *
* @since GemFire 5.7
*/
private EventID getNearSideEventId(TXState txState) {
@@ -719,7 +720,7 @@ public class TXEntryState implements Releasable {
/**
* Calculate and return the event offset for this entry's farSide operation.
- *
+ *
* @since GemFire 5.7
*/
void generateEventOffsets(TXState txState) {
@@ -813,7 +814,7 @@ public class TXEntryState implements Releasable {
/**
* Gets the operation code for the operation done on this entry in caches remote from the
* originator of the tx (i.e. the "far side").
- *
+ *
* @return null if no far side operation
*/
private Operation getFarSideOperation() {
@@ -966,7 +967,7 @@ public class TXEntryState implements Releasable {
/**
* @param event the event object for this operation, with the exception that the oldValue
* parameter is not yet filled in. The oldValue will be filled in by this operation.
- *
+ *
* @param ifNew true if this operation must not overwrite an existing key
* @param originRemote value for cacheWriter's isOriginRemote flag
* @return true if put was done; otherwise returns false
@@ -1025,7 +1026,7 @@ public class TXEntryState implements Releasable {
* We will try to establish TXState on members with dataPolicy REPLICATE, this is done for the
* first region to be involved in a transaction. For subsequent region if the dataPolicy is not
* REPLICATE, we fetch the VersionTag from replicate members.
- *
+ *
* @param event
*/
private void fetchRemoteVersionTag(EntryEventImpl event) {
@@ -1047,7 +1048,7 @@ public class TXEntryState implements Releasable {
/**
* Perform operation algebra
- *
+ *
* @return false if operation was not done
*/
private byte adviseOp(byte requestedOpCode, EntryEventImpl event) {
@@ -1596,7 +1597,7 @@ public class TXEntryState implements Releasable {
/**
* If the entry is not dirty (read only) then clean it up.
- *
+ *
* @return true if this entry is not dirty.
*/
boolean cleanupNonDirty(LocalRegion r) {
@@ -1840,12 +1841,12 @@ public class TXEntryState implements Releasable {
/**
* Serializes this entry state to a data output stream for a far side consumer. Make sure this
* method is backwards compatible if changes are made.
- *
+ *
* @param largeModCount true if modCount needs to be represented by an int; false if a byte is
* enough
* @param sendVersionTag true if versionTag should be sent to clients 7.0 and above
* @param sendShadowKey true if wan shadowKey should be sent to peers 7.0.1 and above
- *
+ *
* @since GemFire 5.0
*/
void toFarSideData(DataOutput out, boolean largeModCount, boolean sendVersionTag,
@@ -1890,7 +1891,7 @@ public class TXEntryState implements Releasable {
/**
* Creates a queued op and returns it for this entry on the far side of the tx.
- *
+ *
* @param key the key for this op
* @since GemFire 5.0
*/
@@ -1926,7 +1927,7 @@ public class TXEntryState implements Releasable {
/**
* Just like an EntryEventImpl but also has access to TxEntryState to make it Comparable
- *
+ *
* @since GemFire 5.0
*/
public class TxEntryEventImpl extends EntryEventImpl implements Comparable {
@@ -1968,7 +1969,7 @@ public class TXEntryState implements Releasable {
}
- private final static TXEntryStateFactory factory = new TXEntryStateFactory() {
+ private static final TXEntryStateFactory factory = new TXEntryStateFactory() {
public TXEntryState createEntry() {
return new TXEntryState();
@@ -2052,13 +2053,13 @@ public class TXEntryState implements Releasable {
/**
* For Distributed Transaction Usage
- *
+ *
* This class is used to bring relevant information for DistTxEntryEvent from primary, after end
* of precommit. Same information are sent to all replicates during commit.
- *
+ *
* Whereas @see DistTxEntryEvent is used forstoring entry event information on TxCordinator and
* carry same to replicates.
- *
+ *
*/
public static class DistTxThinEntryState implements DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java
index 2ca0867..e870cc9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java
@@ -17,14 +17,14 @@ package org.apache.geode.internal.cache;
import org.apache.geode.internal.cache.RegionEntry;
/**
- *
+ *
*
*/
public interface TXEntryStateFactory {
/**
* Creates an instance of TXEntryState.
- *
+ *
* @return the created entry
*/
public TXEntryState createEntry();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java
index c2c6ec9..15c9697 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java
@@ -21,9 +21,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* TXEntryUserAttrState is the entity that tracks transactional changes to an entry user attribute.
*
- *
+ *
* @since GemFire 4.0
- *
+ *
*/
public class TXEntryUserAttrState {
private final Object originalValue;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
index 777eea5..684f698 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
import java.util.*;
+
+import org.apache.geode.cache.*;
import org.apache.geode.internal.offheap.Releasable;
/**
@@ -27,7 +28,7 @@ public class TXEvent implements TransactionEvent, Releasable {
private final TXStateInterface localTxState;
private List events;
- final private Cache cache;
+ private final Cache cache;
TXEvent(TXStateInterface localTxState, Cache cache) {
this.localTxState = localTxState;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
index b7ab7e8..3f6771d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
@@ -58,7 +58,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* </ol>
*
* @since GemFire 4.0
- *
+ *
*/
public class TXFarSideCMTracker {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
index ffc0758..38cfe84 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
@@ -14,13 +14,14 @@
*/
package org.apache.geode.internal.cache;
+import java.io.*;
+
+import org.apache.geode.cache.TransactionId;
+import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.ExternalizableDSFID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
-import org.apache.geode.cache.TransactionId;
-import org.apache.geode.internal.DSFIDFactory;
-import java.io.*;
-import org.apache.geode.distributed.internal.membership.*;
/**
* The implementation of the {@link TransactionId} interface stored in the transaction state and
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java
index 579390e..919597d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java
@@ -15,17 +15,17 @@
package org.apache.geode.internal.cache;
+import java.util.*;
+
import org.apache.geode.cache.*;
import org.apache.geode.internal.cache.locks.*;
-import java.util.*;
-
/**
* TXLockRequest represents all the locks that need to be made for a single transaction.
*
- *
+ *
* @since GemFire 4.0
- *
+ *
*/
public class TXLockRequest {
private boolean localLockHeld;
@@ -137,7 +137,7 @@ public class TXLockRequest {
releaseDistributed();
}
- static private final TXReservationMgr resMgr = new TXReservationMgr(true);
+ private static final TXReservationMgr resMgr = new TXReservationMgr(true);
/**
* @param localLocks is a list of TXRegionLockRequest instances
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
index 88ab5dd..560629b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
@@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.locks.LockSupport;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.GemFireException;
import org.apache.geode.InternalGemFireError;
@@ -67,18 +69,17 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.MapCallback;
-import org.apache.logging.log4j.Logger;
/**
* The internal implementation of the {@link CacheTransactionManager} interface returned by
* {@link InternalCache#getCacheTransactionManager}. Internal operations
- *
+ *
* {@code TransactionListener} invocation, Region synchronization, transaction statistics and
- *
+ *
* transaction logging are handled here
*
* @since GemFire 4.0
- *
+ *
* @see CacheTransactionManager
*/
public class TXManagerImpl implements CacheTransactionManager, MembershipListener {
@@ -197,7 +198,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Get the TransactionWriter for the cache
- *
+ *
* @return the current TransactionWriter
* @see TransactionWriter
*/
@@ -612,7 +613,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* sets {@link TXStateProxy#setInProgress(boolean)} when a txContext is present. This method must
* only be used in fail-over scenarios.
- *
+ *
* @param progress value of the progress flag to be set
* @return the previous value of inProgress flag
* @see TXStateProxy#setInProgress(boolean)
@@ -701,7 +702,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
* If the current thread is in a transaction then internal suspend will cause it to no longer be
* in a transaction. The thread can start a new transaction after it internal suspended a
* transaction.
- *
+ *
* @return the state of the transaction or null. to reactivate the suspended transaction.
*/
public TXStateProxy internalSuspend() {
@@ -843,7 +844,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
* Associate the remote txState with the thread processing this message. Also, we acquire a lock
* on the txState, on which this thread operates. Some messages like SizeMessage should not create
* a new txState.
- *
+ *
* @return {@link TXStateProxy} the txProxy for the transactional message
*/
public TXStateProxy masqueradeAs(TransactionMessage msg) throws InterruptedException {
@@ -922,7 +923,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
* Associate the remote txState with the thread processing this message. Also, we acquire a lock
* on the txState, on which this thread operates. Some messages like SizeMessage should not create
* a new txState.
- *
+ *
* @param probeOnly - do not masquerade; just look up the TX state
* @return {@link TXStateProxy} the txProxy for the transactional message
*/
@@ -972,7 +973,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Associate the transactional state with this thread.
- *
+ *
* @param txState the transactional state.
*/
public void masqueradeAs(TXStateProxy txState) {
@@ -995,7 +996,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Cleanup the remote txState after commit and rollback
- *
+ *
* @return the TXStateProxy
*/
public TXStateProxy removeHostedTXState(TXId txId) {
@@ -1029,7 +1030,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Used to verify if a transaction with a given id is hosted by this txManager.
- *
+ *
* @return true if the transaction is in progress, false otherwise
*/
public boolean isHostedTxInProgress(TXId txId) {
@@ -1090,7 +1091,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* retrieve the transaction TXIds for the given client
- *
+ *
* @param id the client's membership ID
* @return a set of the currently open TXIds
*/
@@ -1108,7 +1109,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* retrieve the transaction states for the given client
- *
+ *
* @param id the client's membership ID
* @return a set of the currently open transaction states
*/
@@ -1190,7 +1191,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* If the given transaction is already being completed by another thread this will wait for that
* completion to finish and will ensure that the result is saved in the client failover map.
- *
+ *
* @return true if a wait was performed
*/
public boolean waitForCompletingTransaction(TXId txId) {
@@ -1217,7 +1218,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Returns the TXCommitMessage for a transaction that has been successfully completed.
- *
+ *
* @return the commit message or an exception token e.g {@link TXCommitMessage#CMT_CONFLICT_MSG}
* if the transaction threw an exception
* @see #isExceptionToken(TXCommitMessage)
@@ -1240,7 +1241,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Generates exception messages for the three TXCommitMessage tokens that represent exceptions
* during transaction execution.
- *
+ *
* @param msg the token that represents the exception
* @return the exception
*/
@@ -1445,7 +1446,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* The timeout after which any suspended transactions are rolled back if they are not resumed. If
* a negative timeout is passed, suspended transactions will never expire.
- *
+ *
* @param timeout the timeout in minutes
*/
public void setSuspendedTransactionTimeout(long timeout) {
@@ -1454,7 +1455,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Return the timeout after which suspended transactions are rolled back.
- *
+ *
* @return the timeout in minutes
* @see #setSuspendedTransactionTimeout(long)
*/
@@ -1470,7 +1471,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* schedules the transaction to expire after {@link #suspendedTXTimeout}
- *
+ *
* @param expiryTimeUnit the time unit to use when scheduling the expiration
*/
private void scheduleExpiry(TransactionId txId, TimeUnit expiryTimeUnit) {
@@ -1745,7 +1746,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/**
* Find all client originated transactions sent from the departed proxy server. Remove them from
* the hostedTXStates map after the set TransactionTimeToLive period.
- *
+ *
* @param proxyServer the departed proxy server
*/
public void removeTransactionsSentFromDepartedProxy(InternalDistributedMember proxyServer) {
@@ -1774,9 +1775,9 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
/*
* retrieve the transaction states for the given client from a certain proxy server. if
* transactions failed over, the new proxy server information should be stored in the TXState
- *
+ *
* @param id the proxy server
- *
+ *
* @return a set of the currently open transaction states
*/
private Set<TXId> getTransactionsSentFromDepartedProxy(InternalDistributedMember proxyServer) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
index 3a9abae..367c144 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
@@ -158,7 +158,7 @@ public abstract class TXMessage extends SerialDistributionMessage
/**
* Transaction operations override this method to do actual work
- *
+ *
* @param txId The transaction Id to operate on
* @return true if TXMessage should send a reply false otherwise
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java
index 496a812..7d16574 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java
@@ -15,6 +15,11 @@
package org.apache.geode.internal.cache;
+import java.util.*;
+import java.util.Map.Entry;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.cache.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -22,17 +27,12 @@ import org.apache.geode.internal.cache.TXEntryState.DistTxThinEntryState;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import java.util.*;
-import java.util.Map.Entry;
-
-import org.apache.logging.log4j.Logger;
-
/**
* TXRegionState is the entity that tracks all the changes a transaction has made to a region.
*
- *
+ *
* @since GemFire 4.0
- *
+ *
* @see TXManagerImpl
*/
public class TXRegionState {
@@ -172,7 +172,7 @@ public class TXRegionState {
/**
* Fills in a set of any entries created by this transaction for the provided region.
- *
+ *
* @param ret the HashSet to fill in with key objects
*/
void fillInCreatedEntryKeys(HashSet ret) {
@@ -246,7 +246,7 @@ public class TXRegionState {
/**
* Returns a set of entry keys that this tx needs to request a lock for at commit time.
- *
+ *
* @return <code>null</code> if no entries need to be locked.
*/
private Set getLockRequestEntryKeys() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
index 7eab2b5..8036f92 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
@@ -124,7 +124,7 @@ public class TXRemoteCommitMessage extends TXMessage {
/**
* This message is used for the reply to a remote commit operation: a commit from a stub to the tx
* host. This is the reply to a {@link TXRemoteCommitMessage}.
- *
+ *
* @since GemFire 6.5
*/
public static class TXRemoteCommitReplyMessage extends ReplyMessage {
@@ -162,7 +162,7 @@ public class TXRemoteCommitMessage extends TXMessage {
* Return the value from the get operation, serialize it bytes as late as possible to avoid
* making un-neccesary byte[] copies. De-serialize those same bytes as late as possible to avoid
* using precious threads (aka P2P readers).
- *
+ *
* @param recipient the origin VM that performed the get
* @param processorId the processor on which the origin thread is waiting
* @param val the raw value that will eventually be serialized
@@ -178,7 +178,7 @@ public class TXRemoteCommitMessage extends TXMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -233,7 +233,7 @@ public class TXRemoteCommitMessage extends TXMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage}
- *
+ *
* @since GemFire 6.6
*/
public static class RemoteCommitResponse extends RemoteOperationResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
index 261f90c..4abc4d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
@@ -15,18 +15,17 @@
package org.apache.geode.internal.cache;
+import java.util.*;
+
import org.apache.geode.cache.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-// import org.apache.geode.internal.cache.locks.*;
-// import java.io.*;
-import java.util.*;
/**
* Used to reserve region entries, during a transaction commit, for modification by the transaction.
*
- *
+ *
* @since GemFire 4.0
- *
+ *
*/
public class TXReservationMgr {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
index f41ae16..e924aed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRmtEvent.java
@@ -33,10 +33,10 @@ import org.apache.geode.internal.offheap.annotations.Retained;
* <p>
* The internal implementation of the {@link TransactionEvent}interface used by the remote commit
* code.
- *
- *
+ *
+ *
* @since GemFire 4.0
- *
+ *
*/
public class TXRmtEvent implements TransactionEvent {
private final TransactionId txId;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index e81efb8..b7f4c3e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -191,7 +191,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getTransactionId()
*/
public TransactionId getTransactionId() {
@@ -225,7 +225,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#readRegion(org.apache.geode.internal.cache.
* LocalRegion)
@@ -243,7 +243,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#writeRegion(org.apache.geode.internal.cache.
* LocalRegion)
@@ -267,7 +267,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getBeginTime()
*/
public long getBeginTime() {
@@ -276,7 +276,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getChanges()
*/
public int getChanges() {
@@ -291,7 +291,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#isInProgress()
*/
public boolean isInProgress() {
@@ -300,7 +300,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#nextModSerialNum()
*/
public int nextModSerialNum() {
@@ -310,7 +310,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#needsLargeModCount()
*/
public boolean needsLargeModCount() {
@@ -362,7 +362,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#commit()
*/
public void commit() throws CommitConflictException {
@@ -449,10 +449,10 @@ public class TXState implements TXStateInterface {
* In order to preserve data consistency, we need to: 1. Modify the cache first
* (applyChanges) 2. Ask for advice on who to send to (buildMessage) 3. Send out to other
* members.
- *
+ *
* If this is done out of order, we will have problems with GII, split brain, and HA. See
* bug #41187
- *
+ *
* @gregp
*/
@@ -566,7 +566,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#rollback()
*/
public void rollback() {
@@ -582,7 +582,7 @@ public class TXState implements TXStateInterface {
/**
* This is a fix for bug #42228 where a client fails over from one server to another but gets a
* conflict on completion because completion had already been initiated and had not yet completed
- *
+ *
* @return true if a previous completion was in progress
*/
public boolean waitForPreviousCompletion() {
@@ -609,7 +609,7 @@ public class TXState implements TXStateInterface {
/**
* Generate an event id for each operation that will be done by this tx during the application
* phase of its commit.
- *
+ *
* @return a sorted list of TXEntryStateWithRegionAndKey that will be used to apply the ops on the
* nearside in the correct order.
*/
@@ -740,7 +740,7 @@ public class TXState implements TXStateInterface {
/**
* this builds a new TXCommitMessage and returns it
- *
+ *
* @return the new message
*/
protected TXCommitMessage buildMessage() {
@@ -759,7 +759,7 @@ public class TXState implements TXStateInterface {
/**
* this builds a new TXCommitMessage and returns it
- *
+ *
* @return the new message
*/
protected TXCommitMessage buildCompleteMessage() {
@@ -902,7 +902,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getEvents()
*/
public List getEvents() {
@@ -942,7 +942,7 @@ public class TXState implements TXStateInterface {
/**
* Used to keep track of the region and key associated with a TXEntryState. Also used to sort the
* entries into the order in which they will be applied.
- *
+ *
* @since GemFire 5.7
*/
static class TXEntryStateWithRegionAndKey implements Comparable {
@@ -983,7 +983,7 @@ public class TXState implements TXStateInterface {
//////////////////////////////////////////////////////////////////
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#beforeCompletion()
*/
public void beforeCompletion() throws SynchronizationCommitConflictException {
@@ -1042,7 +1042,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#afterCompletion(int)
*/
public void afterCompletion(int status) {
@@ -1177,7 +1177,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getCache()
*/
public Cache getCache() {
@@ -1186,7 +1186,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getRegions()
*/
public Collection<LocalRegion> getRegions() {
@@ -1286,7 +1286,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#containsValueForKey(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -1306,7 +1306,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#destroyExistingEntry(org.apache.geode.internal
* .cache.EntryEventImpl, boolean, java.lang.Object)
@@ -1331,7 +1331,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#invalidateExistingEntry(org.apache.geode.
* internal.cache.EntryEventImpl, boolean, boolean)
*/
@@ -1352,7 +1352,7 @@ public class TXState implements TXStateInterface {
/**
* Write an existing entry. This form takes an expectedOldValue which, if not null, must be equal
* to the current value of the entry. If it is not, an EntryNotFoundException is thrown.
- *
+ *
* @param event
* @param expectedOldValue
* @return the tx entry object
@@ -1389,7 +1389,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getEntry(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -1460,7 +1460,7 @@ public class TXState implements TXStateInterface {
/*
* This means it isn't in the cache and rememberReads = false. This should only happen from
* test hooks at this point.
- *
+ *
*/
if (txr != null) {
txr.cleanupNonDirtyEntries(dataReg);
@@ -1486,7 +1486,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getDeserializedValue(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -1508,7 +1508,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getSerializedValue(org.apache.geode.internal.
* cache.LocalRegion, java.lang.Object, java.lang.Object)
@@ -1538,7 +1538,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#entryCount(org.apache.geode.internal.cache.
* LocalRegion)
@@ -1561,7 +1561,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#containsKey(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -1576,7 +1576,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getValueInVM(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -1592,7 +1592,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#putEntry(org.apache.geode.internal.cache.
* EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
*/
@@ -1605,7 +1605,7 @@ public class TXState implements TXStateInterface {
/**
* throws an exception when cloning is disabled while using delta
- *
+ *
* @param event
*/
private void validateDelta(EntryEventImpl event) {
@@ -1617,7 +1617,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#isStatsDeferred()
*/
public boolean isDeferredStats() {
@@ -1626,7 +1626,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#findObject(org.apache.geode.internal.cache.
* LocalRegion, java.lang.Object, java.lang.Object, boolean, boolean, java.lang.Object)
@@ -1655,7 +1655,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#getEntryForIterator(org.apache.geode.internal.
* cache.LocalRegion, java.lang.Object, boolean)
@@ -1687,7 +1687,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getKeyForIterator(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -1703,7 +1703,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getAdditionalKeysForIterator(org.apache.geode.
* internal.cache.LocalRegion)
@@ -1735,7 +1735,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#isInProgressAndSameAs(org.apache.geode.
* internal.cache.TXStateInterface)
*/
@@ -1746,7 +1746,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#putEntryOnRemote(org.apache.geode.internal.
* cache.EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
@@ -1802,7 +1802,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getBucketKeys(org.apache.geode.internal.cache.
* LocalRegion, int)
@@ -1814,7 +1814,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getEntryOnRemote(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -1834,7 +1834,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getSemaphore()
*/
public ReentrantLock getLock() {
@@ -1843,7 +1843,7 @@ public class TXState implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getRegionKeysForIteration(org.apache.geode.
* internal.cache.LocalRegion)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java
index 3bafeba..07db839 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java
@@ -25,16 +25,16 @@ import javax.transaction.Synchronization;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CommitConflictException;
+import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.TransactionId;
import org.apache.geode.cache.UnsupportedOperationInTransactionException;
-import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.client.internal.ServerRegionDataAccess;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.tx.TransactionalOperation.ServerRegionOperation;
/**
* An entity that tracks transactions must implement this interface.
- *
+ *
*/
public interface TXStateInterface extends Synchronization, InternalDataView {
@@ -42,14 +42,14 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
/**
* Used by transaction operations that are doing a read operation on the specified region.
- *
+ *
* @return the TXRegionState for the given LocalRegion or null if no state exists
*/
public TXRegionState readRegion(LocalRegion r);
/**
* Used by transaction operations that are doing a write operation on the specified region.
- *
+ *
* @return the TXRegionState for the given LocalRegion
*/
public TXRegionState writeRegion(LocalRegion r);
@@ -67,7 +67,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
/**
* Determines if a transaction is in progress. Transactions are in progress until they commit or
* rollback.
- *
+ *
* @return true if this transaction has completed.
*/
public boolean isInProgress();
@@ -80,7 +80,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
/**
* Return true if mod counts for this transaction can not be represented by a byte
- *
+ *
* @since GemFire 5.0
*/
public boolean needsLargeModCount();
@@ -149,7 +149,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
public void rmRegion(LocalRegion r);
/**
- *
+ *
* @param state
* @return true if transaction is in progress and the given state has the same identity as this
* instance
@@ -157,7 +157,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
public boolean isInProgressAndSameAs(TXStateInterface state);
/**
- *
+ *
* @return true if callbacks should be fired for this TXState
*/
public boolean isFireCallbacks();
@@ -165,7 +165,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
/**
* On the remote node, the tx can potentially be accessed by multiple threads, specially with
* function execution. This lock should be used to synchronize access to the tx state.
- *
+ *
* @return the lock to be used
*/
public ReentrantLock getLock();
@@ -218,7 +218,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
/*
* Is class meant for Coordinator for Distributed Transaction
- *
+ *
* Will be true for DistTXCoordinatorInterface
*/
public boolean isCreatedOnDistTxCoordinator();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
index c7ba38c..c2e9a91 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.tx.TransactionalOperation.ServerRegionOpe
/**
* This interface extends {@link TXStateInterface} providing for a proxy for the real transaction on
* a remote data store node.
- *
+ *
*/
public interface TXStateProxy extends TXStateInterface {
@@ -56,7 +56,7 @@ public interface TXStateProxy extends TXStateInterface {
/**
* establishes the synchronization thread used for client/server beforeCompletion/afterCompletion
* processing
- *
+ *
* @param sync
*/
public void setSynchronizationRunnable(TXSynchronizationRunnable sync);
@@ -88,7 +88,7 @@ public interface TXStateProxy extends TXStateInterface {
* During client transaction failover, it is possible to get two Commit (rollback) requests for a
* single transaction. It becomes necessary to set the progress flag when the second request
* arrives. When the requeset is processed, progress flag must be reset. see bug 43350
- *
+ *
* @param progress
*/
public void setInProgress(boolean progress);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
index 7a1e202..7e0fea4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
@@ -54,7 +54,7 @@ public class TXStateProxyImpl implements TXStateProxy {
private boolean isJTA;
private TXId txId;
- final protected TXManagerImpl txMgr;
+ protected final TXManagerImpl txMgr;
protected DistributedMember target;
private boolean commitRequestedByOwner;
private boolean isJCATransaction;
@@ -109,7 +109,7 @@ public class TXStateProxyImpl implements TXStateProxy {
/**
* This returns either the TXState for the current transaction or a proxy for the state if it is
* held in another member. If no state currently exists, one is created
- *
+ *
* @param key the key of the entry that is currently being modified
* @param r the region that is currently being modified
* @return the state or a proxy for the state
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
index 76dbca3..899cd67 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
@@ -24,10 +24,10 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.Region;
import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.SynchronizationCommitConflictException;
import org.apache.geode.cache.TransactionDataNodeHasDepartedException;
-import org.apache.geode.cache.Region;
import org.apache.geode.cache.TransactionException;
import org.apache.geode.cache.TransactionId;
import org.apache.geode.cache.UnsupportedOperationInTransactionException;
@@ -108,7 +108,7 @@ public abstract class TXStateStub implements TXStateInterface {
/**
* Get or create a TXRegionStub for the given region. For regions that are new to the tx, we
* validate their eligibility.
- *
+ *
* @param region The region to involve in the tx.
* @return existing or new stub for region
*/
@@ -140,7 +140,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#destroyExistingEntry(org.apache.geode.internal
* .cache.EntryEventImpl, boolean, java.lang.Object)
@@ -158,7 +158,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getBeginTime()
*/
public long getBeginTime() {
@@ -168,7 +168,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getCache()
*/
public Cache getCache() {
@@ -177,7 +177,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getChanges()
*/
public int getChanges() {
@@ -187,7 +187,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getDeserializedValue(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -207,7 +207,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getEntry(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -223,7 +223,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getEvent()
*/
public TXEvent getEvent() {
@@ -232,7 +232,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getEvents()
*/
public List getEvents() {
@@ -241,7 +241,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getRegions()
*/
public Collection<LocalRegion> getRegions() {
@@ -250,7 +250,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getTransactionId()
*/
public TransactionId getTransactionId() {
@@ -259,7 +259,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#invalidateExistingEntry(org.apache.geode.
* internal.cache.EntryEventImpl, boolean, boolean)
*/
@@ -277,7 +277,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#isInProgress()
*/
public boolean isInProgress() {
@@ -286,7 +286,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#isInProgressAndSameAs(org.apache.geode.
* internal.cache.TXStateInterface)
*/
@@ -296,7 +296,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#needsLargeModCount()
*/
public boolean needsLargeModCount() {
@@ -306,7 +306,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#nextModSerialNum()
*/
public int nextModSerialNum() {
@@ -316,7 +316,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#readRegion(org.apache.geode.internal.cache.
* LocalRegion)
@@ -327,7 +327,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#rmRegion(org.apache.geode.internal.cache.
* LocalRegion)
*/
@@ -350,7 +350,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#txPutEntry(org.apache.geode.internal.cache.
* EntryEventImpl, boolean, boolean, boolean)
@@ -362,7 +362,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#txReadEntry(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -374,7 +374,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#txReadRegion(org.apache.geode.internal.cache.
* LocalRegion)
@@ -386,7 +386,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#txWriteRegion(org.apache.geode.internal.cache.
* LocalRegion, java.lang.Object)
@@ -398,7 +398,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.TXStateInterface#writeRegion(org.apache.geode.internal.cache.
* LocalRegion)
@@ -410,7 +410,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#containsKey(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -420,7 +420,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#containsValueForKey(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -430,7 +430,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#entryCount(org.apache.geode.internal.cache.
* LocalRegion)
@@ -441,7 +441,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#findObject(org.apache.geode.internal.cache.
* LocalRegion, java.lang.Object, java.lang.Object, boolean, boolean, java.lang.Object)
@@ -456,7 +456,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getAdditionalKeysForIterator(org.apache.geode.
* internal.cache.LocalRegion)
@@ -468,7 +468,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getEntryForIterator(org.apache.geode.internal.
* cache.LocalRegion, java.lang.Object, boolean)
@@ -480,7 +480,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getKeyForIterator(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -495,7 +495,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getValueInVM(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion, boolean)
*/
@@ -506,7 +506,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#isDeferredStats()
*/
public boolean isDeferredStats() {
@@ -515,7 +515,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#putEntry(org.apache.geode.internal.cache.
* EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
*/
@@ -528,7 +528,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getSerializedValue(org.apache.geode.internal.
* cache.LocalRegion, java.lang.Object, java.lang.Object)
@@ -541,7 +541,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#putEntryOnRemote(org.apache.geode.internal.
* cache.EntryEventImpl, boolean, boolean, java.lang.Object, boolean, long, boolean)
@@ -558,7 +558,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#destroyOnRemote(java.lang.Integer,
* org.apache.geode.internal.cache.EntryEventImpl, java.lang.Object)
*/
@@ -569,7 +569,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#invalidateOnRemote(org.apache.geode.internal.
* cache.EntryEventImpl, boolean, boolean)
@@ -598,7 +598,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getBucketKeys(org.apache.geode.internal.cache.
* LocalRegion, int)
@@ -613,7 +613,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.InternalDataView#getEntryOnRemote(java.lang.Object,
* org.apache.geode.internal.cache.LocalRegion)
*/
@@ -624,7 +624,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.TXStateInterface#getSemaphore()
*/
public ReentrantLock getLock() {
@@ -633,7 +633,7 @@ public abstract class TXStateStub implements TXStateInterface {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.InternalDataView#getRegionKeysForIteration(org.apache.geode.
* internal.cache.LocalRegion)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXSynchronizationRunnable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXSynchronizationRunnable.java
index 884f281..63e831d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXSynchronizationRunnable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXSynchronizationRunnable.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.cache;
import org.apache.logging.log4j.Logger;
+
import org.apache.geode.internal.cache.tier.sockets.CommBufferPool;
import org.apache.geode.internal.logging.LogService;
@@ -23,7 +24,7 @@ import org.apache.geode.internal.logging.LogService;
* cache. The thread should be instantiated with a Runnable that invokes beforeCompletion behavior.
* Then you must invoke runSecondRunnable() with another Runnable that invokes afterCompletion
* behavior.
- *
+ *
* @since GemFire 6.6
*/
public class TXSynchronizationRunnable implements Runnable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TestHeapThresholdObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TestHeapThresholdObserver.java
index d62be05..b93f8a9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TestHeapThresholdObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TestHeapThresholdObserver.java
@@ -16,8 +16,8 @@ package org.apache.geode.internal.cache;
/**
* Test only hand back object passed to
- *
- *
+ *
+ *
*/
public class TestHeapThresholdObserver {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TimestampedEntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TimestampedEntryEventImpl.java
index 9f9cb3f..4d93177 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TimestampedEntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TimestampedEntryEventImpl.java
@@ -19,7 +19,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
/**
* A subclass of EntryEventImpl used in WAN conflict resolution
- *
+ *
*/
public class TimestampedEntryEventImpl extends EntryEventImpl implements TimestampedEntryEvent {
@@ -40,7 +40,7 @@ public class TimestampedEntryEventImpl extends EntryEventImpl implements Timesta
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.util.TimestampedEntryEvent#getNewDistributedSystemID()
*/
@Override
@@ -50,7 +50,7 @@ public class TimestampedEntryEventImpl extends EntryEventImpl implements Timesta
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.util.TimestampedEntryEvent#getOldDistributedSystemID()
*/
@Override
@@ -60,7 +60,7 @@ public class TimestampedEntryEventImpl extends EntryEventImpl implements Timesta
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.util.TimestampedEntryEvent#getNewTimestamp()
*/
@Override
@@ -70,7 +70,7 @@ public class TimestampedEntryEventImpl extends EntryEventImpl implements Timesta
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.util.TimestampedEntryEvent#getOldTimestamp()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
index f2809a6..0d29451 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
@@ -15,10 +15,6 @@
package org.apache.geode.internal.cache;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -26,6 +22,10 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.nio.ByteBuffer;
+import org.apache.geode.internal.DSCODE;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+
/**
* Internal tokens used as region values. These tokens are never seen from the public API.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
index bf5b97c..457cd7f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
@@ -65,7 +65,7 @@ public class TombstoneService {
* This is the period over which the destroy operation may conflict with another operation. After
* this timeout elapses the tombstone is put into a GC set for removal. Removal is typically
* triggered by the size of the GC set, but could be influenced by resource managers.
- *
+ *
* The default is 600,000 milliseconds (10 minutes).
*/
public static long REPLICATE_TOMBSTONE_TIMEOUT =
@@ -144,7 +144,7 @@ public class TombstoneService {
/**
* Tombstones are markers placed in destroyed entries in order to keep the entry around for a
* while so that it's available for concurrent modification detection.
- *
+ *
* @param r the region holding the entry
* @param entry the region entry that holds the tombstone
* @param destroyedVersion the version that was destroyed
@@ -200,7 +200,7 @@ public class TombstoneService {
/**
* remove tombstones from the given region that have region-versions <= those in the given removal
* map
- *
+ *
* @return a collection of keys removed (only if the region is a bucket - empty otherwise)
*/
@SuppressWarnings("rawtypes")
@@ -270,7 +270,7 @@ public class TombstoneService {
* separate version vectors for each bucket. In the client this causes the version vector to make
* no sense, so we have to send it a collection of the keys removed on the server and then we
* brute-force remove any of them that are tombstones on the client
- *
+ *
* @param r the region affected
* @param tombstoneKeys the keys removed on the server
*/
@@ -305,7 +305,7 @@ public class TombstoneService {
/**
* For test purposes only, force the expiration of a number of tombstones for replicated regions.
- *
+ *
* @return true if the expiration occurred
*/
public boolean forceBatchExpirationForTests(int count) throws InterruptedException {
@@ -728,7 +728,7 @@ public class TombstoneService {
}
}
- private static abstract class TombstoneSweeper implements Runnable {
+ private abstract static class TombstoneSweeper implements Runnable {
/**
* the expiration time for tombstones in this sweeper
*/
@@ -805,7 +805,7 @@ public class TombstoneService {
/**
* For each unexpired tombstone this sweeper knows about call the predicate. If the predicate
* returns true then remove the tombstone from any storage and update the memory estimate.
- *
+ *
* @return true if predicate ever returned true
*/
private boolean removeUnexpiredIf(Predicate<Tombstone> predicate) {
@@ -831,7 +831,7 @@ public class TombstoneService {
/**
* For all tombstone this sweeper knows about call the predicate. If the predicate returns true
* then remove the tombstone from any storage and update the memory estimate.
- *
+ *
* @return true if predicate ever returned true
*/
private boolean removeIf(Predicate<Tombstone> predicate) {
@@ -1021,7 +1021,7 @@ public class TombstoneService {
* returns true then remove the tombstone from any storage and update the memory estimate.
* <p>
* Some sweepers batch up the expired tombstones to gc them later.
- *
+ *
* @return true if predicate ever returned true
*/
protected abstract boolean removeExpiredIf(Predicate<Tombstone> predicate);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java
index a9970c2..9f3347e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -22,19 +22,19 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
/**
* Messages that carry transaction information will implement this interface
- *
+ *
*/
public interface TransactionMessage {
/**
* Returns the transaction id on the sender this message belongs to
- *
+ *
* @return the unique transaction id per sender
*/
public int getTXUniqId();
/**
* Returns the member id of the originating member for this transaction
- *
+ *
* @return memberId of tx originator
*/
public InternalDistributedMember getMemberToMasqueradeAs();
@@ -43,7 +43,7 @@ public interface TransactionMessage {
/**
* We do not want all the messages to start a remote transaction. e.g. SizeMessage. If this method
* returns true, a transaction will be created if none exists
- *
+ *
* @return true if this message can start a remote transaction, false otherwise
*/
public boolean canStartRemoteTransaction();
@@ -56,7 +56,7 @@ public interface TransactionMessage {
/**
* Gets the MemberId of the originating member of the transaction that this message is a part of.
- *
+ *
* @return the memberId of the client that started this transaction, or null if not from client
*/
public InternalDistributedMember getTXOriginatorClient();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java
index 22a9458..78eacd1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java
@@ -15,13 +15,13 @@
package org.apache.geode.internal.cache;
/**
- *
+ *
*
*/
public interface TxEntryFactory {
/**
* Creates an instance of TXEntry.
- *
+ *
* @return the created entry
*/
public TXEntry createEntry(LocalRegion localRegion, KeyInfo key, TXStateInterface tx);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
index 5718001..20eebca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
@@ -59,7 +59,7 @@ public class UpdateAttributesProcessor {
/**
* If true then sender is telling receiver to remove the sender's profile. No profile exchange is
* needed in this case.
- *
+ *
* @since GemFire 5.7
*/
private boolean removeProfile = false;
@@ -72,7 +72,7 @@ public class UpdateAttributesProcessor {
/**
* Creates a new instance of UpdateAttributesProcessor
- *
+ *
* @since GemFire 5.7
*/
public UpdateAttributesProcessor(DistributionAdvisee da, boolean removeProfile) {
@@ -90,7 +90,7 @@ public class UpdateAttributesProcessor {
/**
* Distribute with optional exchange of profiles but do not create new profile version.
- *
+ *
* @param exchangeProfiles true if we want to receive profile replies
*/
public void distribute(boolean exchangeProfiles) {
@@ -186,7 +186,7 @@ public class UpdateAttributesProcessor {
/**
* Registers this processor as a membership listener and returns a set of the current members.
- *
+ *
* @return a Set of the current members
* @since GemFire 5.7
*/
@@ -202,7 +202,7 @@ public class UpdateAttributesProcessor {
/**
* Unregisters this processor as a membership listener
- *
+ *
* @since GemFire 5.7
*/
@Override
@@ -217,7 +217,7 @@ public class UpdateAttributesProcessor {
/**
* If this processor being used by controller then return ALL members; otherwise defer to super.
- *
+ *
* @return a Set of the current members
* @since GemFire 5.7
*/
@@ -427,7 +427,7 @@ public class UpdateAttributesProcessor {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.ReplyMessage#getInlineProcess()
* ProfileReplyMessages must be processed in-line and not in a pool to keep partitioned region
* bucket profile exchange from swamping the high priority pool and not allowing other profile
@@ -442,7 +442,7 @@ public class UpdateAttributesProcessor {
}
/**
* Used to return multiple profiles
- *
+ *
* @since GemFire 5.7
*/
public static class ProfilesReplyMessage extends ReplyMessage {
@@ -519,7 +519,7 @@ public class UpdateAttributesProcessor {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.ReplyMessage#getInlineProcess()
* ProfilesReplyMessages must be processed in-line and not in a pool to keep partitioned region
* bucket profile exchange from swamping the high priority pool and not allowing other profile
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java
index 4a48fee..08bd025 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java
@@ -38,8 +38,8 @@ import org.apache.geode.internal.offheap.annotations.Retained;
/**
* This operation updates Version stamp of an entry if entry is available and entry version stamp
* has same DSID as in event's version tag.
- *
- *
+ *
+ *
*/
public class UpdateEntryVersionOperation extends DistributedCacheOperation {
private static final Logger logger = LogService.getLogger();
@@ -53,7 +53,7 @@ public class UpdateEntryVersionOperation extends DistributedCacheOperation {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.DistributedCacheOperation#createMessage()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
index 2ba9517..7d79595 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -47,7 +49,6 @@ import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.internal.util.Breadcrumbs;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
/**
* Handles distribution messaging for updating an entry in a region.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedDiskStoreAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedDiskStoreAttributes.java
index 2132c14..18d75a1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedDiskStoreAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedDiskStoreAttributes.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import org.apache.geode.internal.Assert;
/**
@@ -24,7 +25,7 @@ import org.apache.geode.internal.Assert;
* values. It may be used when collecting attributes from an XML parser or from attribute changes
* made using the {@link org.apache.geode.cache.DiskStoreFactory}. Its initial usage was to validate
* when a user set a value which should not be set (for DiskStore).
- *
+ *
* @since GemFire prPersistSprint2
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedRegionAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedRegionAttributes.java
index 5ee98b3..eba6193 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedRegionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UserSpecifiedRegionAttributes.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.Assert;
* It may be used when collecting attributes from an XML parser or from attribute changes made using
* the {@link org.apache.geode.cache.AttributesFactory}. Its initial usage was to validate when a
* user set a value which should not be set (for PartitionedRegions).
- *
+ *
* @since GemFire 5.1
*
*/
@@ -113,14 +113,14 @@ public abstract class UserSpecifiedRegionAttributes<K, V> implements RegionAttri
/**
* Whether this region has entry value compression.
- *
+ *
* @since GemFire 8.0
*/
private boolean hasCompressor = false;
/**
* Whether this region has enable off-heap memory set.
- *
+ *
* @since Geode 1.0
*/
private boolean hasOffHeap = false;
@@ -439,13 +439,13 @@ public abstract class UserSpecifiedRegionAttributes<K, V> implements RegionAttri
/**
* If set to true then an exception will be thrown at creation time if hasPoolName is not true.
- *
+ *
* @since GemFire 6.5
*/
public boolean requiresPoolName = false;
/**
* Holds index information. Hoisted up to this class in 7.0
- *
+ *
* @since GemFire 6.5
*/
private List indexes;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
index c559b5d..faf1536 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
@@ -73,7 +73,7 @@ public class VMCachedDeserializable implements CachedDeserializable, DataSeriali
/**
* Create a new instance with an object and it's size. Note the caller decides if objectSize is
* the memory size or the serialized size.
- *
+ *
* @param object
* @param objectSize
*/
@@ -272,4 +272,3 @@ public class VMCachedDeserializable implements CachedDeserializable, DataSeriali
return true;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
index 3a32efd..32426f2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
@@ -16,7 +16,6 @@
package org.apache.geode.internal.cache;
import org.apache.geode.internal.cache.lru.*;
-// import org.apache.geode.internal.util.Sizeof;
/**
* Internal implementation of {@link RegionMap} for regions stored in normal VM memory that maintain
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java
index 52c8f8c..730f4cd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java
@@ -43,7 +43,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A disk region that is created when doing offline validation.
- *
+ *
* @since GemFire prPersistSprint3
*/
public class ValidatingDiskRegion extends DiskRegion implements DiskRecoveryStore {
@@ -255,7 +255,7 @@ public class ValidatingDiskRegion extends DiskRegion implements DiskRecoveryStor
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.DiskEntry#getVersionStamp()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java
index a0bb66f..fe45eee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java
@@ -26,7 +26,7 @@ class ValueByteWrapper {
/**
* Constructs the wrapper object
- *
+ *
* @param value byte[] bytes read from oplog
* @param userBit A byte describing the nature of the value i.e whether it is: serialized ,
* invalid or empty byte array etc.
@@ -39,7 +39,7 @@ class ValueByteWrapper {
/**
* @return boolean returns true if the value bytes are a serialized object
- *
+ *
* boolean isSerialized() { return isSerialized; }
*/
@@ -52,7 +52,7 @@ class ValueByteWrapper {
/**
* Getter method for the userBit assosciated with the value read from Oplog during initialization
- *
+ *
* @return byte value
*/
byte getUserBit() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java
index 42b0ffc..c5dd768 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.cache;
/**
- *
+ *
*/
public class VersionTimestamp {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedCallbackArgument.java b/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedCallbackArgument.java
index e2d2abd..70b0788 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedCallbackArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedCallbackArgument.java
@@ -55,7 +55,7 @@ public abstract class WrappedCallbackArgument {
/**
* Returns the original callback argument.
- *
+ *
* @return the original callback argument
*/
public Object getOriginalCallbackArg() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java
index ee9925d..e8cbaf0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java
@@ -32,7 +32,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/**
* has initMembers been invoked?
- *
+ *
* @guarded.By initLock
*/
private boolean initialized;
@@ -56,7 +56,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.RegionMembershipListener#afterRemoteRegionCrash(org.apache.geode.cache.
* RegionEvent)
@@ -71,7 +71,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.RegionMembershipListener#afterRemoteRegionCreate(org.apache.geode.cache.
* RegionEvent)
@@ -86,7 +86,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.RegionMembershipListener#afterRemoteRegionDeparture(org.apache.geode.
* cache.RegionEvent)
@@ -101,7 +101,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.RegionMembershipListener#initialMembers(org.apache.geode.cache.Region,
* org.apache.geode.distributed.DistributedMember[])
@@ -117,7 +117,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterCreate(org.apache.geode.cache.EntryEvent)
*/
public void afterCreate(EntryEvent event) {
@@ -126,7 +126,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterDestroy(org.apache.geode.cache.EntryEvent)
*/
public void afterDestroy(EntryEvent event) {
@@ -135,7 +135,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterInvalidate(org.apache.geode.cache.EntryEvent)
*/
public void afterInvalidate(EntryEvent event) {
@@ -144,7 +144,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterRegionClear(org.apache.geode.cache.RegionEvent)
*/
public void afterRegionClear(RegionEvent event) {
@@ -153,7 +153,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterRegionCreate(org.apache.geode.cache.RegionEvent)
*/
public void afterRegionCreate(RegionEvent event) {
@@ -162,7 +162,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.CacheListener#afterRegionDestroy(org.apache.geode.cache.RegionEvent)
*/
@@ -172,7 +172,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.CacheListener#afterRegionInvalidate(org.apache.geode.cache.RegionEvent)
*/
@@ -182,7 +182,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterRegionLive(org.apache.geode.cache.RegionEvent)
*/
public void afterRegionLive(RegionEvent event) {
@@ -191,7 +191,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheListener#afterUpdate(org.apache.geode.cache.EntryEvent)
*/
public void afterUpdate(EntryEvent event) {
@@ -200,7 +200,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheCallback#close()
*/
public void close() {
@@ -209,7 +209,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -219,7 +219,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -229,7 +229,7 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java
index cdefb90..00149fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/compression/CompressedCachedDeserializable.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.lang.StringUtils;
/**
* An abstract implementation of {@link CachedDeserializable} that prefers serialization and
* compresses the internal serialized value.
- *
+ *
*/
public abstract class CompressedCachedDeserializable
implements CachedDeserializable, DataSerializableFixedID {
@@ -72,7 +72,7 @@ public abstract class CompressedCachedDeserializable
/**
* Creates a new {@link CompressedCachedDeserializable} with a serialized value.
- *
+ *
* @param serializedValue a region entry value that has already been serialized.
*/
public CompressedCachedDeserializable(final byte[] serializedValue) {
@@ -87,7 +87,7 @@ public abstract class CompressedCachedDeserializable
/**
* Creates a new {@link CompressedCachedDeserializable} with an unserialized value.
- *
+ *
* @param obj a region entry value.
*/
public CompressedCachedDeserializable(final Object obj) {
@@ -126,7 +126,7 @@ public abstract class CompressedCachedDeserializable
/**
* Returns the serialized value of the region entry contained by this
* CompressedCachedDeserializable. This value is the uncompressed value.
- *
+ *
* @see CachedDeserializable#getSerializedValue()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/compression/SnappyCompressedCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/compression/SnappyCompressedCachedDeserializable.java
index 1a8615b..0c81168 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/compression/SnappyCompressedCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/compression/SnappyCompressedCachedDeserializable.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.Version;
* An implementation of {@link CompressedCachedDeserializable} that uses the built in Snappy
* compression codec and favors absolute minimal region entry value overhead by sharing the same
* Snappy {@link Compressor} instance with all instances of this class within the {@link Cache}.
- *
+ *
*/
public class SnappyCompressedCachedDeserializable extends CompressedCachedDeserializable {
@@ -38,7 +38,7 @@ public class SnappyCompressedCachedDeserializable extends CompressedCachedDeseri
/**
* Creates a new {@link SnappyCompressedCachedDeserializable} with a serialized value or raw byte
* array.
- *
+ *
* @param serializedValue a region entry value that has already been serialized or is a raw byte
* array.
*/
@@ -48,7 +48,7 @@ public class SnappyCompressedCachedDeserializable extends CompressedCachedDeseri
/**
* Creates a new {@link SnappyCompressedCachedDeserializable} with an unserialized value.
- *
+ *
* @param obj a region entry value.
*/
public SnappyCompressedCachedDeserializable(final Object obj) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index 8a16ea1..c3c4c8d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -58,7 +58,7 @@ import org.apache.geode.internal.statistics.StatisticsImpl;
* the thresholds are crossed. Gathering memory usage information from the JVM is done using a
* listener on the MemoryMXBean, by polling the JVM and as a listener on GemFire Statistics output
* in order to accommodate differences in the various JVMs.
- *
+ *
* @since Geode 1.0
*/
public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
@@ -167,9 +167,9 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Determines if the name of the memory pool MXBean provided matches a list of known tenured pool
* names.
- *
+ *
* Package private for testing.
- *
+ *
* @param memoryPoolMXBean The memory pool MXBean to check.
* @return True if the pool name matches a known tenured pool name, false otherwise.
*/
@@ -292,7 +292,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Start a listener on the cache stats to monitor memory usage.
- *
+ *
* @return True of the listener was correctly started, false otherwise.
*/
private boolean startCacheStatListener() {
@@ -460,9 +460,9 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Compare the number of bytes used to the thresholds. If necessary, change the state and send an
* event for the state change.
- *
+ *
* Public for testing.
- *
+ *
* @param bytesUsed Number of bytes of heap memory currently used.
*/
public void updateStateAndSendEvent(long bytesUsed) {
@@ -498,7 +498,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Update resource manager stats based upon the given event.
- *
+ *
* @param event Event from which to derive data for updating stats.
*/
private void updateStatsFromEvent(MemoryEvent event) {
@@ -519,7 +519,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Populate heap memory data in the given profile.
- *
+ *
* @param profile Profile to populate.
*/
@Override
@@ -550,7 +550,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Sets the usage threshold on the tenured pool to either the eviction threshold or the critical
* threshold depending on the current number of bytes used
- *
+ *
* @param bytesUsed Number of bytes of heap memory currently used.
*/
private void setUsageThresholdOnMXBean(final long bytesUsed) {
@@ -559,7 +559,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Register with the JVM to get threshold events.
- *
+ *
* Package private for testing.
*/
void startJVMThresholdListener() {
@@ -586,7 +586,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* To avoid memory spikes in jrockit, we only deliver events if we receive more than
* {@link HeapMemoryMonitor#memoryStateChangeTolerance} of the same state change.
- *
+ *
* @return True if an event should be skipped, false otherwise.
*/
private boolean skipEventDueToToleranceLimits(MemoryState oldState, MemoryState newState) {
@@ -644,9 +644,9 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
* Deliver a memory event from one of the monitors to both local listeners and remote resource
* managers. Also, if a critical event is received and a query monitor has been enabled, then the
* query monitor will be notified.
- *
+ *
* Package private for testing.
- *
+ *
* @param event Event to process.
*/
synchronized void processLocalEvent(MemoryEvent event) {
@@ -736,7 +736,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Given a set of members, determine if any member in the set is above critical threshold.
- *
+ *
* @param members The set of members to check.
* @return True if the set contains a member above critical threshold, false otherwise
*/
@@ -750,9 +750,9 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Determines if the given member is in a heap critical state.
- *
+ *
* @param member Member to check.
- *
+ *
* @return True if the member's heap memory is in a critical state, false otherwise.
*/
public boolean isMemberHeapCritical(final InternalDistributedMember member) {
@@ -765,7 +765,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
class LocalHeapStatListener implements LocalStatListener {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.statistics.LocalStatListener#statValueChanged(double)
*/
@Override
@@ -824,7 +824,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
/**
* Overrides the value returned by the JVM as the number of bytes of available memory.
- *
+ *
* @param testMaxMemoryBytes The value to use as the maximum number of bytes of memory available.
*/
public void setTestMaxMemoryBytes(final long testMaxMemoryBytes) {
@@ -856,7 +856,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
* based upon the new threshold value and the number of bytes currently used by the JVM, there
* needs to be a way to override the number of bytes of memory reported as in use for testing.
* That's what this method and the value it sets are for.
- *
+ *
* @param newTestBytesUsedForThresholdSet Value to use as the amount of memory in use when calling
* the setEvictionThreshold or setCriticalThreshold methods are called.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java
index 48cb34e..6978169 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java
@@ -233,7 +233,7 @@ public class InternalResourceManager implements ResourceManager {
/**
* Deliver an event received from remote resource managers to the local listeners.
- *
+ *
* @param event Event to deliver.
*/
public void deliverEventFromRemote(final ResourceEvent event) {
@@ -286,7 +286,7 @@ public class InternalResourceManager implements ResourceManager {
/**
* Use threshold event processor to execute the event embedded in the runnable.
- *
+ *
* @param runnable Runnable to execute.
*/
void runWithNotifyExecutor(Runnable runnable) {
@@ -393,7 +393,7 @@ public class InternalResourceManager implements ResourceManager {
* For testing only, an observer which is called when rebalancing is started and finished for a
* particular region. This observer is called even the "rebalancing" is actually redundancy
* recovery for a particular region.
- *
+ *
* @param observer
*/
public static void setResourceObserver(ResourceObserver observer) {
@@ -417,28 +417,28 @@ public class InternalResourceManager implements ResourceManager {
public static interface ResourceObserver {
/**
* Indicates that rebalancing has started on a given region.
- *
+ *
* @param region
*/
public void rebalancingStarted(Region region);
/**
* Indicates that rebalancing has finished on a given region.
- *
+ *
* @param region
*/
public void rebalancingFinished(Region region);
/**
* Indicates that recovery has started on a given region.
- *
+ *
* @param region
*/
public void recoveryStarted(Region region);
/**
* Indicates that recovery has finished on a given region.
- *
+ *
* @param region
*/
public void recoveryFinished(Region region);
@@ -447,14 +447,14 @@ public class InternalResourceManager implements ResourceManager {
* Indicated that a membership event triggered a recovery operation, but the recovery operation
* will not be executed because there is already an existing recovery operation waiting to
* happen on this region.
- *
+ *
* @param region
*/
public void recoveryConflated(PartitionedRegion region);
/**
* Indicates that a bucket is being moved from the source member to the target member.
- *
+ *
* @param region the region
* @param bucketId the bucket being moved
* @param source the member the bucket is moving from
@@ -465,7 +465,7 @@ public class InternalResourceManager implements ResourceManager {
/**
* Indicates that a bucket primary is being moved from the source member to the target member.
- *
+ *
* @param region the region
* @param bucketId the bucket primary being moved
* @param source the member the bucket primary is moving from
@@ -537,7 +537,7 @@ public class InternalResourceManager implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.DistributionAdvisee#getCancelCriterion()
*/
public CancelCriterion getCancelCriterion() {
@@ -563,7 +563,7 @@ public class InternalResourceManager implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#setEvictionHeapPercentage(int)
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java
index 3f2e040..ad1a0a5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java
@@ -82,4 +82,3 @@ public class MemoryEvent implements ResourceEvent {
.append(",thresholds:" + this.thresholds + "]").toString();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java
index 45d60f6..cbcd604 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java
@@ -28,11 +28,11 @@ public interface MemoryMonitor extends ResourceMonitor {
public boolean hasEvictionThreshold();
- default public float getCriticalThreshold() {
+ public default float getCriticalThreshold() {
return getThresholds().getCriticalThreshold();
}
- default public float getEvictionThreshold() {
+ public default float getEvictionThreshold() {
return getThresholds().getEvictionThreshold();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
index c701b3f..40d84eb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.internal.cache.control;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.LowMemoryException;
import org.apache.geode.cache.control.ResourceManager;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
/**
* Stores eviction and critical thresholds for memory as well as the logic for determining how
* memory transitions between states.
- *
+ *
* @since Geode 1.0
*/
public class MemoryThresholds {
@@ -263,7 +263,7 @@ public class MemoryThresholds {
/**
* Generate a Thresholds object from data available from the DataInput
- *
+ *
* @param in DataInput from which to read the data
* @return a new instance of Thresholds
* @throws IOException
@@ -277,7 +277,7 @@ public class MemoryThresholds {
/**
* Write the state of this to the DataOutput
- *
+ *
* @param out DataOutput on which to write internal state
* @throws IOException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java
index 17d22ea..ac6a34b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java
@@ -145,7 +145,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
public static interface OffHeapMemoryMonitorObserver {
/**
* Called at the beginning of updateMemoryUsed.
- *
+ *
* @param bytesUsed the number of bytes of off-heap memory currently used
* @param willSendEvent true if an event will be sent to the OffHeapMemoryUsageListener.
*/
@@ -155,7 +155,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
/**
* Called at the beginning of updateStateAndSendEvent.
- *
+ *
* @param bytesUsed the number of bytes of off-heap memory currently used
* @param willSendEvent true if an event will be sent to the OffHeapMemoryUsageListener.
*/
@@ -283,7 +283,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
/**
* Compare the number of bytes used (fetched from the JVM) to the thresholds. If necessary, change
* the state and send an event for the state change.
- *
+ *
* @return true if an event was sent
*/
public boolean updateStateAndSendEvent() {
@@ -293,9 +293,9 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
/**
* Compare the number of bytes used to the thresholds. If necessary, change the state and send an
* event for the state change.
- *
+ *
* Public for testing.
- *
+ *
* @param bytesUsed Number of bytes of off-heap memory currently used.
* @return true if an event was sent
*/
@@ -345,7 +345,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
/**
* Return true if the given number of bytes compared to the current monitor state would generate a
* new memory event.
- *
+ *
* @param bytesUsed Number of bytes of off-heap memory currently used.
* @return true if a new event might need to be sent
*/
@@ -377,7 +377,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
/**
* Update resource manager stats based upon the given event.
- *
+ *
* @param event Event from which to derive data for updating stats.
*/
private void updateStatsFromEvent(MemoryEvent event) {
@@ -398,7 +398,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
/**
* Populate off-heap memory data in the given profile.
- *
+ *
* @param profile Profile to populate.
*/
@Override
@@ -436,9 +436,9 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener
* Deliver a memory event from one of the monitors to both local listeners and remote resource
* managers. Also, if a critical event is received and a query monitor has been enabled, then the
* query monitor will be notified.
- *
+ *
* Package private for testing.
- *
+ *
* @param event Event to process.
*/
void processLocalEvent(MemoryEvent event) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
index 2cabb53..e6e0e6b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
@@ -24,9 +24,9 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* Holds the rebalancing details for a single partitioned region.
- *
+ *
* Serializable form is used to allow JMX MBeans to use this as a remotable return type.
- *
+ *
*/
public class PartitionRebalanceDetailsImpl
implements PartitionRebalanceInfo, Serializable, Comparable<PartitionRebalanceDetailsImpl> {
@@ -44,7 +44,7 @@ public class PartitionRebalanceDetailsImpl
private Set<PartitionMemberInfo> partitionMemberDetailsBefore;
private long primaryTransferTime;
private int primaryTransfersCompleted;
- transient private final PartitionedRegion region;
+ private final transient PartitionedRegion region;
private long time;
public PartitionRebalanceDetailsImpl(PartitionedRegion region) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
index 4a04bfe..66de049 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
@@ -248,7 +248,7 @@ public class RebalanceOperationImpl implements RebalanceOperation {
/**
* Returns true if this is a simulation.
- *
+ *
* @return true if this is a simulation
*/
boolean isSimulation() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
index ca4a42e..36e1c3c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* The advisor associated with a {@link ResourceManager}. Allows knowledge of remote
* {@link ResourceManager} state and distribution of local {@link ResourceManager} state.
- *
+ *
* @since GemFire 6.0
*/
public class ResourceAdvisor extends DistributionAdvisor {
@@ -71,7 +71,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
/**
* Constructor used to send profiles to other members.
- *
+ *
* @param recips Members to send the profile to.
* @param profile Profile to send.
*/
@@ -169,7 +169,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
/**
* Send profiles to the provided members
- *
+ *
* @param irm The resource manager which is requesting distribution
* @param recips The recipients of the message
* @param profile Profile to send in this message
@@ -283,7 +283,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
/**
* Profile which shares state with other ResourceManagers. The data available in this profile
* should be enough to deliver a {@link MemoryEvent} for any of the CRITICAL {@link MemoryState}s
- *
+ *
* @since GemFire 6.0
*/
public static class ResourceManagerProfile extends Profile {
@@ -333,7 +333,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
/**
* Used to process incoming Resource Manager profiles. A reply is expected to contain a profile
* with state of the local Resource Manager.
- *
+ *
* @since GemFire 6.0
*/
@Override
@@ -424,7 +424,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
* Get set of members whose {@linkplain ResourceManager#setCriticalHeapPercentage(float) critical
* heap threshold} has been met or exceeded. The set does not include the local VM. The mutability
* of this set only effects the elements in the set, not the state of the members.
- *
+ *
* @return a mutable set of members in the critical state otherwise {@link Collections#EMPTY_SET}
*/
public Set<InternalDistributedMember> adviseCritialMembers() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java
index 581da33..210f955 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java
@@ -17,14 +17,14 @@ package org.apache.geode.internal.cache.control;
/**
* Provides notification of {@link org.apache.geode.cache.Cache} resource management events.
- *
+ *
* @since GemFire 6.0
*/
public interface ResourceListener<T extends ResourceEvent> {
/**
* Invoked when a {@link ResourceEvent resource event} occurs. Implementation of this method
* should be light weight.
- *
+ *
* @param event the resource event
*/
public void onEvent(T event);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java
index fffefc8..016eccc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java
@@ -21,14 +21,14 @@ import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerPr
/**
* Implemented by classes that the ResourceManager creates in order to monitor a specific type of
* resource (heap memory, off-heap memory, disk, etc.).
- *
+ *
* @since Geode 1.0
*/
interface ResourceMonitor {
/**
* Ask the monitor to notify the given listeners of the given event.
- *
+ *
* @param listeners Set of listeners of notify.
* @param event Event to send to the listeners.
*/
@@ -41,7 +41,7 @@ interface ResourceMonitor {
/**
* Populate the fields in the profile that are appropriate for this monitor.
- *
+ *
* @param profile The profile to populate.
*/
public void fillInProfile(final ResourceManagerProfile profile);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractDiskRegionEntry.java
index 763133e..d6ebed9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractDiskRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractDiskRegionEntry.java
@@ -43,7 +43,7 @@ public abstract class AbstractDiskRegionEntry extends AbstractRegionEntry implem
/**
* Sets the value with a {@link RegionEntryContext}.
- *
+ *
* @param context the value's context.
* @param value an entry value.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java
index 22cd4e8..8cdea63 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/AbstractRegionEntry.java
@@ -19,14 +19,6 @@ import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.*;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.geode.internal.cache.CachedDeserializable;
-import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import org.apache.geode.internal.cache.DistributedRegion;
-import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.FilterProfile;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.ImageState;
-import org.apache.geode.internal.cache.InitialImageOperation.Entry;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
@@ -52,6 +44,14 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.CachedDeserializableFactory;
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.FilterProfile;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.ImageState;
+import org.apache.geode.internal.cache.InitialImageOperation.Entry;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.internal.cache.InternalRegion;
@@ -203,7 +203,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
* This sets the lastModified time for the entry. In subclasses with statistics it will also set
* the lastAccessed time unless the system property gemfire.disableAccessTimeUpdateOnPut is set to
* true.
- *
+ *
* @param lastModified the time of last modification of the entry
*/
public void setLastModified(long lastModified) {
@@ -213,7 +213,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
/**
* This sets the lastModified and lastAccessed time for the entry. Subclasses that do not keep
* track of lastAccessed time will ignore the second parameter.
- *
+ *
* @param lastModified the time of last modification of the entry
* @param lastAccessed the time the entry was last accessed
*/
@@ -313,7 +313,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
/**
* Return true if the object is removed.
- *
+ *
* TODO this method does NOT return true if the object is Token.DESTROYED. dispatchListenerEvents
* relies on that fact to avoid removing destroyed tokens from the map. We should refactor so that
* this method calls Token.isRemoved, and places that don't want a destroyed Token can explicitly
@@ -425,7 +425,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
/**
* To fix bug 49901 if v is a GatewaySenderEventImpl then make a heap copy of it if it is offheap.
- *
+ *
* @return the value to provide to the gii request; null if no value should be provided.
*/
static Object prepareValueForGII(Object v) {
@@ -529,7 +529,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
*
* @param context the values context.
* @param value a region entry value.
- *
+ *
* @return the decompressed form of the value parameter.
*/
static Object decompress(RegionEntryContext context, Object value) {
@@ -551,7 +551,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
*
* @param context the values context.
* @param value a region entry value.
- *
+ *
* @return the compressed form of the value parameter.
*/
protected static Object compress(RegionEntryContext context, Object value, EntryEventImpl event) {
@@ -1503,7 +1503,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
/**
* Reads the value of this region entry. Provides low level access to the value field.
- *
+ *
* @return possible OFF_HEAP_OBJECT (caller uses region entry reference)
*/
@Unretained
@@ -1511,7 +1511,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
/**
* Set the value of this region entry. Provides low level access to the value field.
- *
+ *
* @param v the new value to set
*/
protected abstract void setValueField(@Unretained Object v);
@@ -1668,20 +1668,20 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
/**
* This performs a concurrency check.
- *
+ *
* This check compares the version number first, followed by the member ID.
- *
+ *
* Wraparound of the version number is detected and handled by extending the range of versions by
* one bit.
- *
+ *
* The normal membership ID comparison method is used.
* <p>
- *
+ *
* Note that a tag from a remote (WAN) system may be in the event. If this is the case this method
* will either invoke a user plugin that allows/disallows the event (and may modify the value) or
* it determines whether to allow or disallow the event based on timestamps and
* distributedSystemIDs.
- *
+ *
* @throws ConcurrentCacheModificationException if the event conflicts with an event that has
* already been applied to the entry.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
index 6de7f93..43aae36 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
@@ -83,7 +83,7 @@ import org.apache.geode.internal.util.BlobHelper;
public interface DiskEntry extends RegionEntry {
/**
* Sets the value with a {@link RegionEntryContext}.
- *
+ *
* @param context the value's context.
* @param value an entry value.
*/
@@ -138,7 +138,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Testing purpose only Get the value of an entry that is on disk without faulting it in and
* without looking in the io buffer.
- *
+ *
* @since GemFire 3.2.1
*/
public static Object getValueOnDisk(DiskEntry entry, DiskRegion dr) {
@@ -166,7 +166,7 @@ public interface DiskEntry extends RegionEntry {
* Get the serialized value directly from disk. Returned object may be a
* {@link CachedDeserializable}. Goes straight to disk without faulting into memory. Only looks
* at the disk storage, not at heap storage.
- *
+ *
* @param entry the entry used to identify the value to fetch
* @param dr the persistent storage from which to fetch the value
* @return either null, byte array, or CacheDeserializable
@@ -196,7 +196,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Get the value of an entry that is on disk without faulting it in . It checks for the presence
* in the buffer also. This method is used for concurrent map operations and CQ processing
- *
+ *
* @since GemFire 5.1
*/
public static Object getValueOnDiskOrBuffer(DiskEntry entry, DiskRegion dr,
@@ -291,7 +291,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Get the value of an entry that is on disk without faulting it in.
- *
+ *
* @since GemFire 3.2.1
*/
static boolean fillInValue(DiskEntry de, InitialImageOperation.Entry entry, DiskRegion dr,
@@ -814,7 +814,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Writes the key/value object stored in the given entry to disk
- *
+ *
* @see DiskRegion#put
*/
private static void writeToDisk(DiskEntry entry, InternalRegion region, boolean async,
@@ -1233,7 +1233,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Caller must have "entry" and "did" synced and "dr" readLocked.
- *
+ *
* @return the unretained result must be used by the caller before it releases the sync on
* "entry".
*/
@@ -1403,7 +1403,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Flush an entry that was previously scheduled to be written to disk.
- *
+ *
* @since GemFire prPersistSprint1
*/
public static void doAsyncFlush(DiskEntry entry, InternalRegion region, VersionTag tag) {
@@ -1413,7 +1413,7 @@ public interface DiskEntry extends RegionEntry {
/**
* Does a synchronous write to disk for a region that uses async. This method is used by both
* doAsyncFlush and handleFullAsyncQueue to fix GEODE-1700.
- *
+ *
* @param asyncQueueWasFull true if caller wanted to put this entry in the queue but could not
* do so because it was full
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java
index 98fa479..d162c55 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java
@@ -20,20 +20,20 @@ import org.apache.geode.internal.offheap.Releasable;
/**
* Any RegionEntry that is stored off heap must implement this interface.
- *
+ *
*
*/
public interface OffHeapRegionEntry extends RegionEntry, Releasable {
/**
* OFF_HEAP_FIELD_READER
- *
+ *
* @return OFF_HEAP_ADDRESS
*/
public long getAddress();
/**
* OFF_HEAP_FIELD_WRITER
- *
+ *
* @param expectedAddr OFF_HEAP_ADDRESS
* @param newAddr OFF_HEAP_ADDRESS
* @return newAddr OFF_HEAP_ADDRESS
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapIntKey.java
index 7938420..e9a767d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapIntKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapLongKey.java
index a78012c..0c9e67c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapLongKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapObjectKey.java
index f30a3f4..fc98bf3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapObjectKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey1.java
index 20aadcc..944a0f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey1.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey2.java
index af52b1b..a6621f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapStringKey2.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapUUIDKey.java
index 334af2a..7d38d0c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -18,17 +18,18 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapIntKey.java
index d2fd9b3..dbdd9ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -17,18 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapLongKey.java
index 40675b2..0c9a2bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -17,18 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
index 62419d9..a962596 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -17,18 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
index 276dee5..679238e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -17,18 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
index 3189bb2..519c361 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -17,18 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
index 9387dde..b6d7461 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -18,18 +18,19 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapIntKey.java
index b852a74..a48d752 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapIntKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapLongKey.java
index 6207c43..01fd925 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapLongKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapObjectKey.java
index 98bc662..f6d64ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapObjectKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey1.java
index f6a064d..1d9be0f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey1.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey2.java
index 1e2bec4..c985fe6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapStringKey2.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapUUIDKey.java
index 0241eff..c3c5b59 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryHeapUUIDKey.java
@@ -18,14 +18,15 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapIntKey.java
index 1714b5d..d2d5fa6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapIntKey.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapLongKey.java
index 260cd92..1ad4b32 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapLongKey.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapObjectKey.java
index 9a5ee2f..7fa1317 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapObjectKey.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey1.java
index f0d6beb..faade3d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey1.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey2.java
index 87c0265..4de67a2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapStringKey2.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapUUIDKey.java
index 25b7389..41407a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -18,15 +18,16 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntry.java
index 158befe..8feef1a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntry.java
@@ -32,4 +32,3 @@ public abstract class VMStatsLRURegionEntry extends AbstractLRURegionEntry {
// Do not add any instance fields to this class.
// Instead add them to the STATS section of LeafRegionEntry.cpp.
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapIntKey.java
index 4824844..25e9587 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapIntKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapLongKey.java
index f7c13de..a27415e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapLongKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapObjectKey.java
index 80eda7f..9141f66 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapObjectKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey1.java
index 9df1073..d6157e9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey1.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey2.java
index dc0b9d2..99ed631 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapStringKey2.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapUUIDKey.java
index 3191b4c..2d90e81 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryHeapUUIDKey.java
@@ -18,13 +18,14 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapIntKey.java
index 4792fc4..cc8f353 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapIntKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapLongKey.java
index bb37c77..6853300 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapLongKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapObjectKey.java
index 2b7e313..6030f1a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapObjectKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey1.java
index 48954dc..24f4249 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey1.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey2.java
index 55b2e90..bc76c51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapStringKey2.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapUUIDKey.java
index 27923a5..659ea63 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsLRURegionEntryOffHeapUUIDKey.java
@@ -18,14 +18,15 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntry.java
index 1a3c537..d212bb7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntry.java
@@ -34,4 +34,3 @@ public abstract class VMStatsRegionEntry extends AbstractRegionEntry {
// Do not add any instance fields to this class.
// Instead add them to the STATS section of LeafRegionEntry.cpp
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapIntKey.java
index 6b4d3a9..654fcac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapIntKey.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapLongKey.java
index 4ed1c42..5f05bf9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapLongKey.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapObjectKey.java
index 087ef62..19f8495 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapObjectKey.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey1.java
index 12697e7..9a997b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey1.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey2.java
index 81cc3f0..9862a9e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapStringKey2.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapUUIDKey.java
index 7fffbac..6ddfe2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryHeapUUIDKey.java
@@ -18,8 +18,9 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapIntKey.java
index 197a80a..10de41b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapIntKey.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapLongKey.java
index bde45fa..b8b588c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapLongKey.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapObjectKey.java
index 2a812a9..9085102 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapObjectKey.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey1.java
index d05f166..c027006 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey1.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey2.java
index 0ab255e..8e211ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapStringKey2.java
@@ -17,8 +17,9 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapUUIDKey.java
index 411bd91..617e43d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMStatsRegionEntryOffHeapUUIDKey.java
@@ -18,8 +18,9 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapIntKey.java
index 331c253..0766608 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapIntKey.java
@@ -17,16 +17,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapLongKey.java
index 4e74b0e..7626f2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapLongKey.java
@@ -17,16 +17,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapObjectKey.java
index d201146..beb91ee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapObjectKey.java
@@ -17,16 +17,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey1.java
index 8e9eb95..bac481c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey1.java
@@ -17,16 +17,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey2.java
index 99e7a03..4cbd3df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapStringKey2.java
@@ -17,16 +17,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapUUIDKey.java
index d3a9a19..7b33604 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryHeapUUIDKey.java
@@ -18,16 +18,17 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapIntKey.java
index 5aeeeae..0870d81 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapIntKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapLongKey.java
index 97d42f7..253f280 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapLongKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapObjectKey.java
index 61038d5..61418af 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapObjectKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey1.java
index 8a35ffd..b234501 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey1.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey2.java
index 41b9a89..e54e6c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapStringKey2.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
index b972941..03c1fbb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
@@ -18,17 +18,18 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntry.java
index ec6cc27..17309d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntry.java
@@ -16,8 +16,6 @@
package org.apache.geode.internal.cache.entries;
-// import org.apache.geode.cache.*;
-// import org.apache.geode.distributed.internal.DM;
import org.apache.geode.internal.cache.RegionEntryContext;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapIntKey.java
index a342f16..2b7a550 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapIntKey.java
@@ -16,13 +16,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapLongKey.java
index 30dc444..36aec39 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapLongKey.java
@@ -16,13 +16,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapObjectKey.java
index 5fe1eb3..8c14aa2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapObjectKey.java
@@ -16,13 +16,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey1.java
index abdb45f..7fcbf16 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey1.java
@@ -16,13 +16,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey2.java
index a1a05af..1b91394 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapStringKey2.java
@@ -16,13 +16,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapUUIDKey.java
index e42826e..99e1dee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryHeapUUIDKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapIntKey.java
index 73c1e18..cf1cbf6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapIntKey.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapLongKey.java
index ba65317..14b142c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapLongKey.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapObjectKey.java
index 9e2d6b6..e746ad7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapObjectKey.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey1.java
index aec3f9f..7f215fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey1.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey2.java
index 5611a56..e669d0c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapStringKey2.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapUUIDKey.java
index 1474c34..e526fd2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinDiskRegionEntryOffHeapUUIDKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntry.java
index 80a6f18..21faac5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntry.java
@@ -30,4 +30,3 @@ public abstract class VMThinLRURegionEntry extends AbstractLRURegionEntry {
super(context, value);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapIntKey.java
index cf8f76e..f7846a1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapIntKey.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapLongKey.java
index 00a2124..0680506 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapLongKey.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapObjectKey.java
index b864656..13eb190 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapObjectKey.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey1.java
index 16c3e75..6ec2996 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey1.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey2.java
index 215444a..3c756d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapStringKey2.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapUUIDKey.java
index 2840107..1ec0b07 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryHeapUUIDKey.java
@@ -18,12 +18,13 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
/*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapIntKey.java
index 0c40bde..6fce080 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapIntKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapLongKey.java
index 7d62ca6..8113b75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapLongKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapObjectKey.java
index 60b2fb9..940d769 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapObjectKey.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey1.java
index 4c7687f..2c339a3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey1.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey2.java
index 6091124..f09ec39 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapStringKey2.java
@@ -17,13 +17,14 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapUUIDKey.java
index 27e7a30..8194f18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinLRURegionEntryOffHeapUUIDKey.java
@@ -18,13 +18,14 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntry.java
index 47d8eee..8383741 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntry.java
@@ -30,4 +30,3 @@ public abstract class VMThinRegionEntry extends AbstractRegionEntry {
super(context, value);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapIntKey.java
index 512c135..449c5ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapIntKey.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapLongKey.java
index 3b9e764..53a3027 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapLongKey.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapObjectKey.java
index 559632a..586f9dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapObjectKey.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey1.java
index 1b166bf..929f26a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey1.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey2.java
index 2b44f9b..f413bdb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapStringKey2.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapUUIDKey.java
index d8072c8..f9d411c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryHeapUUIDKey.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapIntKey.java
index a5630c1..c44847d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapIntKey.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapLongKey.java
index 7835b06..a92ccf7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapLongKey.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapObjectKey.java
index 3c2b5aa..d9b061e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapObjectKey.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey1.java
index 61dd530..b1dd066 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey1.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey2.java
index 9526011..cec58b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapStringKey2.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapUUIDKey.java
index ced896f..cb605dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VMThinRegionEntryOffHeapUUIDKey.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapIntKey.java
index e8dd9eb..a631a2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapIntKey.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapLongKey.java
index 5983bd7..d5c517d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapLongKey.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
index 6569fc9..0748f15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
index 1d80f94..29659bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
index 174b3c5..50909d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
index 4d00563..bbb7986 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -18,20 +18,20 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
index 7c888a1..86175bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -17,24 +17,24 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
index a4e14ae..f5d5575 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -17,24 +17,24 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
index cf52b62..b99b0a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -17,24 +17,24 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
index b51e2c2..2a39b67 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -17,24 +17,24 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
index 23626ba..c66ec95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -17,24 +17,24 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
index ca4eda1..61ced60 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -18,24 +18,24 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapIntKey.java
index 7608668..3bfb4b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapIntKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapLongKey.java
index 70e38cc..532e986 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapLongKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapObjectKey.java
index 826b24a..9488927 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapObjectKey.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey1.java
index 05a6d22..3901644 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey1.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey2.java
index 28c03f0..d4d4fb5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapStringKey2.java
@@ -17,17 +17,18 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapUUIDKey.java
index f77d04e..7b45756 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryHeapUUIDKey.java
@@ -18,17 +18,18 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapIntKey.java
index 47dd639..3f8fa9b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapIntKey.java
@@ -17,21 +17,22 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapLongKey.java
index f9ef147..8feeecd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapLongKey.java
@@ -17,21 +17,22 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
index 531e2ff..da0306d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
@@ -17,21 +17,22 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
index 2492a2f..e2c648d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
@@ -17,21 +17,22 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
index 018c388..d166840 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
@@ -17,21 +17,22 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
index 374fb8c..193cd63 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -18,21 +18,22 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapIntKey.java
index b0b5092..3fb9a6d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapIntKey.java
@@ -17,16 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapLongKey.java
index 0b32733..8d64aaa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapLongKey.java
@@ -17,16 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapObjectKey.java
index 48b9bf4..186aa12 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapObjectKey.java
@@ -17,16 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey1.java
index 0ba90be..1b157af 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey1.java
@@ -17,16 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey2.java
index 02b9bf1..4c43094 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapStringKey2.java
@@ -17,16 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapUUIDKey.java
index b319a24..d360bcf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryHeapUUIDKey.java
@@ -18,16 +18,16 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapIntKey.java
index e1d4579..e36cc21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapIntKey.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapLongKey.java
index ef76a56..1c5e171 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapLongKey.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapObjectKey.java
index 0cf348d..2a604d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapObjectKey.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey1.java
index a98d499..3f9b10d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey1.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey2.java
index f01bf24..d7fd503 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapStringKey2.java
@@ -17,20 +17,20 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
index 7a6fedb..42c1267 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
@@ -18,20 +18,20 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapIntKey.java
index 03745f2..9b00443 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapIntKey.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapLongKey.java
index 6dc8fc8..7634039 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapLongKey.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapObjectKey.java
index b31ef5e..ad51953 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapObjectKey.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey1.java
index 60bbc74..85363ba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey1.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey2.java
index 5ed7d0a..6abc6b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapStringKey2.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapUUIDKey.java
index e87dfe3..df23aae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryHeapUUIDKey.java
@@ -18,11 +18,12 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapIntKey.java
index 88623b4..2d933de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapIntKey.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapLongKey.java
index 8b4b01d..c3fbc24 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapLongKey.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapObjectKey.java
index d0c3af5..6338abd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapObjectKey.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey1.java
index f17db80..5111387 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey1.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey2.java
index 16f032b..536c007 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapStringKey2.java
@@ -17,15 +17,16 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapUUIDKey.java
index 3ebd9c9..b6c25d3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsRegionEntryOffHeapUUIDKey.java
@@ -18,15 +18,16 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.InternalStatisticsDisabledException;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapIntKey.java
index 61ffaff..2254063 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapIntKey.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapLongKey.java
index b7363de..5c86762 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapLongKey.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapObjectKey.java
index 0fd3ea4..93f35d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapObjectKey.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey1.java
index acea976..cf05b69 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey1.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey2.java
index 313310f..75448e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapStringKey2.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
index f688c27..108098b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
@@ -18,19 +18,19 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
index b83a630..78d5775 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
@@ -17,23 +17,23 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
index d8d6ba8..0bc1a37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
@@ -17,23 +17,23 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
index ba42a9a..4c5a942 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
@@ -17,23 +17,23 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
index 74d8a92..4cd61f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
@@ -17,23 +17,23 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
index f2b5f85..ee7b623 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
@@ -17,23 +17,23 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
index 18deabc..fbec474 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
@@ -18,23 +18,23 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapIntKey.java
index 148c015..69404ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapIntKey.java
@@ -16,16 +16,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapLongKey.java
index b1ef2d0..4272c6f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapLongKey.java
@@ -16,16 +16,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapObjectKey.java
index cc79251..7d3ec1e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapObjectKey.java
@@ -16,16 +16,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey1.java
index daf2c65..48bc237 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey1.java
@@ -16,16 +16,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey2.java
index 9ffc26a..0c0f93d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapStringKey2.java
@@ -16,16 +16,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapUUIDKey.java
index d31c43d..ededc52 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryHeapUUIDKey.java
@@ -17,16 +17,17 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapIntKey.java
index 1ab92e0..6d050bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapIntKey.java
@@ -16,20 +16,21 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapLongKey.java
index ed2e62a..43c81e3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapLongKey.java
@@ -16,20 +16,21 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapObjectKey.java
index 03fd8c8..36a18db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapObjectKey.java
@@ -16,20 +16,21 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey1.java
index 6c3e99a..a9e90cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey1.java
@@ -16,20 +16,21 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey2.java
index 2f4a2d5..71bff72 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapStringKey2.java
@@ -16,20 +16,21 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
index 4345c64..6e639b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
@@ -17,20 +17,21 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapIntKey.java
index 7f19026..f8797e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapIntKey.java
@@ -17,15 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapLongKey.java
index 13d9422..5853733 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapLongKey.java
@@ -17,15 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapObjectKey.java
index 869cb4c..84d3376 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapObjectKey.java
@@ -17,15 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey1.java
index f2770b7..444c403 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey1.java
@@ -17,15 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey2.java
index e427217..ec56423 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapStringKey2.java
@@ -17,15 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapUUIDKey.java
index 647c6dd..ed75c5c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryHeapUUIDKey.java
@@ -18,15 +18,15 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapIntKey.java
index e973eaf..b2f30e1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapIntKey.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapLongKey.java
index 04f130e..dbfdade 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapLongKey.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapObjectKey.java
index 859b454..7154a95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapObjectKey.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey1.java
index cb94853..c290bfd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey1.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey2.java
index f278a81..55c6315 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapStringKey2.java
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapUUIDKey.java
index a47a06d..0f7365f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinLRURegionEntryOffHeapUUIDKey.java
@@ -18,19 +18,19 @@ package org.apache.geode.internal.cache.entries;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapIntKey.java
index 9e04518..4468abe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapIntKey.java
@@ -16,10 +16,11 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapLongKey.java
index e616765..ce8d776 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapLongKey.java
@@ -16,10 +16,11 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapObjectKey.java
index 5fd9fc9..8adb1ba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapObjectKey.java
@@ -16,10 +16,11 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey1.java
index 9964f03..7da1339 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey1.java
@@ -16,10 +16,11 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey2.java
index 9483a98..910b225 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapStringKey2.java
@@ -16,10 +16,11 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapUUIDKey.java
index 04ecc4f..7670287 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryHeapUUIDKey.java
@@ -17,10 +17,11 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapIntKey.java
index 140762a..a032c01 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapIntKey.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapLongKey.java
index 6b8b906..d15e416 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapLongKey.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapObjectKey.java
index 02ddb5c..0a9ca08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapObjectKey.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey1.java
index d75cdff..9b68091 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey1.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey2.java
index bbf7503..c633430 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapStringKey2.java
@@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapUUIDKey.java
index e0a42f7..71046be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntryOffHeapUUIDKey.java
@@ -17,14 +17,15 @@ package org.apache.geode.internal.cache.entries;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/event/DistributedEventTracker.java b/geode-core/src/main/java/org/apache/geode/internal/cache/event/DistributedEventTracker.java
index ee0e8ff..fc11a04 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/event/DistributedEventTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/event/DistributedEventTracker.java
@@ -62,7 +62,7 @@ public class DistributedEventTracker implements EventTracker {
* a mapping of originator to bulkOperation's last version tags. This map differs from
* {@link #recordedBulkOps} in that the thread identifier used here is the base member id and
* thread id of the bulk op, as opposed to the fake thread id which is assigned for each bucket.
- *
+ *
* recordedBulkOps are also only tracked on the secondary for partitioned regions
* recordedBulkOpVersionTags are tracked on both the primary and secondary.
*
@@ -101,7 +101,7 @@ public class DistributedEventTracker implements EventTracker {
/**
* Create an event tracker
- *
+ *
* @param cache the cache of the region to associate with this tracker
* @param stopper the CancelCriterion for the region
* @param regionName name of the region
@@ -178,7 +178,7 @@ public class DistributedEventTracker implements EventTracker {
/**
* Record an event sequence id if it is higher than what we currently have. This is intended for
* use during initial image transfer.
- *
+ *
* @param membershipID the key of an entry in the map obtained from getEventState()
* @param evhObj the value of an entry in the map obtained from getEventState()
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
index 08a93ee..bd756e7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Abstract implementation of InternalExecution interface.
- *
+ *
* @since GemFire 5.8LA
*
*/
@@ -97,7 +97,7 @@ public abstract class AbstractExecution implements InternalExecution {
protected ProxyCache proxyCache;
- private final static ConcurrentHashMap<String, byte[]> idToFunctionAttributes =
+ private static final ConcurrentHashMap<String, byte[]> idToFunctionAttributes =
new ConcurrentHashMap<String, byte[]>();
public static final byte NO_HA_NO_HASRESULT_NO_OPTIMIZEFORWRITE = 0;
@@ -430,7 +430,7 @@ public abstract class AbstractExecution implements InternalExecution {
/**
* validates whether a function should execute in presence of transaction and HeapCritical
* members. If the function is the first operation in a transaction, bootstraps the function.
- *
+ *
* @param function the function
* @param targetMembers the set of members the function will be executed on
* @throws TransactionException if more than one nodes are targeted within a transaction
@@ -450,7 +450,7 @@ public abstract class AbstractExecution implements InternalExecution {
/**
* Returns the function attributes defined by the functionId, returns null if no function is found
* for the specified functionId
- *
+ *
* @param functionId
* @return byte[]
* @throws FunctionException if functionID passed is null
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java
index aafcabe..73e724e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java
@@ -21,7 +21,7 @@ public class BucketMovedException extends GemFireException {
/**
* Creates new function exception with given error message.
- *
+ *
* @param msg
* @since GemFire 6.0
*/
@@ -31,7 +31,7 @@ public class BucketMovedException extends GemFireException {
/**
* Creates new function exception with given error message and optional nested exception.
- *
+ *
* @param msg
* @param cause
* @since GemFire 6.0
@@ -42,7 +42,7 @@ public class BucketMovedException extends GemFireException {
/**
* Creates new function exception given throwable as a cause and source of error message.
- *
+ *
* @param cause
* @since GemFire 6.0
*/
@@ -50,4 +50,3 @@ public class BucketMovedException extends GemFireException {
super(cause);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java
index 96b722f..26ff355 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java
@@ -28,9 +28,9 @@ import org.apache.geode.distributed.DistributedMember;
* Using a custom ResultCollector a user can sort/aggregate the result. This implementation stores
* the result in a List. The size of the list will be same as the no of nodes on which a function
* got executed
- *
+ *
* @since GemFire 6.0
- *
+ *
*/
public class DefaultResultCollector implements ResultCollector {
@@ -40,7 +40,7 @@ public class DefaultResultCollector implements ResultCollector {
/**
* Adds a single function execution result from a remote node to the ResultCollector
- *
+ *
* @param distributedMember
* @param resultOfSingleExecution
*/
@@ -53,7 +53,7 @@ public class DefaultResultCollector implements ResultCollector {
* Waits if necessary for the computation to complete, and then retrieves its result.<br>
* If {@link Function#hasResult()} is false, upon calling {@link ResultCollector#getResult()}
* throws {@link FunctionException}.
- *
+ *
* @return the Object computed result
* @throws FunctionException if something goes wrong while retrieving the result
*/
@@ -64,7 +64,7 @@ public class DefaultResultCollector implements ResultCollector {
/**
* Call back provided to caller, which is called after function execution is complete and caller
* can retrieve results using {@link ResultCollector#getResult()}
- *
+ *
*/
public void endResults() {}
@@ -73,7 +73,7 @@ public class DefaultResultCollector implements ResultCollector {
* retrieves its result, if available. <br>
* If {@link Function#hasResult()} is false, upon calling {@link ResultCollector#getResult()}
* throws {@link FunctionException}.
- *
+ *
* @param timeout the maximum time to wait
* @param unit the time unit of the timeout argument
* @return Object computed result
@@ -86,7 +86,7 @@ public class DefaultResultCollector implements ResultCollector {
/**
* GemFire will invoke this method before re-executing function (in case of Function Execution HA)
* This is to clear the previous execution results from the result collector
- *
+ *
*/
public void clearResults() {
this.resultList.clear();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
index aa10f60..e48d79c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java
@@ -34,15 +34,15 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Executes Function on Distributed Regions.
- *
+ *
* For DistributedRegions with DataPolicy.NORMAL, it throws UnsupportedOperationException. <br>
* For DistributedRegions with DataPolicy.EMPTY, execute the function on any random member which has
* DataPolicy.REPLICATE <br>
* For DistributedRegions with DataPolicy.REPLICATE, execute the function locally.
- *
- *
+ *
+ *
* @since GemFire 5.8 LA
- *
+ *
*/
public class DistributedRegionFunctionExecutor extends AbstractExecution {
@@ -291,7 +291,7 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.execute.AbstractExecution#validateExecution(org.apache.geode.
* cache.execute.Function, java.util.Set)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java
index c9d3fd8..d206d21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java
@@ -49,7 +49,7 @@ public class DistributedRegionFunctionResultSender implements InternalResultSend
/**
* Have to combine next two construcotr in one and make a new class which will send Results back.
- *
+ *
* @param msg
* @param dm
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java
index 7aad4ef..2ea5358 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.DistributedRegionFunctionStreamingMessage;
/**
- *
+ *
*
*/
public class DistributedRegionFunctionResultWaiter extends StreamingFunctionOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
index 985f12e..ded8c8d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
@@ -24,14 +24,14 @@ import org.apache.geode.cache.execute.ResultSender;
/**
* Context available to application functions which is passed from GemFire to {@link Function}. <br>
- *
+ *
* For data dependent functions refer to {@link RegionFunctionContext}
- *
- *
+ *
+ *
* @since GemFire 6.0
- *
+ *
* @see RegionFunctionContextImpl
- *
+ *
*/
public class FunctionContextImpl implements FunctionContext {
@@ -62,7 +62,7 @@ public class FunctionContextImpl implements FunctionContext {
/**
* Returns the arguments provided to this function execution. These are the arguments specified by
* caller using {@link Execution#setArguments(Object)}
- *
+ *
* @return the arguments or null if there are no arguments
*/
public Object getArguments() {
@@ -71,7 +71,7 @@ public class FunctionContextImpl implements FunctionContext {
/**
* Get the identifier of the running function used for logging and administration purposes
- *
+ *
* @return String uniquely identifying this running instance
* @see Function#getId()
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
index 98559dc..52eaa7f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
*
*/
public class FunctionExecutionNodePruner {
@@ -90,11 +90,11 @@ public class FunctionExecutionNodePruner {
* First Logic: Just implement the Greedy algorithm where you keep adding nodes which has the
* biggest set of non-currentBucketSet. // Deterministic but it (almost)always chooses minimum
* no of nodes to execute the function on.
- *
+ *
* Second Logic: Give highest preference to the local node and after that use First Logic. //
* Local Node gets preference but still its deterministic for all the execution taking // place
* at that node which require same set of buckets.
- *
+ *
* Third Logic: After including local node, choose random nodes among the remaining nodes in
* step until your curentBucketSet has all the required buckets. // No optimization for number
* of nodes to execute the function
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionRemoteContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionRemoteContext.java
index ceaba36..968aea2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionRemoteContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionRemoteContext.java
@@ -27,7 +27,7 @@ import org.apache.geode.cache.execute.FunctionService;
/**
* FunctionContext for remote/target nodes
- *
+ *
*
*/
public class FunctionRemoteContext implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java
index 40aa37b..aee8371 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java
@@ -174,7 +174,7 @@ public class FunctionServiceStats {
/**
* Constructor.
- *
+ *
* @param factory The <code>StatisticsFactory</code> which creates the <code>Statistics</code>
* instance
* @param name The name of the <code>Statistics</code>
@@ -202,7 +202,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total number of completed function.execute() calls" stat.
- *
+ *
* @return the current value of the "function Executions completed" stat
*/
public int getFunctionExecutionsCompleted() {
@@ -218,7 +218,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total time consumed for all completed invocations" stat.
- *
+ *
* @return the current value of the "functionExecutionCompleteProcessingTime" stat
*/
public long getFunctionExecutionCompleteProcessingTime() {
@@ -227,7 +227,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "number of currently running invocations" stat.
- *
+ *
* @return the current value of the "functionExecutionsRunning" stat
*/
public int getFunctionExecutionsRunning() {
@@ -243,7 +243,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total number of results sent to the ResultCollector" stat.
- *
+ *
* @return the current value of the "resultsReturned" stat
*/
public int getResultsSentToResultCollector() {
@@ -260,7 +260,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total number of results received and passed to
* ResultCollector" stat.
- *
+ *
* @return the current value of the "resultsReturned" stat
*/
public int getResultsReceived() {
@@ -276,7 +276,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total number of FunctionService...execute() calls" stat.
- *
+ *
* @return the current value of the "functionExecutionsCall" stat
*/
public int getFunctionExecutionCalls() {
@@ -293,7 +293,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total time consumed for all completed execute() calls where
* hasResult() returns true" stat.
- *
+ *
* @return the current value of the "functionExecutionHasResultCompleteProcessingTime" stat
*/
public int getFunctionExecutionHasResultCompleteProcessingTime() {
@@ -303,7 +303,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "A gauge indicating the number of currently active execute()
* calls for functions where hasResult() returns true" stat.
- *
+ *
* @return the current value of the "functionExecutionHasResultRunning" stat
*/
public int getFunctionExecutionHasResultRunning() {
@@ -320,7 +320,7 @@ public class FunctionServiceStats {
/**
* Returns the current value of the "Total number of Exceptions Occurred while executing function"
* stat.
- *
+ *
* @return the current value of the "functionExecutionHasResultRunning" stat
*/
public int getFunctionExecutionExceptions() {
@@ -336,7 +336,7 @@ public class FunctionServiceStats {
/**
* Returns the current time (ns).
- *
+ *
* @return the current time (ns)
*/
public long startTime() {
@@ -363,7 +363,7 @@ public class FunctionServiceStats {
/**
* Increments the "functionExecutionsCompleted" and "functionExecutionCompleteProcessingTime"
* stats.
- *
+ *
* @param start The start of the functionExecution (which is decremented from the current time to
* determine the function Execution processing time).
* @param haveResult haveResult=true then update the _functionExecutionHasResultRunningId and
@@ -394,7 +394,7 @@ public class FunctionServiceStats {
/**
* Increments the "_functionExecutionException" and decrements "_functionExecutionsRunningId"
- *
+ *
* @param haveResult
*/
public void endFunctionExecutionWithException(boolean haveResult) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
index 590c93a..2e05c91 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
@@ -203,7 +203,7 @@ public class FunctionStats {
private final Statistics _stats;
/** This is an instance of the FunctionStats when the statsDisabled = true; */
- private final static FunctionStats dummy = createDummy();
+ private static final FunctionStats dummy = createDummy();
// ///////////////////// Constructors ///////////////////////
@@ -218,7 +218,7 @@ public class FunctionStats {
/**
* Constructor.
- *
+ *
* @param factory The <code>StatisticsFactory</code> which creates the <code>Statistics</code>
* instance
* @param name The name of the <code>Statistics</code>
@@ -237,7 +237,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total number of completed function.execute() calls" stat.
- *
+ *
* @return the current value of the "function Executions completed" stat
*/
public int getFunctionExecutionsCompleted() {
@@ -254,7 +254,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total time consumed for all completed invocations" stat.
- *
+ *
* @return the current value of the "functionExecutionCompleteProcessingTime" stat
*/
public long getFunctionExecutionCompleteProcessingTime() {
@@ -263,7 +263,7 @@ public class FunctionStats {
/**
* Returns the current value of the "number of currently running invocations" stat.
- *
+ *
* @return the current value of the "functionExecutionsRunning" stat
*/
public int getFunctionExecutionsRunning() {
@@ -280,7 +280,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total number of results sent to the ResultCollector" stat.
- *
+ *
* @return the current value of the "resultsReturned" stat
*/
public int getResultsSentToResultCollector() {
@@ -298,7 +298,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total number of results received and passed to
* ResultCollector" stat.
- *
+ *
* @return the current value of the "resultsReturned" stat
*/
public int getResultsReceived() {
@@ -315,7 +315,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total number of FunctionService...execute() calls" stat.
- *
+ *
* @return the current value of the "functionExecutionsCall" stat
*/
public int getFunctionExecutionCalls() {
@@ -333,7 +333,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total time consumed for all completed execute() calls where
* hasResult() returns true" stat.
- *
+ *
* @return the current value of the "functionExecutionHasResultCompleteProcessingTime" stat
*/
public int getFunctionExecutionHasResultCompleteProcessingTime() {
@@ -343,7 +343,7 @@ public class FunctionStats {
/**
* Returns the current value of the "A gauge indicating the number of currently active execute()
* calls for functions where hasResult() returns true" stat.
- *
+ *
* @return the current value of the "functionExecutionHasResultRunning" stat
*/
public int getFunctionExecutionHasResultRunning() {
@@ -361,7 +361,7 @@ public class FunctionStats {
/**
* Returns the current value of the "Total number of Exceptions Occurred while executing function"
* stat.
- *
+ *
* @return the current value of the "functionExecutionHasResultRunning" stat
*/
public int getFunctionExecutionExceptions() {
@@ -378,7 +378,7 @@ public class FunctionStats {
/**
* Returns the current time (ns).
- *
+ *
* @return the current time (ns)
*/
public long startTime() {
@@ -406,7 +406,7 @@ public class FunctionStats {
/**
* Increments the "functionExecutionsCompleted" and "functionExecutionCompleteProcessingTime"
* stats.
- *
+ *
* @param start The start of the functionExecution (which is decremented from the current time to
* determine the function Execution processing time).
* @param haveResult haveResult=true then update the _functionExecutionHasResultRunningId and
@@ -438,7 +438,7 @@ public class FunctionStats {
/**
* Increments the "_functionExecutionException" and decrements "_functionExecutionsRunningId" and
* decrement "_functionExecutionHasResultRunningId"
- *
+ *
* @param haveResult
*/
public void endFunctionExecutionWithException(boolean haveResult) {
@@ -457,7 +457,7 @@ public class FunctionStats {
/**
* Returns the Function Stats for the given function
- *
+ *
* @param functionID represents the function for which we are returning the function Stats
* @param ds represents the Distributed System
* @return object of the FunctionStats
@@ -483,4 +483,3 @@ public class FunctionStats {
return Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "statsDisabled");
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java
index 72439e3..1428038 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java
@@ -49,7 +49,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
*
*/
public class FunctionStreamingResultCollector extends ReplyProcessor21 implements ResultCollector {
@@ -423,7 +423,7 @@ public class FunctionStreamingResultCollector extends ReplyProcessor21 implement
/**
* Waits for the response from the recipient
- *
+ *
* @throws CacheException if the recipient threw a cache exception during message processing
* @throws ForceReattemptException if the recipient left the distributed system before the
* response was received.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java
index 7e1f17b..eafe9be 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java
@@ -24,9 +24,9 @@ import org.apache.geode.cache.execute.ResultCollector;
/**
* Internal interface that adds some internal methods to the Execution interface.
- *
+ *
* @since GemFire 5.8LA
- *
+ *
*/
public interface InternalExecution extends Execution {
@@ -36,8 +36,8 @@ public interface InternalExecution extends Execution {
* Specifies a filter of bucketIDs for selecting the GemFire members to execute the function on.
* <p>
* Applicable only for regions with {@link DataPolicy#PARTITION} DataPolicy.
- *
- *
+ *
+ *
* @param bucketIDs Set of bucketIDs defining the buckets to be used for executing the function
* @return an Execution with the filter
* @throws UnsupportedOperationException if not called after
@@ -49,7 +49,7 @@ public interface InternalExecution extends Execution {
/**
* If true, function execution waits for all exceptions from target nodes <br>
* If false, function execution returns when first exception is occurred.
- *
+ *
* @param setWaitOnException
*/
public void setWaitOnExceptionFlag(boolean setWaitOnException);
@@ -59,7 +59,7 @@ public interface InternalExecution extends Execution {
* {@link ResultCollector}. The user will not need to invoke {@link ResultCollector#getResult()}
* to receive errors. Setting this flag may interface will proper handling of HA-enabled
* functions.
- *
+ *
* @param forward true if all exceptions should be forwarded to the <code>ResultCollector</code>
*/
public void setForwardExceptions(boolean forward);
@@ -68,9 +68,9 @@ public interface InternalExecution extends Execution {
* If true, allows results of function execution on groups to be collected in presence of member
* failures. For the failed member, resultCollector will have an Exception in place of a result,
* so that information about the failed member can be obtained.
- *
+ *
* see bug #45765
- *
+ *
* @param ignore true to collect results
*/
public void setIgnoreDepartedMembers(boolean ignore);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
index c38718d..ac8edcc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
@@ -23,12 +23,12 @@ import org.apache.geode.cache.execute.FunctionService;
* through ResultSender.sendException will be wrapped internally in InternalFunctionException. This
* InternalFunctionException will be used to decide whether the exception should be added as a part
* of addResult or exception should be thrown while doing ResultCollector#getResult
- *
+ *
* <p>
* The exception string provides details on the cause of failure.
* </p>
- *
- *
+ *
+ *
* @since GemFire 6.6
* @see FunctionService
*/
@@ -38,13 +38,13 @@ public class InternalFunctionException extends FunctionException {
/**
* Creates new internal function exception with given error message.
- *
+ *
*/
public InternalFunctionException() {}
/**
* Creates new internal function exception with given error message.
- *
+ *
* @param msg
*/
public InternalFunctionException(String msg) {
@@ -53,7 +53,7 @@ public class InternalFunctionException extends FunctionException {
/**
* Creates new internal function exception with given error message and optional nested exception.
- *
+ *
* @param msg
* @param cause
*/
@@ -63,7 +63,7 @@ public class InternalFunctionException extends FunctionException {
/**
* Creates new internal function exception given throwable as a cause and source of error message.
- *
+ *
* @param cause
*/
public InternalFunctionException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
index 1cd577b..fd255c3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
@@ -27,7 +27,7 @@ public class InternalFunctionInvocationTargetException extends FunctionInvocatio
/**
* Construct an instance of InternalFunctionInvocationTargetException
- *
+ *
* @param cause a Throwable cause of this exception
*/
public InternalFunctionInvocationTargetException(Throwable cause) {
@@ -36,7 +36,7 @@ public class InternalFunctionInvocationTargetException extends FunctionInvocatio
/**
* Construct an instance of InternalFunctionInvocationTargetException
- *
+ *
* @param msg the error message
*/
public InternalFunctionInvocationTargetException(String msg) {
@@ -45,7 +45,7 @@ public class InternalFunctionInvocationTargetException extends FunctionInvocatio
/**
* Construct an instance of InternalFunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param failedNode the failed node member
*/
@@ -56,7 +56,7 @@ public class InternalFunctionInvocationTargetException extends FunctionInvocatio
/**
* Construct an instance of InternalFunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param failedNodeSet set of the failed node member id
*/
@@ -67,7 +67,7 @@ public class InternalFunctionInvocationTargetException extends FunctionInvocatio
/**
* Construct an instance of InternalFunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java
index ee2f300..ce272a7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java
@@ -28,12 +28,12 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
* Provides internal methods for tests
- *
- *
+ *
+ *
* @since GemFire 6.1
- *
+ *
*/
public class InternalFunctionService {
@@ -41,7 +41,7 @@ public class InternalFunctionService {
* Returns an {@link Execution} object that can be used to execute a function on the set of
* {@link Region}s. The function would be executed on the set of members that host data for any of
* the regions in the set of regions. <br>
- *
+ *
* If the Set provided contains region with : <br>
* DataPolicy.NORMAL, execute the function on any random member which has DataPolicy.REPLICATE .
* <br>
@@ -50,16 +50,16 @@ public class InternalFunctionService {
* DataPolicy.REPLICATE, execute the function locally or any random member which has
* DataPolicy.REPLICATE .<br>
* DataPolicy.PARTITION, it executes on members where the primary copy of data is hosted. <br>
- *
+ *
* This API is not supported for cache clients in client server mode
- *
+ *
* For an Execution object obtained from this method, calling the withFilter method throws
* {@link UnsupportedOperationException}
- *
+ *
* @see MultiRegionFunctionContext
- *
+ *
* @param regions
- *
+ *
*/
public static Execution onRegions(Set<Region> regions) {
if (regions == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java
index 2406ca6..f7a3a45 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java
@@ -37,9 +37,9 @@ public interface InternalRegionFunctionContext extends RegionFunctionContext {
* given partitioned region.
* <p>
* Writes using this Region have no constraints and behave the same as the partitioned region.
- *
+ *
* @param r region to get the local data set for
- *
+ *
* @return a region for efficient reads or null if the region is not a partitioned region
*/
public <K, V> Region<K, V> getLocalDataSet(Region<K, V> r);
@@ -52,7 +52,7 @@ public interface InternalRegionFunctionContext extends RegionFunctionContext {
* Writes using these Region have no constraints and behave the same as a partitioned Region.
* <p>
* If there are no colocated regions, return an empty map.
- *
+ *
* @return an unmodifiable map of {@linkplain Region#getFullPath() region name} to {@link Region}
*/
public Map<String, LocalDataSet> getColocatedLocalDataSets();
@@ -60,9 +60,9 @@ public interface InternalRegionFunctionContext extends RegionFunctionContext {
/**
* Get the set of bucket IDs for this node as specified by the {@link #getFilter()} method of the
* function context for the given region.
- *
+ *
* @param region region to get the local bucket IDs for
- *
+ *
* @return the set of bucket IDs for this node in this function context for the given region
*/
public <K, V> Set<Integer> getLocalBucketSet(Region<K, V> region);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java
index e273008..e5944d4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.execute;
import org.apache.geode.cache.execute.ResultSender;
/**
- *
+ *
*
*/
public interface InternalResultSender extends ResultSender<Object> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollector.java
index 515886a..60cbc19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollector.java
@@ -21,7 +21,7 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
/**
* Extends {@link ResultCollector} interface to provide for methods that are required internally by
* the product.
- *
+ *
*/
public interface LocalResultCollector<T, S> extends ResultCollector<T, S> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
index d0a0b88..cb8517b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- *
+ *
*
*/
public class MemberFunctionResultSender implements InternalResultSender {
@@ -58,7 +58,7 @@ public class MemberFunctionResultSender implements InternalResultSender {
/**
* Have to combine next two construcotr in one and make a new class which will send Results back.
- *
+ *
* @param msg
* @param dm
*/
@@ -71,7 +71,7 @@ public class MemberFunctionResultSender implements InternalResultSender {
/**
* Have to combine next two construcotr in one and make a new class which will send Results back.
- *
+ *
* @param dm
* @param rc
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java
index 2b11c4e..09fcc0e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
/**
- *
+ *
*
*/
public class MemberFunctionResultWaiter extends StreamingFunctionOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberMappedArgument.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberMappedArgument.java
index b4ddbde..052c60d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberMappedArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberMappedArgument.java
@@ -23,17 +23,17 @@ import java.util.Map;
* distributed, the* target member is looked up in this map by the function service. If the target
* member id has a value in the map, then that value is used as an argument for that distribution.
* If that member id is not found, then the default value is used as an argument instead.
- *
+ *
* For the SQL Fabric, its use would be as follows: The defaultArgument is set to be the query
* string. The keys of the map are set to be all known member ids that have already prepared this
* statement, and the values are all null (to be interpreted as no argument).
- *
+ *
* This way, when the function is distributed to a member that is not in the map, it will include
* the query string as an argument. When it is sent to a member that is in the map, will not include
* the query string as an argument.
- *
+ *
* @since GemFire 6.0
- *
+ *
*/
public class MemberMappedArgument implements Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java
index 9066746..b87c2f6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java
@@ -22,10 +22,10 @@ import org.apache.geode.cache.execute.FunctionContext;
/**
* Context available when called using {@link InternalFunctionService#onRegions(Set)}
- *
- *
+ *
+ *
* @since GemFire 6.5
- *
+ *
*/
public interface MultiRegionFunctionContext extends FunctionContext {
@@ -34,9 +34,9 @@ public interface MultiRegionFunctionContext extends FunctionContext {
/**
* Returns a boolean to identify whether this is a re-execute. Returns true if it is a re-execute
* else returns false
- *
+ *
* @return a boolean (true) to identify whether it is a re-execute (else false)
- *
+ *
* @since GemFire 6.5
* @see Function#isHA()
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContextImpl.java
index cfb802c..8a9a5e3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContextImpl.java
@@ -22,10 +22,10 @@ import org.apache.geode.cache.execute.ResultSender;
/**
* Context available when called using {@link InternalFunctionService#onRegions(Set)}
- *
- *
+ *
+ *
* @since GemFire 6.5
- *
+ *
*/
public class MultiRegionFunctionContextImpl extends FunctionContextImpl
implements MultiRegionFunctionContext {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java
index f3e6cf3..959f032 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java
@@ -27,7 +27,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
/**
- *
+ *
*
*/
public class MultiRegionFunctionResultWaiter extends StreamingFunctionOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
index 3694e98..eaba221 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
@@ -16,8 +16,8 @@
package org.apache.geode.internal.cache.execute;
import java.io.Serializable;
-
import java.util.concurrent.TimeUnit;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.ResultCollector;
@@ -28,13 +28,13 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* A Special ResultCollector implementation. Functions having {@link Function#hasResult()} false,
* this ResultCollector will be returned. <br>
* Calling getResult on this NoResult will throw {@link FunctionException}
- *
- *
- *
+ *
+ *
+ *
* @since GemFire 5.8 Beta
- *
+ *
* @see Function#hasResult()
- *
+ *
*/
public class NoResult implements ResultCollector, Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
index 5fb1f78..6162045 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* PRFunctionExecutionStreamer to send results to the calling node. The results will be received in
* the ResultReciever. ResultSender will be instantiated in executeOnDatastore and set in
* FunctionContext.
- *
+ *
*/
public class PartitionedRegionFunctionResultSender implements InternalResultSender {
@@ -76,7 +76,7 @@ public class PartitionedRegionFunctionResultSender implements InternalResultSend
/**
* Have to combine next two constructor in one and make a new class which will send Results back.
- *
+ *
* @param msg
* @param dm
* @param pr
@@ -96,7 +96,7 @@ public class PartitionedRegionFunctionResultSender implements InternalResultSend
/**
* Have to combine next two constructor in one and make a new class which will send Results back.
- *
+ *
* @param dm
* @param partitionedRegion
* @param time
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultWaiter.java
index 86bf8fa..15921fc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultWaiter.java
@@ -26,15 +26,15 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.partitioned.PartitionedRegionFunctionStreamingMessage;
import org.apache.geode.internal.cache.partitioned.PRFunctionStreamingResultCollector;
+import org.apache.geode.internal.cache.partitioned.PartitionedRegionFunctionStreamingMessage;
/**
* ResultReciever (which could be resultCollector?)will be instantiated and will be used to send
* messages and receive results from other nodes. It takes a set of nodes to which functionExecution
* message has to be sent. Creates one message for each and sends it to each of them. Then it gets
* result in processData where it adds them to the resultCollector.
- *
+ *
*
*/
public class PartitionedRegionFunctionResultWaiter extends StreamingFunctionOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/RegionFunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/RegionFunctionContextImpl.java
index 4f90745..fa525cc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/RegionFunctionContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/RegionFunctionContextImpl.java
@@ -32,10 +32,10 @@ import org.apache.geode.internal.cache.LocalDataSet;
* {@link FunctionService#onRegion(Region)}, the FunctionContext can be type casted to
* RegionFunctionContext. Methods provided to retrieve the Region and filter passed to the function
* execution
- *
- *
+ *
+ *
* @since GemFire 6.0
- *
+ *
* @see FunctionContextImpl
*/
public class RegionFunctionContextImpl extends FunctionContextImpl
@@ -74,9 +74,9 @@ public class RegionFunctionContextImpl extends FunctionContextImpl
/**
* Returns the Region on which function is executed
- *
+ *
* @see FunctionService#onRegion(Region)
- *
+ *
* @return Returns the Region on which function is executed
*/
public <K, V> Region<K, V> getDataSet() {
@@ -86,9 +86,9 @@ public class RegionFunctionContextImpl extends FunctionContextImpl
/**
* Returns subset of keys provided by the invoking thread (aka routing objects) which may exist in
* the local data set.
- *
+ *
* @see Execution#withFilter(Set)
- *
+ *
* @return the objects should be local to this context
*/
public Set<?> getFilter() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
index 1e692cf..c56fa2b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.cache.execute.util.SynchronizedResultCollector;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
*
*/
public class ServerFunctionExecutor extends AbstractExecution {
@@ -284,7 +284,7 @@ public class ServerFunctionExecutor extends AbstractExecution {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.execute.AbstractExecution#validateExecution(org.apache.geode.
* cache.execute.Function, java.util.Set)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
index 7779678..1282e44 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java
@@ -38,7 +38,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Executes Function with FunctionService#onRegion(Region region) in client server mode.
- *
+ *
* @see FunctionService#onRegion(Region) *
* @since GemFire 5.8 LA
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java
index 6b00582..eb3f0ca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
* @since GemFire 6.5
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java
index 5fccf31..26257b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache.execute;
import java.util.Collections;
import java.util.HashMap;
import java.util.Set;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.execute.ResultSender;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java
index dfc7442..99e00a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java
@@ -20,9 +20,9 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
/**
* Provides marker for extensibility and access to {@link ExtensionPoint}. Objects should implement
* this interface to support modular config and extensions.
- *
+ *
* Used in {@link CacheXml} to read and write cache xml configurations.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -30,7 +30,7 @@ public interface Extensible<T> {
/**
* Get {@link ExtensionPoint} for this object.
- *
+ *
* @return {@link ExtensionPoint} for this object.
* @since GemFire 8.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extension.java b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extension.java
index c73cfbb..6e02fa2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extension.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extension.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* Interface used for objects wishing to extend and {@link Extensible} object.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -29,7 +29,7 @@ public interface Extension<T> {
/**
* Get {@link XmlGenerator} capable of serializing this object's configuration.
- *
+ *
* @return {@link XmlGenerator} for this object's configuration.
* @since GemFire 8.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/ExtensionPoint.java b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/ExtensionPoint.java
index b7ad7a2..5a096ba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/ExtensionPoint.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/ExtensionPoint.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.extension;
/**
* Allows {@link Extensible} objects to add and remove {@link Extension}s.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -25,7 +25,7 @@ public interface ExtensionPoint<T> {
/**
* Add {@link Extension} to {@link ExtensionPoint}.
- *
+ *
* @param extension to add.
* @since GemFire 8.1
*/
@@ -33,7 +33,7 @@ public interface ExtensionPoint<T> {
/**
* Remove {@link Extension} from {@link ExtensionPoint}.
- *
+ *
* @param extension to remove.
* @since GemFire 8.1
*/
@@ -41,7 +41,7 @@ public interface ExtensionPoint<T> {
/**
* Get {@link Iterable} of {@link Extension}s.
- *
+ *
* @return {@link Exception}s
* @since GemFire 8.1
*/
@@ -49,9 +49,9 @@ public interface ExtensionPoint<T> {
/**
* Helper method to get appropriately typed access to target {@link Extensible} object.
- *
+ *
* @return {@link Extensible} object target.
- *
+ *
* @since GemFire 8.1
*/
T getTarget();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/SimpleExtensionPoint.java b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/SimpleExtensionPoint.java
index d85c2fa..1d025de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/SimpleExtensionPoint.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/SimpleExtensionPoint.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.util.CollectionUtils;
/**
* Simple implementation of {@link ExtensionPoint} for easy integration with existing objects.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -40,9 +40,9 @@ public class SimpleExtensionPoint<T> implements ExtensionPoint<T> {
/**
* Construct a new {@link SimpleExtensionPoint} around the given extensible target.
- *
+ *
* @param extensible the {@link Extensible} object this extension point acts on.
- *
+ *
* @param target the <code>T</code> instance being extended. Likely the same as
* <code>exensible</code>.
* @since GemFire 8.1
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java
index e5de97d..63536a9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java
@@ -154,7 +154,7 @@ public class HAContainerMap implements HAContainerWrapper {
throw new UnsupportedOperationException("values() not supported.");
}
- static protected class Entry implements Map.Entry {
+ protected static class Entry implements Map.Entry {
private Object key = null;
private Object value = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
index f75a912..1650604 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -102,7 +102,7 @@ import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock
* a counter(long) and value will be the offered Object in the queue. For example, an entry in this
* region (key = 5; value = obj1) would mean that the Object obj1 is at the 5th position in the
* queue.
- *
+ *
* This class has a field idsAvailable which is guraded by a ReentrantReadWriteLock. The peek
* threads which do not modify the idsAvailable LinkedhashSet take read lock , thereby increasing
* the concurrency of peek operations. The threads like take, remove, QRM ,put& expiry take a write
@@ -113,15 +113,15 @@ import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock
* ReentrantLock . Condition object of this lock is used to issue signal to the waiting peek & take
* threads for put operation. As a result , concurrency of peek operations is not possible. This
* class is optimized for a single peek thread .
- *
+ *
* 30 May 2008: 5.7 onwards the underlying GemFire Region will continue to have key as counter(long)
* but the value will be a wrapper object(HAEventWrapper) which will be a key in a separate data
* structure called haContainer (an implementation of Map). The value against this wrapper will be
* the offered object in the queue. The purpose of this modification is to allow multiple
* ha-region-queues share their offered values without storing separate copies in memory, upon GII.
- *
+ *
* (See BlockingHARegionQueue)
- *
+ *
* @since GemFire 4.3
*/
public class HARegionQueue implements RegionQueue {
@@ -280,7 +280,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Boolean to indicate whether client is a slow receiver
- *
+ *
* @since GemFire 6.0
*/
public boolean isClientSlowReciever = false;
@@ -292,7 +292,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Test hooks for periodic ack
- *
+ *
* @since GemFire 6.0
*/
static boolean testMarkerMessageRecieved = false;
@@ -316,7 +316,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Processes the given string and returns a string which is allowed for region names
- *
+ *
* @return legal region name
*/
public static String createRegionName(String regionName) {
@@ -513,7 +513,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Puts the GII'd entry into the ha region, if it was GII'd along with its ClientUpdateMessageImpl
* instance.
- *
+ *
* @since GemFire 5.7
*/
protected void putInQueue(Object val) throws InterruptedException {
@@ -530,7 +530,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Check whether to conflate an event
- *
+ *
* @since GemFire 5.7
*/
protected boolean shouldBeConflated(Conflatable event) {
@@ -573,13 +573,13 @@ public class HARegionQueue implements RegionQueue {
* 2)If no then Do a "put-if-absent" on the eventsMap ,inserting the
* LastDispatchedAndCurrentEvents object or adding the position to the existing object for the
* ThreadIdentifier
- *
+ *
* It is possible that DispatchedAnCurrentEvents object just retrieved by the put thread has
* expired thus a one level recursion can occur to do a valid put
- *
+ *
* The operation is thread safe & is guarded by taking a lock on LastDispatchedAndCurrentEvents
* object & SIZE Lock
- *
+ *
* @param object object to put onto the queue
*/
public boolean put(Object object) throws CacheException, InterruptedException {
@@ -829,7 +829,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Implementation in BlokcingHARegionQueue class
- *
+ *
*/
void incrementTakeSidePutPermitsWithoutNotify() {
@@ -850,9 +850,9 @@ public class HARegionQueue implements RegionQueue {
/**
* Clears the dispatchedMessagesMap and shuts down the QueueRemovalThread.
- *
+ *
*/
- public synchronized static void stopHAServices() {
+ public static synchronized void stopHAServices() {
if (qrmThread != null) {
qrmThread.shutdown();
qrmThread = null;
@@ -864,7 +864,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only
- *
+ *
* @return the frequency (in seconds) at which a message will be sent by the primary to all the
* secondary nodes to remove the events which have already been dispatched from the queue.
*/
@@ -873,7 +873,7 @@ public class HARegionQueue implements RegionQueue {
}
/**
- *
+ *
* The internal method used for setting the message synch interval time via the Cache API
*
* @param seconds time to wait between two synch messages
@@ -884,7 +884,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Returns the previous counter if any for the Conflatable object
- *
+ *
* @param event Object to be conflated
* @param newPosition New Conflatable object's position
* @return Long object denoting the position of the previous conflatable object
@@ -909,7 +909,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Creates and returns a ConcurrentMap. This method is over-ridden in test classes to test some
* functionality
- *
+ *
* @return new ConcurrentMap
*/
ConcurrentMap createConcurrentMap() {
@@ -917,7 +917,7 @@ public class HARegionQueue implements RegionQueue {
}
/**
- *
+ *
* @return CacheListener object having the desired functionility of expiry of Thread Identifier &
* Events for the HAregion. This method is appropriately over ridden in the test classes.
*/
@@ -1057,7 +1057,7 @@ public class HARegionQueue implements RegionQueue {
* Destroys the entry at the position from the Region. It checks for the presence of the position
* in the AvailableID Set. If the position existed in the Set, then only it is removed from the
* Set & the underlying Region
- *
+ *
* @param position Long position counter for entry in the Region
* @return true if the entry with <br>
* position <br>
@@ -1085,7 +1085,7 @@ public class HARegionQueue implements RegionQueue {
* Removes from the local region and decrements stats GII does not call this because it messes
* with the cq stats Expiry can call this for now as durable client expires would shut down the cq
* anyways if anything goes wrong
- *
+ *
* @param position
*/
private void destroyFromQueue(Object key) {
@@ -1166,7 +1166,7 @@ public class HARegionQueue implements RegionQueue {
/**
* For non blocking queue , this method either returns null or an Object. For blocking queue it
* will always return with an Object or wait for queue to be populated.
- *
+ *
* @throws CacheException The exception can be thrown by BlockingQueue if it encounters
* InterruptedException while waiting for data
*/
@@ -1379,7 +1379,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Return a batch of minimum specified size
- *
+ *
* @param minSize minimum number to return
* @return null if minimum was not present
*/
@@ -1407,13 +1407,13 @@ public class HARegionQueue implements RegionQueue {
* elapse before batchSize number of elements has been peeked, it stops. All the counters peeked
* for the batch are added to the thread-context, so that upon calling of remove(), all the peeked
* events of the batch are removed from the queue.
- *
+ *
* If the Queue is non blocking multiple peek operations can proceed but if it is of type non
* blocking only one peek operation will proceed as the blocking queue does not use ReadWriteLock
- *
+ *
* @param batchSize The number of objects to peek from the queue
* @param timeToWait The number of milliseconds to attempt to peek
- *
+ *
* @return The list of events peeked
*/
public List peek(int batchSize, int timeToWait) throws InterruptedException {
@@ -1475,7 +1475,7 @@ public class HARegionQueue implements RegionQueue {
* This method prepares the batch of events and updates the thread-context with corresponding
* counters, so that when remove is called by this thread, these events are destroyed from the
* queue.This method should always be invoked within the {@code rwLock}.
- *
+ *
* @param batchSize - number of events to be peeked
* @return - list of events peeked
*/
@@ -1595,7 +1595,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only
- *
+ *
* @return Map object
*/
public static Map getDispatchedMessagesMapForTesting() {
@@ -1604,7 +1604,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only
- *
+ *
* @return Map object
*/
Map getConflationMapForTesting() {
@@ -1617,7 +1617,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only
- *
+ *
* @return Map object containing DispatchedAndCurrentEvents object for a ThreadIdentifier
*/
Map getEventsMapForTesting() {
@@ -1629,7 +1629,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only. Returns the set of current counters for the given
* ThreadIdentifier
- *
+ *
* @param id - the EventID object
* @return - the current counters set
*/
@@ -1652,7 +1652,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only. Returns the last dispatched sequenceId for the given
* ThreadIdentifier
- *
+ *
* @param id - the EventID object
* @return - the current counters set
*/
@@ -1664,7 +1664,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Used for testing purposes only
- *
+ *
* @return Set
*/
Set getAvalaibleIds() {
@@ -1716,7 +1716,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Returns the size of the queue
- *
+ *
* @return the size of the queue
*/
public int size() {
@@ -1781,7 +1781,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Caller must hold the rwLock.
- *
+ *
* @return true if the queue contains objects
*/
boolean internalIsEmpty() {
@@ -1790,7 +1790,7 @@ public class HARegionQueue implements RegionQueue {
/**
* test hook to see if the queue is empty
- *
+ *
* @return true if the queue is empty, false if not
*/
public boolean isEmpty() {
@@ -1811,7 +1811,7 @@ public class HARegionQueue implements RegionQueue {
*
* All invocations of this method need to have {@link #releaseWriteLock()} in a matching finally
* block.
- *
+ *
* <p>
* author Asif
*/
@@ -1824,10 +1824,10 @@ public class HARegionQueue implements RegionQueue {
* BlockingHARegionQueue class which acquires the lock on a ReentrantLock instead of
* ReentrantReadWriteLock of this class. A read lock is aquired by a non blocking peek while
* operating on the idsAvailable LinkedHashSet without structurally modifying it.
- *
+ *
* All invocations of this method must have {@link #releaseReadLock()} in a matching finally
* block.
- *
+ *
* <p>
* author Asif
*/
@@ -1838,7 +1838,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Releases the Read lock. Overridden in the BlockingHARegionQueue class.
- *
+ *
*/
void releaseReadLock() {
this.readLock.unlock();
@@ -1846,7 +1846,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Releases the write lock. Overridden in the BlockingHARegionQueue class.
- *
+ *
*/
void releaseWriteLock() {
this.writeLock.unlock();
@@ -1854,7 +1854,7 @@ public class HARegionQueue implements RegionQueue {
/**
* A no op. Overridden in the BlockingHARegionQueue class.
- *
+ *
* <p>
* author Asif
*/
@@ -1874,7 +1874,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Utility method which extracts ThreadIdentifier from an EventID object
- *
+ *
* @param eventId EventID object
* @return ThreadIdentifier object
*/
@@ -1884,7 +1884,7 @@ public class HARegionQueue implements RegionQueue {
/**
* get the qrm thread for testing purposes
- *
+ *
*/
static void stopQRMThread() {
qrmThread.shutdown();
@@ -1892,7 +1892,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Calls the createMessageList method of QueueRemovalThread for testing purposes
- *
+ *
* @return message list for testing
*/
static List createMessageListForTesting() {
@@ -1901,7 +1901,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Creates a HARegionQueue object with default attributes Used by tests
- *
+ *
* @param regionName uniquely identifies the HARegionQueue in the VM.For HARegionQueues across the
* VM to communicate with each other , the name should be identical
* @param cache Gemfire Cache instance
@@ -1927,7 +1927,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Creates a HARegionQueue object with default attributes
- *
+ *
* @param regionName uniquely identifies the HARegionQueue in the VM.For HARegionQueues across the
* VM to communicate with each other , the name should be identical
* @param cache Gemfire Cache instance
@@ -1975,7 +1975,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Creates a HARegionQueue object with default attributes. used by tests
- *
+ *
* @return an instance of HARegionQueue
* @since GemFire 5.7
*/
@@ -2247,7 +2247,7 @@ public class HARegionQueue implements RegionQueue {
* This method is called by the publish method when a valid Long position is added to the
* idsAvailable set. It should always be called after acquiring the ReentrantLock. It notifies
* the waiting peek & take threads.
- *
+ *
* <p>
* author Asif
*/
@@ -2284,7 +2284,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Noop method to prevent HARegionQueue population before the constructor of BlockingQueue is
* complete.
- *
+ *
* <p>
* author Asif
*/
@@ -2295,7 +2295,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Identical to the releaseWriteLock as there is only one type of Lock object in this class.
- *
+ *
*/
@Override
@@ -2305,10 +2305,10 @@ public class HARegionQueue implements RegionQueue {
/**
* Identical to the releaseReadLock as there is only one type of Lock object in this class.
- *
+ *
* <p>
* author Asif
- *
+ *
*/
@Override
@@ -2497,7 +2497,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Returns the size of the idsAvailable Set
- *
+ *
* Caller must hold the rwLock
*/
@Override
@@ -2560,7 +2560,7 @@ public class HARegionQueue implements RegionQueue {
static class TestOnlyHARegionQueue extends HARegionQueue {
/**
* Overloaded constructor to accept haContainer.
- *
+ *
* @since GemFire 5.7
*/
TestOnlyHARegionQueue(String regionName, InternalCache cache, Map haContainer)
@@ -2589,7 +2589,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Overloaded constructor to pass an {@code HashMap} instance as a haContainer.
- *
+ *
* @since GemFire 5.7
*/
TestOnlyHARegionQueue(String regionName, InternalCache cache, HARegionQueueAttributes hrqa)
@@ -2730,7 +2730,7 @@ public class HARegionQueue implements RegionQueue {
* thread while operating on the MapWrapper for a given region , sets a new map object so that
* put operations are not blocked while the QRM thread is iterating over the map contained in
* MapWrapper & the put operations will continue using the new internal Ma.
- *
+ *
* @return List
*/
protected List createMessageList() {
@@ -2787,7 +2787,7 @@ public class HARegionQueue implements RegionQueue {
/**
* shutdown this thread and the caller thread will join this thread
- *
+ *
*/
public void shutdown() {
this.shutdown = true;
@@ -2865,7 +2865,7 @@ public class HARegionQueue implements RegionQueue {
* object gets created for every ThreadIdentifier . And a given thread ( corresponding to this
* thread identifier) is doing operation in sequence & a new add operation in DACE cannot happen
* till the old one is done.
- *
+ *
* @param event Object to be added to the queue
* @param sequenceID Sequence ID of the event originating from a unqiue thread identified by its
* ThreadIdentifier
@@ -3004,7 +3004,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Removes the Entry from the Counters Set contained in DACE & from the conflation Map. This
* method should be invoked only if the removal from available ID set returns true.
- *
+ *
* @param position Long position to be removed from the Counter Set
* @param key Object used as the key in the conflation Map
* @param rName String region name against which the conflation map is stored
@@ -3037,7 +3037,7 @@ public class HARegionQueue implements RegionQueue {
* This callabck is used to check whether DispatchedAndCurrentEvens object for a
* ThreadIdentifier is eligible for removal or not. A DACE object is removed if the last
* dispatched sequenec Id matches the expVal & the size of the counters set is 0
- *
+ *
* @param expVal long value indicating the sequence with which the ThreadIdentifier was last
* updated for expiry.
* @param ti ThreadIdentifier object corresponding to the thread which is being expired ( whose
@@ -3095,7 +3095,7 @@ public class HARegionQueue implements RegionQueue {
* a time only one thread operates on it which is accomplished by the QRM_LOCK. The lock on the
* DACE is minimized by copying the Counters Set & then identifying the positions which need to
* be removed
- *
+ *
* @param lastDispatchedSeqId long indicating the last dispatched ID which gets set in a DACE
*/
protected void setLastDispatchedIDAndRemoveEvents(long lastDispatchedSeqId)
@@ -3164,7 +3164,7 @@ public class HARegionQueue implements RegionQueue {
* DACE & destroys all the sequence Ids which are less than the last dispatched sequence ID. The
* lock on the DACE is minimized by copying the Counters Set & then identifying the positions
* which need to be removed
- *
+ *
* @param removedEventInfoList List containing objects of RemovedEventInfo class representing
* Events which have been peeked & are now candidate for removal. It has to be guaranteed
* that the sequence IDs of all the other counters is less than the last dispatched
@@ -3210,7 +3210,7 @@ public class HARegionQueue implements RegionQueue {
/**
* This method is invoked by the take function. Before invoking it , the take has already
* removed the poistion from the available IDs set.
- *
+ *
* @param info Data object of type RemovedEventInfo which contains info like position countre,
* key & region name
* @param sequenceID sequence ID of the event being removed from HARegionQueue
@@ -3245,7 +3245,7 @@ public class HARegionQueue implements RegionQueue {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#fromData(java.io.DataInput)
*/
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
@@ -3257,7 +3257,7 @@ public class HARegionQueue implements RegionQueue {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
@@ -3266,7 +3266,7 @@ public class HARegionQueue implements RegionQueue {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#toData(java.io.DataOutput)
*/
public void toData(DataOutput out) throws IOException {
@@ -3333,7 +3333,7 @@ public class HARegionQueue implements RegionQueue {
/**
* If the event is an instance of HAEventWrapper, put it into the haContainer and then into the ha
* region. Otherwise, simply put it into the ha region.
- *
+ *
* @since GemFire 5.7
*/
protected void putEventInHARegion(Conflatable event, Long position) {
@@ -3444,7 +3444,7 @@ public class HARegionQueue implements RegionQueue {
/**
* If the wrapper's referenceCount becomes 1 after increment, then set this haEventWrapper and its
* clientUpdateMessage into the haContainer as <key, value>.
- *
+ *
* @param haEventWrapper An instance of {@code HAEventWrapper}
* @since GemFire 5.7
*/
@@ -3460,7 +3460,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Caller must hold the rwLock
- *
+ *
* @return size of idsAvailable
*/
protected int availableIDsSize() {
@@ -3469,7 +3469,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Caller must hold the rwLock
- *
+ *
* @return the idsAvailable Set as an array
*/
protected Object[] availableIDsArray() {
@@ -3504,7 +3504,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Called from destroy(), this method decrements the referenceCount of all the HAEventWrapper
* instances held by this queue. Also, removes those instances whose referenceCount becomes zero.
- *
+ *
* @since GemFire 5.7
*/
private void updateHAContainer() {
@@ -3574,7 +3574,7 @@ public class HARegionQueue implements RegionQueue {
* in the haContainer, then decrements its reference count. If the decremented ref count is zero
* and put is not in progress, removes the entry from the haContainer, before returning the
* {@code ClientUpdateMessage} instance.
- *
+ *
* @return An instance of {@code ClientUpdateMessage}
* @since GemFire 5.7
*/
@@ -3598,7 +3598,7 @@ public class HARegionQueue implements RegionQueue {
* HARegion underlying this queue. <br>
* Decrements wrapper's reference count by one. If the decremented ref count is zero and put is
* not in progress, removes the entry from the haContainer.
- *
+ *
* @since GemFire 5.7
*/
public void decAndRemoveFromHAContainer(HAEventWrapper wrapper) {
@@ -3617,7 +3617,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Returns true if the dispatcher for this HARegionQueue is active.
- *
+ *
* @return the true if dispatcher for this HARegionQueue is active(primary node)
*/
public boolean isPrimary() {
@@ -3634,7 +3634,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Set whether the dispatcher of this node is active or not (i.e. primary or secondary node). If
* {@code flag} is set to {@code true}, disables Entry Expiry Tasks.
- *
+ *
* @param flag the value to set isPrimary to
*/
public void setPrimary(boolean flag) {
@@ -3651,7 +3651,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Disables EntryExpiryTask for the HARegion ({@code this.region}).
- *
+ *
*/
private void disableEntryExpiryTasks() {
int oldTimeToLive = this.region.getEntryTimeToLive().getTimeout();
@@ -3668,7 +3668,7 @@ public class HARegionQueue implements RegionQueue {
/**
* Set client conflation override
- *
+ *
* @since GemFire 5.7
*/
public void setClientConflation(byte value) {
@@ -3710,7 +3710,7 @@ public class HARegionQueue implements RegionQueue {
/**
* A simple check to validate that the peek() method has been executed as it initializes some
* structures used by other methods.
- *
+ *
* @return true if peeking returns a non-null value
*/
public boolean isPeekInitialized() {
@@ -3793,5 +3793,3 @@ public class HARegionQueue implements RegionQueue {
public void close() {}
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java
index 7208add..bf0e81b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java
@@ -13,17 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.ha;
import org.apache.geode.distributed.internal.DistributionConfig;
/**
- *
+ *
* This class defines the user specified attributes of the HARegion which are configurable.
- *
- *
+ *
+ *
*/
public class HARegionQueueAttributes {
/**
@@ -46,7 +46,7 @@ public class HARegionQueueAttributes {
private int expiryTime = DEFAULT_EXPIRY_TIME;
/**
- *
+ *
*/
private int blockingQueueCapacity =
Integer.getInteger(BLOCKING_QUEUE_CAPACITY, DEFAULT_BLOCKING_QUEUE_CAPACITY).intValue();
@@ -67,7 +67,7 @@ public class HARegionQueueAttributes {
/**
* Gets the expiration time for the region entries
- *
+ *
* @return the expiry time in seconds
*/
public int getExpiryTime() {
@@ -76,7 +76,7 @@ public class HARegionQueueAttributes {
/**
* Sets the expiration time for the region entries
- *
+ *
* @param expiryTime expiry time in seconds
*/
public void setExpiryTime(int expiryTime) {
@@ -85,7 +85,7 @@ public class HARegionQueueAttributes {
/**
* Gets the blocking queue capacity
- *
+ *
* @return the blocking queue capacity
*/
public int getBlockingQueueCapacity() {
@@ -94,7 +94,7 @@ public class HARegionQueueAttributes {
/**
* Sets the capacity of the queue
- *
+ *
* @param cap number of items allowed in the queue
*/
public void setBlockingQueueCapacity(int cap) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
index 5cb56c2..e7100f5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
@@ -23,8 +23,8 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* This class tracks GemFire statistics related to a {@link HARegionQueue}.
- *
- *
+ *
+ *
*/
public class HARegionQueueStats {
/** The <code>StatisticsType</code> of the statistics */
@@ -162,7 +162,7 @@ public class HARegionQueueStats {
/**
* Constructor.
- *
+ *
* @param factory The <code>StatisticsFactory</code> which creates the <code>Statistics</code>
* instance
* @param name The name of the <code>Statistics</code>
@@ -182,7 +182,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsQueued" stat.
- *
+ *
* @return the current value of the "eventsQueued" stat
*/
public long getEventsEnqued() {
@@ -198,7 +198,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsConflated" stat.
- *
+ *
* @return the current value of the "eventsConflated" stat
*/
public long getEventsConflated() {
@@ -214,7 +214,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "markerEventsConflated" stat.
- *
+ *
* @return the current value of the "markerEventsConflated" stat
*/
public long getMarkerEventsConflated() {
@@ -230,7 +230,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsRemoved" stat.
- *
+ *
* @return the current value of the "eventsRemoved" stat
*/
public long getEventsRemoved() {
@@ -246,7 +246,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsTaken" stat.
- *
+ *
* @return the current value of the "eventsTaken" stat
*/
public long getEventsTaken() {
@@ -262,7 +262,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsExpired" stat.
- *
+ *
* @return the current value of the "eventsExpired" stat
*/
public long getEventsExpired() {
@@ -278,7 +278,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsRemovedByQrm" stat.
- *
+ *
* @return the current value of the "eventsRemovedByQrm" stat
*/
public long getEventsRemovedByQrm() {
@@ -294,7 +294,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "threadIdentifiers" stat.
- *
+ *
* @return the current value of the "threadIdentifiers" stat
*/
public int getThreadIdentiferCount() {
@@ -317,7 +317,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "eventsDispatched" stat.
- *
+ *
* @return the current value of the "eventsDispatched" stat
*/
public long getEventsDispatched() {
@@ -333,7 +333,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "numVoidRemovals" stat.
- *
+ *
* @return the current value of the "numVoidRemovals" stat
*/
public long getNumVoidRemovals() {
@@ -349,7 +349,7 @@ public class HARegionQueueStats {
/**
* Returns the current value of the "numSequenceViolated" stat.
- *
+ *
* @return the current value of the "numSequenceViolated" stat
*/
public long getNumSequenceViolated() {
@@ -365,7 +365,7 @@ public class HARegionQueueStats {
/**
* Returns true if the stats instance has been closed.
- *
+ *
* @return true if the stats instance has been closed.
*/
public boolean isClosed() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
index 93a25d7..2d73bd2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
@@ -34,14 +34,14 @@ import org.apache.geode.internal.logging.LogService;
* Class identifying a Thread uniquely across the distributed system. It is composed of two fields
* 1) A byte array uniquely identifying the distributed system 2) A long value unqiuely identifying
* the thread in the distributed system
- *
+ *
* The application thread while operating on the Region gets an EventID object ( contained in
* EntryEventImpl) This EventID object contains a ThreadLocal field which uniquely identifies the
* thread by storing the Object of this class.
- *
+ *
* @see EventID
- *
- *
+ *
+ *
*/
public class ThreadIdentifier implements DataSerializable {
@@ -66,7 +66,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* Generates a new thread id for usage in a parallel wan context.
- *
+ *
* @param threadId the original thread id
* @param offset the thread offset
* @param gatewayIndex the index of the gateway
@@ -80,7 +80,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* Returns true if the supplied value is a wan thread identifier.
- *
+ *
* @param tid the thread
* @return true if the thread id is one of the wan types
*/
@@ -113,7 +113,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* Returns the field bitmask.
- *
+ *
* @return the mask
*/
public long mask() {
@@ -122,7 +122,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* Returns the value shifted into the field position.
- *
+ *
* @param val the value to shift
* @return the shifted value
*/
@@ -134,7 +134,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* Extracts the field bits from the value.
- *
+ *
* @param val the value
* @return the field
*/
@@ -258,7 +258,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* Checks if the input thread id is a WAN_TYPE thread id
- *
+ *
* @param tid
* @return whether the input thread id is a WAN_TYPE thread id
*/
@@ -268,7 +268,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* create a fake id for an operation on the given bucket
- *
+ *
* @return the fake id
*/
public static long createFakeThreadIDForBulkOp(int bucketNumber, long originatingThreadId) {
@@ -277,7 +277,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* create a fake id for an operation on the given bucket
- *
+ *
* @return the fake id
*/
public static long createFakeThreadIDForParallelGSPrimaryBucket(int bucketId,
@@ -287,7 +287,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* create a fake id for an operation on the given bucket
- *
+ *
* @return the fake id
*/
public static long createFakeThreadIDForParallelGSSecondaryBucket(int bucketId,
@@ -297,7 +297,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* create a fake id for an operation on the given bucket
- *
+ *
* @return the fake id
*/
public static long createFakeThreadIDForParallelGateway(int index, long originatingThreadId,
@@ -307,7 +307,7 @@ public class ThreadIdentifier implements DataSerializable {
/**
* checks to see if the membership id of this identifier is the same as in the argument
- *
+ *
* @param other
* @return whether the two IDs are from the same member
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java
index ff7169b..8f80c2d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java
@@ -92,4 +92,3 @@ public class TXLessorDepartureHandler implements DLockLessorDepartureHandler {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
index c762158..0126caf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
@@ -15,19 +15,18 @@
package org.apache.geode.internal.cache.locks;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-// import org.apache.geode.cache.Region;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
-import org.apache.geode.internal.cache.IdentityArrayList;
+import java.io.*;
+import java.util.*;
+
import org.apache.geode.distributed.internal.locks.DLockBatch;
import org.apache.geode.distributed.internal.locks.DLockBatchId;
import org.apache.geode.distributed.internal.locks.LockGrantorId;
-
-import java.io.*;
-import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.IdentityArrayList;
+import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
/**
* Adapts multiple TXRegionLockRequests to one DLockBatch for DLock to use.
@@ -89,7 +88,7 @@ public class TXLockBatch implements DLockBatch, DataSerializableFixedID {
/**
* Each lock batch contains a set of distributed system member ids that are participating in the
* transaction. Public access for testing purposes.
- *
+ *
* @return participants in the transaction
*/
public Set getParticipants() {
@@ -141,4 +140,3 @@ public class TXLockBatch implements DLockBatch, DataSerializableFixedID {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java
index 0dbba24..269d658 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java
@@ -33,4 +33,3 @@ public interface TXLockId extends DLockBatchId {
/** Gets the lock grantor id that granted this lock */
public LockGrantorId getLockGrantorId();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
index b1e5bab..7bcd9a4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.cache.locks;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.DataSerializer;
import java.io.*;
+import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.locks.LockGrantorId;
import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
/**
* Identifies a group of transaction locks.
@@ -133,4 +133,3 @@ public class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
return null;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java
index 60dd7f8..b26740b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.locks;
+import java.util.*;
+
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.distributed.internal.locks.*;
-import java.util.*;
-
/**
* Provides transaction locking service for coordinating transactions.
* <p>
@@ -102,7 +102,7 @@ public abstract class TXLockService {
* Updates the set of participants for a given tx lock reference.
*
* @param txLockId the tx lock reference as generated from the call to <code>txLock</code>
- *
+ *
* @param updatedParticipants the set of new participants generated from the advisor for each
* <code>Region</code> in the transaction.
*
@@ -151,4 +151,3 @@ public abstract class TXLockService {
abstract void basicDestroy();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
index 717d878..3830312 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
@@ -15,6 +15,13 @@
package org.apache.geode.internal.cache.locks;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyException;
@@ -25,12 +32,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
-import org.apache.logging.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
/** Provides clean separation of implementation from public facade */
public class TXLockServiceImpl extends TXLockService {
@@ -279,4 +280,3 @@ public class TXLockServiceImpl extends TXLockService {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
index 5d03abd..f9e6733 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
@@ -15,17 +15,18 @@
package org.apache.geode.internal.cache.locks;
+import java.io.*;
+import java.util.Set;
+
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.MessageWithReply;
-import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.distributed.internal.PooledDistributionMessage;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.distributed.internal.locks.DLockService;
+import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.distributed.internal.locks.DLockGrantor;
+import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.distributed.internal.locks.LockGrantorDestroyedException;
-import java.io.*;
-import java.util.Set;
+import org.apache.geode.internal.InternalDataSerializer;
/**
* A message to update the Grantor with the latest TXLock participants This class was added as part
@@ -33,7 +34,7 @@ import java.util.Set;
* given TXLockId. This update is needed in the event that a recovery is needed when the TXLock
* Lessor (the origin VM of the transaction) crashes/departs before or while sending the
* TXCommitMessage but after making the reservation for the transaction.
- *
+ *
* @see org.apache.geode.internal.cache.TXCommitMessage#send(TXLockId)
* @see org.apache.geode.internal.cache.TXCommitMessage#updateLockMembers
* @see org.apache.geode.distributed.internal.locks.DLockGrantor#getLockBatch(Object)
@@ -43,7 +44,7 @@ import java.util.Set;
* @see TXLessorDepartureHandler
* @see TXOriginatorRecoveryProcessor
* @see org.apache.geode.internal.cache.TXFarSideCMTracker
- *
+ *
* @since GemFire 4.1.1
*/
public class TXLockUpdateParticipantsMessage extends PooledDistributionMessage
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
index 0dc75ff..511d9b1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
@@ -294,4 +294,3 @@ public class TXOriginatorRecoveryProcessor extends ReplyProcessor21 {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
index 7ae2d2b..2324af9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
@@ -15,6 +15,10 @@
package org.apache.geode.internal.cache.locks;
+import java.util.concurrent.RejectedExecutionException;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
@@ -26,9 +30,6 @@ import org.apache.geode.internal.cache.TXCommitMessage;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.util.concurrent.RejectedExecutionException;
/**
* Provides processing of DLockRecoverGrantorProcessor. Reply will not be sent until all locks are
@@ -149,4 +150,3 @@ public class TXRecoverGrantorMessageProcessor
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java
index b8e1990..47a8e77 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java
@@ -15,10 +15,10 @@
package org.apache.geode.internal.cache.locks;
-import org.apache.geode.DataSerializable;
-// import org.apache.geode.cache.Region;
import java.util.Set;
+import org.apache.geode.DataSerializable;
+
/** Specifies a set of keys to try-lock within the scope of a region */
public interface TXRegionLockRequest extends DataSerializable {
@@ -34,4 +34,3 @@ public interface TXRegionLockRequest extends DataSerializable {
/** add the set of keys to be locked */
public void addEntryKeys(Set<Object> s);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java
index 5beae60..69f7e8b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java
@@ -93,7 +93,7 @@ public interface EnableLRU {
/**
* Returns the id of the "greedyReturns" statistic for this LRU algorith'ms statistics
- *
+ *
* @return the id
*/
public int getGreedyReturnsStatId();
@@ -112,4 +112,3 @@ public interface EnableLRU {
public boolean lruLimitExceeded(LRUStatistics lruStatistics, DiskRegionView drv);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
index 2ff6ed6..212ba5c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.internal.cache.lru;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.RegionDestroyedException;
@@ -27,19 +34,13 @@ import org.apache.geode.internal.cache.control.MemoryEvent;
import org.apache.geode.internal.cache.control.ResourceListener;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
-import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* Triggers centralized eviction(asynchronously) when the ResourceManager sends an eviction event
* for on-heap regions. This is registered with the ResourceManager.
- *
+ *
* @since GemFire 6.0
- *
+ *
*/
public class HeapEvictor implements ResourceListener<MemoryEvent> {
private static final Logger logger = LogService.getLogger();
@@ -218,7 +219,7 @@ public class HeapEvictor implements ResourceListener<MemoryEvent> {
/**
* returns the total number of tasks that are currently being executed or queued for execution
- *
+ *
* @return sum of scheduled and running tasks
*/
public int getRunningAndScheduledTasks() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
index fdf694b..1abedb5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
@@ -106,9 +106,9 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
/**
* Creates a new <code>HeapLRUCapacityController</code> with the given eviction action.
- *
+ *
* @param evictionAction The action that will occur when an entry is evicted
- *
+ *
*/
public HeapLRUCapacityController(EvictionAction evictionAction, Region region) {
super(evictionAction, region);
@@ -150,9 +150,9 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
- *
+ *
* Note that we just need to make sure that equal objects return equal hashcodes; nothing really
* elaborate is done here.
*/
@@ -164,7 +164,7 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
/**
* Returns a brief description of this eviction controller.
- *
+ *
* @since GemFire 4.0
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
index 105d4de..e256508 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
@@ -16,7 +16,6 @@
package org.apache.geode.internal.cache.lru;
import org.apache.geode.*;
-// import org.apache.geode.internal.*;
/**
* Statistics for the HeapLRUCapacityController, which treats the counter statistic differently than
@@ -39,7 +38,7 @@ public class HeapLRUStatistics extends LRUStatistics {
* has changed after performing a Region operation. The <code>HeapLRUCapacityController</code>
* however does not care about <code>Region</code> changes, it only considers heap changes and
* uses <code>Runtime</code> to determine how much to evict.
- *
+ *
* @see org.apache.geode.internal.cache.lru.HeapLRUCapacityController#createLRUHelper
* @see EnableLRU#mustEvict
*/
@@ -58,4 +57,3 @@ public class HeapLRUStatistics extends LRUStatistics {
super.resetCounter();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
index b07a124..80e82d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.cache.lru;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Properties;
+
import org.apache.geode.InternalGemFireException;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.cache.CacheCallback;
@@ -23,10 +27,6 @@ import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Properties;
-
/**
* Eviction controllers that extend this class evict the least recently used (LRU) entry in the
* region whose capacity they controller. In order to provide an efficient computation of the LRU
@@ -170,7 +170,7 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
/**
* This method is an artifact when eviction controllers used to called capacity controllers and
* were configured in the cache.xml file as <code>Declarable</code>
- *
+ *
* @since GemFire 4.1.1
*/
public abstract Properties getProperties();
@@ -245,7 +245,7 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
protected abstract class AbstractEnableLRU implements EnableLRU {
/** The region whose capacity is controller by this eviction controller */
- private volatile transient String regionName;
+ private transient volatile String regionName;
public long limit() {
if (stats == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
index f1972a6..7103dc3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.lru;
+import java.util.*;
+
import org.apache.geode.*;
import org.apache.geode.cache.*;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.*;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
import org.apache.geode.internal.i18n.LocalizedStrings;
-
-import java.util.*;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* A <code>CapacityController</code> that will remove the least recently used (LRU) entry from a
@@ -116,7 +116,7 @@ public class LRUCapacityController extends LRUAlgorithm implements Declarable {
/**
* Creates an LRU capacity controller that allows the given number of maximum entries and uses the
* default eviction action.
- *
+ *
* @param maximumEntries The maximum number of entries allowed in the region whose capacity this
* controller controls. Once there are <code>capacity</code> entries in a region, this
* controller will remove the least recently used entry.<br>
@@ -133,7 +133,7 @@ public class LRUCapacityController extends LRUAlgorithm implements Declarable {
/**
* Creates an LRU capacity controller that allows the given number of maximum entries.
- *
+ *
* @param maximumEntries The maximum number of entries allowed in the region whose capacity this
* controller controls. Once there are <code>capacity</code> entries in a region, this
* controller will remove the least recently used entry.<br>
@@ -311,9 +311,9 @@ public class LRUCapacityController extends LRUAlgorithm implements Declarable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
- *
+ *
* Note that we just need to make sure that equal objects return equal hashcodes; nothing really
* elaborate is done here.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java
index b157038..e783626 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java
@@ -30,7 +30,7 @@ public interface LRUClockNode {
/**
* compute the new entry size and return the delta from the previous entry size
- *
+ *
* @param value then entry's value
* @since GemFire 6.1.2.9
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java
index 0b1cc6f..de9a689 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache.lru;
-// import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.RegionEntry;
-// import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
/**
@@ -36,7 +34,7 @@ public interface LRUMapCallbacks {
/**
* Disables lruUpdateCallback in calling thread
- *
+ *
* @return false if it's already disabled
*/
public boolean disableLruUpdateCallback();
@@ -55,7 +53,7 @@ public interface LRUMapCallbacks {
/**
* Return true if the lru has exceeded its limit and needs to evict. Note that this method is
* currently used to prevent disk recovery from faulting in values once the limit is exceeded.
- *
+ *
* @param drv the disk region whose limit is checked
*/
public boolean lruLimitExceeded(DiskRegionView drv);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUStatistics.java
index ec4dec2..04504fd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUStatistics.java
@@ -199,4 +199,3 @@ public class LRUStatistics {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
index 17673a3..e042d89 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
@@ -27,12 +27,12 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.AbstractLRURegionMap.CDValueWrapper;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
@@ -150,7 +150,7 @@ public class MemLRUCapacityController extends LRUAlgorithm implements Declarable
/**
* Create an instance of the capacity controller the given settings.
- *
+ *
* @param megabytes the amount of memory allowed in this region specified in megabytes.<br>
* <p>
* For a region with {@link org.apache.geode.cache.DataPolicy#PARTITION}, it is overridden
@@ -167,7 +167,7 @@ public class MemLRUCapacityController extends LRUAlgorithm implements Declarable
/**
* Create an instance of the capacity controller the given settings.
- *
+ *
* @param megabytes the amount of memory allowed in this region specified in megabytes.<br>
* <p>
* For a region with {@link org.apache.geode.cache.DataPolicy#PARTITION}, it is overridden
@@ -185,7 +185,7 @@ public class MemLRUCapacityController extends LRUAlgorithm implements Declarable
/**
* Create an instance of the capacity controller the given settings.
- *
+ *
* @param megabytes the amount of memory allowed in this region specified in megabytes.<br>
* <p>
* For a region with {@link org.apache.geode.cache.DataPolicy#PARTITION}, it is overridden
@@ -483,9 +483,9 @@ public class MemLRUCapacityController extends LRUAlgorithm implements Declarable
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
- *
+ *
* Note that we just need to make sure that equal objects return equal hashcodes; nothing really
* elaborate is done here.
*/
@@ -507,4 +507,3 @@ public class MemLRUCapacityController extends LRUAlgorithm implements Declarable
+ " megabytes and and eviction action " + this.getEvictionAction();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLIFOClockHand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLIFOClockHand.java
index 702b663..eec9554 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLIFOClockHand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLIFOClockHand.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
/**
* NewLIFOClockHand holds the behavior for LIFO logic , Overwriting getLRUEntry() to return most
* recently added Entry
- *
+ *
* @since GemFire 5.7
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
index 4588757..37cb2c1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache.lru;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.StatisticsFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -25,7 +27,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.logging.log4j.Logger;
/**
* AbstractLRUClockHand holds the lrulist, and the behavior for maintaining the list in a cu-pipe
@@ -44,17 +45,17 @@ public class NewLRUClockHand {
protected LRUClockNode head = new GuardNode();
/** The object for locking the head of the cu-pipe. */
- final protected HeadLock lock;
+ protected final HeadLock lock;
/** Description of the Field */
- final private LRUStatistics stats;
+ private final LRUStatistics stats;
/** Counter for the size of the LRU list */
protected int size = 0;
public static final boolean debug =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "verbose-lru-clock");
- static private final int maxEntries;
+ private static final int maxEntries;
static {
String squelch = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "lru.maxSearchEntries");
@@ -461,4 +462,3 @@ public class NewLRUClockHand {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java
index 27a3c50..8b1fd4a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java
@@ -20,26 +20,26 @@ package org.apache.geode.internal.cache.lru;
* <b>Sample Implementation</b><br>
* <code>public int getSizeInBytes(){</code><br>
* // The sizes of the primitive as well as object instance variables are calculated:<br>
- *
+ *
* <code>int size = 0;</code><br>
- *
+ *
* // Add overhead for this instance.<br>
* <code>size += Sizeable.PER_OBJECT_OVERHEAD;</code><br>
- *
+ *
* // Add object references (implements Sizeable)<br>
* // value reference = 4 bytes <br>
- *
+ *
* <code>size += 4;</code><br>
- *
+ *
* // Add primitive instance variable size<br>
* // byte bytePr = 1 byte<br>
* // boolean flag = 1 byte<br>
- *
+ *
* <code>size += 2;</code><br>
- *
+ *
* // Add individual object size<br>
* <code>size += (value.getSizeInBytes());</code><br>
- *
+ *
* <code>return size;</code><br>
* }<br>
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/operations/ContainsKeyOperationContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/operations/ContainsKeyOperationContext.java
index 0b07b0e..b75dcf8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/operations/ContainsKeyOperationContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/operations/ContainsKeyOperationContext.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.operations.KeyOperationContext;
* Encapsulates a
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#CONTAINS_KEY} region
* operation having the key object for the pre-operation case.
- *
+ *
* @since GemFire 5.5
* @deprecated since Geode1.0, use {@link org.apache.geode.security.ResourcePermission} instead
*/
@@ -29,7 +29,7 @@ public class ContainsKeyOperationContext extends KeyOperationContext {
/**
* Constructor for the operation.
- *
+ *
* @param key the key for this operation
*/
public ContainsKeyOperationContext(Object key) {
@@ -38,7 +38,7 @@ public class ContainsKeyOperationContext extends KeyOperationContext {
/**
* Return the operation associated with the <code>OperationContext</code> object.
- *
+ *
* @return <code>OperationCode.CONTAINS_KEY</code>.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
index 910de64..4e853a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* A Partitioned Region meta-data update message. This is used to send all local bucket's meta-data
* to other members with the same Partitioned Region.
- *
+ *
* @since GemFire 6.6
*/
public class AllBucketProfilesUpdateMessage extends DistributionMessage
@@ -108,7 +108,7 @@ public class AllBucketProfilesUpdateMessage extends DistributionMessage
/**
* Send a profile update to a set of members.
- *
+ *
* @param recipients the set of members to be notified
* @param dm the distribution manager used to send the message
* @param prId the unique partitioned region identifier
@@ -155,4 +155,3 @@ public class AllBucketProfilesUpdateMessage extends DistributionMessage
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
index b5de2e8..c14c07f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
@@ -42,11 +42,11 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* This message is sent to a recipient to make it become the primary for a partitioned region
* bucket. The recipient will get in line for the bucket's primary lock and then send a
* {@link DeposePrimaryBucketMessage} to the current primary.
- *
+ *
* Usage: BecomePrimaryBucketResponse response = BecomePrimaryBucketMessage.send(
* InternalDistributedMember, PartitionedRegion, int bucketId); if (response != null &&
* response.waitForResponse()) { // recipient became primary for the bucket }
- *
+ *
*/
public class BecomePrimaryBucketMessage extends PartitionMessage {
@@ -69,7 +69,7 @@ public class BecomePrimaryBucketMessage extends PartitionMessage {
/**
* Sends a message to make the recipient primary for the bucket.
- *
+ *
* @param recipient the member to to become primary
* @param pr the PartitionedRegion of the bucket
* @param bid the bucket to become primary for
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java
index 5e6cb62..7fe5788 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java
@@ -19,8 +19,8 @@ import java.util.Set;
import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.CacheDistributionAdvisee;
import org.apache.geode.internal.cache.HasDiskRegion;
-import org.apache.geode.internal.cache.persistence.PersistenceAdvisor;
import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.persistence.PersistenceAdvisor;
/**
* Represents a storage or meta-data container for a <code>PartitionedRegion</code>.
@@ -51,14 +51,14 @@ public interface Bucket extends CacheDistributionAdvisee, HasDiskRegion {
/**
* Returns the bucket id used to uniquely identify the bucket in its partitioned region
- *
+ *
* @return the unique identity of the bucket
*/
public int getId();
/**
* Report members that are currently hosting the bucket
- *
+ *
* @return set of members
* @since GemFire 5.9
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
index c4a3fbd..00b8684 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* A message sent requesting that an evaluation of buckets be made to determine if one or more needs
* to be backed-up in order to satisfy the redundantCopies setting
- *
+ *
* @since GemFire 5.0
*/
public class BucketBackupMessage extends PartitionMessage {
@@ -57,7 +57,7 @@ public class BucketBackupMessage extends PartitionMessage {
/**
* Sends a BucketBackupMessage requesting that another VM backup an existing bucket
- *
+ *
* @param recipients the member that the contains keys/value message is sent to
* @param r the PartitionedRegion that contains the bucket
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java
index d51b762..35c342f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore;
/**
* A load probe which calculates the load of a pr using the just the number of buckets on a member.
- *
+ *
*/
public class BucketCountLoadProbe implements LoadProbe, DataSerializableFixedID {
private static final long serialVersionUID = 7040814060882774875L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
index e353393..5f9a53e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* A Partitioned Region meta-data update message. This is used to send a bucket's meta-data to other
* members with the same Partitioned Region.
- *
+ *
* @since GemFire 5.1
*/
public class BucketProfileUpdateMessage extends DistributionMessage implements MessageWithReply {
@@ -114,7 +114,7 @@ public class BucketProfileUpdateMessage extends DistributionMessage implements M
/**
* Send a profile update to a set of members.
- *
+ *
* @param recipients the set of members to be notified
* @param dm the distribution manager used to send the message
* @param prId the unique partitioned region identifier
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
index ee5d1be..76e31b6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* A message used to determine the number of bytes a Bucket consumes.
- *
+ *
* @since GemFire 5.0
*/
@@ -72,7 +72,7 @@ public class BucketSizeMessage extends PartitionMessage {
/**
* Sends a BucketSize message to determine the number of bytes the bucket consumes
- *
+ *
* @param recipient the member that the contains keys/value message is sent to
* @param r the PartitionedRegion that contains the bucket
* @param bucketId the identity of the bucket whose size should be returned.
@@ -163,7 +163,7 @@ public class BucketSizeMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -225,7 +225,7 @@ public class BucketSizeMessage extends PartitionMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class BucketSizeResponse extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java
index e4b7402..5fe1967 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java
@@ -45,7 +45,7 @@ public class ColocatedRegionDetails implements DataSerializable {
/**
* Returns the canonical name of the host machine
- *
+ *
* @return parent
*/
public String getHost() {
@@ -54,7 +54,7 @@ public class ColocatedRegionDetails implements DataSerializable {
/**
* Returns the name of the {@link DistributedMember}
- *
+ *
* @return parent
*/
public String getMember() {
@@ -63,7 +63,7 @@ public class ColocatedRegionDetails implements DataSerializable {
/**
* Returns the name of the parent region of a colocated pair
- *
+ *
* @return parent
*/
public String getParent() {
@@ -72,7 +72,7 @@ public class ColocatedRegionDetails implements DataSerializable {
/**
* Returns the name of the child region of a colocated pair
- *
+ *
* @return child
*/
public String getChild() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
index 709cb13..89cb55d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
@@ -70,7 +70,7 @@ public class ContainsKeyValueMessage extends PartitionMessageWithDirectReply {
* {@link org.apache.geode.cache.Region#containsKey(Object)}or
* {@link org.apache.geode.cache.Region#containsValueForKey(Object)} depending on the
* <code>valueCheck</code> argument
- *
+ *
* @param recipient the member that the contains keys/value message is sent to
* @param r the PartitionedRegion that contains the bucket
* @param key the key to be queried
@@ -196,7 +196,7 @@ public class ContainsKeyValueMessage extends PartitionMessageWithDirectReply {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -250,7 +250,7 @@ public class ContainsKeyValueMessage extends PartitionMessageWithDirectReply {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class ContainsKeyValueResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
index 90f3396..145efdd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
@@ -87,7 +87,7 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion manage bucket request to the recipient
- *
+ *
* @param recipient the member to which the bucket manage request is sent
* @param r the PartitionedRegion to which the bucket belongs
* @param bucketId the unique identifier of the bucket
@@ -170,7 +170,7 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* Assists the toString method in reporting the contents of this message
- *
+ *
* @see PartitionMessage#toString()
* @param buff
*/
@@ -191,7 +191,7 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* A class that contains the reply to a {@link CreateBucketMessage} message which contains the
* {@link Node} that has accepted to manage the bucket.
- *
+ *
* @since GemFire 5.0
*/
public static class CreateBucketReplyMessage extends ReplyMessage {
@@ -213,7 +213,7 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* Accept the request to manage the bucket
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the acceptance message
@@ -228,7 +228,7 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -287,10 +287,10 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* A processor to capture the {@link Node} returned by {@link CreateBucketMessage}
- *
+ *
* @since GemFire 5.0
*/
- static public class NodeResponse extends ReplyProcessor21 {
+ public static class NodeResponse extends ReplyProcessor21 {
/**
* the message that triggers return from waitForAcceptance. This will be null if the target
* member exited
@@ -321,7 +321,7 @@ public class CreateBucketMessage extends PartitionMessage {
/**
* Wait for the response to a {@link CreateBucketMessage} request.
- *
+ *
* @return true if the node sent the request is managing the bucket
* @throws ForceReattemptException if the peer is no longer available
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
index 18503c5..2d1b3e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
@@ -17,8 +17,8 @@ package org.apache.geode.internal.cache.partitioned;
import org.apache.geode.internal.cache.ColocationHelper;
import org.apache.geode.internal.cache.PRHARedundancyProvider;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.PartitionedRegionStats;
import org.apache.geode.internal.cache.PartitionedRegion.RecoveryLock;
+import org.apache.geode.internal.cache.PartitionedRegionStats;
/**
* A task for creating buckets in a child colocated region that are present in the leader region.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
index c9d7d70..35a7c69 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
@@ -62,7 +62,7 @@ public class DeposePrimaryBucketMessage extends PartitionMessage {
/**
* Sends a message to depose the primary bucket.
- *
+ *
* @param recipient the member to depose as primary
* @param region the PartitionedRegion of the bucket
* @param bucketId the bucket to depose primary for
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
index 7009a98..e56d0d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
@@ -61,14 +61,14 @@ import org.apache.geode.internal.offheap.annotations.Retained;
/**
* A class that specifies a destroy operation.
- *
+ *
* Note: The reason for different classes for Destroy and Invalidate is to prevent sending an extra
* bit for every DestroyMessage to differentiate an invalidate versus a destroy. The assumption is
* that these operations are used frequently, if they are not then it makes sense to fold the
* destroy and the invalidate into the same message and use an extra bit to differentiate
- *
+ *
* @since GemFire 5.0
- *
+ *
*/
public class DestroyMessage extends PartitionMessageWithDirectReply {
@@ -163,7 +163,7 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
/**
* send a notification-only message to a set of listeners. The processor id is passed with the
* message for reply message processing. This method does not wait on the processor.
- *
+ *
* @param cacheOpReceivers receivers of associated bucket CacheOperationMessage
* @param adjunctRecipients receivers that must get the event
* @param filterRoutingInfo client routing information
@@ -186,7 +186,7 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
/**
* Sends a DestroyMessage {@link org.apache.geode.cache.Region#destroy(Object)}message to the
* recipient
- *
+ *
* @param recipient the recipient of the message
* @param r the PartitionedRegion for which the destroy was performed
* @param event the event causing this message
@@ -417,7 +417,7 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
/**
* Assists the toString method in reporting the contents of this message
- *
+ *
* @see PartitionMessage#toString()
* @param buff
*/
@@ -569,7 +569,7 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.distributed.internal.ReplyMessage#getInlineProcess()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
index d0c959c..6a2fbb9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
@@ -17,28 +17,26 @@ package org.apache.geode.internal.cache.partitioned;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-
-import org.apache.geode.DataSerializer;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LogMarker;
-
import java.util.Set;
+import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheException;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionDataStore;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* A message sent to a data store telling that data store to globally destroy the region on behalf
* of a PR accessor.
- *
+ *
* @since GemFire 5.0
*/
public class DestroyRegionOnDataStoreMessage extends PartitionMessage {
@@ -60,7 +58,7 @@ public class DestroyRegionOnDataStoreMessage extends PartitionMessage {
/**
* Sends a DestroyRegionOnDataStoreMessage requesting that another VM destroy an existing region
- *
+ *
*/
public static void send(InternalDistributedMember recipient, PartitionedRegion r,
Object callbackArg) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
index 07b293b..c3781a6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* A message used for debugging purposes. For example if a test fails it can call
* {@link org.apache.geode.internal.cache.PartitionedRegion#sendDumpAllPartitionedRegions()} which
* sends this message to all VMs that have that PartitionedRegion defined.
- *
+ *
* @see org.apache.geode.internal.cache.PartitionedRegion#sendDumpAllPartitionedRegions()
*/
public class DumpAllPRConfigMessage extends PartitionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
index 220c51f..6847340 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
@@ -51,7 +51,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* A message used for debugging purposes. For example if a test fails it can call
* {@link org.apache.geode.internal.cache.PartitionedRegion#sendDumpB2NRegionForBucket(int)} which
* sends this message to all VMs that have that PartitionedRegion defined.
- *
+ *
* @see org.apache.geode.internal.cache.PartitionedRegion#sendDumpB2NRegionForBucket(int)
*/
public class DumpB2NRegion extends PartitionMessage {
@@ -310,7 +310,7 @@ public class DumpB2NRegion extends PartitionMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.PartitionMessage#appendFields(java.lang.
* StringBuffer)
*/
@@ -323,7 +323,7 @@ public class DumpB2NRegion extends PartitionMessage {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#clone()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
index b8bd629..e150f37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* A message used for debugging purposes. For example if a test fails it can call
* {@link PartitionedRegion#dumpAllBuckets(boolean)} which sends this message to all VMs that have
* that PartitionedRegion defined.
- *
+ *
* @see org.apache.geode.internal.cache.PartitionedRegion#dumpAllBuckets(boolean)
*/
public class DumpBucketsMessage extends PartitionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
index 84cc845..3f90f0c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
* This message is sent to a member to make it attempt to become primary. This message is sent at
* the end of PRHARedundancyProvider .createBucketAtomically, because the buckets created during
* that time do not volunteer for primary until receiving this message.
- *
+ *
*/
public class EndBucketCreationMessage extends PartitionMessage {
@@ -53,9 +53,9 @@ public class EndBucketCreationMessage extends PartitionMessage {
/**
* Sends a message to make the recipient primary for the bucket.
- *
+ *
* @param acceptedMembers
- *
+ *
* @param newPrimary the member to to become primary
* @param pr the PartitionedRegion of the bucket
* @param bid the bucket to become primary for
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
index b767f6c..cd0bf21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
@@ -60,7 +60,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
/**
- *
+ *
* @since GemFire 8.0
*/
public class FetchBulkEntriesMessage extends PartitionMessage {
@@ -100,7 +100,7 @@ public class FetchBulkEntriesMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion message to fetch all the entries for a bucketId
- *
+ *
* @param recipient the member that the fetch keys message is sent to
* @param r the PartitionedRegion that contains the bucket
* @param bucketIds the identity of the buckets that contain the entries to be returned
@@ -400,7 +400,7 @@ public class FetchBulkEntriesMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -470,7 +470,7 @@ public class FetchBulkEntriesMessage extends PartitionMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage}
- *
+ *
* @since GemFire 8.0
*/
public static class FetchBulkEntriesResponse extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
index 00e432b..402a0cc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
@@ -14,6 +14,20 @@
*/
package org.apache.geode.internal.cache.partitioned;
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheException;
@@ -49,19 +63,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.util.ObjectIntProcedure;
-import org.apache.logging.log4j.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
public class FetchEntriesMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
@@ -78,7 +79,7 @@ public class FetchEntriesMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion message to fetch all the entries for a bucketId
- *
+ *
* @param recipient the member that the fetch keys message is sent to
* @param r the PartitionedRegion that contains the bucket
* @param bucketId the identity of the bucket that contains the entries to be returned
@@ -197,7 +198,7 @@ public class FetchEntriesMessage extends PartitionMessage {
/**
* Send an ack
- *
+ *
* @throws ForceReattemptException if the peer is no longer available
*/
public static void send(final InternalDistributedMember recipient, final int processorId,
@@ -345,7 +346,7 @@ public class FetchEntriesMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -423,7 +424,7 @@ public class FetchEntriesMessage extends PartitionMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class FetchEntriesResponse extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
index 1072576..d5ecfd0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
@@ -54,7 +54,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* This message is used as the request for a
* {@link org.apache.geode.cache.Region#getEntry(Object)}operation. The reply is sent in a
* {@link org.apache.geode.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage}.
- *
+ *
* @since GemFire 5.1
*/
public class FetchEntryMessage extends PartitionMessage {
@@ -80,7 +80,7 @@ public class FetchEntryMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion {@link org.apache.geode.cache.Region#getEntry(Object)} message
- *
+ *
* @param recipient the member that the getEntry message is sent to
* @param r the PartitionedRegion for which getEntry was performed upon
* @param key the object to which the value should be feteched
@@ -208,7 +208,7 @@ public class FetchEntryMessage extends PartitionMessage {
/**
* This message is used for the reply to a {@link FetchEntryMessage}.
- *
+ *
* @since GemFire 5.0
*/
public static class FetchEntryReplyMessage extends ReplyMessage {
@@ -241,7 +241,7 @@ public class FetchEntryMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
index 67d81ef..2b399b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
@@ -82,7 +82,7 @@ public class FetchKeysMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion message to fetch keys for a bucketId
- *
+ *
* @param recipient the member that the fetch keys message is sent to
* @param r the PartitionedRegion that contains the bucket
* @param bucketId the identity of the bucket that contains the keys to be returned
@@ -109,7 +109,7 @@ public class FetchKeysMessage extends PartitionMessage {
}
/**
- *
+ *
* @param recipient
* @param r
* @param bucketId
@@ -251,7 +251,7 @@ public class FetchKeysMessage extends PartitionMessage {
/**
* Send an ack
- *
+ *
* @throws ForceReattemptException if the peer is no longer available
*/
public static void send(final InternalDistributedMember recipient, final int processorId,
@@ -373,7 +373,7 @@ public class FetchKeysMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -445,7 +445,7 @@ public class FetchKeysMessage extends PartitionMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class FetchKeysResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
index 523186d..0cb5c97 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
@@ -64,7 +64,7 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
/**
* Sends a message to fetch {@link org.apache.geode.cache.partition.PartitionMemberInfo
* PartitionMemberDetails} for the specified <code>PartitionedRegion</code>.
- *
+ *
* @param recipients the members to fetch PartitionMemberDetails from
* @param region the PartitionedRegion to fetch member details for
* @param fetchOfflineMembers
@@ -186,7 +186,7 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
/**
* Send an ack
- *
+ *
* @param offlineDetails
*/
public static void send(InternalDistributedMember recipient, int processorId,
@@ -299,7 +299,7 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage.FetchPartitionDetailsReplyMessage}
- *
+ *
*/
public static class FetchPartitionDetailsResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
index 34d530b..929a72d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
@@ -34,18 +34,18 @@ import org.apache.geode.internal.logging.LogService;
/**
* A Partitioned Region specific message whose reply guarantees that all operations have completed
* for a given Partitioned Region's bucket.
- *
+ *
* <p>
* Currently this message does not support conserve-sockets=false, that is it only flushes the
* shared communication channels.
* </p>
- *
+ *
* <p>
* This messages implementation is unique in that it uses another instance of itself as the reply.
* This was to leverage the fact that the message is a
* {@link org.apache.geode.distributed.internal.SerialDistributionMessage}.
* </p>
- *
+ *
* @since GemFire 5.1
*/
public class FlushMessage extends SerialDistributionMessage implements MessageWithReply {
@@ -109,7 +109,7 @@ public class FlushMessage extends SerialDistributionMessage implements MessageWi
* should be complete. Use this from a host of a backup bucket (aka secondary) when the update
* operations originating from the primary {@link Scope#DISTRIBUTED_NO_ACK do not require an
* acknowldgement}
- *
+ *
* @param primary
* @param p
* @param bucketId
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
index d0cd938..8235223 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
@@ -15,6 +15,14 @@
package org.apache.geode.internal.cache.partitioned;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.EntryNotFoundException;
@@ -46,22 +54,15 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
/**
* This message is used as the request for a
* {@link org.apache.geode.cache.Region#get(Object)}operation. The reply is sent in a
* {@link org.apache.geode.internal.cache.partitioned.GetMessage}.
- *
+ *
* Since the {@link org.apache.geode.cache.Region#get(Object)}operation is used <bold>very </bold>
* frequently the performance of this class is critical.
- *
+ *
* @since GemFire 5.0
*/
public class GetMessage extends PartitionMessageWithDirectReply {
@@ -264,7 +265,7 @@ public class GetMessage extends PartitionMessageWithDirectReply {
/**
* Sends a PartitionedRegion {@link org.apache.geode.cache.Region#get(Object)} message
- *
+ *
* @param recipient the member that the get message is sent to
* @param r the PartitionedRegion for which get was performed upon
* @param key the object to which the value should be feteched
@@ -292,10 +293,10 @@ public class GetMessage extends PartitionMessageWithDirectReply {
* This message is used for the reply to a
* {@link org.apache.geode.cache.Region#get(Object)}operation This is the reply to a
* {@link GetMessage}.
- *
+ *
* Since the {@link org.apache.geode.cache.Region#get(Object)}operation is used <bold>very </bold>
* frequently the performance of this class is critical.
- *
+ *
* @since GemFire 5.0
*/
public static class GetReplyMessage extends ReplyMessage {
@@ -363,7 +364,7 @@ public class GetMessage extends PartitionMessageWithDirectReply {
* Return the value from the get operation, serialize it bytes as late as possible to avoid
* making un-neccesary byte[] copies. De-serialize those same bytes as late as possible to avoid
* using precious threads (aka P2P readers).
- *
+ *
* @param recipient the origin VM that performed the get
* @param processorId the processor on which the origin thread is waiting
* @param val the raw value that will eventually be serialized
@@ -381,7 +382,7 @@ public class GetMessage extends PartitionMessageWithDirectReply {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -481,7 +482,7 @@ public class GetMessage extends PartitionMessageWithDirectReply {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class GetResponse extends PartitionResponse {
@@ -518,7 +519,7 @@ public class GetMessage extends PartitionMessageWithDirectReply {
/**
* De-seralize the value, if the value isn't already a byte array, this method should be called
* in the context of the requesting thread for the best scalability
- *
+ *
* @param preferCD
* @see EntryEventImpl#deserialize(byte[])
* @return the value object
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
index a99fd7a..caf9343 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* A message sent to determine the most recent PartitionedRegion identity
- *
+ *
* @since GemFire 5.0
*/
public class IdentityRequestMessage extends DistributionMessage implements MessageWithReply {
@@ -60,7 +60,7 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
/**
* Method public for test reasons
- *
+ *
* @return the latest identity
*/
public static synchronized int getLatestId() {
@@ -119,7 +119,7 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
* Sends a <code>IdentityRequest</code> to each <code>PartitionedRegion</code>
* {@link org.apache.geode.internal.cache.Node}. The <code>IdentityResponse</code> is used to
* fetch the highest current identity value.
- *
+ *
* @param recipients
* @return the response object to wait upon
*/
@@ -163,7 +163,7 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
/**
* The message that contains the <code>Integer</code> identity response to the
* {@link IdentityRequestMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class IdentityReplyMessage extends HighPriorityDistributionMessage {
@@ -240,7 +240,7 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
/**
* Fetch the current Identity number
- *
+ *
* @return the identity Integer from the sender or null if the sender did not have the Integer
* initialized
*/
@@ -255,7 +255,7 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
/**
* The response to a {@link IdentityRequestMessage} use {@link #waitForId()} to capture the
* identity
- *
+ *
* @since GemFire 5.0
*/
public static class IdentityResponse extends ReplyProcessor21 {
@@ -299,10 +299,10 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
/**
* Fetch the next <code>PartitionedRegion</code> identity, used to uniquely identify (globally)
* each instance of a <code>PartitionedRegion</code>
- *
+ *
* @return the next highest Integer for the <code>PartitionedRegion</code> or null if this is
* the first identity
- *
+ *
* @see PartitionMessage#getRegionId()
*/
public Integer waitForId() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
index 419e083..db3e9c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
@@ -127,7 +127,7 @@ public class IdentityUpdateMessage extends DistributionMessage implements Messag
/**
* A processor that ignores exceptions, silently removing those nodes that reply with problems
- *
+ *
* @since GemFire 5.0
*/
public static class IdentityUpdateResponse extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
index dc76652..416c396 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
@@ -62,7 +62,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Constructor for the index creation message to be sent over the wire with all the relevant
* information.
- *
+ *
* @param recipients members to which this message has to be sent
* @param regionId partitioned region id
* @param processor The processor to reply to
@@ -78,7 +78,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Empty default constructor.
- *
+ *
*/
public IndexCreationMsg() {
@@ -97,7 +97,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* This method actually operates on the partitioned region and creates given list of indexes from
* a index creation message.
- *
+ *
* @param dm distribution manager.
* @param pr partitioned region on which to create an index.
* @throws CacheException indicating a cache level error
@@ -336,7 +336,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Methods that sends the actual index creation message to all the members.
- *
+ *
* @param recipient set of members.
* @param pr partitoned region associated with the index.
* @param indexDefinitions set of index definitions
@@ -394,7 +394,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Send a reply for index creation message.
- *
+ *
* @param member representing the actual index creatro in the system
* @param procId waiting processor
* @param dm distribution manager to send the message
@@ -444,8 +444,8 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Class representing index creation response. This class has all the information for successful
* or unsuccessful index creation on this member of the partitioned region.
- *
- *
+ *
+ *
*/
public static class IndexCreationResponse extends PartitionResponse {
@@ -457,7 +457,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Construtor for index creation response message.
- *
+ *
* @param ds distributed system for this member.
* @param recipients all the member associated with the index
*/
@@ -467,7 +467,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Waits for the response from the members for index creation.
- *
+ *
* @return IndexCreationResult for creation of indexes
* @throws CacheException indicating a cache level error
* @throws ForceReattemptException if the peer is no longer available
@@ -494,7 +494,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Sets the relevant information in the response.
- *
+ *
* @param result true if index created properly
* @param indexBucketsMap Map of indexes created and number of buckets indexed
* @param numTotalBuckets Number of total buckets in this vm
@@ -508,8 +508,8 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Class representing index creation result.
- *
- *
+ *
+ *
*/
public static class IndexCreationResult {
/** Map of indexes created and number of buckets indexed. */
@@ -520,7 +520,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Constructor for index creation result.
- *
+ *
* @param indexBucketsMap Map of indexes created and number of buckets indexed
* @param numTotalBuckets Number of total buckets in this vm
*/
@@ -531,7 +531,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Returns a map of index names and number of buckets indexed
- *
+ *
* @return indexBucketsMap
*/
public Map<String, Integer> getIndexBucketsMap() {
@@ -543,8 +543,8 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Class for index creation reply. This class has the information about successful index creation.
- *
- *
+ *
+ *
*/
public static class IndexCreationReplyMsg extends ReplyMessage {
@@ -566,7 +566,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Constructor for index creation reply message.
- *
+ *
* @param processorId processor id of the waiting processor
* @param ex any exceptions
* @param result true if index created properly else false
@@ -610,7 +610,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Actual method sending the index creation reply message.
- *
+ *
* @param recipient the originator of index creation message
* @param processorId waiting processor id
* @param dm distribution manager
@@ -630,7 +630,7 @@ public class IndexCreationMsg extends PartitionMessage {
/**
* Processes the index creation result.
- *
+ *
* @param dm distribution manager
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java
index 523536e..fd3ce7e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.internal.cache.partitioned;
+import java.util.Set;
+
import org.apache.geode.cache.partition.PartitionRegionInfo;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import java.util.Set;
-
/**
* Extends <code>PartitionRegionInfo</code> with internal-only methods.
- *
+ *
*/
public interface InternalPRInfo extends PartitionRegionInfo, Comparable<InternalPRInfo> {
/**
* Returns an immutable set of <code>InternalPartitionDetails</code> representing every member
* that is configured to provide storage space to the partitioned region.
- *
+ *
* @return set of member details configured for storage space
*/
public Set<InternalPartitionDetails> getInternalPartitionDetails();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java
index aa75dbe..ad3d8d1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java
@@ -19,21 +19,21 @@ import org.apache.geode.cache.partition.PartitionMemberInfo;
/**
* Provides load and bucket level details for internal use. Extends
* {@link org.apache.geode.cache.partition.PartitionMemberInfo}.
- *
+ *
*/
public interface InternalPartitionDetails
extends PartitionMemberInfo, Comparable<InternalPartitionDetails> {
/**
* Returns the load for the partitioned region.
- *
+ *
* @return the load for the partitioned region
*/
public PRLoad getPRLoad();
/**
* Returns the size of the bucket in bytes.
- *
+ *
* @param bucketId the identity of the bucket from 0 to number of buckets -1
* @return the size of the bucket in bytes
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
index 00db87c..fd74285 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
@@ -73,7 +73,7 @@ public class InvalidateMessage extends DestroyMessage {
/**
* added for sending old value over the wire to the bridge servers with Cqs
- *
+ *
* @param original invalidateMessage originated at remote vm.
* @param event EntryEventImpl generated by operation on the bucket region.
* @param members list of members which needs old value.
@@ -95,7 +95,7 @@ public class InvalidateMessage extends DestroyMessage {
/**
* send a notification-only message to a set of listeners. The processor id is passed with the
* message for reply message processing. This method does not wait on the processor.
- *
+ *
* @param cacheOpReceivers receivers of associated bucket CacheOperationMessage
* @param adjunctRecipients receivers that must get the event
* @param filterRoutingInfo client routing information
@@ -118,7 +118,7 @@ public class InvalidateMessage extends DestroyMessage {
/**
* Sends an InvalidateMessage {@link org.apache.geode.cache.Region#invalidate(Object)}message to
* the recipient
- *
+ *
* @param recipient the recipient of the message
* @param r the PartitionedRegion for which the invalidate was performed
* @param event the event causing this message
@@ -145,7 +145,7 @@ public class InvalidateMessage extends DestroyMessage {
* This method is called upon receipt and make the desired changes to the PartitionedRegion Note:
* It is very important that this message does NOT cause any deadlocks as the sender will wait
* indefinitely for the acknowledgement
- *
+ *
* @throws EntryExistsException
* @throws DataLocationException
*/
@@ -273,7 +273,7 @@ public class InvalidateMessage extends DestroyMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -333,7 +333,7 @@ public class InvalidateMessage extends DestroyMessage {
}
/**
* A processor to capture the value returned by {@link InvalidateMessage}
- *
+ *
* @since GemFire 5.1
*/
public static class InvalidateResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
index cca8953..f5a3598 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
@@ -91,7 +91,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion manage bucket request to the recipient
- *
+ *
* @param recipient the member to which the bucket manage request is sent
* @param r the PartitionedRegion to which the bucket belongs
* @param bucketId the unique identifier of the bucket
@@ -190,7 +190,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Assists the toString method in reporting the contents of this message
- *
+ *
* @see PartitionMessage#toString()
* @param buff
*/
@@ -214,7 +214,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* A class that contains the reply to a {@link ManageBackupBucketMessage} message which contains
* the {@link Node} that has accepted to manage the bucket.
- *
+ *
* @since GemFire 5.0
*/
public static class ManageBackupBucketReplyMessage extends ReplyMessage {
@@ -241,7 +241,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Refuse the request to manage the bucket
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the refusal
@@ -256,7 +256,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Refuse the request to manage the bucket because the region is still being initialized
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the acceptance message
@@ -271,7 +271,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Accept the request to manage the bucket
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the acceptance message
@@ -286,7 +286,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -341,10 +341,10 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* A processor to capture the {@link Node} returned by {@link ManageBackupBucketMessage}
- *
+ *
* @since GemFire 5.0
*/
- static public class NodeResponse extends ReplyProcessor21 {
+ public static class NodeResponse extends ReplyProcessor21 {
/**
* the message that triggers return from waitForAcceptance. This will be null if the target
* member exited
@@ -382,7 +382,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
/**
* Wait for the response to a {@link ManageBackupBucketMessage} request.
- *
+ *
* @return true if the node sent the request is managing the bucket
* @see org.apache.geode.internal.cache.PartitionedRegionDataStore#handleManageBucketRequest(int,
* int, InternalDistributedMember, boolean)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
index 7e84404..1ceb93e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
@@ -86,7 +86,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Sends a PartitionedRegion manage bucket request to the recipient
- *
+ *
* @param recipient the member to which the bucket manage request is sent
* @param r the PartitionedRegion to which the bucket belongs
* @param bucketId the unique identifier of the bucket
@@ -187,7 +187,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Assists the toString method in reporting the contents of this message
- *
+ *
* @see PartitionMessage#toString()
* @param buff
*/
@@ -208,7 +208,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* A class that contains the reply to a {@link ManageBucketMessage} message which contains the
* {@link Node} that has accepted to manage the bucket.
- *
+ *
* @since GemFire 5.0
*/
public static class ManageBucketReplyMessage extends ReplyMessage {
@@ -235,7 +235,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Refuse the request to manage the bucket
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the refusal
@@ -249,7 +249,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Refuse the request to manage the bucket because the region is still being initialized
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the acceptance message
@@ -263,7 +263,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Accept the request to manage the bucket
- *
+ *
* @param recipient the requesting node
* @param processorId the identity of the processor the requesting node is waiting on
* @param dm the distribution manager used to send the acceptance message
@@ -277,7 +277,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -332,10 +332,10 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* A processor to capture the {@link Node} returned by {@link ManageBucketMessage}
- *
+ *
* @since GemFire 5.0
*/
- static public class NodeResponse extends ReplyProcessor21 {
+ public static class NodeResponse extends ReplyProcessor21 {
/**
* the message that triggers return from waitForAcceptance. This will be null if the target
* member exited
@@ -367,7 +367,7 @@ public class ManageBucketMessage extends PartitionMessage {
/**
* Wait for the response to a {@link ManageBucketMessage} request.
- *
+ *
* @return true if the node sent the request is managing the bucket
* @see org.apache.geode.internal.cache.PartitionedRegionDataStore#handleManageBucketRequest(int,
* int, InternalDistributedMember, boolean)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
index 2d2b3c4..0848039 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
@@ -43,7 +43,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* Moves the bucket to the recipient's PartitionedRegionDataStore. The recipient will create an
* extra redundant copy of the bucket and then send a {@link RemoveBucketMessage} to the specified
* source for the bucket.
- *
+ *
* Usage: MoveBucketResponse response = MoveBucketMessage.send( InternalDistributedMember,
* PartitionedRegion, int bucketId); if (response != null && response.waitForResponse()) { // bucket
* was moved }
@@ -69,7 +69,7 @@ public class MoveBucketMessage extends PartitionMessage {
/**
* Sends a message to move the bucket from <code>source</code> member to the
* <code>recipient</code> member.
- *
+ *
* @param recipient the member to move the bucket to
* @param region the PartitionedRegion of the bucket
* @param bucketId the bucket to move
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java
index 28f3cfe..98a4033 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* This interface provides the bucket ID from which the current local entry is being fetched from
* and the PartitionedRegion being iterated.
- *
+ *
*/
public interface PREntriesIterator<T> extends Iterator<T> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
index 1cbad83..687f4a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
@@ -24,7 +24,7 @@ import org.apache.geode.DataSerializer;
/**
* A class which holds the load for a partitioned region on a given VM.
- *
+ *
* @since GemFire 6.0
*/
public class PRLoad implements DataSerializable {
@@ -37,7 +37,7 @@ public class PRLoad implements DataSerializable {
/**
* Creates a new immutable instance of PRLoad from the provided DataInput. Actually
* {@link #addBucket(int, float, float)} will allow the bucket loads to be mutated.
- *
+ *
* @param in the input stream to gather state from
* @return new immutable instance of PRLoad
* @throws IOException if DataSerializer failed to read object from input stream
@@ -60,7 +60,7 @@ public class PRLoad implements DataSerializable {
/**
* Constructs a new PRLoad. Please use {@link #addBucket(int, float, float)} to add bucket loads.
- *
+ *
* @param numBuckets the number of buckets in the the PR
* @param weight the weight of the PR
*/
@@ -73,7 +73,7 @@ public class PRLoad implements DataSerializable {
/**
* Constructs a new PRLoad. The bucket read and writes loads are backed by the provided arrays
* which will be owned and potentially modified by this instance.
- *
+ *
* @param weight the weight of the PR
* @param bucketReadLoads the read loads for all buckets
* @param bucketWriteLoads the write loads for all buckets
@@ -94,7 +94,7 @@ public class PRLoad implements DataSerializable {
/**
* Get the read load for a bucket
- *
+ *
* @param bucketId the id of a bucket
*/
public float getReadLoad(int bucketId) {
@@ -103,7 +103,7 @@ public class PRLoad implements DataSerializable {
/**
* Get the write load for a bucket
- *
+ *
* @param bucketId the id of a bucket
*/
public float getWriteLoad(int bucketId) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLocallyDestroyedException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLocallyDestroyedException.java
index 48c37a7..33c7fd8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLocallyDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLocallyDestroyedException.java
@@ -19,7 +19,7 @@ import org.apache.geode.internal.cache.DataLocationException;
/**
* An exception indicating that a PartitionedRegion was found to be Locally Destroyed
- *
+ *
* @since GemFire 5.1
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
index e835fce..421d358 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.internal.cache.partitioned;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheException;
@@ -28,15 +33,10 @@ import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Set;
-
/**
* PRSanityCheckMessage is used to assert correctness of prID assignments across the distributed
* system.
- *
+ *
*
*/
public class PRSanityCheckMessage extends PartitionMessage {
@@ -144,7 +144,7 @@ public class PRSanityCheckMessage extends PartitionMessage {
/**
* completely override process() from PartitionMessage. This message doesn't operate on a specific
* partitioned region, so the superclass impl doesn't make any sense to it.
- *
+ *
* @param dm the distribution manager to use
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
index 0e27621..31465b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This message class sends tombstone GC information to other PR holders
- *
+ *
* @since GemFire 7.0
*/
public class PRTombstoneMessage extends PartitionMessageWithDirectReply
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
index b214075..2956e0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
@@ -52,8 +52,8 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This message is generated based on event received on GatewayReceiver for updating the time-stamp
* in a version tag for a RegionEntry.
- *
- *
+ *
+ *
*/
public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply {
@@ -100,7 +100,7 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
@Override
@@ -110,7 +110,7 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.partitioned.PartitionMessage# operateOnPartitionedRegion
* (org.apache.geode.distributed.internal.DistributionManager,
* org.apache.geode.internal.cache.PartitionedRegion, long)
@@ -198,7 +198,7 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
/**
* Assists the toString method in reporting the contents of this message
- *
+ *
* @see PartitionMessage#toString()
* @param buff
*/
@@ -219,7 +219,7 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
/**
* Response for PartitionMessage {@link PRUpdateEntryVersionMessage}.
- *
+ *
*/
public static class UpdateEntryVersionResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMemberInfoImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMemberInfoImpl.java
index 4ea343a..ac35f5a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMemberInfoImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMemberInfoImpl.java
@@ -21,7 +21,7 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Implements PartitionMemberInfo. Serializable form is used to allow JMX MBeans to use this as a
* remotable return type.
- *
+ *
*/
public class PartitionMemberInfoImpl implements InternalPartitionDetails, Serializable {
@@ -96,7 +96,7 @@ public class PartitionMemberInfoImpl implements InternalPartitionDetails, Serial
/**
* Returns the backed array of bucket bytes. Index is the BID and the value is either 0 or
* positive. Please do not change the values! Internal use only.
- *
+ *
* @return the backed array of bucket bytes
*/
public long[] getBucketSizes() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
index 64bebc4..9a6f3d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
@@ -68,7 +68,7 @@ import org.apache.geode.internal.sequencelog.EntryLogger;
/**
* The base PartitionedRegion message type upon which other messages should be based.
- *
+ *
* @since GemFire 5.0
*/
public abstract class PartitionMessage extends DistributionMessage
@@ -96,7 +96,7 @@ public abstract class PartitionMessage extends DistributionMessage
* these bit masks are used for encoding the bits of a short on the wire instead of transmitting
* booleans. Any subclasses interested in saving bits on the wire should add a mask here and then
* override computeCompressedShort and setBooleans
- *
+ *
*/
/** flag to indicate notification message */
protected static final short NOTIFICATION_ONLY = DistributionMessage.UNRESERVED_FLAGS_START;
@@ -200,7 +200,7 @@ public abstract class PartitionMessage extends DistributionMessage
* Severe alert processing enables suspect processing at the ack-wait-threshold and issuing of a
* severe alert at the end of the ack-severe-alert-threshold. Some messages should not support
* this type of processing (e.g., GII, or DLockRequests)
- *
+ *
* @return whether severe-alert processing may be performed on behalf of this message
*/
@Override
@@ -261,7 +261,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* check to see if the distributed system is closing
- *
+ *
* @return true if the distributed system is closing
*/
public boolean checkDSClosing(DistributionManager dm) {
@@ -290,7 +290,7 @@ public abstract class PartitionMessage extends DistributionMessage
* Upon receipt of the message, both process the message and send an acknowledgement, not
* necessarily in that order. Note: Any hang in this message may cause a distributed deadlock for
* those threads waiting for an acknowledgement.
- *
+ *
* @throws PartitionedRegionException if the region does not exist (typically, if it has been
* destroyed)
*/
@@ -421,7 +421,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* Send a generic ReplyMessage. This is in a method so that subclasses can override the reply
* message type
- *
+ *
* @param pr the Partitioned Region for the message whose statistics are incremented
* @param startTime the start time of the operation in nanoseconds
* @see PutMessage#sendReply
@@ -439,7 +439,7 @@ public abstract class PartitionMessage extends DistributionMessage
* Allow classes that over-ride to choose whether a RegionDestroyException is thrown if no
* partitioned region is found (typically occurs if the message will be sent before the
* PartitionedRegion has been fully constructed.
- *
+ *
* @return true if throwing a {@link RegionDestroyedException} is acceptable
*/
protected boolean failIfRegionMissing() {
@@ -448,7 +448,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* relay this message to another set of recipients for event notification
- *
+ *
* @param cacheOpRecipients recipients of associated bucket CacheOperationMessage
* @param adjunctRecipients recipients who unconditionally get the message
* @param filterRoutingInfo routing information for all recipients
@@ -494,7 +494,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* An operation upon the messages partitioned region which each subclassing message must implement
- *
+ *
* @param dm the manager that received the message
* @param pr the partitioned region that should be modified
* @param startTime the start time of the operation
@@ -568,7 +568,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* Sets the bits of a short by using the bit masks. A subclass must override this method if it is
* using bits in the compressed short.
- *
+ *
* @return short with appropriate bits set
*/
protected short computeCompressedShort(short s) {
@@ -585,7 +585,7 @@ public abstract class PartitionMessage extends DistributionMessage
return s;
}
- public final static String PN_TOKEN = ".cache.";
+ public static final String PN_TOKEN = ".cache.";
@Override
public String toString() {
@@ -647,7 +647,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* added to support old value to be written on wire.
- *
+ *
* @param value true or false
* @since GemFire 5.5
*/
@@ -700,7 +700,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* A processor on which to await a response from the {@link PartitionMessage} recipient, capturing
* any CacheException thrown by the recipient and handle it as an expected exception.
- *
+ *
* @since GemFire 5.0
* @see #waitForCacheException()
*/
@@ -770,7 +770,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* Waits for the response from the {@link PartitionMessage}'s recipient
- *
+ *
* @throws CacheException if the recipient threw a cache exception during message processing
* @throws ForceReattemptException if the recipient left the distributed system before the
* response was received.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java
index b5f5e6f..f826bda 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java
@@ -30,10 +30,10 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* Used for partitioned region messages which support direct ack responses. Direct ack should be
* used for message with a response from a single member, or responses which are small.
- *
+ *
* Messages that extend this class *must* reply using the ReplySender returned by
* {@link DistributionMessage#getReplySender(org.apache.geode.distributed.internal.DM)}
- *
+ *
* Additionally, if the ReplyProcessor used for this message extends PartitionResponse, it should
* pass false for the register parameter of the PartitionResponse.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java
index 7e0d714..b715dc6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java
@@ -19,8 +19,8 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* This interface is used by testing/debugging code to be notified of different events. See the
* documentation for class PartitionedRegionObserverHolder for details.
- *
- *
+ *
+ *
*/
public interface PartitionedRegionObserver {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverAdapter.java
index ef7ee02..48c778b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverAdapter.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.ProxyBucketRegion;
* This class provides 'do-nothing' implementations of all of the methods of interface
* PartitionedRegionObserver. See the documentation for class PartitionedRegionObserverHolder for
* details.
- *
+ *
*/
public class PartitionedRegionObserverAdapter implements PartitionedRegionObserver {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
index e8241db..a443a62 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.query.internal.Support;
* This class is intended to hold a single 'observer' which will receive callbacks. There can be
* only one such observer at a time. If no observer is needed, this member variable should point to
* an object with 'do-nothing' methods, such as PartitionedRegionObserverAdapter.
- *
+ *
*/
public class PartitionedRegionObserverHolder {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
index e91bd15..1aa8826 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
@@ -59,21 +59,21 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* This class performs a rebalance on a single partitioned region.
- *
+ *
* There are three main classes involved in the rebalance - this class, the
* PartitionedRegionLoadModel, and the RebalanceDirector. This class owns the overall rebalance
* process, and takes care of gathering the data from all members, preventing concurrent rebalances,
* and forwarding operations for the rebalance to the appropriate members.
- *
+ *
* The PartitionedRegionLoadModel model of the system that is constructed by this class. It contains
* information about what buckets are where and how big they are. It has methods to find low
* redundancy buckets or determine where the best place to move a bucket is.
- *
+ *
* The RebalanceDirector is responsible for actually deciding what to do at each step of a
* rebalance. There are several different director implementations for different types of
* rebalancing. The most common on is the CompositeDirector, which first satisfies redundancy, moves
* buckets, and then moves primaries.
- *
+ *
* There is also a FPRDirector that creates buckets and moves primaries for fixed partititioned
* regions.
*/
@@ -101,7 +101,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Create a rebalance operation for a single region.
- *
+ *
* @param region the region to rebalance
* @param simulate true to only simulate rebalancing, without actually doing anything
* @param replaceOfflineData true to replace offline copies of buckets with new live copies of
@@ -116,7 +116,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Create a rebalance operation for a single region.
- *
+ *
* @param region the region to rebalance
* @param simulate true to only simulate rebalancing, without actually doing anything
* @param replaceOfflineData true to replace offline copies of buckets with new live copies of
@@ -147,7 +147,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Do the actual rebalance
- *
+ *
* @return the details of the rebalance.
*/
public Set<PartitionRebalanceInfo> execute() {
@@ -282,7 +282,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Set the list of colocated regions, and check to make sure that colocation is complete.
- *
+ *
* @return true if colocation is complete.
*/
protected boolean checkAndSetColocatedRegions() {
@@ -326,7 +326,7 @@ public class PartitionedRegionRebalanceOp {
/**
* For FPR we will creatd buckets and make primaries as specified by FixedPartitionAttributes. We
* have to just create buckets and make primaries for the local node.
- *
+ *
* @return the details of the rebalance.
*/
public Set<PartitionRebalanceInfo> executeFPA() {
@@ -429,7 +429,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Build a model of the load on the partitioned region, which can determine which buckets to move,
* etc.
- *
+ *
* @param detailsMap
* @param resourceManager
*/
@@ -511,7 +511,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Create a redundant bucket on the target member
- *
+ *
* @param target the member on which to create the redundant bucket
* @param bucketId the identifier of the bucket
* @return true if the redundant bucket was created
@@ -523,7 +523,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Remove a redundant bucket on the target member
- *
+ *
* @param target the member on which to create the redundant bucket
* @param bucketId the identifier of the bucket
* @return true if the redundant bucket was removed
@@ -546,7 +546,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Move the primary of a bucket to the target member
- *
+ *
* @param target the member which should be primary
* @param bucketId the identifier of the bucket
* @return true if the move was successful
@@ -572,7 +572,7 @@ public class PartitionedRegionRebalanceOp {
/**
* Move a bucket from the provided source to the target
- *
+ *
* @param source member that contains the bucket
* @param target member which should receive the bucket
* @param bucketId the identifier of the bucket
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
index f053d5f..1add752 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
@@ -43,7 +43,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* The primary request message signals bucket owners to re-select the primary owner of the bucket.
* It is sent by client threads which need to use the bucket, however do not know of its primary
* location.
- *
+ *
*
*/
public class PrimaryRequestMessage extends PartitionMessage {
@@ -56,7 +56,7 @@ public class PrimaryRequestMessage extends PartitionMessage {
/**
* Send request for primary election
- *
+ *
* @param recipients those members which own the bucket
* @param r the Partitioned Region which uses/owns the bucket
* @param bucketId the idenity of the bucket
@@ -136,7 +136,7 @@ public class PrimaryRequestMessage extends PartitionMessage {
/**
* The reply to a PrimarRequestMessage, indicating if the sender is the primary
*/
- static public class PrimaryRequestReplyMessage extends ReplyMessage {
+ public static class PrimaryRequestReplyMessage extends ReplyMessage {
private static final long serialVersionUID = 1L;
public volatile boolean isPrimary;
@@ -175,10 +175,10 @@ public class PrimaryRequestMessage extends PartitionMessage {
/**
* A processor to capture the member who was selected as primary for the bucket requested
- *
+ *
* @since GemFire 5.1
*/
- static public class PrimaryResponse extends ReplyProcessor21 {
+ public static class PrimaryResponse extends ReplyProcessor21 {
private volatile PrimaryRequestReplyMessage msg;
protected PrimaryResponse(InternalDistributedSystem ds, Set recipients) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java
index 06c3d89..609c0f1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java
@@ -179,7 +179,7 @@ public class PutAllPRMessage extends PartitionMessageWithDirectReply {
/**
* Sends a PartitionedRegion PutAllPRMessage to the recipient
- *
+ *
* @param recipient the member to which the put message is sent
* @param r the PartitionedRegion for which the put was performed
* @return the processor used to await acknowledgement that the update was sent, or null to
@@ -358,7 +358,7 @@ public class PutAllPRMessage extends PartitionMessageWithDirectReply {
* sendMsgByBucket() when processing a msg targeted to local Jvm. PartitionedRegion Note: It is
* very important that this message does NOT cause any deadlocks as the sender will wait
* indefinitely for the acknowledgment
- *
+ *
* @param r partitioned region eventSender the endpoint server who received request from client
* lastModified timestamp for last modification
* @return If succeeds, return true, otherwise, throw exception
@@ -747,7 +747,7 @@ public class PutAllPRMessage extends PartitionMessageWithDirectReply {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -803,7 +803,7 @@ public class PutAllPRMessage extends PartitionMessageWithDirectReply {
/**
* A processor to capture the value returned by {@link PutAllPRMessage}
- *
+ *
* @since GemFire 5.8
*/
public static class PutAllResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
index b43bfc4..506c336 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.internal.cache.partitioned;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -66,9 +69,6 @@ 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 static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
-
/**
* A Partitioned Region update message. Meant to be sent only to a bucket's primary owner. In
* addition to updating an entry it is also used to send Partitioned Region event information.
@@ -140,7 +140,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
/**
* For put to happen, the old value must be equal to this expectedOldValue.
- *
+ *
* @see PartitionedRegion#replace(Object, Object, Object)
*/
private Object expectedOldValue;
@@ -356,7 +356,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
/**
* Sends a PartitionedRegion {@link org.apache.geode.cache.Region#put(Object, Object)} message to
* the recipient
- *
+ *
* @param recipient the member to which the put message is sent
* @param r the PartitionedRegion for which the put was performed
* @param event the event prompting this message
@@ -396,7 +396,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
// return this.directAck;
// }
- // final public int getProcessorType() {
+ // public final int getProcessorType() {
// return DistributionManager.PARTITIONED_REGION_EXECUTOR;
// }
@@ -459,7 +459,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
/**
* (ashetkar) Strictly for Delta Propagation purpose.
- *
+ *
* @param o Object of type Delta
*/
public void setDeltaValObj(Object o) {
@@ -937,7 +937,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -1045,7 +1045,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
/**
* A processor to capture the value returned by {@link PutMessage}
- *
+ *
* @since GemFire 5.1
*/
public static class PutResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
index bbd9d9c..215fc19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
@@ -30,6 +30,7 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.QueryException;
import org.apache.geode.cache.query.QueryExecutionLowMemoryException;
+import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
@@ -52,7 +53,6 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.cache.query.Struct;
public class QueryMessage extends StreamingPartitionOperation.StreamingPartitionMessage {
private static final Logger logger = LogService.getLogger();
@@ -272,7 +272,7 @@ public class QueryMessage extends StreamingPartitionOperation.StreamingPartition
/**
* send a reply message. This is in a method so that subclasses can override the reply message
* type
- *
+ *
* @see PutMessage#sendReply
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java
index a42548c..fb0a821 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java
@@ -29,7 +29,6 @@ import java.util.concurrent.CountDownLatch;
import org.apache.logging.log4j.Logger;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.BucketPersistenceAdvisor;
import org.apache.geode.internal.cache.ColocationHelper;
import org.apache.geode.internal.cache.DiskStoreImpl;
@@ -40,6 +39,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentStateListener;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.process.StartupStatus;
import org.apache.geode.internal.util.TransformUtils;
@@ -47,7 +47,7 @@ import org.apache.geode.internal.util.TransformUtils;
* Consolidates logging during the recovery of ProxyRegionBuckets that are not hosted by this
* member. This logger is meant to run in its own thread and utilizes the PRHARedundancyProvider's
* count down latch in order to determine when it is finished.
- *
+ *
*/
public class RedundancyLogger extends RecoveryRunnable implements PersistentStateListener {
@@ -73,7 +73,7 @@ public class RedundancyLogger extends RecoveryRunnable implements PersistentStat
/**
* Creates a new RedundancyLogger.
- *
+ *
* @param prhaRedundancyProvider
*/
public RedundancyLogger(PRHARedundancyProvider prhaRedundancyProvider) {
@@ -281,7 +281,7 @@ public class RedundancyLogger extends RecoveryRunnable implements PersistentStat
/**
* Returns a unique Set of persistent members that all the ProxyBucketRegions are waiting for.
- *
+ *
* @param offlineOnly true if only the members which are not currently try running should be
* returned, false to return all members that this member is waiting for, including
* members which are running but not fully initialized.
@@ -398,4 +398,3 @@ public class RedundancyLogger extends RecoveryRunnable implements PersistentStat
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
index 63a694a..e1ff830 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
@@ -15,6 +15,17 @@
package org.apache.geode.internal.cache.partitioned;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireException;
@@ -39,16 +50,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicLong;
public class RegionAdvisor extends CacheDistributionAdvisor {
private static final Logger logger = LogService.getLogger();
@@ -188,7 +189,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the {@link #volunteeringQueue} used to queue primary volunteering tasks by this PR's
* BucketAdvisors.
- *
+ *
* @return the volunteering queue for use by this PR's BucketAdvisors
*/
public Queue getVolunteeringQueue() {
@@ -198,7 +199,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the {@link #volunteeringSemaphore} for controlling the number of threads that this PR's
* BucketAdvisors are allowed to use for volunteering to be primary.
- *
+ *
* @return the semaphore for controlling number of volunteering threads
*/
public Semaphore getVolunteeringSemaphore() {
@@ -291,7 +292,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Close the bucket advisors, releasing any locks for primary buckets
- *
+ *
* @return returns a list of primary bucket IDs
*
*/
@@ -380,7 +381,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
* Clear the knowledge of given member from this advisor. In particular, clear the knowledge of
* remote Bucket locations so that we avoid sending partition messages to buckets that will soon
* be destroyed.
- *
+ *
* @param memberId member that has closed the region
* @param prSerial serial number of this partitioned region
* @param serials serial numbers of buckets that need to be removed
@@ -427,7 +428,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Iterates over all buckets and marks them sick if the given member hosts the bucket.
- *
+ *
* @param member
* @param sick true if the bucket should be marked sick, false if healthy
*/
@@ -467,7 +468,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* throws LowMemoryException if the given bucket is hosted on a member which has crossed the
* ResourceManager threshold.
- *
+ *
* @param bucketId
* @param key for bucketId used in exception
* @throws LowMemoryException
@@ -514,7 +515,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* requiresNotification determines whether a member needs to be notified of cache operations so
* that cache listeners and other hooks can be engaged
- *
+ *
* @since GemFire 5.1
*/
public boolean requiresNotification = false;
@@ -694,7 +695,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Return a real Set if set to true, which can be modified
- *
+ *
* @param realHashSet true if a real set is needed
* @return depending on the realHashSet value may be a HashSet
*/
@@ -724,7 +725,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* return the set of the distributed members on which the given partition name is defined.
- *
+ *
*/
public Set<InternalDistributedMember> adviseFixedPartitionDataStores(final String partitionName) {
@@ -759,7 +760,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* return a distributed members on which the primary partition for given bucket is defined
- *
+ *
*/
public InternalDistributedMember adviseFixedPrimaryPartitionDataStore(final int bucketId) {
final List<InternalDistributedMember> fixedPartitionDataStore =
@@ -794,7 +795,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the list of all remote FixedPartitionAttributes defined across all members for the
* given partitioned region
- *
+ *
* @return list of all partitions(primary as well as secondary) defined on remote nodes
*/
public List<FixedPartitionAttributesImpl> adviseAllFixedPartitionAttributes() {
@@ -818,7 +819,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the list of all FixedPartitionAttributes defined across all members of given
* partitioned region for a given FixedPartitionAttributes
- *
+ *
* @param fpa
* @return the list of same partitions defined on other nodes(can be primary or secondary)
*/
@@ -848,7 +849,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the list of all remote primary FixedPartitionAttributes defined across members for the
* given partitioned region
- *
+ *
* @return list of all primary partitions defined on remote nodes
*/
public List<FixedPartitionAttributesImpl> adviseRemotePrimaryFPAs() {
@@ -877,7 +878,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* TODO remove this when Primary Bucket impl. is permanently in place
- *
+ *
* @param limitNodeList
* @return the node??
*/
@@ -1010,7 +1011,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* return the set of all members who must receive operation notifications
- *
+ *
* @since GemFire 5.1
*/
public Set adviseRequiresNotification(final EntryEventImpl event) {
@@ -1037,7 +1038,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
}
@Override
- synchronized public boolean putProfile(Profile p) {
+ public synchronized boolean putProfile(Profile p) {
assert p instanceof CacheProfile;
CacheProfile profile = (CacheProfile) p;
PartitionedRegion pr = getPartitionedRegion();
@@ -1068,7 +1069,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns true if the bucket is currently being hosted locally. Note that as soon as this call
* returns, this datastore may begin to host the bucket, thus two calls in a row may be different.
- *
+ *
* @param bucketId the index of the bucket to check
* @return true if the bucket is currently being hosted locally
*/
@@ -1087,7 +1088,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
* Returns the real BucketRegion if it's currently locally hosted. Otherwise the ProxyBucketRegion
* is returned. Note that this member may be in the process of hosting the real bucket. Until that
* has completed, getBucket will continue to return the ProxyBucketRegion.
- *
+ *
* @param bucketId the index of the bucket to retrieve
* @return the bucket identified by bucketId
*/
@@ -1104,7 +1105,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the BucketAdvisor for the specified bucket.
- *
+ *
* @param bucketId the index of the bucket to retrieve the advisor for
* @return the bucket advisor identified by bucketId
*/
@@ -1133,7 +1134,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
}
/**
- *
+ *
* @return array of serial numbers for buckets created locally
*/
public int[] getBucketSerials() {
@@ -1157,7 +1158,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the bucket identified by bucketId after waiting for initialization to finish processing
* queued profiles. Call synchronizes and waits on {@link #preInitQueueMonitor}.
- *
+ *
* @param bucketId the bucket identifier
* @return the bucket identified by bucketId
* @throws org.apache.geode.distributed.DistributedSystemDisconnectedException if interrupted for
@@ -1187,7 +1188,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Get the most recent primary node for the bucketId. Returns null if no primary can be found
* within {@link DistributionConfig#getMemberTimeout}.
- *
+ *
* @param bucketId
* @return the Node managing the primary copy of the bucket
*/
@@ -1199,7 +1200,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Return the node favored for reading for the given bucket
- *
+ *
* @param bucketId the bucket we want to read
* @return the member, possibly null if no member is available
*/
@@ -1236,7 +1237,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Get the redundancy of the this bucket, taking into account the local bucket, if any.
- *
+ *
* @return number of redundant copies for a given bucket, or -1 if there are no instances of the
* bucket.
*/
@@ -1248,7 +1249,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Return the set of all members who currently own the bucket, including the local owner, if
* applicable
- *
+ *
* @return a set of {@link InternalDistributedMember}s that own the bucket
*/
public Set<InternalDistributedMember> getBucketOwners(int bucketId) {
@@ -1258,7 +1259,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Return the set of buckets which have storage assigned
- *
+ *
* @return set of Integer bucketIds
*/
public Set<Integer> getBucketSet() {
@@ -1415,7 +1416,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Obtain the ordered {@link ArrayList} of data stores limited to those specified in the provided
* memberFilter.
- *
+ *
* @param memberFilter the set of members allowed to be in the list.
* @return a list of DataStoreBuckets
*/
@@ -1481,7 +1482,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Dumps out all profiles in this advisor AND all buckets. Callers should check for debug enabled.
- *
+ *
* @param infoMsg prefix message to log
*/
@Override
@@ -1515,7 +1516,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Find the set of members which own primary buckets, including the local member
- *
+ *
* @return set of InternalDistributedMember ids
*/
public Set advisePrimaryOwners() {
@@ -1549,14 +1550,14 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Invoke the given {@link BucketVisitor} on all the {@link ProxyBucketRegion} s exiting when the
* {@link BucketVisitor#visit} method returns false.
- *
+ *
* @param <T> the type of object used for aggregation of results
* @param visitor the {@link BucketVisitor} to use for the visit
* @param aggregate an aggregate object that will be used to for aggregation of results by the
* {@link BucketVisitor#visit} method; this allows the {@link BucketVisitor} to not
* maintain any state so that in most situations a global static object encapsulating the
* required behaviour will work
- *
+ *
* @return true when the full visit completed, and false if it was terminated due to
* {@link BucketVisitor#visit} returning false
*/
@@ -1580,7 +1581,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
* return the profile will be enqueued for processing during initialization, otherwise the profile
* will be immediately processed. This architecture limits the blockage of threads during
* initialization.
- *
+ *
* @param bucketId the unique identifier of the bucket
* @param profile the bucket meta-data from a particular member with the bucket
*/
@@ -1623,7 +1624,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Queue up an addition
- *
+ *
* @param bId the bucket being added
* @param p the profile to add
*/
@@ -1641,7 +1642,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Queue up a removal due to member leaving the view
- *
+ *
* @param mbr the member being removed
*/
public QueuedBucketProfile(InternalDistributedMember mbr, boolean crashed, boolean destroyed,
@@ -1659,7 +1660,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Queue up a removal due to region destroy
- *
+ *
* @param mbr the member being removed
* @param serials the serials it had
*/
@@ -1731,7 +1732,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns the total number of buckets created anywhere in the distributed system for this
* partitioned region.
- *
+ *
* @return the total number of buckets created anywhere for this PR
*/
public int getCreatedBucketsCount() {
@@ -1751,7 +1752,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Returns a possibly null list of this advisor's real bucket profiles. A real bucket profile is
* one that for a bucket that actually has storage in this vm.
- *
+ *
* @return a list of BucketProfileAndId instances; may be null
* @since GemFire 5.5
*/
@@ -1778,7 +1779,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Takes a list of BucketProfileAndId and adds them to thsi advisors proxy buckets.
- *
+ *
* @since GemFire 5.5
*/
public void putBucketRegionProfiles(ArrayList l) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteFetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteFetchKeysMessage.java
index a7dc65d..2ea28bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteFetchKeysMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteFetchKeysMessage.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.partitioned;
@@ -72,7 +72,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.RemoteOperationMessage#operateOnRegion(org.apache.geode.
* distributed.internal.DistributionManager, org.apache.geode.internal.cache.LocalRegion, long)
*/
@@ -95,7 +95,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
@@ -118,7 +118,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.RemoteOperationMessage#toData(java.io.DataOutput)
*/
@Override
@@ -128,7 +128,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.RemoteOperationMessage#fromData(java.io.DataInput)
*/
@Override
@@ -170,7 +170,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
/**
* Send an ack
- *
+ *
* @throws ForceReattemptException if the peer is no longer available
*/
public static void send(final InternalDistributedMember recipient, final int processorId,
@@ -292,7 +292,7 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
index fd0ebd4..a6bbe01 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This message is used to determine the number of Entries in a Region, or its size.
- *
+ *
* @since GemFire 5.0
*/
public class RemoteSizeMessage extends RemoteOperationMessage {
@@ -67,7 +67,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
/**
* The message sent to a set of {@link InternalDistributedMember}s to caculate the number of
* Entries in each of their buckets
- *
+ *
* @param recipients members to receive the message
* @param regionPath the path to the region
* @param processor the reply processor used to wait on the response
@@ -89,7 +89,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
/**
* Sends a PartitionedRegion message for {@link java.util.Map#size()}ignoring any errors on send
- *
+ *
* @param recipients the set of members that the size message is sent to
* @param r the Region that contains the bucket
* @return the processor used to read the returned size
@@ -101,7 +101,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
/**
* sends a message to the given recipients asking for the size of either their primary bucket
* entries or the values sets of their primary buckets
- *
+ *
* @param recipients recipients of the message
* @param r the local PartitionedRegion instance
* @param queryType either TYPE_ENTRIES or TYPE_VALUES
@@ -212,7 +212,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -271,7 +271,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class SizeResponse extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
index ebfc5ed..e5cd220 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -173,7 +173,7 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
/**
* Sends a PartitionedRegion RemoveAllPRMessage to the recipient
- *
+ *
* @param recipient the member to which the message is sent
* @param r the PartitionedRegion for which the op was performed
* @return the processor used to await acknowledgement that the op was sent, or null to indicate
@@ -350,7 +350,7 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
* sendMsgByBucket() when processing a msg targeted to local Jvm. PartitionedRegion Note: It is
* very important that this message does NOT cause any deadlocks as the sender will wait
* indefinitely for the acknowledgment
- *
+ *
* @param r partitioned region
* @param eventSender the endpoint server who received request from client
* @param cacheWrite if true invoke cacheWriter before desrtoy
@@ -705,7 +705,7 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -762,7 +762,7 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
/**
* A processor to capture the value returned by {@link RemoveAllPRMessage}
- *
+ *
* @since GemFire 8.1
*/
public static class RemoveAllResponse extends PartitionResponse {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
index 6650549..5af8f71 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* Removes the hosted bucket from the recipient's PartitionedRegionDataStore.
- *
+ *
* Usage: RemoveBucketResponse response = RemoveBucketMessage.send( InternalDistributedMember,
* PartitionedRegion, int bucketId); if (response != null && response.waitForResponse()) { // bucket
* was removed }
@@ -66,7 +66,7 @@ public class RemoveBucketMessage extends PartitionMessage {
/**
* Sends a message to remove the bucket.
- *
+ *
* @param recipient the member to remove the bucket from
* @param region the PartitionedRegion of the bucket
* @param bucketId the bucket to remove
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
index 4377daa..b3cc268 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
@@ -46,8 +46,8 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* This class represents a partition message for removing indexes. An instance of this class is send
* over the wire to remove indexes on remote vms. This class extends PartitionMessage
* {@link org.apache.geode.internal.cache.partitioned.PartitionMessage}
- *
- *
+ *
+ *
*/
public class RemoveIndexesMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
@@ -76,7 +76,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Constructor for remove indexes to be sent over the wire.
- *
+ *
* @param recipients members to which this message has to be sent
* @param regionId partitioned region id
* @param processor the processor to reply to
@@ -87,14 +87,14 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Constructor to remove a particular index which will be sent over the wire.
- *
+ *
* @param recipients members to which this message has to be sent
* @param regionId partitioned region id
* @param processor the processor to reply to
* @param removeSingleIndex boolean indicating to remove a partitular index
- *
+ *
* @param indexName name of the index to be removed.
- *
+ *
*/
public RemoveIndexesMessage(Set recipients, int regionId, ReplyProcessor21 processor,
boolean removeSingleIndex, String indexName) {
@@ -115,10 +115,10 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* This method is responsible to remove index on the given partitioned region.
- *
+ *
* @param dm Distribution maanger for the system
* @param pr Partitioned region to remove indexes on.
- *
+ *
* @throws CacheException indicates a cache level error
* @throws ForceReattemptException if the peer is no longer available
* @throws InterruptedException if the thread is interrupted in the operation for example during
@@ -158,7 +158,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Send a reply for remove indexes message.
- *
+ *
* @param member representing the actual index creatro in the system
* @param procId waiting processor
* @param dm distirbution manager to send the message
@@ -175,10 +175,10 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Sends this RemoveIndexesMessage to all the participating members in the system.
- *
+ *
* @param pr prartitioned region to remove the index on.
* @return PartitionResponse indicating sucessful remove index
- *
+ *
*/
public static PartitionResponse send(PartitionedRegion pr, Index ind, boolean removeAllIndex) {
@@ -314,8 +314,8 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Class representing remove index response. This class has all the information for successful or
* unsucessful remove index on the member of the partitioned region.
- *
- *
+ *
+ *
*/
public static class RemoveIndexesResponse extends PartitionResponse {
@@ -345,7 +345,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Waits for the response from the members for remove indexes call on this system.
- *
+ *
* @throws ForceReattemptException
*/
public RemoveIndexesResult waitForResults() throws CacheException, ForceReattemptException {
@@ -355,7 +355,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Sets the relevant information in the response.
- *
+ *
* @param result true if index removed properly
* @param numBucketsIndexesRemoved number of buckets indexes removed remotely for a memeber.
* @param numTotalBuckets number of total buckets in the member.
@@ -384,7 +384,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Class representing remove index results on pr.
- *
+ *
*/
public static class RemoveIndexesResult {
@@ -395,9 +395,9 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Constructor.
- *
+ *
* @param numBucketIndexRemoved number of total bucket indexes removed.
- *
+ *
*/
public RemoveIndexesResult(int numBucketIndexRemoved) {
@@ -437,7 +437,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Constructor for index creation reply message.
- *
+ *
* @param processorId processor id of the waiting processor
* @param ex any exceptions
* @param result ture if indexes removed properly else false
@@ -479,7 +479,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Actual method sending the index creation reply message.
- *
+ *
* @param recipient the originator of index creation message
* @param processorId waiting processor id
* @param dm distribution manager
@@ -498,7 +498,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
/**
* Processes this RemoveIndexesReplyMessge on the receiver.
- *
+ *
* @param dm distribution manager
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
index a6c9707..29b143c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This message is used to determine the number of Entries in a Region, or its size.
- *
+ *
* @since GemFire 5.0
*/
public class SizeMessage extends PartitionMessage {
@@ -70,7 +70,7 @@ public class SizeMessage extends PartitionMessage {
/**
* The message sent to a set of {@link InternalDistributedMember}s to caculate the number of
* Entries in each of their buckets
- *
+ *
* @param recipients members to receive the message
* @param regionId the <code>PartitionedRegion<code> regionId
* @param processor the reply processor used to wait on the response
@@ -90,7 +90,7 @@ public class SizeMessage extends PartitionMessage {
/**
* sends a message to the given recipients asking for the size of either their primary bucket
* entries or the values sets of their primary buckets
- *
+ *
* @param recipients recipients of the message
* @param r the local PartitionedRegion instance
* @param bucketIds the buckets to look for, or null for all buckets
@@ -227,7 +227,7 @@ public class SizeMessage extends PartitionMessage {
/**
* Processes this message. This method is invoked by the receiver of the message.
- *
+ *
* @param dm the distribution manager that is processing the message.
*/
@Override
@@ -286,7 +286,7 @@ public class SizeMessage extends PartitionMessage {
/**
* A processor to capture the value returned by
* {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage}
- *
+ *
* @since GemFire 5.0
*/
public static class SizeResponse extends ReplyProcessor21 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java
index 6b0c3d7..7e86648 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
@@ -21,13 +25,9 @@ import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionDataStore;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
/**
* A load probe which calculates the load of a pr using the size of the buckets in bytes.
- *
+ *
* @since GemFire 6.0
*/
public class SizedBasedLoadProbe implements LoadProbe, DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java
index 1204e16..e4ac809 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java
@@ -214,7 +214,7 @@ public abstract class StreamingPartitionOperation extends StreamingOperation {
/**
* Waits for the response from the {@link PartitionMessage}'s recipient
- *
+ *
* @throws CacheException if the recipient threw a cache exception during message processing
* @throws QueryException if the recipient threw a query exception
* @throws RegionDestroyedException if the peer has closed its copy of the region
@@ -315,7 +315,7 @@ public abstract class StreamingPartitionOperation extends StreamingOperation {
}
}
- public static abstract class StreamingPartitionMessage extends PartitionMessage {
+ public abstract static class StreamingPartitionMessage extends PartitionMessage {
// the following transient fields are used for passing extra data to the sendReply method
transient HeapDataOutputStream outStream = null;
transient int replyMsgNum = 0;
@@ -338,7 +338,7 @@ public abstract class StreamingPartitionOperation extends StreamingOperation {
/**
* send a reply message. This is in a method so that subclasses can override the reply message
* type
- *
+ *
* @see PutMessage#sendReply
*/
@Override
@@ -361,7 +361,7 @@ public abstract class StreamingPartitionOperation extends StreamingOperation {
/**
* An operation upon the messages partitioned region
- *
+ *
* @param dm the manager that received the message
* @param pr the partitioned region that should be modified
* @return true if a reply message should be sent
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java
index d5e1eea..09317be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java
@@ -28,11 +28,11 @@ public interface BucketOperator {
/**
* Create a redundancy copy of a bucket on a given node. This call may be asynchronous, it will
* notify the completion when the the operation is done.
- *
+ *
* Note that the completion is not required to be threadsafe, so implementors should ensure the
* completion is invoked by the calling thread of createRedundantBucket, usually by invoking the
* completions in waitForOperations.
- *
+ *
* @param targetMember the node to create the bucket on
* @param bucketId the id of the bucket to create
* @param colocatedRegionBytes the size of the bucket in bytes
@@ -50,7 +50,7 @@ public interface BucketOperator {
/**
* Move a bucket from one member to another
- *
+ *
* @param sourceMember The member we want to move the bucket off of.
* @param targetMember The member we want to move the bucket too.
* @param bucketId the id of the bucket we want to move
@@ -62,7 +62,7 @@ public interface BucketOperator {
/**
* Move a primary from one node to another. This method will not be called unless both nodes are
* hosting the bucket, and the source node is the primary for the bucket.
- *
+ *
* @param source The old primary for the bucket
* @param target The new primary for the bucket
* @param bucketId The id of the bucket to move;
@@ -80,9 +80,9 @@ public interface BucketOperator {
/**
* Callbacks for asnychonous operations. These methods will be invoked when an ansynchronous
* operation finishes.
- *
+ *
* The completions are NOT THREADSAFE.
- *
+ *
* They will be completed when createRedundantBucket or waitForOperations is called.
*/
public interface Completion {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/CompositeDirector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/CompositeDirector.java
index d3f9d8e..f9bdc67 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/CompositeDirector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/CompositeDirector.java
@@ -17,10 +17,10 @@ package org.apache.geode.internal.cache.partitioned.rebalance;
/**
* The composite director performs a complete rebalance, which can remove over redundant buckets,
* satisfy redundancy, move buckets, and move primaries.
- *
+ *
* This is the most commonly used director.
- *
- *
+ *
+ *
*/
public class CompositeDirector extends RebalanceDirectorAdapter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/FPRDirector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/FPRDirector.java
index 31fa6ef..040f75c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/FPRDirector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/FPRDirector.java
@@ -18,9 +18,9 @@ package org.apache.geode.internal.cache.partitioned.rebalance;
* The FPR director performs rebalancing operations for a fixed partitioned region. There two things
* a fixed partitioned region does during rebalancing: - Create redundant buckets in a known
* location - move primaries to the appropriate member.
- *
+ *
* Note that unlike other directors, this director performs all the work in a call to nextStep.
- *
+ *
*
*/
public class FPRDirector extends RebalanceDirectorAdapter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MoveBuckets.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MoveBuckets.java
index 10bb223..9ce63fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MoveBuckets.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MoveBuckets.java
@@ -43,7 +43,7 @@ public class MoveBuckets extends RebalanceDirectorAdapter {
/**
* Move a single bucket from one member to another.
- *
+ *
* @return true if we could move the bucket
*/
private boolean moveBuckets() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MovePrimaries.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MovePrimaries.java
index d524ac5..119de08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MovePrimaries.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/MovePrimaries.java
@@ -43,7 +43,7 @@ public class MovePrimaries extends RebalanceDirectorAdapter {
/**
* Move a single primary from one member to another
- *
+ *
* @return if we are able to move a primary.
*/
private boolean movePrimaries() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/ParallelBucketOperator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/ParallelBucketOperator.java
index fd4d457..f161378 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/ParallelBucketOperator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/ParallelBucketOperator.java
@@ -26,19 +26,19 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
/**
* A bucket operator that will perform operations on a bucket asynchronously.
- *
+ *
* This class wraps a delegate bucket operator that is synchronous. That is, the delegate bucket
* operator is expected to move the bucket and notify the Completion within the scope of the call to
* create bucket.
- *
+ *
* What this class does in make that call asynchronous. A task to create the bucket is handed to the
* thread pool and executed there. After it is done, the completion is notified.
- *
+ *
* Calling waitForOperations waits for all previously submitted operations and ensures the
* completions are notified.
- *
+ *
* Note that only createRedundantBucket is asynchronous, the rest of the operations are synchronous.
- *
+ *
*/
public class ParallelBucketOperator implements BucketOperator {
@@ -54,7 +54,7 @@ public class ParallelBucketOperator implements BucketOperator {
/**
* Create a parallel bucket operator
- *
+ *
* @param maxParallelOperations The number of operations that can execute concurrently. Futher
* calls to createRedundantBucket will block.
* @param executor the executor to submit tasks to. This executor should be able to create at
@@ -74,7 +74,7 @@ public class ParallelBucketOperator implements BucketOperator {
* Create a redundant bucket asynchronously. If maxParallelOperations is not reached, this call
* will submit a task and return immediately. Otherwise, it will block until an executor thread is
* available to take a task.
- *
+ *
* The completion will not be notified until the caller makes another call to createRedundant
* bucket or waitForOperations.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
index 46c55a0..4de43ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
@@ -47,22 +47,22 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* the best members to create buckets on or move buckets or primaries too. All of the actual work of
* creating a copy, moving a primary, etc. Is performed by the BucketOperator that is passed to the
* constructor.
- *
+ *
* To use, create a model and populate it using the addMember method. addMember takes a region
* argument, to indicate which region the data is for. All of the regions added to a single model
* are assumed to be colocated, and the model adds together the load from each of the individual
* regions to balance all of the regions together.
- *
+ *
* Reblancing operations are performed by repeatedly calling model.nextStep until it returns false.
* Each call to nextStep should perform another operation. The model will make callbacks to the
* BucketOperator you provide to the contructor perform the actual create or move.
- *
+ *
* While creating redundant copies our moving buckets, this model tries to minimize the standard
* deviation in the weighted loads for the members. The weighted load for the member is the sum of
* the load for all of the buckets on the member divided by that members weight.
- *
+ *
* This model is not threadsafe.
- *
+ *
* @since GemFire 6.0
*/
@SuppressWarnings("synthetic-access")
@@ -147,7 +147,7 @@ public class PartitionedRegionLoadModel {
/**
* Create a new model
- *
+ *
* @param operator the operator which performs the actual creates/moves for buckets
* @param redundancyLevel The expected redundancy level for the region
*/
@@ -167,7 +167,7 @@ public class PartitionedRegionLoadModel {
* region added to the model should be the parent region. The parent region is expected to have at
* least as many members as child regions; it may have more. If the parent has more members than
* child regions those members will be considered invalid.
- *
+ *
* @param region
* @param memberDetailSet A set of details about each member.
* @param offlineDetails
@@ -365,7 +365,7 @@ public class PartitionedRegionLoadModel {
/**
* Trigger the creation of a redundant bucket, potentially asynchronously.
- *
+ *
* This method will find the best node to create a redundant bucket and invoke the bucket operator
* to create a bucket on that node. Because the bucket operator is asynchronous, the bucket may
* not be created immediately, but the model will be updated regardless. Invoke
@@ -444,7 +444,7 @@ public class PartitionedRegionLoadModel {
/**
* Find the best member to put a new bucket on.
- *
+ *
* @param bucket the bucket we want to create
* @param checkIPAddress true if we should only consider members that do not have the same IP
* Address as a member that already hosts the bucket
@@ -470,7 +470,7 @@ public class PartitionedRegionLoadModel {
/**
* Find the best member to remove a bucket from
- *
+ *
* @param bucket the bucket we want to create
*/
public Move findBestRemove(Bucket bucket) {
@@ -709,7 +709,7 @@ public class PartitionedRegionLoadModel {
/**
* Calculate how much the variance in load will decrease for a given move.
- *
+ *
* @param sLoad the current load on the source member
* @param sWeight the weight of the source member
* @param tLoad the current load on the target member
@@ -791,7 +791,7 @@ public class PartitionedRegionLoadModel {
/**
* Return a snapshot of what the partitioned member details look like.
- *
+ *
* @return a set of partitioned member details.
*/
public Set<PartitionMemberInfo> getPartitionedMemberDetails(String region) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PercentageMoveDirector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PercentageMoveDirector.java
index f79f862..020e2d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PercentageMoveDirector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PercentageMoveDirector.java
@@ -29,14 +29,14 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Move buckets from one node to another, up to a certain percentage of the source node. Each call
* to nextStep attempts to move a single bucket.
- *
+ *
* This uses a first fit decreasing strategy to choose which buckets to move. It sorts the buckets
* by size, and then moves the largest bucket that is below the load we are trying to move.
- *
+ *
* An improvement would be find the bucket that can be moved with the least cost for the most load
* change, but because the load probe currently use the same value for load and cost, there's no
* need to complicate things now.
- *
+ *
*
*/
public class PercentageMoveDirector extends RebalanceDirectorAdapter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java
index ff530c6..291c733 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.cache.partitioned.rebalance;
* A class that is responsible for directing all or part of a rebalance operation. The director
* receives a model of the current system, and requests changes to the system such as creating
* buckets, moving buckets, or moving primaries.
- *
+ *
*
*/
public interface RebalanceDirector {
@@ -29,10 +29,10 @@ public interface RebalanceDirector {
* A check to see if rebalancing is necessary on the given region. This is called before the
* initialize method is called with the model it is here so that directors can cause the rebalance
* to early out before gathering extra information.
- *
+ *
* @param redundancyImpaired true if redundancy is impaired for the PR
* @param withPersistence - true if persistence is enabled for the PR
- *
+ *
* @return true if the rebalance should continue.
*/
public boolean isRebalanceNecessary(boolean redundancyImpaired, boolean withPersistence);
@@ -53,15 +53,15 @@ public interface RebalanceDirector {
/**
* Perform one step of the rebalancing process. This step may be to create a redundant bucket,
* move a bucket, or move a primary.
- *
+ *
* This method is expected to attempt one small unit of rebalancing work. When the method returns,
* the system will check to see if the model is still accurate. If true is returned, the
* PartitionedRegionRebalanceOperation will come back and call nextStep again. It's not required
* that a move is actually performed during the nextStep call, just that nextStep will return
* false once there is no more work to be done.
- *
+ *
* It is expected that nextStep will eventually return false.
- *
+ *
* @return true we were able to make progress or at least attempt an operation, false if there is
* no more rebalancing work to be done.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirectorAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirectorAdapter.java
index be6ff8a..0e654ac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirectorAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirectorAdapter.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.partitioned.rebalance;
/**
* A base class for rebalance directors that provides some default implementations of methods on
* rebalance director.
- *
+ *
*
*/
public abstract class RebalanceDirectorAdapter implements RebalanceDirector {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/SatisfyRedundancy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/SatisfyRedundancy.java
index a05822e..3465abb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/SatisfyRedundancy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/SatisfyRedundancy.java
@@ -55,7 +55,7 @@ public class SatisfyRedundancy extends RebalanceDirectorAdapter {
/**
* Try to satisfy redundancy for a single bucket.
- *
+ *
* @return true if we actually created a bucket somewhere.
*/
private boolean satisfyRedundancy() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupInspector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupInspector.java
index 1a2de31..8c707f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupInspector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupInspector.java
@@ -50,7 +50,7 @@ public abstract class BackupInspector {
/**
* Returns a BackupInspector for a member's backup directory.
- *
+ *
* @param backupDir a member's backup directory.
* @return a new BackupInspector.
* @throws IOException the backup directory was malformed.
@@ -65,7 +65,7 @@ public abstract class BackupInspector {
/**
* Creates a new BackupInspector.
- *
+ *
* @param backupDir a a previous backup for a member.
* @throws IOException an error occurred while parsing the restore script.
*/
@@ -97,7 +97,7 @@ public abstract class BackupInspector {
/**
* Searches for the incremental backup marker and parses the incremental portion.
- *
+ *
* @param reader restore file reader.
*/
private void parseRestoreFile(final BufferedReader reader) throws IOException {
@@ -129,7 +129,7 @@ public abstract class BackupInspector {
/**
* Returns the restore script line that restores a particular operation log file.
- *
+ *
* @param oplogFileName an operation log file.
*/
public String getScriptLineForOplogFile(final String oplogFileName) {
@@ -146,28 +146,28 @@ public abstract class BackupInspector {
/**
* Returns the restore script for the backup.
- *
+ *
* @param backupDir a member's backup directory.
*/
protected abstract File getRestoreFile(final File backupDir);
/**
* Returns the copyTo operation log file path for an operation log file name.
- *
+ *
* @param oplogFileName an operation log file.
*/
public abstract String getCopyToForOplogFile(final String oplogFileName);
/**
* Returns the copy from operation log file path for an operation log file name.
- *
+ *
* @param oplogFileName an operation log file.
*/
public abstract String getCopyFromForOplogFile(final String oplogFileName);
/**
* Parses out operation log data from the incremental backup portion of the restore script.
- *
+ *
* @param reader restore file reader.
*/
protected abstract void parseOplogLines(final BufferedReader reader) throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java
index 02c4b0c..48a969e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.internal.cache.persistence;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import org.apache.logging.log4j.Logger;
import org.apache.geode.internal.logging.LogService;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-
/**
* This class manages in memory copy of the canonical ids held in the disk init file. It's used by
* the init file to assign numbers to new ids and retrieve existing ids.
- *
+ *
* This class is not thread safe, so it should be synchronized externally.
- *
+ *
*
*/
public class CanonicalIdHolder {
@@ -72,7 +71,7 @@ public class CanonicalIdHolder {
/**
* Create an id of the given object.
- *
+ *
* @param object
* @return the id generated for this object.
*/
@@ -86,7 +85,7 @@ public class CanonicalIdHolder {
/**
* Get all of the objects that are mapped.
- *
+ *
* @return a map of id to object for all objects held by this canonical id holder.
*/
public Int2ObjectOpenHashMap getAllMappings() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CreatePersistentRegionProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CreatePersistentRegionProcessor.java
index 17c62c1..2895884 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CreatePersistentRegionProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CreatePersistentRegionProcessor.java
@@ -40,9 +40,9 @@ public class CreatePersistentRegionProcessor extends CreateRegionProcessor {
/**
* Returns the member id of the member who has the latest copy of the persistent region. This may
* be the local member ID if this member has the latest known copy.
- *
+ *
* This method will block until the latest member is online.
- *
+ *
* @throws ConflictingPersistentDataException if there are active members which are not based on
* the state that is persisted in this member.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index ed0cec4..8472ae3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -500,7 +500,7 @@ public class DiskInitFileParser {
/**
* Reads a class name from the given input stream, as written by writeClass, and loads the class.
- *
+ *
* @return null if class can not be loaded; otherwise loaded Class
*/
private static Class<?> readClass(DataInput di) throws IOException {
@@ -518,7 +518,7 @@ public class DiskInitFileParser {
/**
* Reads a class name from the given input stream.
- *
+ *
* @return class name
*/
private static String readClassName(DataInput di) throws IOException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java
index e0703a0..9a3890c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java
@@ -16,11 +16,11 @@ package org.apache.geode.internal.cache.persistence;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.EvictionAttributes;
-import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.RegionMap;
+import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.versions.RegionVersionHolder;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionTag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
index c357e9b..d4d5e32 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.persistence;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java
index 1b846a2..205cef9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java
@@ -45,7 +45,7 @@ public interface PersistenceAdvisor {
/**
* Determine the state of this member on it's peers, along with the PersistentMemberID of those
* peers.
- *
+ *
* @return a map from the peers persistentId to the state of this member according to that peer.
*/
PersistentStateQueryResults getMyStateOnMembers(Set<InternalDistributedMember> members)
@@ -90,7 +90,7 @@ public interface PersistenceAdvisor {
/**
* Update the membership on this member to reflect changes that have happened since the member was
* last online. This method should be called before the member is online.
- *
+ *
* @param replicate the replicate to initialize from.
*/
public void updateMembershipView(InternalDistributedMember replicate,
@@ -98,11 +98,11 @@ public interface PersistenceAdvisor {
/**
* Indicate that the current member is online.
- *
+ *
* @param didGII - indicates that the member did a GII (for updating stats)
* @param atomicCreation - indicates that we are coming online as part of an atomic bucket
* creation.
- *
+ *
*/
public void setOnline(boolean didGII, boolean atomicCreation, PersistentMemberID newId);
@@ -142,7 +142,7 @@ public interface PersistenceAdvisor {
/**
* Check to see if the other members know about the current member .
- *
+ *
* @param replicates
* @throws ConflictingPersistentDataException if the other members were not part of the same
* distributed system as the persistent data on in this VM.
@@ -156,9 +156,9 @@ public interface PersistenceAdvisor {
/**
* Returns the member id of the member who has the latest copy of the persistent region. This may
* be the local member ID if this member has the latest known copy.
- *
+ *
* This method will block until the latest member is online.
- *
+ *
* @param recoverFromDisk
* @throws ConflictingPersistentDataException if there are active members which are not based on
* the state that is persisted in this member.
@@ -173,7 +173,7 @@ public interface PersistenceAdvisor {
/*
* Persist members to be offline and equal
- *
+ *
* @param Map<InternalDistributedMember, PersistentMemberID> map of current online members
*/
public void persistMembersOfflineAndEqual(Map<InternalDistributedMember, PersistentMemberID> map);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
index f4a0da9..bebb8f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.internal.cache.persistence;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.persistence.ConflictingPersistentDataException;
@@ -33,11 +39,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.process.StartupStatus;
import org.apache.geode.internal.util.TransformUtils;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
/**
*
@@ -1346,7 +1347,7 @@ public class PersistenceAdvisorImpl implements PersistenceAdvisor {
}
public static interface PersistenceAdvisorObserver {
- default public void observe(String regionPath) {}
+ public default void observe(String regionPath) {}
}
public static void setPersistenceAdvisorObserver(PersistenceAdvisorObserver o) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java
index 6355054..14a58b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java
@@ -63,7 +63,7 @@ public class PersistentMemberID implements DataSerializable {
/**
* Indicate that this persistent member id is from the same disk store, and is older than, or
* equal to, the passed in disk store.
- *
+ *
* This is an older version if it has an older timestamp, or the same timestamp and an older
* version
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java
index 1c4ab39..e0f6173 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java
@@ -64,7 +64,7 @@ public class PersistentMemberManager {
/**
* Add a new revocation listener
- *
+ *
* @param listener The revocation listener
* @param recoveredRevokedMembers a set of members which the listener knows have been revoked
*/
@@ -157,7 +157,7 @@ public class PersistentMemberManager {
/**
* Prepare the revoke of a persistent id.
- *
+ *
* @param pattern the pattern to revoke
* @param dm the distribution manager
* @param sender the originator of the prepare
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java
index 7a7851c..b24d0a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java
@@ -26,10 +26,10 @@ import org.apache.geode.internal.net.SocketCreator;
/**
* Implementation of the public PersistentID. It holds the region, host, directory, and timestamp.
- *
+ *
* This class also is also used to describe members that the user has revoked. Any fields that are
* null will be considered a wildcard matching any members.
- *
+ *
* @since GemFire prPersistSprint1
*/
public class PersistentMemberPattern implements PersistentID, Comparable<PersistentMemberPattern> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java
index 6813cd8..9c01ecf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java
@@ -23,8 +23,8 @@ import org.apache.geode.internal.cache.LocalRegion;
/**
* Holds a view of the persistent members for a region. This view may be backed by disk, or it may
* be only in memory on non-persistent replicas.
- *
- *
+ *
+ *
*/
public interface PersistentMemberView {
@@ -73,7 +73,7 @@ public interface PersistentMemberView {
/**
* Indicate that the member no longer persists the region and can be removed. This is only called
* after this member is online.
- *
+ *
* @param persistentID
*/
public void memberRemoved(PersistentMemberID persistentID);
@@ -100,13 +100,13 @@ public interface PersistentMemberView {
/**
* This method is called to finish either setAboutToDestroy or setAboutToPartialDestroy.
- *
+ *
* It can be called either during a normal region destroy or during a partial region destroy.
* AFTER distribution has completed or during initialization IF the region was previously crashed
* while it was "about to destroy." This method is expected to purge any data on disk, as well as
* any membership view information and persistent ID for this region.
- *
- *
+ *
+ *
* This method should NOT prevent this disk region from being initialized later.
*/
public abstract void endDestroy(LocalRegion region);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMembershipView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMembershipView.java
index 629fe72..844f498 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMembershipView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMembershipView.java
@@ -57,7 +57,7 @@ public class PersistentMembershipView implements DataSerializable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializable#fromData(java.io.DataInput)
*/
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
index 78a866f..a3bd455 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.lang.SystemUtils;
* This class is used to automatically generate a restore script for a backup. It keeps a list of
* files that were backed up, and a list of files that we should test for to avoid overriding when
* we restore the backup.
- *
+ *
* <p>
* It generates either a restore.sh for unix or a restore.bat for windows.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java
index d79919b..3132da8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java
@@ -18,20 +18,20 @@ import org.apache.geode.internal.cache.CachedDeserializable;
/**
* The contract for a sorted map that maps the pair (index key, regionKey) to an optional value.
- *
+ *
* All read API take INDEX keys, and return REGION keys. So for example keyIterator takes a range of
* index keys and returns the associated region keys.
- *
+ *
* The index key is allowed to be an object, or a CachedDeserializable.
- *
+ *
* This class is threadsafe. Iterators will reflect all entries added to the map up until the time
* that the iterator was obtained. After that they may or may not reflect modifications to the map
* while the iteration is in progress. They will guarantee that entries will be returned in the
* correct order.
- *
+ *
* TODO - is the user required to filter out NULL index keys, or should we provide separate NULL
* iterators.
- *
+ *
* TODO - Do we need getKey, getValue,
*
* @since GemFire cedar
@@ -41,7 +41,7 @@ public interface IndexMap {
/**
* Add an entry to the map. If the same indexKey, regionKey pair exists in the map is it replaced
* with the new value.
- *
+ *
* @param indexKey the index key for the entry. The index key may be NULL.
* @param regionKey the region key for the entry. The region key cannot be NULL.
* @param value a value for the entry, or NULL for no value
@@ -50,10 +50,10 @@ public interface IndexMap {
/**
* Remove an entry from the map.
- *
+ *
* @param indexKey the index key to remove
* @param regionKey the region key to remove
- *
+ *
* This method has no effect if the indexKey, regionKey does not exist in the map.
*/
void remove(Object indexKey, Object regionKey);
@@ -151,7 +151,7 @@ public interface IndexMap {
/**
* A single entry in an index
- *
+ *
* @since GemFire cedar
*/
interface IndexEntry {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java
index e572acd..b51121d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java
@@ -19,26 +19,26 @@ import org.apache.geode.internal.cache.CachedDeserializable;
/**
* The contract for a sorted bag of temporary results for a query. This bag may be persisted on
* disk.
- *
+ *
* This class is threadsafe. Iterators will reflect all entries added to the set up until the time
* that the iterator was obtained. After that they may or may not reflect modifications to the set
* while the iteration is in progress. They will guarantee that entries will be returned in the
* correct order.
- *
+ *
* The element is allowed to be an object, or a CachedDeserializable.
- *
+ *
* If multiple instances of the same element are required, use SortedResultBag instead.
- *
+ *
* The result set should be closed using the close method to free up resources when it is no longer
* in use.
- *
+ *
* @since GemFire cedar
*/
public interface ResultBag {
/**
* Add an element to the bag. Multiple copies of the same entry may be inserted into the bag.
- *
+ *
* @param e the element. e may be NULL.
*/
void add(Object e);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java
index 4d4ee24..4552137 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java
@@ -18,12 +18,12 @@ import org.apache.geode.internal.cache.CachedDeserializable;
/**
* The contract for a list of temporary results for a query. This set may be persisted on disk.
- *
+ *
* This class is threadsafe. Iterators will reflect all entries added to the set up until the time
* that the iterator was obtained. After that they may or may not reflect modifications to the set
* while the iteration is in progress. They will guarantee that entries will be returned in the
* correct order.
- *
+ *
* @since GemFire cedar
*/
public interface ResultList {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java
index 5ca0430..76dc149 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java
@@ -19,21 +19,21 @@ import org.apache.geode.internal.cache.CachedDeserializable;
/**
* The contract for a sorted set of temporary results for a query. This set may be persisted on
* disk.
- *
+ *
* This class is threadsafe. Iterators will reflect all entries added to the set up until the time
* that the iterator was obtained. After that they may or may not reflect modifications to the set
* while the iteration is in progress. They will guarantee that entries will be returned in the
* correct order.
- *
+ *
* The key and value are both allowed to be an object, or a CachedDeserializable.
- *
+ *
* @since GemFire cedar
*/
public interface ResultMap {
/**
* Add an entry to the map. If the same key exists in the map it is replaced with the new value
- *
+ *
* @param key the key for the entry. The key may be NULL.
* @param value a value for the entry, or NULL for no value
*/
@@ -41,9 +41,9 @@ public interface ResultMap {
/**
* Remove an entry from the map.
- *
+ *
* @param key the key to remove
- *
+ *
* This method has no effect if the key does not exist in the map.
*/
void remove(Object key);
@@ -103,7 +103,7 @@ public interface ResultMap {
/**
* A single entry in an index
- *
+ *
* @since GemFire cedar
*/
interface Entry {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java
index f7bb7b4..49bf5e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java
@@ -19,19 +19,19 @@ import org.apache.geode.internal.cache.CachedDeserializable;
/**
* The contract for a sorted set of temporary results for a query. This set may be persisted on
* disk.
- *
+ *
* This class is threadsafe. Iterators will reflect all entries added to the set up until the time
* that the iterator was obtained. After that they may or may not reflect modifications to the set
* while the iteration is in progress. They will guarantee that entries will be returned in the
* correct order.
- *
+ *
* The element is allowed to be an object, or a CachedDeserializable.
- *
+ *
* If multiple instances of the same element are required, use SortedResultBag instead.
- *
+ *
* The result set should be closed using the close method to free up resources when it is no longer
* in use.
- *
+ *
* @since GemFire cedar
*/
public interface ResultSet {
@@ -39,7 +39,7 @@ public interface ResultSet {
/**
* Add an element to the set. If the same element exists in the set it is replaced with the new
* element
- *
+ *
* @param e the element. e may be NULL.
*/
void add(Object e);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactory.java
index 5455549..e7aeb03 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactory.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.cache.persistence.query.mock.SortedResultSetImp
/**
* This is a factory for temporary result sets that overflow to disk.
- *
+ *
* The result sets will not be recovered when the member restarts. Any temporary results still on
* disk when a member restarts will be deleted.
*
@@ -31,7 +31,7 @@ public class TemporaryResultSetFactory {
/**
* Get a result set that is sorted. The result set will be overflowed on to disk as necessary, but
* it will not be recovered from disk.
- *
+ *
* @param extractor a callback to extract the index sort key from the object. The sort key is
* expected to be comparable.
* @param reverse - true to reverse the natural order of the keys
@@ -43,7 +43,7 @@ public class TemporaryResultSetFactory {
/**
* Get a result bag that is sorted. The result set will be overflowed on to disk as necessary, but
* it will not be recovered from disk.
- *
+ *
* @param extractor a callback to extract the index sort key from the object. The sort key is
* expected to be comparable.
* @param reverse - true to reverse the natural order of the keys
@@ -55,10 +55,10 @@ public class TemporaryResultSetFactory {
/**
* Get a result set that is not sorted. The result set will be overflowed on to disk as necessary,
* but it will not be recovered from disk.
- *
+ *
* This is useful for cases where the ordering is not important, but the set semantics are. For
* example, a distinct query.
- *
+ *
* @param reverse - true to reverse the natural order of the keys
*/
public ResultSet getUnsortedResultSet(boolean reverse) {
@@ -68,7 +68,7 @@ public class TemporaryResultSetFactory {
/**
* Get a list to store temporary results. The list will be overflowed on to disk as necessary, but
* it will not be recovered from disk.
- *
+ *
*/
public ResultList getResultList() {
return new ResultListImpl();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ByteComparator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ByteComparator.java
index 12b3a78..ca08ecc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ByteComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ByteComparator.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.EntryEventImpl;
/**
* Compare the serialized form of two objects.
- *
+ *
* Note that this does not do lexigraphic order, or really any useful order. It's only guaranteed to
* return 0 if the bytes are equal, and satisfy all the transitivity and communitivity properties of
* compare.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/CachedDeserializableComparator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/CachedDeserializableComparator.java
index c419568..cbe5910 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/CachedDeserializableComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/CachedDeserializableComparator.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.cache.CachedDeserializable;
/**
* Compare two cached deserializable objects by unwrapping the underlying object.
- *
+ *
* If either object is not a cached deserializable, just use the object directly.
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/IndexMapImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/IndexMapImpl.java
index 7d63a4d..02c929a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/IndexMapImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/IndexMapImpl.java
@@ -17,19 +17,18 @@ package org.apache.geode.internal.cache.persistence.query.mock;
import java.util.Iterator;
import java.util.concurrent.ConcurrentSkipListMap;
+import org.apache.geode.cache.query.internal.types.ExtendedNumericComparator;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
import org.apache.geode.internal.cache.persistence.query.IndexMap;
-import org.apache.geode.cache.query.internal.types.ExtendedNumericComparator;
-
/**
* A dummy implementation of an IndexMap. Keeps all of the entries in memory, but in serialized
* form.
- *
+ *
*
*/
public class IndexMapImpl implements IndexMap {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ItrAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ItrAdapter.java
index 59fef81..ce2540c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ItrAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/mock/ItrAdapter.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
/**
* An adapter from a java.util.iterator to a closable iterator.
- *
+ *
* The java.util.iterator is expected to be iterating over a set of CachedDeserializable objects.
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
index 95bde41..482f890 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java
@@ -43,7 +43,7 @@ import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
* enabled, the proxy function will use a {@link WindowedExporter} to rate the data gathering prior
* to forwarding back to the client. The client uses a custom {@link ResultCollector} to write
* entries immediately into the snapshot file.
- *
+ *
*
* @param <K> the key type
* @param <V> the value type
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ExportedRegistry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ExportedRegistry.java
index 6eb9927..ecb78ac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ExportedRegistry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ExportedRegistry.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
/**
* Captures the pdx types and enums to be exported.
- *
+ *
*/
public class ExportedRegistry {
/** the types */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/FlowController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/FlowController.java
index da3bb28..05f48e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/FlowController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/FlowController.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.InternalDataSerializer;
* invoke {@link #create(Region, DistributedMember, int)} while the recipient should respond with
* {@link #sendAck(DM, DistributedMember, int, String)} or
* {@link #sendAbort(DM, int, DistributedMember)}.
- *
+ *
*/
public class FlowController {
// watch out for rollover problems with MAX_VALUE
@@ -51,28 +51,28 @@ public class FlowController {
public interface Window {
/**
* Returns the window id.
- *
+ *
* @return the window id
*/
int getWindowId();
/**
* Returns true if the operation has been aborted.
- *
+ *
* @return true if aborted
*/
boolean isAborted();
/**
* Returns true if the window is open and {{@link #waitForOpening()} will return immediately.
- *
+ *
* @return true if open
*/
boolean isOpen();
/**
* Blocks until the window is open.
- *
+ *
* @throws InterruptedException Interrupted while waiting
*/
void waitForOpening() throws InterruptedException;
@@ -99,11 +99,11 @@ public class FlowController {
/**
* Creates and registers a {@link Window} that provides flow control.
- *
+ *
* @param region the region
* @param sink the data recipient
* @param windowSize the size of the sliding window
- *
+ *
* @see #sendAbort(DM, int, DistributedMember)
* @see #sendAck(DM, DistributedMember, int, String)
*/
@@ -117,7 +117,7 @@ public class FlowController {
/**
* Sends an ACK to allow the source to continue sending messages.
- *
+ *
* @param dmgr the distribution manager
* @param member the data source
* @param windowId the window
@@ -142,7 +142,7 @@ public class FlowController {
/**
* Aborts further message processing.
- *
+ *
* @param dmgr the distribution manager
* @param windowId the window
* @param member the data source
@@ -241,7 +241,7 @@ public class FlowController {
/**
* Sent to abort message processing.
- *
+ *
* @see Window#isAborted()
* @see FlowController#sendAbort(DM, int, DistributedMember)
*/
@@ -294,7 +294,7 @@ public class FlowController {
/**
* Sent to acknowledge receipt of a message packet.
- *
+ *
* @see FlowController#sendAck(DM, DistributedMember, int, String)
*/
public static class FlowControlAckMessage extends DistributionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
index aa72bd9..9c714a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
@@ -51,7 +51,7 @@ public class GFSnapshot {
public interface SnapshotWriter {
/**
* Appends a cache entry to the snapshot.
- *
+ *
* @param entry the cache entry
*/
void snapshotEntry(SnapshotRecord entry) throws IOException;
@@ -109,7 +109,7 @@ public class GFSnapshot {
/**
* Creates a snapshot file and provides a serializer to write entries to the snapshot.
- *
+ *
* @param snapshot the snapshot file
* @param region the region name
* @return the callback to allow the invoker to provide the snapshot entries
@@ -132,12 +132,12 @@ public class GFSnapshot {
/**
* Reads a snapshot file.
- *
+ *
* @param <K> the key type
* @param <V> the value type
* @param snapshot the snapshot file
* @return the snapshot iterator
- *
+ *
* @throws IOException error reading the snapshot file
* @throws ClassNotFoundException unable to deserialize entry
*/
@@ -239,7 +239,7 @@ public class GFSnapshot {
/**
* Writes an entry in the snapshot.
- *
+ *
* @param entry the snapshot entry
* @throws IOException unable to write entry
*/
@@ -350,7 +350,7 @@ public class GFSnapshot {
/**
* Returns the snapshot file version.
- *
+ *
* @return the version
*/
public byte getVersion() {
@@ -359,7 +359,7 @@ public class GFSnapshot {
/**
* Returns the original pathname of the region used to create the snapshot.
- *
+ *
* @return the region name (full pathname)
*/
public String getRegionName() {
@@ -368,7 +368,7 @@ public class GFSnapshot {
/**
* Returns the pdx types defined in the snapshot file.
- *
+ *
* @return the pdx types
*/
public ExportedRegistry getPdxTypes() {
@@ -377,7 +377,7 @@ public class GFSnapshot {
/**
* Reads a snapshot entry. If the last entry has been read, a null value will be returned.
- *
+ *
* @return the entry or null
* @throws IOException unable to read entry
* @throws ClassNotFoundException unable to create entry
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/LocalExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/LocalExporter.java
index c8e44f9..47ad83f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/LocalExporter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/LocalExporter.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
/**
* Exports snapshot data directly to the supplied {@link ExportSink}. All data is assumed to be
* local so snapshot data is obtained directly by iterating over the {@link Region#entrySet()}.
- *
+ *
*
* @param <K> the key type
* @param <V> the value type
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapper.java
index e86dcc2..1ec8b77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapper.java
@@ -55,7 +55,7 @@ public class ParallelSnapshotFileMapper implements SnapshotFileMapper {
* Combines the ip address and port of a distributed member to create a unique identifier for the
* member. As this string will be used in file names, the periods (ipv4) and colons (ipv6) are
* stripped out.
- *
+ *
* @param member the member to create a unique id for
* @return a String based on the ip address and host of the member
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
index a22b5ad..9554f21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
@@ -14,6 +14,22 @@
*/
package org.apache.geode.internal.cache.snapshot;
+import static org.apache.geode.distributed.internal.InternalDistributedSystem.getLoggerI18n;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.logging.log4j.LogManager;
+
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.PoolManager;
@@ -45,25 +61,9 @@ import org.apache.geode.internal.cache.snapshot.GFSnapshot.SnapshotWriter;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.File;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import static org.apache.geode.distributed.internal.InternalDistributedSystem.getLoggerI18n;
-
-import org.apache.logging.log4j.LogManager;
-
/**
* Provides an implementation for region snapshots.
- *
+ *
*
* @param <K> the key type
* @param <V> the value type
@@ -101,7 +101,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
public interface ExportSink {
/**
* Writes snapshot data to the destination sink.
- *
+ *
* @param records the snapshot records
* @throws IOException error writing records
*/
@@ -110,14 +110,14 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
/**
* Provides a strategy for exporting a region.
- *
+ *
* @param <K> the key type
* @param <V> the value type
*/
public interface Exporter<K, V> {
/**
* Exports the requested region.
- *
+ *
* @param region the region to export
* @param sink the sink for the snapshot data
* @param options snapshot options
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotFileMapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotFileMapper.java
index 659eb3f..9f48430 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotFileMapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotFileMapper.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Defines a mapping between the snapshot path and the file(s) to be imported or exported on a
* specific member.
- *
+ *
* @see SnapshotOptionsImpl#setMapper(SnapshotFileMapper)
*
*/
@@ -37,16 +37,16 @@ public interface SnapshotFileMapper extends Serializable {
* must resolve to a valid file path.
* <p>
* Example:
- *
+ *
* <pre>
* public File mapExportFile(String regionPath, DistributedMember member, File snapshot) {
* return new File(snapshot.getAbsolutePath() + "-" + member.getId());
* }
* </pre>
- *
+ *
* If members are writing to a shared location, the implementation <b>must</b> provide a unique
* file path to avoid an export error.
- *
+ *
* @param member the member performing the export
* @param snapshot the path specified in the invocation of
* {@link RegionSnapshotService#save(File, org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat)
@@ -64,17 +64,17 @@ public interface SnapshotFileMapper extends Serializable {
* more valid file paths.
* <p>
* Example:
- *
+ *
* <pre>
* public File[] mapImportPath(DistributedMember member, File snapshot) {
* File dir = new File(snapshot, member.getHost() + ":" + member.getProcessId());
* return dir.listFiles();
* }
* </pre>
- *
+ *
* If members are reading from a shared location, the implementation should partition the files so
* that a snapshot file is only imported once.
- *
+ *
* @param member the member performing the import
* @param snapshot the path specified in the invocation of
* {@link RegionSnapshotService#load(File, org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotOptionsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotOptionsImpl.java
index a2d217a..6bfc1fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotOptionsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotOptionsImpl.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.snapshot.SnapshotOptions;
/**
* Implements the snapshot options.
- *
+ *
*
* @param <K> the key type
* @param <V> the value type
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
index 6e7bfd2..b60b337 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
@@ -38,7 +38,7 @@ import org.apache.geode.internal.util.BlobHelper;
/**
* Provides an envelope for transmitting a collection of <code>SnapshotRecord</code>s during export.
- *
+ *
*/
public class SnapshotPacket implements DataSerializableFixedID {
/**
@@ -82,7 +82,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the serialized key.
- *
+ *
* @return the key
*/
public byte[] getKey() {
@@ -91,7 +91,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the serialized value.
- *
+ *
* @return the value
*/
public byte[] getValue() {
@@ -100,9 +100,9 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the deserialized key object.
- *
+ *
* @return the key
- *
+ *
* @throws IOException error deserializing key
* @throws ClassNotFoundException unable to deserialize key
*/
@@ -112,9 +112,9 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the deserialized value object.
- *
+ *
* @return the value
- *
+ *
* @throws IOException error deserializing value
* @throws ClassNotFoundException unable to deserialize value
*/
@@ -124,7 +124,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns true if the record has a value.
- *
+ *
* @return the value, or null
*/
public boolean hasValue() {
@@ -133,7 +133,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the size in bytes of the serialized key and value.
- *
+ *
* @return the record size
*/
public int getSize() {
@@ -202,7 +202,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the window id for sending responses.
- *
+ *
* @return the window id
*/
public int getWindowId() {
@@ -211,7 +211,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the packet id.
- *
+ *
* @return the packet id
*/
public String getPacketId() {
@@ -220,7 +220,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the member that sent the packet.
- *
+ *
* @return the sender
*/
public DistributedMember getSender() {
@@ -229,7 +229,7 @@ public class SnapshotPacket implements DataSerializableFixedID {
/**
* Returns the snapshot data
- *
+ *
* @return the records
*/
public SnapshotRecord[] getRecords() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
index 6ba94a3..2994ad4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java
@@ -14,21 +14,7 @@
*/
package org.apache.geode.internal.cache.snapshot;
-import org.apache.geode.cache.EntryDestroyedException;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.execute.*;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.cache.snapshot.SnapshotOptions;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.ReplyProcessor21;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.execute.InternalExecution;
-import org.apache.geode.internal.cache.execute.LocalResultCollector;
-import org.apache.geode.internal.cache.snapshot.FlowController.Window;
-import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl.ExportSink;
-import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl.Exporter;
-import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
+import static org.apache.geode.distributed.internal.InternalDistributedSystem.getLoggerI18n;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -44,14 +30,28 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.geode.distributed.internal.InternalDistributedSystem.getLoggerI18n;
+import org.apache.geode.cache.EntryDestroyedException;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.*;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.cache.snapshot.SnapshotOptions;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.execute.InternalExecution;
+import org.apache.geode.internal.cache.execute.LocalResultCollector;
+import org.apache.geode.internal.cache.snapshot.FlowController.Window;
+import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl.ExportSink;
+import org.apache.geode.internal.cache.snapshot.RegionSnapshotServiceImpl.Exporter;
+import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
/**
* Exports snapshot data using a sliding window to prevent the nodes in a partitioned region from
* overrunning the exporter. When a {@link SnapshotPacket} is written to the {@link ExportSink}, an
* ACK is sent back to the source node. The source node will continue to send data until it runs out
* of permits; it must then wait for ACK's to resume.
- *
+ *
*
* @param <K> the key type
* @param <V> the value type
@@ -144,10 +144,10 @@ public class WindowedExporter<K, V> implements Exporter<K, V> {
* Gathers the local data on the region and sends it back to the {@link ResultCollector} in
* serialized form as {@link SnapshotPacket}s. Uses a sliding window provided by the
* {@link FlowController} to avoid over-running the exporting member.
- *
+ *
* @param <K> the key type
* @param <V> the value type
- *
+ *
* @see FlowController
*/
private static class WindowedExportFunction<K, V> implements Function {
@@ -287,7 +287,7 @@ public class WindowedExporter<K, V> implements Exporter<K, V> {
/**
* Returns an exception that occurred during function exception.
- *
+ *
* @return the exception, or null
*/
public FunctionException getException() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
index c1ef814..22a5e43 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
@@ -29,7 +29,7 @@ public interface Acceptor {
/**
* The GFE version of the server.
- *
+ *
* @since GemFire 5.7
*/
Version VERSION = Version.CURRENT.getGemFireVersion();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/BatchException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/BatchException.java
index 6e8814a..5596ad6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/BatchException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/BatchException.java
@@ -38,7 +38,7 @@ public class BatchException extends GemFireCheckedException {
/**
* Constructor. Creates an instance of <code>RegionQueueException</code> with the specified detail
* message.
- *
+ *
* @param msg the detail message
* @param index the index in the batch list where the exception occurred
*/
@@ -49,7 +49,7 @@ public class BatchException extends GemFireCheckedException {
/**
* Constructor. Creates an instance of <code>RegionQueueException</code> with the specified cause.
- *
+ *
* @param cause the causal Throwable
* @param index the index in the batch list where the exception occurred
*/
@@ -60,7 +60,7 @@ public class BatchException extends GemFireCheckedException {
/**
* Answers the index in the batch where the exception occurred
- *
+ *
* @return the index in the batch where the exception occurred
*/
public int getIndex() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
index 940da95..0bf102d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
@@ -63,7 +63,7 @@ public class CachedRegionHelper {
/**
* Just ensure that this class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java
index 3e0332b..4272593 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
/**
* <code>ClientHandShake</code> represents a handshake from the client.
- *
+ *
* @since GemFire 5.7
*/
public interface ClientHandShake {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java
index d867f9a..99c68ce 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java
@@ -26,7 +26,7 @@ public interface ConnectionProxy {
/**
* The GFE version of the client.
- *
+ *
* @since GemFire 5.7
*/
public static final Version VERSION = Version.CURRENT.getGemFireVersion();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InterestType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InterestType.java
index 02299e9..973edeb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InterestType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InterestType.java
@@ -39,11 +39,11 @@ public class InterestType {
/**
* Convert an interest type to a printable string
- *
+ *
* @param kind the type to convert
* @return a printable string
*/
- static public String getString(int kind) {
+ public static String getString(int kind) {
switch (kind) {
case KEY:
return "KEY";
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
index 6fac66f..abb0d8e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
@@ -64,7 +64,7 @@ public class InternalClientMembership {
/**
* The membership listeners registered on this InternalClientMembership
- *
+ *
* This list is never modified in place, and a new list is installed only under the control of
* (@link #membershipLock}.
*/
@@ -92,7 +92,7 @@ public class InternalClientMembership {
/**
* True if class is monitoring systems
- *
+ *
* guarded.By InternalClientMembership.class
*/
private static boolean isMonitoring = false;
@@ -139,7 +139,7 @@ public class InternalClientMembership {
/**
* Registers a {@link ClientMembershipListener} for notification of connection changes for
* CacheServer and clients.
- *
+ *
* @param listener a ClientMembershipListener to be registered
*/
public static void registerClientMembershipListener(ClientMembershipListener listener) {
@@ -157,7 +157,7 @@ public class InternalClientMembership {
/**
* Removes registration of a previously registered {@link ClientMembershipListener}.
- *
+ *
* @param listener a ClientMembershipListener to be unregistered
*/
public static void unregisterClientMembershipListener(ClientMembershipListener listener) {
@@ -177,7 +177,7 @@ public class InternalClientMembership {
/**
* Returns an array of all the currently registered <code>ClientMembershipListener</code>s.
* Modifications to the returned array will not effect the registration of these listeners.
- *
+ *
* @return the registered <code>ClientMembershipListener</code>s; an empty array if no listeners
*/
public static ClientMembershipListener[] getClientMembershipListeners() {
@@ -210,12 +210,12 @@ public class InternalClientMembership {
* a String representation of the client memberId, and the map entry value is an Integer count of
* connections to that client. Since a single client can have multiple ConnectionProxy objects,
* this map will contain all the Connection objects across the ConnectionProxies
- *
+ *
* @param onlyClientsNotifiedByThisServer true will return only those clients that are actively
* being updated by this server
* @return map of client memberIds to count of connections to that client
- *
- *
+ *
+ *
*/
public static Map getConnectedClients(boolean onlyClientsNotifiedByThisServer) {
ClientHealthMonitor chMon = ClientHealthMonitor.getInstance();
@@ -242,7 +242,7 @@ public class InternalClientMembership {
Map map = chMon.getConnectedClients(filterProxyIDs);
/*
* if (onlyClientsNotifiedByThisServer) { Map notifyMap = new HashMap();
- *
+ *
* for (Iterator iter = map.keySet().iterator(); iter.hasNext();) { String memberId = (String)
* iter.next(); if (notifierClients.contains(memberId)) { // found memberId that is notified by
* this server notifyMap.put(memberId, map.get(memberId)); } } map = notifyMap; }
@@ -253,7 +253,7 @@ public class InternalClientMembership {
/**
* This method returns the CacheClientStatus for all the clients that are connected to this
* server. This method returns all clients irrespective of whether subscription is enabled or not.
- *
+ *
* @return Map of ClientProxyMembershipID against CacheClientStatus objects.
*/
public static Map getStatusForAllClientsIgnoreSubscriptionStatus() {
@@ -266,7 +266,7 @@ public class InternalClientMembership {
/**
* Caller must synchronize on cache.allClientServersLock
- *
+ *
* @return all the clients
*/
public static Map getConnectedClients() {
@@ -312,7 +312,7 @@ public class InternalClientMembership {
/**
* Returns a map of servers to count of pools connected to that server. The map entry key is a
* String representation of the server,
- *
+ *
* @return map of servers to count of pools using that server
*/
public static Map getConnectedServers() {
@@ -418,7 +418,7 @@ public class InternalClientMembership {
/**
* Notifies registered listeners that a Client member has joined. The new member may be a client
* connecting to this process or a server that this process has just connected to.
- *
+ *
* @param member the <code>DistributedMember</code>
* @param client true if the member is a client; false if server
* @param typeOfEvent joined/left/crashed
@@ -609,4 +609,3 @@ public class InternalClientMembership {
JOINED, LEFT, CRASHED
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/MessageType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/MessageType.java
index de9d80d..4e02232 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/MessageType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/MessageType.java
@@ -202,21 +202,21 @@ public class MessageType {
/**
* A message to make primary server
- *
+ *
* @since GemFire 5.1
*/
public static final int MAKE_PRIMARY = 31;
/**
* Response message type from primary server
- *
+ *
* @since GemFire 5.1
*/
public static final int RESPONSE_FROM_PRIMARY = 32;
/**
* Response message type from secondary server
- *
+ *
* @since GemFire 5.1
*/
public static final int RESPONSE_FROM_SECONDARY = 33;
@@ -226,7 +226,7 @@ public class MessageType {
*
* <p>
* author gregp
- *
+ *
* @since GemFire 4.1.1
*/
public static final int QUERY = 34;
@@ -265,7 +265,7 @@ public class MessageType {
/**
* A message to register the Instantiators.
- *
+ *
* @since GemFire 5.0
*/
public static final int REGISTER_INSTANTIATORS = 51;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
index 3a456d5..21a0ac3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
@@ -95,7 +95,7 @@ import org.apache.geode.internal.util.ArrayUtils;
/**
* Implements the acceptor thread on the bridge server. Accepts connections from the edge and starts
* up threads to process requests from these.
- *
+ *
* @since GemFire 2.0.2
*/
@SuppressWarnings("deprecation")
@@ -274,7 +274,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* The ip address or host name this acceptor is to bind to; <code>null</code> or "" indicates it
* will listen on all local addresses.
- *
+ *
* @since GemFire 5.7
*/
private final String bindHostName;
@@ -314,7 +314,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* Initializes this acceptor thread to listen for connections on the given port.
- *
+ *
* @param port The port on which this acceptor listens for connections. If <code>0</code>, a
* random port will be chosen.
* @param bindHostName The ip address or host name this acceptor listens on for connections. If
@@ -680,7 +680,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* This system property is only used if max-threads == 0. This is for 5.0.2 backwards
* compatibility.
- *
+ *
* @deprecated since 5.1 use cache-server max-threads instead
*/
@Deprecated
@@ -689,13 +689,13 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* This system property is only used if max-threads == 0. This is for 5.0.2 backwards
* compatibility.
- *
+ *
* @deprecated since 5.1 use cache-server max-threads instead
*/
@Deprecated
- private final static int DEPRECATED_SELECTOR_POOL_SIZE =
+ private static final int DEPRECATED_SELECTOR_POOL_SIZE =
Integer.getInteger("BridgeServer.SELECTOR_POOL_SIZE", 16).intValue();
- private final static int HANDSHAKE_POOL_SIZE = Integer
+ private static final int HANDSHAKE_POOL_SIZE = Integer
.getInteger("BridgeServer.HANDSHAKE_POOL_SIZE", HANDSHAKER_DEFAULT_POOL_SIZE).intValue();
@Override
@@ -827,7 +827,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* Ensure that the CachedRegionHelper and ServerConnection classes get loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
@@ -1189,7 +1189,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* The work loop of this acceptor
- *
+ *
* @see #accept
*/
public void run() {
@@ -1704,7 +1704,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* Gets the address that this bridge server can be contacted on from external processes.
- *
+ *
* @since GemFire 5.7
*/
public String getExternalAddress() {
@@ -1738,7 +1738,7 @@ public class AcceptorImpl implements Acceptor, Runnable, CommBufferPool {
/**
* This method finds a client notifier and returns it. It is used to propagate interest
* registrations to other servers
- *
+ *
* @return the instance that provides client notification
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 84fe88a..d2eb7b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -14,6 +14,25 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.regex.Pattern;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CopyException;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.SerializationException;
@@ -61,24 +80,6 @@ import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.sequencelog.EntryLogger;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.Semaphore;
-import java.util.regex.Pattern;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
public abstract class BaseCommand implements Command {
protected static final Logger logger = LogService.getLogger();
@@ -189,7 +190,7 @@ public abstract class BaseCommand implements Command {
/**
* checks to see if this thread needs to masquerade as a transactional thread. clients after
* GFE_66 should be able to start a transaction.
- *
+ *
* @return true if thread should masquerade as a transactional thread.
*/
protected boolean shouldMasqueradeForTx(Message clientMessage,
@@ -1001,7 +1002,7 @@ public abstract class BaseCommand implements Command {
/**
* Determines whether keys for destroyed entries (tombstones) should be sent to clients in
* register-interest results.
- *
+ *
* @return true if tombstones should be sent to the client
*/
private static boolean sendTombstonesInRIResults(ServerConnection servConn,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index feec442..50cf7bb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -70,12 +70,8 @@ import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.ClassLoadUtil;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
-import org.apache.geode.internal.net.SocketCloser;
import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
@@ -94,6 +90,7 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.FilterProfile;
import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEventImpl;
@@ -103,12 +100,15 @@ import org.apache.geode.internal.cache.ha.HAContainerWrapper;
import org.apache.geode.internal.cache.ha.HARegionQueue;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.tier.Acceptor;
+import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.net.SocketCloser;
+import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.security.AccessControl;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
@@ -1202,7 +1202,7 @@ public class CacheClientNotifier {
/**
* Store region and delta relation
- *
+ *
* @param regionDataPolicy (0==empty)
* @since GemFire 6.1
*/
@@ -1297,7 +1297,7 @@ public class CacheClientNotifier {
* If the conflatable is an instance of HAEventWrapper, and if the corresponding entry is present
* in the haContainer, set the reference to the clientUpdateMessage to null and putInProgress flag
* to false. Also, if the ref count is zero, then remove the entry from the haContainer.
- *
+ *
* @since GemFire 5.7
*/
private void checkAndRemoveFromClientMsgsRegion(Conflatable conflatable) {
@@ -1358,7 +1358,7 @@ public class CacheClientNotifier {
/**
* Returns the <code>CacheClientProxy</code> associated to the durableClientId
- *
+ *
* @return the <code>CacheClientProxy</code> associated to the durableClientId
*/
public CacheClientProxy getClientProxy(String durableClientId) {
@@ -1368,7 +1368,7 @@ public class CacheClientNotifier {
/**
* Returns the <code>CacheClientProxy</code> associated to the durableClientId. This version of
* the method can check for initializing proxies as well as fully initialized proxies.
- *
+ *
* @return the <code>CacheClientProxy</code> associated to the durableClientId
*/
public CacheClientProxy getClientProxy(String durableClientId, boolean proxyInInitMode) {
@@ -1415,7 +1415,7 @@ public class CacheClientNotifier {
/**
* Returns the <code>CacheClientProxySameDS</code> associated to the membershipID *
- *
+ *
* @return the <code>CacheClientProxy</code> associated to the same distributed system
*/
public CacheClientProxy getClientProxySameDS(ClientProxyMembershipID membershipID) {
@@ -1563,7 +1563,7 @@ public class CacheClientNotifier {
/**
* Return (possibly stale) list of all clients and their status
- *
+ *
* @return Map, with CacheClientProxy as a key and CacheClientStatus as a value
*/
public Map getAllClients() {
@@ -1578,10 +1578,10 @@ public class CacheClientNotifier {
/**
* Checks if there is any proxy present for the given durable client
- *
+ *
* @param durableId - id for the durable-client
* @return - true if a proxy is present for the given durable client
- *
+ *
* @since GemFire 5.6
*/
public boolean hasDurableClient(String durableId) {
@@ -1597,10 +1597,10 @@ public class CacheClientNotifier {
/**
* Checks if there is any proxy which is primary for the given durable client
- *
+ *
* @param durableId - id for the durable-client
* @return - true if a primary proxy is present for the given durable client
- *
+ *
* @since GemFire 5.6
*/
public boolean hasPrimaryForDurableClient(String durableId) {
@@ -1772,9 +1772,9 @@ public class CacheClientNotifier {
/**
* Registers a new <code>InterestRegistrationListener</code> with the set of
* <code>InterestRegistrationListener</code>s.
- *
+ *
* @param listener The <code>InterestRegistrationListener</code> to register
- *
+ *
* @since GemFire 5.8Beta
*/
public void registerInterestRegistrationListener(InterestRegistrationListener listener) {
@@ -1784,9 +1784,9 @@ public class CacheClientNotifier {
/**
* Unregisters an existing <code>InterestRegistrationListener</code> from the set of
* <code>InterestRegistrationListener</code>s.
- *
+ *
* @param listener The <code>InterestRegistrationListener</code> to unregister
- *
+ *
* @since GemFire 5.8Beta
*/
public void unregisterInterestRegistrationListener(InterestRegistrationListener listener) {
@@ -1796,10 +1796,10 @@ public class CacheClientNotifier {
/**
* Returns a read-only collection of <code>InterestRegistrationListener</code>s registered with
* this notifier.
- *
+ *
* @return a read-only collection of <code>InterestRegistrationListener</code>s registered with
* this notifier
- *
+ *
* @since GemFire 5.8Beta
*/
public Set getInterestRegistrationListeners() {
@@ -1807,7 +1807,7 @@ public class CacheClientNotifier {
}
/**
- *
+ *
* @since GemFire 5.8Beta
*/
protected boolean containsInterestRegistrationListeners() {
@@ -1815,7 +1815,7 @@ public class CacheClientNotifier {
}
/**
- *
+ *
* @since GemFire 5.8Beta
*/
protected void notifyInterestRegistrationListeners(InterestRegistrationEvent event) {
@@ -1840,7 +1840,7 @@ public class CacheClientNotifier {
/**
* Returns this <code>CacheClientNotifier</code>'s <code>InternalCache</code>.
- *
+ *
* @return this <code>CacheClientNotifier</code>'s <code>InternalCache</code>
*/
protected InternalCache getCache() { // TODO:SYNC: looks wrong
@@ -1857,7 +1857,7 @@ public class CacheClientNotifier {
/**
* Returns this <code>CacheClientNotifier</code>'s maximum message count.
- *
+ *
* @return this <code>CacheClientNotifier</code>'s maximum message count
*/
protected int getMaximumMessageCount() {
@@ -1866,7 +1866,7 @@ public class CacheClientNotifier {
/**
* Returns this <code>CacheClientNotifier</code>'s message time-to-live.
- *
+ *
* @return this <code>CacheClientNotifier</code>'s message time-to-live
*/
protected int getMessageTimeToLive() {
@@ -2135,7 +2135,7 @@ public class CacheClientNotifier {
* The size of the server-to-client communication socket buffers. This can be modified using the
* BridgeServer.SOCKET_BUFFER_SIZE system property.
*/
- static final private int socketBufferSize =
+ private static final int socketBufferSize =
Integer.getInteger("BridgeServer.SOCKET_BUFFER_SIZE", 32768).intValue();
/**
@@ -2268,4 +2268,3 @@ public class CacheClientNotifier {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
index e866c79..2e1a3b4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
@@ -19,8 +19,8 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* GemFire statistics about a {@link CacheClientNotifier}. These statistics are related to cache
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index a9c1064..0394f65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -518,7 +518,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Mark the receiver as needing removal
- *
+ *
* @return true if it was already marked for removal
*/
protected boolean startRemoval() {
@@ -532,7 +532,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Wait until the receiver's removal has completed before returning.
- *
+ *
* @return true if the proxy was initially marked for removal
*/
protected boolean waitRemoval() {
@@ -601,7 +601,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Returns this proxy's <code>CacheClientNotifier</code>.
- *
+ *
* @return this proxy's <code>CacheClientNotifier</code>
*/
protected CacheClientNotifier getCacheClientNotifier() {
@@ -1537,7 +1537,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Delivers the message to the client representing this client proxy.
- *
+ *
* @param conflatable
*/
protected void deliverMessage(Conflatable conflatable) {
@@ -1821,14 +1821,14 @@ public class CacheClientProxy implements ClientSession {
}
// private static int nextId = 0;
- // static protected int getNextId() {
+ // protected static int getNextId() {
// synchronized (CacheClientProxy.class) {
// return ++nextId;
// }
// }
/*
* Return this client's HA region queue
- *
+ *
* @returns - HARegionQueue of the client
*/
public HARegionQueue getHARegionQueue() {
@@ -1841,7 +1841,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Reinitialize a durable <code>CacheClientProxy</code> with a new client.
- *
+ *
* @param socket The socket between the server and the client
* @param ip whether this proxy represents the primary
*/
@@ -1957,7 +1957,7 @@ public class CacheClientProxy implements ClientSession {
* Class <code>ClientInterestList</code> provides a convenient interface for manipulating client
* interest information.
*/
- static protected class ClientInterestList {
+ protected static class ClientInterestList {
final CacheClientProxy ccp;
@@ -1966,12 +1966,12 @@ public class CacheClientProxy implements ClientSession {
/**
* An object used for synchronizing the interest lists
*/
- final private Object interestListLock = new Object();
+ private final Object interestListLock = new Object();
/**
* Regions that this client is interested in
*/
- final protected Set<String> regions = new HashSet<String>();
+ protected final Set<String> regions = new HashSet<String>();
/**
* Constructor.
@@ -2404,7 +2404,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Returns the size of the queue calculated through stats This includes events that have
* dispatched but have yet been removed
- *
+ *
* @return the size of the queue
*/
protected int getQueueSizeStat() {
@@ -3009,7 +3009,7 @@ public class CacheClientProxy implements ClientSession {
/**
* Returns the number of seconds that have elapsed since the Client proxy created.
- *
+ *
* @since GemFire 7.0
*/
public long getUpTime() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
index f3663c3..d8f164d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
@@ -20,8 +20,8 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* Class <code>CacheClientProxyStats</code> tracks GemFire statistics related to a
@@ -81,7 +81,7 @@ public class CacheClientProxyStats implements MessageStats {
private static final int _deltaFullMessagesSentId;
/** Id of the CQ count statistic */
private static final int _cqCountId;
- private final static int _sentBytesId;
+ private static final int _sentBytesId;
/**
* Static initializer to create and initialize the <code>StatisticsType</code>
@@ -172,7 +172,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messagesReceived" stat.
- *
+ *
* @return the current value of the "messagesReceived" stat
*/
public int getMessagesReceived() {
@@ -181,7 +181,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messagesQueued" stat.
- *
+ *
* @return the current value of the "messagesQueued" stat
*/
public int getMessagesQueued() {
@@ -190,7 +190,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messagesNotQueuedOriginator" stat.
- *
+ *
* @return the current value of the "messagesNotQueuedOriginator" stat
*/
public int getMessagesNotQueuedOriginator() {
@@ -199,7 +199,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messagesNotQueuedNotInterested" stat.
- *
+ *
* @return the current value of the "messagesNotQueuedNotInterested" stat
*/
public int getMessagesNotQueuedNotInterested() {
@@ -208,7 +208,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messagesFailedQueued" stat.
- *
+ *
* @return the current value of the "messagesFailedQueued" stat
*/
public int getMessagesFailedQueued() {
@@ -217,7 +217,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messageQueueSize" stat.
- *
+ *
* @return the current value of the "messageQueueSize" stat
*/
public int getMessageQueueSize() {
@@ -226,7 +226,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the messagesProcessed" stat.
- *
+ *
* @return the current value of the messagesProcessed" stat
*/
public int getMessagesProcessed() {
@@ -235,7 +235,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "messageProcessingTime" stat.
- *
+ *
* @return the current value of the "messageProcessingTime" stat
*/
public long getMessageProcessingTime() {
@@ -244,7 +244,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "deltaMessagesSent" stat.
- *
+ *
* @return the current value of the "deltaMessagesSent" stat
*/
public int getDeltaMessagesSent() {
@@ -253,7 +253,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "deltaFullMessagesSent" stat.
- *
+ *
* @return the current value of the "deltaFullMessagesSent" stat
*/
public int getDeltaFullMessagesSent() {
@@ -262,7 +262,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current value of the "cqCount" stat.
- *
+ *
* @return the current value of the "cqCount" stat
*/
public int getCqCount() {
@@ -320,7 +320,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Sets the "messageQueueSize" stat.
- *
+ *
* @param size The size of the queue
*/
public void setQueueSize(int size) {
@@ -329,7 +329,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Returns the current time (ns).
- *
+ *
* @return the current time (ns)
*/
public long startTime() {
@@ -338,7 +338,7 @@ public class CacheClientProxyStats implements MessageStats {
/**
* Increments the "messagesProcessed" and "messageProcessingTime" stats.
- *
+ *
* @param start The start of the message (which is decremented from the current time to determine
* the message processing time).
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index 764defd..5d9a113 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -97,7 +97,7 @@ import org.apache.geode.security.GemFireSecurityException;
* {@code CacheClientUpdater} is a thread that processes update messages from a cache server and
* {@linkplain org.apache.geode.cache.Region#localInvalidate(Object) invalidates} the local cache
* based on the contents of those messages.
- *
+ *
* @since GemFire 3.5
*/
public class CacheClientUpdater extends Thread implements ClientUpdater, DisconnectListener {
@@ -203,7 +203,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Return true if cache appears
- *
+ *
* @return true if cache appears
*/
private boolean waitForCache() {
@@ -255,7 +255,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* @param location the endpoint we represent
* @param primary true if our endpoint is primary
* @param ids the system we are distributing messages through
- *
+ *
* @throws AuthenticationRequiredException when client is not configured to send credentials using
* security-* system properties but server expects credentials
* @throws AuthenticationFailedException when authentication of the client fails
@@ -580,7 +580,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Handle a marker message
- *
+ *
* @param clientMessage message containing the data
*/
private void handleMarker(Message clientMessage) {
@@ -606,7 +606,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Create or update an entry
- *
+ *
* @param clientMessage message containing the data
*/
private void handleUpdate(Message clientMessage) {
@@ -792,7 +792,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Invalidate an entry
- *
+ *
* @param clientMessage message describing the entry
*/
private void handleInvalidate(Message clientMessage) {
@@ -897,7 +897,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* locally destroy an entry
- *
+ *
* @param clientMessage message describing the entry
*/
private void handleDestroy(Message clientMessage) {
@@ -994,7 +994,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Locally destroy a region
- *
+ *
* @param clientMessage message describing the region
*/
private void handleDestroyRegion(Message clientMessage) {
@@ -1063,7 +1063,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Locally clear a region
- *
+ *
* @param clientMessage message describing the region to clear
*/
private void handleClearRegion(Message clientMessage) {
@@ -1130,7 +1130,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Locally invalidate a region NOTE: Added as part of bug#38048. The code only takes care of CQ
* processing. Support needs to be added for local region invalidate.
- *
+ *
* @param clientMessage message describing the region to clear
*/
private void handleInvalidateRegion(Message clientMessage) {
@@ -1549,11 +1549,11 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Processes messages received from the server.
- *
+ *
* Only certain types of messages are handled.
*
* TODO: Method 'processMessages' is too complex to analyze by data flow algorithm
- *
+ *
* @see MessageType#CLIENT_MARKER
* @see MessageType#LOCAL_CREATE
* @see MessageType#LOCAL_UPDATE
@@ -1778,7 +1778,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* <p>
* Signals run thread to stop. Messages are not printed if the thread or the distributed system
* has already been instructed to terminate.
- *
+ *
* @param message contextual string for the failure
* @param exception underlying exception
*/
@@ -1796,7 +1796,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Return an object from serialization. Only used in debug logging.
- *
+ *
* @param serializedBytes the serialized form
* @return the deserialized object
*/
@@ -1834,7 +1834,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Stats for a CacheClientUpdater. Currently the only thing measured are incoming bytes on the
* wire
- *
+ *
* @since GemFire 5.7
*/
public static class CCUStats implements MessageStats {
@@ -1901,7 +1901,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Returns the current time (ns).
- *
+ *
* @return the current time (ns)
*/
public long startTime() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java
index c3c93e7..0daf787 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java
@@ -15,13 +15,6 @@
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.util.BlobHelper;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -29,10 +22,16 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.UTFDataFormatException;
import java.io.UnsupportedEncodingException;
-
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.CacheServerImpl;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.util.BlobHelper;
+
/**
* <code>CacheServerHelper</code> is a static class that provides helper methods for the CacheServer
* classes.
@@ -104,7 +103,7 @@ public class CacheServerHelper {
/**
* The logic used here is based on java's DataInputStream.writeUTF() from the version 1.6.0_10.
- *
+ *
* @param s
* @return byte[]
*/
@@ -115,7 +114,7 @@ public class CacheServerHelper {
/**
* The logic used here is based on java's DataInputStream.readUTF() from the version 1.6.0_10.
- *
+ *
* @param bytearr
* @return String
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
index 1849487..03826c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
@@ -232,7 +232,7 @@ public class CacheServerStats implements MessageStats {
/**
* Add a convinience method to pass in a StatisticsFactory for Statistics construction. Helpful
* for local Statistics operations
- *
+ *
* @param statisticsFactory
* @param ownerName
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
index 39c2f3a..b12b8b8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
@@ -15,47 +15,47 @@
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-
import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.logging.log4j.Logger;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+
/**
* Class <code>ChunkedMessage</code> is used to send messages from a server to a client divided into
* chunks.
- *
+ *
* This class encapsulates the wire protocol. It provides accessors to encode and decode a message
* and serialize it out to the wire.
- *
+ *
* <PRE>
- *
+ *
* messageType - int - 4 bytes type of message, types enumerated below
- *
+ *
* numberOfParts - int - 4 bytes number of elements (LEN-BYTE* pairs) contained
* in the payload. Message can be a multi-part message
- *
+ *
* transId - int - 4 bytes filled in by the requestor, copied back into the
* response len1 part1 . . . lenn partn
- *
+ *
* </PRE>
- *
+ *
* We read the fixed length 15 bytes into a byte[] and populate a bytebuffer We read the fixed
* length header tokens from the header parse the header and use information contained in there to
* read the payload.
- *
+ *
* <P>
- *
+ *
* See also <a href="package-summary.html#messages">package description </a>.
- *
+ *
* @see org.apache.geode.internal.cache.tier.MessageType
- *
- *
+ *
+ *
* @since GemFire 4.2
*/
public class ChunkedMessage extends Message {
@@ -105,7 +105,7 @@ public class ChunkedMessage extends Message {
/**
* Creates a new message with the given number of parts
- *
+ *
* @param numberOfParts The number of parts to create
*/
public ChunkedMessage(int numberOfParts, Version version) {
@@ -114,7 +114,7 @@ public class ChunkedMessage extends Message {
/**
* Returns the header length.
- *
+ *
* @return the header length
*/
@Override
@@ -124,7 +124,7 @@ public class ChunkedMessage extends Message {
/**
* Sets whether this is the last chunk.
- *
+ *
* @param lastChunk Whether this is the last chunk
*/
public void setLastChunk(boolean lastChunk) {
@@ -168,7 +168,7 @@ public class ChunkedMessage extends Message {
/**
* Answers whether this is the last chunk.
- *
+ *
* @return whether this is the last chunk
*/
public boolean isLastChunk() {
@@ -181,7 +181,7 @@ public class ChunkedMessage extends Message {
/**
* Returns the chunk length.
- *
+ *
* @return the chunk length
*/
public int getChunkLength() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientBlacklistProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientBlacklistProcessor.java
index 4ce408f..90347a2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientBlacklistProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientBlacklistProcessor.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.DM;
@@ -27,17 +34,10 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
/**
* A processor for sending client black list message to all nodes from primary. This adds client to
* the blacklist and destroy it's queue if available on node.
- *
+ *
* @since GemFire 6.0
*
*/
@@ -165,4 +165,3 @@ public class ClientBlacklistProcessor extends ReplyProcessor21 {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
index 74bc0dd..326af57 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.MessageType;
/**
- *
+ *
*
*/
public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
@@ -43,7 +43,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
/**
* default constructor
- *
+ *
*/
public ClientDataSerializerMessage() {
@@ -57,7 +57,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
/**
* Returns a <code>Message</code> generated from the fields of this
* <code>ClientDataSerializerMessage</code>.
- *
+ *
* @param latestValue byte[] containing the latest value to use. This could be the original value
* if conflation is not enabled, or it could be a conflated value if conflation is enabled.
* @return a <code>Message</code> generated from the fields of this
@@ -160,7 +160,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
/**
* Writes an object to a <code>Datautput</code>.
- *
+ *
* @throws IOException If this serializer cannot write an object to <code>out</code>.
* @see #fromData
*/
@@ -179,7 +179,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
/**
* Reads an object from a <code>DataInput</code>.
- *
+ *
* @throws IOException If this serializer cannot read an object from <code>in</code>.
* @throws ClassNotFoundException If the class for an object being restored cannot be found.
* @see #toData
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
index 97abbd8..fc33a75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -65,17 +65,17 @@ public class ClientHealthMonitor {
/**
* An object used to lock the map of known clients
*/
- final protected Object _clientHeartbeatsLock = new Object();
+ protected final Object _clientHeartbeatsLock = new Object();
/**
* The map of known client threads
*/
- final protected Map _clientThreads;
+ protected final Map _clientThreads;
/**
* An object used to lock the map of client threads
*/
- final private Object _clientThreadsLock = new Object();
+ private final Object _clientThreadsLock = new Object();
/**
* THe GemFire <code>Cache</code>
@@ -91,7 +91,7 @@ public class ClientHealthMonitor {
/**
* A thread that validates client connections
*/
- final private ClientHealthMonitorThread _clientMonitor;
+ private final ClientHealthMonitorThread _clientMonitor;
/**
* The singleton <code>CacheClientNotifier</code> instance
@@ -107,7 +107,7 @@ public class ClientHealthMonitor {
/**
* The interval between client monitor iterations
*/
- private final static long DEFAULT_CLIENT_MONITOR_INTERVAL_IN_MILLIS = 1000;
+ private static final long DEFAULT_CLIENT_MONITOR_INTERVAL_IN_MILLIS = 1000;
private final CacheClientNotifierStats stats;
@@ -124,10 +124,10 @@ public class ClientHealthMonitor {
/**
* Gives, version-wise, the number of clients connected to the cache servers in this cache, which
* are capable of processing recieved deltas.
- *
+ *
* NOTE: It does not necessarily give the actual number of clients per version connected to the
* cache servers in this cache.
- *
+ *
* @see CacheClientNotifier#addClientProxy(CacheClientProxy)
*/
AtomicIntegerArray numOfClientsPerVersion = new AtomicIntegerArray(Version.HIGHEST_VERSION + 1);
@@ -140,7 +140,7 @@ public class ClientHealthMonitor {
/**
* Factory method to construct or return the singleton <code>ClientHealthMonitor</code> instance.
- *
+ *
* @param cache The GemFire <code>Cache</code>
* @param maximumTimeBetweenPings The maximum time allowed between pings before determining the
* client has died and interrupting its sockets.
@@ -154,7 +154,7 @@ public class ClientHealthMonitor {
/**
* Factory method to return the singleton <code>ClientHealthMonitor</code> instance.
- *
+ *
* @return the singleton <code>ClientHealthMonitor</code> instance
*/
public static ClientHealthMonitor getInstance() {
@@ -164,7 +164,7 @@ public class ClientHealthMonitor {
/**
* Shuts down the singleton <code>ClientHealthMonitor</code> instance.
*/
- public synchronized static void shutdownInstance() {
+ public static synchronized void shutdownInstance() {
refCount--;
if (_instance == null)
return;
@@ -193,7 +193,7 @@ public class ClientHealthMonitor {
/**
* Registers a new client to be monitored.
- *
+ *
* @param proxyID The id of the client to be registered
*/
public void registerClient(ClientProxyMembershipID proxyID) {
@@ -222,7 +222,7 @@ public class ClientHealthMonitor {
/**
* Takes care of unregistering from the _clientHeatBeats map.
- *
+ *
* @param proxyID The id of the client to be unregistered
*/
private void unregisterClient(ClientProxyMembershipID proxyID, boolean clientDisconnectedCleanly,
@@ -260,7 +260,7 @@ public class ClientHealthMonitor {
/**
* Unregisters a client to be monitored.
- *
+ *
* @param proxyID The id of the client to be unregistered
* @param acceptor non-null if the call is from a <code>ServerConnection</code> (as opposed to a
* <code>CacheClientProxy</code>).
@@ -298,7 +298,7 @@ public class ClientHealthMonitor {
* expire the transaction states for the given client. This uses the transactionTimeToLive setting
* that is inherited from the TXManagerImpl. If that setting is non-positive we expire the states
* immediately
- *
+ *
* @param proxyID
*/
private void expireTXStates(ClientProxyMembershipID proxyID) {
@@ -343,7 +343,7 @@ public class ClientHealthMonitor {
/**
* Adds a <code>ServerConnection</code> to the client's processing threads
- *
+ *
* @param proxyID The membership id of the client to be updated
* @param connection The thread processing client requests
*/
@@ -364,7 +364,7 @@ public class ClientHealthMonitor {
/**
* Removes a <code>ServerConnection</code> from the client's processing threads
- *
+ *
* @param proxyID The id of the client to be updated
* @param connection The thread processing client requests
*/
@@ -388,7 +388,7 @@ public class ClientHealthMonitor {
/**
* Processes a received ping for a client.
- *
+ *
* @param proxyID The id of the client from which the ping was received
*/
public void receivedPing(ClientProxyMembershipID proxyID) {
@@ -412,7 +412,7 @@ public class ClientHealthMonitor {
* count. This is different from the map contained in this class as here the key is client
* membershipID & not the the proxyID. It is to be noted that a given client can have multiple
* proxies.
- *
+ *
* @param filterProxies Set identifying the Connection proxies which should be fetched. These
* ConnectionProxies may be from same client member or different. If it is null this would
* mean to fetch the Connections of all the ConnectionProxy objects.
@@ -475,7 +475,7 @@ public class ClientHealthMonitor {
/**
* This method returns the CacheClientStatus for all the clients that are connected to this
* server. This method returns all clients irrespective of whether subscription is enabled or not.
- *
+ *
* @return Map of ClientProxyMembershipID against CacheClientStatus objects.
*/
public Map getStatusForAllClients() {
@@ -637,7 +637,7 @@ public class ClientHealthMonitor {
/**
* Returns the map of known clients.
- *
+ *
* @return the map of known clients
*/
public Map getClientHeartbeats() {
@@ -656,7 +656,7 @@ public class ClientHealthMonitor {
/**
* Creates the singleton <code>CacheClientNotifier</code> instance.
- *
+ *
* @param cache The GemFire <code>Cache</code>
* @param maximumTimeBetweenPings The maximum time allowed between pings before determining the
*/
@@ -672,7 +672,7 @@ public class ClientHealthMonitor {
/**
*
* Constructor.
- *
+ *
* @param cache The GemFire <code>Cache</code>
* @param maximumTimeBetweenPings The maximum time allowed between pings before determining the
*/
@@ -750,7 +750,7 @@ public class ClientHealthMonitor {
* The maximum time allowed between pings before determining the client has died and
* interrupting its sockets.
*/
- final protected int _maximumTimeBetweenPings;
+ protected final int _maximumTimeBetweenPings;
/**
* Whether the monitor is stopped
@@ -759,7 +759,7 @@ public class ClientHealthMonitor {
/**
* Constructor.
- *
+ *
* @param maximumTimeBetweenPings The maximum time allowed between pings before determining the
* client has died and interrupting its sockets
*/
@@ -798,7 +798,7 @@ public class ClientHealthMonitor {
/**
* Returns whether the dispatcher is stopped
- *
+ *
* @return whether the dispatcher is stopped
*/
protected boolean isStopped() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
index 4b6d581..fd7bd0b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
@@ -30,8 +30,8 @@ import org.apache.geode.internal.cache.tier.MessageType;
* Class <code>ClientInstantiatorMessage</code> represents a message that is to be sent to the
* client from a server , when a new <code>Instantiator</code>. object is registerd on Server. This
* message contains array of serailized instantiators along with the unique <code>EventID</code>
- *
- *
+ *
+ *
* @since GemFire 5.0
*/
public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
@@ -43,7 +43,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
/**
* Constructor.
- *
+ *
* @param operation The operation performed (e.g. AFTER_CREATE, AFTER_UPDATE, AFTER_DESTROY,
* AFTER_INVALIDATE, AFTER_REGION_DESTROY)
* @param instantiator Serialized 2D array of the instantiators
@@ -58,7 +58,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
/*
* (non-Javadoc) reimplemented to state that all clients are interested in this message.
- *
+ *
* @see
* org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl#isClientInterested(org.
* apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID)
@@ -75,7 +75,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
/**
* default constructor
- *
+ *
*/
public ClientInstantiatorMessage() {
@@ -93,7 +93,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
/**
* Determines whether or not to conflate this message.
- *
+ *
* @return Whether to conflate this message
*/
@Override
@@ -140,7 +140,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
/**
* Writes an object to a <code>Datautput</code>.
- *
+ *
* @throws IOException If this serializer cannot write an object to <code>out</code>.
* @see #fromData
*/
@@ -159,7 +159,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
/**
* Reads an object from a <code>DataInput</code>.
- *
+ *
* @throws IOException If this serializer cannot read an object from <code>in</code>.
* @throws ClassNotFoundException If the class for an object being restored cannot be found.
* @see #toData
@@ -206,4 +206,3 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index 5e97a77..3fbd30a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.*;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.DataSerializableFixedID;
@@ -23,8 +25,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.internal.cache.tier.MessageType;
-import java.io.*;
-
/**
* Class <code>ClientInterestMessageImpl</code> represents an update to the a client's interest
* registrations made by the server on behalf of the client.
@@ -59,7 +59,7 @@ public class ClientInterestMessageImpl implements ClientMessage {
/**
* Whether the create or update events for this <code>ClientMessage</code> is sent as an
* invalidate
- *
+ *
* @since GemFire 6.0.3
*/
private boolean forUpdatesAsInvalidates;
@@ -90,7 +90,7 @@ public class ClientInterestMessageImpl implements ClientMessage {
protected static final byte UNREGISTER = (byte) 1;
/**
- *
+ *
* @param eventId The EventID of this message
* @param regionName The name of the region whose interest is changing
* @param keyOfInterest The key in the region whose interest is changing
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
index 5aedcef..9809731 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
@@ -15,13 +15,13 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.*;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.MessageType;
-import java.io.*;
-
/**
* Class <code>ClientMarkerMessageImpl</code> is a marker message that is placed in the
* <code>CacheClientProxy</code>'s queue when the client connects to notify the client that all of
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java
index 6d9f38d..9776af8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.IOException;
+
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.cache.Conflatable;
-import java.io.IOException;
-
/**
* Interface <code>ClientMessage</code> is a message representing a cache operation that is sent
* from a server to an interested client.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
index a98214c..4176b80 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
@@ -26,8 +26,8 @@ import org.apache.geode.internal.cache.tier.MessageType;
/**
* Class <code>ClientPingMessageImpl</code> is a ping message that is periodically placed in the
* <code>CacheClientProxy</code>'s queue to verify the client connection is still alive.
- *
- *
+ *
+ *
* @since GemFire 6.6.2.x
*/
public class ClientPingMessageImpl implements ClientMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
index 074034a..d428e5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.io.*;
+import java.util.Arrays;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.distributed.DistributedMember;
@@ -25,18 +32,12 @@ import org.apache.geode.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.io.*;
-import java.util.Arrays;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
* This class represents a ConnectionProxy of the CacheClient
- *
- *
- *
+ *
+ *
+ *
*/
public class ClientProxyMembershipID
implements DataSerializableFixedID, Serializable, Externalizable {
@@ -55,7 +56,7 @@ public class ClientProxyMembershipID
private static final int BYTES_32KB = 32768;
- public volatile static DistributedSystem system = null;
+ public static volatile DistributedSystem system = null;
/**
* the membershpi id of the distributed system in this client (if running in a client)
@@ -243,7 +244,7 @@ public class ClientProxyMembershipID
/**
* For Externalizable
- *
+ *
* @see Externalizable
*/
public void writeExternal(ObjectOutput out) throws IOException {
@@ -267,7 +268,7 @@ public class ClientProxyMembershipID
/**
* For Externalizable
- *
+ *
* @see Externalizable
*/
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@@ -400,9 +401,9 @@ public class ClientProxyMembershipID
/**
* Returns whether this <code>ClientProxyMembershipID</code> is durable.
- *
+ *
* @return whether this <code>ClientProxyMembershipID</code> is durable
- *
+ *
* @since GemFire 5.5
*/
public boolean isDurable() {
@@ -412,9 +413,9 @@ public class ClientProxyMembershipID
/**
* Returns this <code>ClientProxyMembershipID</code>'s durable attributes.
- *
+ *
* @return this <code>ClientProxyMembershipID</code>'s durable attributes
- *
+ *
* @since GemFire 5.5
*/
protected DurableClientAttributes getDurableAttributes() {
@@ -423,9 +424,9 @@ public class ClientProxyMembershipID
/**
* Returns this <code>ClientProxyMembershipID</code>'s durable id.
- *
+ *
* @return this <code>ClientProxyMembershipID</code>'s durable id
- *
+ *
* @since GemFire 5.5
*/
public String getDurableId() {
@@ -435,9 +436,9 @@ public class ClientProxyMembershipID
/**
* Returns this <code>ClientProxyMembershipID</code>'s durable timeout.
- *
+ *
* @return this <code>ClientProxyMembershipID</code>'s durable timeout
- *
+ *
* @since GemFire 5.5
*/
protected int getDurableTimeout() {
@@ -491,9 +492,9 @@ public class ClientProxyMembershipID
* generated based on whether or not this proxy id is durable. If this proxy id is durable, then
* the durable client id is used. If this proxy id is not durable, then
* the<code>DistributedMember</code> string is used.
- *
+ *
* @return the name of the <code>HARegion</code> queueing this proxy's messages.
- *
+ *
* @since GemFire 5.5
*/
protected String getHARegionName() {
@@ -502,9 +503,9 @@ public class ClientProxyMembershipID
/**
* Return the name of the region used for communicating interest changes between servers.
- *
+ *
* @return the name of the region used for communicating interest changes between servers
- *
+ *
* @since GemFire 5.6
*/
protected String getInterestRegionName() {
@@ -524,7 +525,7 @@ public class ClientProxyMembershipID
/**
* Resets the unique id counter. This is done for durable clients that stops/starts its cache.
* When it restarts its cache, it needs to maintain the same unique id
- *
+ *
* @since GemFire 5.5
*/
public static synchronized void resetUniqueIdCounter() {
@@ -541,7 +542,7 @@ public class ClientProxyMembershipID
* <p>
* This class is used to clean up resources associated with a particular client and thus does not
* want to limit itself to the durable id.
- *
+ *
* @since GemFire 5.7
*/
public class Identity {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
index 56d410f..be2b766 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.versions.VersionSource;
/**
- *
+ *
*
*/
public class ClientTombstoneMessage extends ClientUpdateMessageImpl {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java
index c54ffa8..8e4c2c0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java
@@ -15,12 +15,12 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.util.HashMap;
+
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl.CqNameToOp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import java.util.HashMap;
-
/**
* Interface <code>ClientUpdateMessage</code> is a message representing a cache operation that is
* sent from a server to an interested client.
@@ -32,7 +32,7 @@ public interface ClientUpdateMessage extends ClientMessage {
/**
* Returns the region name that was updated.
- *
+ *
* @return the region name that was updated
*/
public String getRegionName();
@@ -44,28 +44,28 @@ public interface ClientUpdateMessage extends ClientMessage {
/**
* Returns the new value.
- *
+ *
* @return the new value
*/
public Object getValue();
/**
* Returns the new value.
- *
+ *
* @return the new value
*/
public boolean valueIsObject();
/**
* Returns the key that was updated.
- *
+ *
* @return the key that was updated
*/
public Object getKeyOfInterest();
/**
* Returns the operation
- *
+ *
* @return the operation performed by this message
*/
public EnumListenerEvent getOperation();
@@ -73,7 +73,7 @@ public interface ClientUpdateMessage extends ClientMessage {
/**
* Returns the membership Id of the originator of the event.
- *
+ *
* @return the membership Id of the originator of the event.
*/
public ClientProxyMembershipID getMembershipId();
@@ -90,7 +90,7 @@ public interface ClientUpdateMessage extends ClientMessage {
/**
* Returns whether the message satisfies CQs for the given clientId.
- *
+ *
* @param clientId ClientProxyMembershipID
* @return boolean true if CQ info is present for the given proxy.
*/
@@ -103,7 +103,7 @@ public interface ClientUpdateMessage extends ClientMessage {
/**
* Returns true if the message satisfies the interest list registered by the given client.
- *
+ *
* @param clientId ClientProxyMembershipID
* @return true if the given client is interested in this message
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
index 6bbe7b8..33358a3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
@@ -43,12 +43,12 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.EntryEventImpl.NewValueImporter;
import org.apache.geode.internal.cache.EntryEventImpl.SerializedCacheValueImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.WrappedCallbackArgument;
import org.apache.geode.internal.cache.ha.HAContainerRegion;
import org.apache.geode.internal.cache.lru.Sizeable;
@@ -145,7 +145,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
/**
* Represents the changed bytes of this event's _value.
- *
+ *
* @since GemFire 6.1
*/
private byte[] deltaBytes = null;
@@ -338,7 +338,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
/**
* Returns a <code>Message</code> generated from the fields of this
* <code>ClientUpdateMessage</code>.
- *
+ *
* @param latestValue Object containing the latest value to use. This could be the original value
* if conflation is not enabled, or it could be a conflated value if conflation is enabled.
* @return a <code>Message</code> generated from the fields of this
@@ -1016,7 +1016,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
/**
* Returns the cqs for the given client.
- *
+ *
* @return cqNames
*/
public String[] getCqs(ClientProxyMembershipID clientId) {
@@ -1037,7 +1037,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
/**
* Add cqs for the given client.
- *
+ *
* @param clientId
* @param filteredCqs
*/
@@ -1122,10 +1122,10 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
* out.writeInt(this._clientCqs.size()); // For each client. Iterator entries =
* this._clientCqs.entrySet().iterator(); while (entries.hasNext()) { Map.Entry entry =
* (Map.Entry)entries.next();
- *
+ *
* // Write ProxyId. ClientProxyMembershipID proxyId = (ClientProxyMembershipID)entry.getKey();
* proxyId.toData(out);
- *
+ *
* HashMap cqs = (HashMap)entry.getValue(); // Write CQ size for each Client.
* out.writeInt(cqs.size()); Iterator clients = cqs.entrySet().iterator(); while
* (clients.hasNext()) { Map.Entry client = (Map.Entry)clients.next(); // Write CQ Name. String cq
@@ -1136,16 +1136,16 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
/*
* private void readCqInfo(ObjectInput in) throws IOException, ClassNotFoundException { // Read
* Client CQ Size int numClientIds = in.readInt(); this._clientCqs = new HashMap();
- *
+ *
* // For each Client. for (int cCnt=0; cCnt < numClientIds; cCnt++){ ClientProxyMembershipID
* proxyId = new ClientProxyMembershipID();
- *
+ *
* // Read Proxy id. proxyId.fromData(in); // read CQ size for each Client. int numCqs =
* in.readInt(); HashMap cqs = new HashMap();
- *
+ *
* for (int cqCnt=0; cqCnt < numCqs; cqCnt++){ // Get CQ Name and CQ Op. // Read CQ Name. String
* cqName = (String)in.readObject(); int cqOp = in.readInt();
- *
+ *
* // Read CQ Op. cqs.put(cqName, Integer.valueOf(cqOp)); } this._clientCqs.put(proxyId, cqs); } }
*/
@@ -1400,7 +1400,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessage#needsNoAuthorizationCheck()
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
index ba2113e..5933162 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUserAuths.java
@@ -60,7 +60,7 @@ public class ClientUserAuths {
m_firstId = uniqueIdGenerator.nextLong();
}
- synchronized private long getNextID() {
+ private synchronized long getNextID() {
long uniqueId = uniqueIdGenerator.nextLong();
if (uniqueId == m_firstId) {
uniqueIdGenerator = new Random(m_seed + System.currentTimeMillis());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java
index de3189e..37bebad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java
@@ -24,13 +24,13 @@ public interface CommBufferPool {
/**
* Set a comm buffer in a ThreadLocal.
- *
+ *
*/
public void setTLCommBuffer();
/**
* Release the ThreadLocal comm buffer back to the queue.
- *
+ *
*/
public void releaseTLCommBuffer();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index f6fc147..5a81308 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -118,7 +118,7 @@ public class CommandInitializer {
/**
* Register a new command with the system.
- *
+ *
* @param messageType - An ordinal for this message. This must be something defined in MessageType
* that has not already been allocated to a different command.
* @param versionToNewCommand The command to register, for different versions. The key is the
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListener.java
index 9f466c7..5bc5d1a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListener.java
@@ -19,14 +19,14 @@ import org.apache.geode.internal.cache.tier.CommunicationMode;
/**
* A listener which can be registered on {@link AcceptorImpl} in order to receive events about
* connections created or destroyed for this acceptor.
- *
+ *
* @since GemFire 5.7
*
*/
public interface ConnectionListener {
/**
* Indicates that a new connection has been opened to this acceptor.
- *
+ *
* @param firstConnection true if this is the first connection from this client.
* @param communicationMode the communication mode of this connection.
*/
@@ -34,7 +34,7 @@ public interface ConnectionListener {
/**
* Indicates that the a connection to this acceptor has been closed.
- *
+ *
* @param lastConnection indicates that this was the last connection from this client.
* @param communicationMode of this connection.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListenerAdapter.java
index 3824920..a446c7f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ConnectionListenerAdapter.java
@@ -18,7 +18,7 @@ import org.apache.geode.internal.cache.tier.CommunicationMode;
/**
* A ConnectionListener that does nothing.
- *
+ *
* @since GemFire 5.7
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
index f486daf..9ace480 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
@@ -44,9 +44,9 @@ import org.apache.geode.internal.logging.LogService;
* instead that of <code>ClientUpdateMessagesImpl</code>. It implements the <code>Conflatable</code>
* interface to fit itself into the <code>HARegionQueue</code> mechanics. It also has a property to
* indicate the number of <code>HARegionQueue</code>s referencing this instance.
- *
+ *
* @since GemFire 5.7
- *
+ *
*/
public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Sizeable {
private static final long serialVersionUID = 5874226899495609988L;
@@ -111,7 +111,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* Parameterized constructor.
- *
+ *
* @param event
*/
public HAEventWrapper(ClientUpdateMessage event) {
@@ -136,13 +136,13 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* Default constructor
- *
+ *
*/
public HAEventWrapper() {}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.Conflatable#getEventId()
*/
public EventID getEventId() {
@@ -151,7 +151,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.Conflatable#getKeyToConflate()
*/
public Object getKeyToConflate() {
@@ -160,7 +160,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.Conflatable#getRegionToConflate()
*/
public String getRegionToConflate() {
@@ -169,7 +169,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.Conflatable#getValueToConflate()
*/
public Object getValueToConflate() {
@@ -178,7 +178,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.Conflatable#setLatestValue(java.lang.Object)
*/
public void setLatestValue(Object value) {
@@ -187,7 +187,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.Conflatable#shouldBeConflated()
*/
public boolean shouldBeConflated() {
@@ -201,7 +201,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* Use this method <B>only</B> when put operation on HARegionQueue is in progress. It'll always
* return null otherwise.
- *
+ *
* @return an instance of <code>ClientUpdateMessage</code> implementation.
*/
public ClientUpdateMessage getClientUpdateMessage() {
@@ -235,9 +235,9 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* This implementation considers only the EventID of <code>HAEventWrapper</code> for the equality
* test. It allows an instance of {@link EventID} to be tested for equality.
- *
+ *
* @param other The instance of HAEventWrapper or EventID to be tested for equality.
- *
+ *
* @return boolean true if <code>this</code> object's event id matches with that of other.
*/
@Override
@@ -251,7 +251,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* Returns the hash code of underlying event id.
- *
+ *
* @return int The hash code of underlying EventID instance.
*/
@Override
@@ -280,7 +280,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* Calls toData() on its clientUpdateMessage present in the haContainer (client-messages-region or
* the map).
- *
+ *
* @param out The output stream which the object should be written to.
*/
public void toData(DataOutput out) throws IOException {
@@ -308,7 +308,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
/**
* Calls fromData() on ClientUpdateMessage and sets it as its member variable. Also, sets the
* referenceCount to zero.
- *
+ *
* @param in The input stream from which the object should be constructed.
*/
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
@@ -391,7 +391,7 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
* Returning zero as default size. This is because this method will be called only in case of
* ha-overflow, in which case, we ignore size of instances of <code>HAEventWrapper</code>, as they
* are never overflown to disk.
- *
+ *
* @return int Size of this instance in bytes.
*/
public int getSizeInBytes() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 7fa6fe3..efc046f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -18,7 +18,51 @@ import static org.apache.geode.distributed.ConfigurationProperties.CONFLATE_EVEN
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTH_INIT;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.net.Socket;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyAgreement;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.DHParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.net.ssl.SSLSocket;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.DataSerializer;
import org.apache.geode.GemFireConfigException;
@@ -59,48 +103,6 @@ import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.Authenticator;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-import java.math.BigInteger;
-import java.net.Socket;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Signature;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import javax.crypto.Cipher;
-import javax.crypto.KeyAgreement;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import javax.net.ssl.SSLSocket;
public class HandShake implements ClientHandShake {
private static final Logger logger = LogService.getLogger();
@@ -131,7 +133,7 @@ public class HandShake implements ClientHandShake {
private boolean isRead = false;
protected final DistributedSystem system;
- final protected ClientProxyMembershipID id;
+ protected final ClientProxyMembershipID id;
private Properties credentials;
@@ -230,7 +232,7 @@ public class HandShake implements ClientHandShake {
/**
* Test hooks for per client conflation
- *
+ *
* @since GemFire 5.7
*/
public static byte clientConflationForTesting = 0;
@@ -238,7 +240,7 @@ public class HandShake implements ClientHandShake {
/**
* Test hook for client version support
- *
+ *
* @since GemFire 5.7
*/
private static Version currentClientVersion = ConnectionProxy.VERSION;
@@ -789,7 +791,7 @@ public class HandShake implements ClientHandShake {
}
}
- static public byte[] encryptBytes(byte[] data, Cipher encrypt) throws Exception {
+ public static byte[] encryptBytes(byte[] data, Cipher encrypt) throws Exception {
try {
@@ -972,7 +974,7 @@ public class HandShake implements ClientHandShake {
- static public byte[] decryptBytes(byte[] data, Cipher decrypt) throws Exception {
+ public static byte[] decryptBytes(byte[] data, Cipher decrypt) throws Exception {
try {
byte[] decrptBytes = decrypt.doFinal(data);
return decrptBytes;
@@ -1173,7 +1175,7 @@ public class HandShake implements ClientHandShake {
/**
* Return fake, temporary DistributedMember to represent the other vm this vm is connecting to
- *
+ *
* @param sock the socket this handshake is operating on
* @return temporary id to reprent the other vm
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
index bfc3937..c79ad39 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
@@ -16,12 +16,12 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.*;
+
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
-import java.io.*;
-
/**
* Used to make InterestResultPolicy implement DataSerializableFixedID
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java
index 2b46eb3..47f7bd2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java
@@ -15,6 +15,9 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.IOException;
+import java.net.Socket;
+
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
@@ -22,9 +25,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-import java.net.Socket;
-
/**
* Handles everything but the new client protocol.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
index b7835a3..6fa115e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
@@ -14,6 +14,20 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.SerializationException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.Assert;
@@ -27,19 +41,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.logging.log4j.Logger;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
/**
* This class encapsulates the wire protocol. It provides accessors to encode and decode a message
@@ -1070,7 +1071,7 @@ public class Message {
/**
* Undo any state changes done by setComms.
- *
+ *
* @since GemFire 5.7
*/
public void unsetComms() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java
index 6db29b1..ba7eef0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.tier.sockets;
/**
* Statistics supported by cache/server Message.
- *
+ *
* @since GemFire 5.0.2
*/
public interface MessageStats {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java
index 398e0d6..3ef80dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList.java
@@ -15,15 +15,6 @@
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.offheap.OffHeapHelper;
-import org.apache.geode.internal.offheap.Releasable;
-import org.apache.geode.DataSerializer;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -33,11 +24,20 @@ import java.util.List;
import org.apache.logging.log4j.Logger;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.offheap.OffHeapHelper;
+import org.apache.geode.internal.offheap.Releasable;
+
/**
* Encapsulates list containing objects, serialized objects, raw byte arrays, or exceptions. It can
* optionally also hold the list of associated keys. Assumes that keys are either provided for all
* entries or for none.
- *
+ *
* @since GemFire 5.7
*/
public class ObjectPartList implements DataSerializableFixedID, Releasable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
index 9a71960..887baf0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
@@ -13,23 +13,23 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.DataSerializableFixedID;
+
/**
* Adds one more object type which indicates that the key is not present at the server.
- *
+ *
* [bruce] THIS CLASS IS OBSOLETE AS OF V7.0. It is replaced with VersionedObjectList
- *
+ *
*
*/
public class ObjectPartList651 extends ObjectPartList {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java
index a8b157e..968600d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java
@@ -28,7 +28,7 @@ public interface OldClientSupportService extends CacheService {
/**
* translates the given throwable into one that can be sent to an old GemFire client
- *
+ *
* @param theThrowable the throwable to convert
* @param clientVersion the version of the client
* @return the exception to give the client
@@ -37,7 +37,7 @@ public interface OldClientSupportService extends CacheService {
/**
* Process a class name read from a serialized object of unknown origin
- *
+ *
* @param name
* @return the class name to use
*/
@@ -45,7 +45,7 @@ public interface OldClientSupportService extends CacheService {
/**
* Process a class name read from a serialized object
- *
+ *
* @param name the fully qualified class name
* @param in the source of the class name
* @return the adjusted class name
@@ -54,7 +54,7 @@ public interface OldClientSupportService extends CacheService {
/**
* Process a class name being written to a serialized form
- *
+ *
* @param name the fully qualified class name
* @param out the consumer of the class name
* @return the adjusted class name
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
index cfe812c..d701f2e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
@@ -45,7 +45,7 @@ public class Part {
/**
* Used to represent and empty byte array for bug 36279
- *
+ *
* @since GemFire 5.1
*/
private static final byte EMPTY_BYTEARRAY_CODE = 2;
@@ -287,7 +287,7 @@ public class Part {
* Write the contents of this part to the specified output stream. This is only called for parts
* that will not fit into the commBuffer so they need to be written directly to the stream. A
* stream is used because the client is configured for old IO (instead of nio).
- *
+ *
* @param buf the buffer to use if any data needs to be copied to one
*/
public void writeTo(OutputStream out, ByteBuffer buf) throws IOException {
@@ -416,7 +416,7 @@ public class Part {
}
}
- static private String typeCodeToString(byte c) {
+ private static String typeCodeToString(byte c) {
switch (c) {
case BYTE_CODE:
return "BYTE_CODE";
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
index 8bc9b07..963fec9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Distribution message for dropping client from blacklist.
- *
+ *
* @since GemFire 6.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
index 145024f..f11e837 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets;
@@ -30,7 +30,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
* objects, rather than as deserialized objects.
*
* [bruce] THIS CLASS IS OBSOLETE AS OF V7.0. It is replaced with VersionedObjectList
- *
+ *
*/
public class SerializedObjectPartList extends ObjectPartList651 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index b141c6c..74451e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -72,7 +72,7 @@ import org.apache.geode.security.GemFireSecurityException;
* Provides an implementation for the server socket end of the hierarchical cache connection. Each
* server connection runs in its own thread to maximize concurrency and improve response times to
* edge requests
- *
+ *
* @since GemFire 2.0.2
*/
public abstract class ServerConnection implements Runnable {
@@ -99,7 +99,7 @@ public abstract class ServerConnection implements Runnable {
private final SecurityService securityService;
- final protected CacheServerStats stats;
+ protected final CacheServerStats stats;
// private static boolean useDataStream =
// System.getProperty("hct.useDataStream", "false").equals("true");
@@ -313,19 +313,19 @@ public abstract class ServerConnection implements Runnable {
return this.acceptor;
}
- static private final ThreadLocal<Byte> executeFunctionOnLocalNodeOnly = new ThreadLocal<Byte>() {
+ private static final ThreadLocal<Byte> executeFunctionOnLocalNodeOnly = new ThreadLocal<Byte>() {
@Override
protected Byte initialValue() {
return 0x00;
}
};
- static public void executeFunctionOnLocalNodeOnly(Byte value) {
+ public static void executeFunctionOnLocalNodeOnly(Byte value) {
byte b = value.byteValue();
executeFunctionOnLocalNodeOnly.set(b);
}
- static public Byte isExecuteFunctionOnLocalNodeOnly() {
+ public static Byte isExecuteFunctionOnLocalNodeOnly() {
return executeFunctionOnLocalNodeOnly.get();
}
@@ -1072,7 +1072,7 @@ public abstract class ServerConnection implements Runnable {
/**
* MessageType of the messages (typically internal commands) which do not need to participate in
* security should be added in the following if block.
- *
+ *
* @return Part
* @see AbstractOp#processSecureBytes(Connection, Message)
* @see AbstractOp#needsUserId()
@@ -1499,7 +1499,7 @@ public abstract class ServerConnection implements Runnable {
/**
* Just ensure that this class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 9c0bd48..c4265cd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -29,8 +29,6 @@ import java.net.SocketTimeoutException;
import java.security.Principal;
import java.util.Properties;
-import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.logging.log4j.Logger;
import org.apache.shiro.subject.Subject;
@@ -45,12 +43,14 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataStream;
import org.apache.geode.internal.cache.tier.Acceptor;
+import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
@@ -72,7 +72,7 @@ public class ServerHandShakeProcessor {
/**
* Test hook for server version support
- *
+ *
* @since GemFire 5.7
*/
public static void setSeverVersionForTesting(short ver) {
@@ -136,7 +136,7 @@ public class ServerHandShakeProcessor {
/**
* Refuse a received handshake.
- *
+ *
* @param out the Stream to the waiting greeter.
* @param message providing details about the refusal reception, mainly for client logging.
* @throws IOException
@@ -147,7 +147,7 @@ public class ServerHandShakeProcessor {
/**
* Refuse a received handshake.
- *
+ *
* @param out the Stream to the waiting greeter.
* @param message providing details about the refusal reception, mainly for client logging.
* @param exception providing details about exception occurred.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerQueueStatus.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerQueueStatus.java
index 4716f17..56dc5c6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerQueueStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerQueueStatus.java
@@ -21,9 +21,9 @@ import org.apache.geode.distributed.DistributedMember;
* information abt HARegionQueue and this gets populated as a response of Handshake to server. This
* wrapper object is used to hold the various info retrurned from Handshake. such as endpoint type
* and queue size.
- *
+ *
* @since GemFire 5.5
- *
+ *
*/
public class ServerQueueStatus {
/** queueSize of HARegionQueue for this client */
@@ -43,7 +43,7 @@ public class ServerQueueStatus {
/**
* Constructor Called when connectionsPerServer is nto equal to 0
- *
+ *
* @param epType
* @param qSize
*/
@@ -56,7 +56,7 @@ public class ServerQueueStatus {
/**
* returns true if the endpoint is primary
- *
+ *
* @return epType
*/
public boolean isPrimary() {
@@ -65,7 +65,7 @@ public class ServerQueueStatus {
/**
* returns true if the endpoint is redundant
- *
+ *
* @return epType
*/
public boolean isRedundant() {
@@ -74,7 +74,7 @@ public class ServerQueueStatus {
/**
* returns true if the endpoint is Non redundant
- *
+ *
* @return epType
*/
public boolean isNonRedundant() {
@@ -83,7 +83,7 @@ public class ServerQueueStatus {
/**
* returns qSize of the HARegionQueue for this client
- *
+ *
* @return qSize
*/
public int getServerQueueSize() {
@@ -121,7 +121,7 @@ public class ServerQueueStatus {
/**
* The member id of the server we connected to.
- *
+ *
* @return the memberid
*/
public DistributedMember getMemberId() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerResponseMatrix.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerResponseMatrix.java
index 5f97c54..f64605c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerResponseMatrix.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerResponseMatrix.java
@@ -22,22 +22,22 @@ import org.apache.geode.internal.cache.tier.MessageType;
/**
* Matrix describes the state machine that needs to be applied to register interest response
* processing and events comming from notification chanel
- *
+ *
* When register interest responses are deserialized and added to the cache, the following rules are
* applied
- *
+ *
* 1) If the entry exists in the cache with a valid value, we consider it to be more current (either
* because it made it via the update channel or because the client updated it as part of put or
* invalidate)
- *
+ *
* 2) If the entry is invalid, and the RI response is valid, the valid value is put into the cache
- *
+ *
* 3) If an entry is marked destroyed (either from the client operation or via the update channel),
* it is not updated from the RI response. Destroyed entries are gathered up after the RI response
* is completed and removed from the system
- *
+ *
* @since GemFire 5.1
- *
+ *
*/
public class ServerResponseMatrix {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UserAuthAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UserAuthAttributes.java
index 55ed952..accb24b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UserAuthAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UserAuthAttributes.java
@@ -67,7 +67,7 @@ public class UserAuthAttributes {
/*
* protected void setAuthorizeRequest(AuthorizeRequest authzRequest) { this.authzRequest =
* authzRequest; }
- *
+ *
* protected void setPostAuthorizeRequest(AuthorizeRequestPP postAuthzRequest) {
* this.postAuthzRequest = postAuthzRequest; }
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
index f204c72..aade47d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
@@ -53,7 +53,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* <P>
* This class also implements Externalizable so that it can be serialized as part of a
* PutAllPartialResultException.
- *
+ *
* @since GemFire 7.0
*/
@@ -70,7 +70,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/**
* add a new entry to the list
- *
+ *
* @param key the entry's key
* @param versionTag the version tag for the entry, or null if there is no version information
* available
@@ -115,7 +115,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/**
* add a versioned "map" entry to the list
- *
+ *
* @param key
* @param value
* @param versionTag
@@ -156,7 +156,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
* replace null membership IDs in version tags with the given member ID. VersionTags received from
* a server may have null IDs because they were operations performed by that server. We transmit
* them as nulls to cut costs, but have to do the swap on the receiving end (in the client)
- *
+ *
* @param sender
*/
public void replaceNullIDs(DistributedMember sender) {
@@ -175,7 +175,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/**
* Add a part for a destroyed or missing entry. If the version tag is not null this represents a
* tombstone.
- *
+ *
* @param key
* @param value
* @param version
@@ -230,7 +230,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/**
* Add a version, assuming that the key list has already been established and we are now filling
* in version information.
- *
+ *
* @param tag the version tag to add
*/
public void addVersion(VersionTag tag) {
@@ -239,7 +239,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/**
* save the current key/tag pairs in the given map
- *
+ *
* @param vault
*/
public void saveVersions(Map<Object, VersionTag> vault) {
@@ -255,7 +255,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
}
/**
- *
+ *
* @return whether the source region had concurrency checks enabled
*/
public boolean regionIsVersioned() {
@@ -642,7 +642,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Map.Entry#getValue()
*/
public Object getValue() {
@@ -655,7 +655,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Map.Entry#setValue(java.lang.Object)
*/
public Object setValue(Object value) {
@@ -681,7 +681,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#hasNext()
*/
public boolean hasNext() {
@@ -690,7 +690,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#next()
*/
public Entry next() {
@@ -699,7 +699,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Iterator#remove()
*/
public void remove() {
@@ -712,7 +712,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
* Chunker is used to send a VersionedObjectList to a client in pieces. It works by pretending to
* be a VersionedObjectList during serialization and writing only a portion of the list in each
* invocation of toData().
- *
+ *
*
*/
public static class Chunker implements DataSerializableFixedID {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
index 194c7c4..d6ed138 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
@@ -31,7 +31,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class AddPdxEnum extends BaseCommand {
private static final Logger logger = LogService.getLogger();
- private final static AddPdxEnum singleton = new AddPdxEnum();
+ private static final AddPdxEnum singleton = new AddPdxEnum();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
index 9cf3105..eeac50f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
@@ -32,7 +32,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class AddPdxType extends BaseCommand {
private static final Logger logger = LogService.getLogger();
- private final static AddPdxType singleton = new AddPdxType();
+ private static final AddPdxType singleton = new AddPdxType();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
index 0989226..c856acb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
@@ -41,7 +41,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class ClearRegion extends BaseCommand {
- private final static ClearRegion singleton = new ClearRegion();
+ private static final ClearRegion singleton = new ClearRegion();
private ClearRegion() {}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
index ae95cae..425989e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
@@ -13,21 +13,21 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
+import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
-import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class ClientReady extends BaseCommand {
- private final static ClientReady singleton = new ClientReady();
+ private static final ClientReady singleton = new ClientReady();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
index ed050bd..a0527f5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
@@ -31,7 +31,7 @@ import org.apache.geode.internal.security.SecurityService;
public class CloseConnection extends BaseCommand {
- private final static CloseConnection singleton = new CloseConnection();
+ private static final CloseConnection singleton = new CloseConnection();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
index c9987db..bcdc632 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
@@ -13,10 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.TXCommitMessage;
@@ -30,16 +32,14 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
/**
* This is the base command which read the parts for the MessageType.COMMIT.<br>
- *
+ *
* @since GemFire 6.6
*/
public class CommitCommand extends BaseCommand {
- private final static CommitCommand singleton = new CommitCommand();
+ private static final CommitCommand singleton = new CommitCommand();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
index fed613b..d89e7e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
@@ -35,7 +35,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class ContainsKey extends BaseCommand {
- private final static ContainsKey singleton = new ContainsKey();
+ private static final ContainsKey singleton = new ContainsKey();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
index a953fef..a21d7f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
@@ -37,7 +37,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class ContainsKey66 extends BaseCommand {
- private final static ContainsKey66 singleton = new ContainsKey66();
+ private static final ContainsKey66 singleton = new ContainsKey66();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
index de6eda6..0376939 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
@@ -34,7 +34,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class CreateRegion extends BaseCommand {
- private final static CreateRegion singleton = new CreateRegion();
+ private static final CreateRegion singleton = new CreateRegion();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
index 5bf9d07..6070cd7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
@@ -13,10 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.*;
@@ -24,12 +26,10 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class Default extends BaseCommand {
- private final static Default singleton = new Default();
+ private static final Default singleton = new Default();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
index dac60ed..d878262 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Destroy extends BaseCommand {
- private final static Destroy singleton = new Destroy();
+ private static final Destroy singleton = new Destroy();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
index b7e5438..31d09cd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
@@ -50,7 +50,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Destroy65 extends BaseCommand {
- private final static Destroy65 singleton = new Destroy65();
+ private static final Destroy65 singleton = new Destroy65();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
index 7c07c72..f072508 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
@@ -13,10 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.cache.client.internal.DestroyOp;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.tier.Command;
@@ -25,13 +27,11 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.cache.versions.VersionTag;
-import java.io.IOException;
-
/**
*
*/
public class Destroy70 extends Destroy65 {
- private final static Destroy70 singleton = new Destroy70();
+ private static final Destroy70 singleton = new Destroy70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
index e96885d..ea77a43 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
@@ -39,7 +39,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class DestroyRegion extends BaseCommand {
- private final static DestroyRegion singleton = new DestroyRegion();
+ private static final DestroyRegion singleton = new DestroyRegion();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
index 6b006d9..e91da91 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
@@ -54,12 +54,12 @@ import org.apache.geode.internal.security.SecurityService;
* This is the base command which read the parts for the MessageType.EXECUTE_FUNCTION.<br>
* If the hasResult byte is 1, then this command send back the result after the execution to the
* client else do not send the reply back to the client
- *
+ *
* @since GemFire 5.8Beta
*/
public class ExecuteFunction extends BaseCommand {
- private final static ExecuteFunction singleton = new ExecuteFunction();
+ private static final ExecuteFunction singleton = new ExecuteFunction();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
index 6c1f79f..3c6272c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
@@ -56,7 +56,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class ExecuteFunction65 extends BaseCommand {
- private final static ExecuteFunction65 singleton = new ExecuteFunction65();
+ private static final ExecuteFunction65 singleton = new ExecuteFunction65();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
index 066362d..a8fb1b8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -68,7 +68,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class ExecuteFunction66 extends BaseCommand {
- private final static ExecuteFunction66 singleton = new ExecuteFunction66();
+ private static final ExecuteFunction66 singleton = new ExecuteFunction66();
protected static volatile boolean ASYNC_TX_WARNING_ISSUED = false;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
index 5299ce4..20f8fd4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.SecurityService;
/**
- *
+ *
*/
public class ExecuteFunction70 extends ExecuteFunction66 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
index 569eb81..289db3d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
@@ -56,7 +56,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class ExecuteRegionFunction extends BaseCommand {
- private final static ExecuteRegionFunction singleton = new ExecuteRegionFunction();
+ private static final ExecuteRegionFunction singleton = new ExecuteRegionFunction();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
index cadf729..3421a5a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
@@ -49,13 +49,13 @@ import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
/**
- *
- *
+ *
+ *
* @since GemFire 6.1
*/
public class ExecuteRegionFunction61 extends BaseCommand {
- private final static ExecuteRegionFunction61 singleton = new ExecuteRegionFunction61();
+ private static final ExecuteRegionFunction61 singleton = new ExecuteRegionFunction61();
public static Command getCommand() {
return singleton;
@@ -294,4 +294,3 @@ public class ExecuteRegionFunction61 extends BaseCommand {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
index dc6ebc9..a78ec9b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
@@ -53,7 +53,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class ExecuteRegionFunction65 extends BaseCommand {
- private final static ExecuteRegionFunction65 singleton = new ExecuteRegionFunction65();
+ private static final ExecuteRegionFunction65 singleton = new ExecuteRegionFunction65();
public static Command getCommand() {
return singleton;
@@ -394,4 +394,3 @@ public class ExecuteRegionFunction65 extends BaseCommand {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 06a8662..7882511 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -57,7 +57,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class ExecuteRegionFunction66 extends BaseCommand {
- private final static ExecuteRegionFunction66 singleton = new ExecuteRegionFunction66();
+ private static final ExecuteRegionFunction66 singleton = new ExecuteRegionFunction66();
public static Command getCommand() {
return singleton;
@@ -423,4 +423,3 @@ public class ExecuteRegionFunction66 extends BaseCommand {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index c6cda89..44c661b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -54,7 +54,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class ExecuteRegionFunctionSingleHop extends BaseCommand {
- private final static ExecuteRegionFunctionSingleHop singleton =
+ private static final ExecuteRegionFunctionSingleHop singleton =
new ExecuteRegionFunctionSingleHop();
public static Command getCommand() {
@@ -402,4 +402,3 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index 33043b2..a6fa57b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -59,7 +59,7 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
public class GatewayReceiverCommand extends BaseCommand {
- private final static GatewayReceiverCommand singleton = new GatewayReceiverCommand();
+ private static final GatewayReceiverCommand singleton = new GatewayReceiverCommand();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
index 6b5c6e5..e3da197 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
@@ -50,7 +50,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Get70 extends BaseCommand {
- private final static Get70 singleton = new Get70();
+ private static final Get70 singleton = new Get70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
index c32986d..b30e0d2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
@@ -40,7 +40,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class GetAll extends BaseCommand {
- private final static GetAll singleton = new GetAll();
+ private static final GetAll singleton = new GetAll();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
index 3ba2917..28ae7dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
@@ -40,7 +40,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class GetAll651 extends BaseCommand {
- private final static GetAll651 singleton = new GetAll651();
+ private static final GetAll651 singleton = new GetAll651();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
index 304b787..711b11c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
@@ -46,7 +46,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class GetAll70 extends BaseCommand {
- private final static GetAll70 singleton = new GetAll70();
+ private static final GetAll70 singleton = new GetAll70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
index 43d3348..4ff7137 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
@@ -22,13 +22,13 @@ import org.apache.geode.internal.cache.tier.sockets.SerializedObjectPartList;
* A version of GetAll which in which the response contains the objects in serialized byte array
* form, so that they can be separated into individual values without being deserialized. The
* standard GetAll requires us to deserialize the value of every object.
- *
+ *
* [bruce] this class is superceded by GetAll70, which merges GetAll651 and GetAllForRI
- *
- *
+ *
+ *
*/
public class GetAllForRI extends GetAll651 {
- private final static GetAllForRI singleton = new GetAllForRI();
+ private static final GetAllForRI singleton = new GetAllForRI();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
index 6299cb6..e96c297 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
@@ -50,7 +50,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class GetAllWithCallback extends BaseCommand {
private static final Logger logger = LogService.getLogger();
- private final static GetAllWithCallback singleton = new GetAllWithCallback();
+ private static final GetAllWithCallback singleton = new GetAllWithCallback();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
index 67a8fa6..717b57f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
@@ -35,13 +35,13 @@ import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPRMetadataCommand}
- *
- *
+ *
+ *
* @since GemFire 6.5
*/
public class GetClientPRMetadataCommand extends BaseCommand {
- private final static GetClientPRMetadataCommand singleton = new GetClientPRMetadataCommand();
+ private static final GetClientPRMetadataCommand singleton = new GetClientPRMetadataCommand();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
index a7aa2ad..3e952f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
@@ -33,13 +33,13 @@ import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPRMetadataCommand66}
- *
- *
+ *
+ *
* @since GemFire 6.6
*/
public class GetClientPRMetadataCommand66 extends BaseCommand {
- private final static GetClientPRMetadataCommand66 singleton = new GetClientPRMetadataCommand66();
+ private static final GetClientPRMetadataCommand66 singleton = new GetClientPRMetadataCommand66();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
index ded577a..ef25074 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
@@ -32,12 +32,12 @@ import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPartitionAttributesOp} operation
- *
+ *
* @since GemFire 6.5
*/
public class GetClientPartitionAttributesCommand extends BaseCommand {
- private final static GetClientPartitionAttributesCommand singleton =
+ private static final GetClientPartitionAttributesCommand singleton =
new GetClientPartitionAttributesCommand();
public static Command getCommand() {
@@ -123,5 +123,3 @@ public class GetClientPartitionAttributesCommand extends BaseCommand {
}
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
index 709cc5e..4e77e80 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
@@ -35,12 +35,12 @@ import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPartitionAttributesOp} operation for 6.6 clients
- *
+ *
* @since GemFire 6.6
*/
public class GetClientPartitionAttributesCommand66 extends BaseCommand {
- private final static GetClientPartitionAttributesCommand66 singleton =
+ private static final GetClientPartitionAttributesCommand66 singleton =
new GetClientPartitionAttributesCommand66();
public static Command getCommand() {
@@ -149,5 +149,3 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntry70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntry70.java
index 17dca62..5a0867b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntry70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntry70.java
@@ -25,12 +25,12 @@ import org.apache.geode.internal.cache.versions.VersionTag;
/**
* getEntry(key) operation performed on server. Extends Request, and overrides getValueAndIsObject()
* in Request so as to not invoke loader.
- *
+ *
* @since GemFire 6.6
*/
public class GetEntry70 extends Get70 {
- private final static GetEntry70 singleton = new GetEntry70();
+ private static final GetEntry70 singleton = new GetEntry70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntryCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntryCommand.java
index 65fecf0..d402889 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntryCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetEntryCommand.java
@@ -25,12 +25,12 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
/**
* getEntry(key) operation performed on server. Extends Request, and overrides getValueAndIsObject()
* in Request so as to not invoke loader.
- *
+ *
* @since GemFire 6.6
*/
public class GetEntryCommand extends Request {
- private final static GetEntryCommand singleton = new GetEntryCommand();
+ private static final GetEntryCommand singleton = new GetEntryCommand();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
index bd1bccc..5d338fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.internal.cache.tier.Command;
@@ -24,11 +26,9 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class GetFunctionAttribute extends BaseCommand {
- private final static GetFunctionAttribute singleton = new GetFunctionAttribute();
+ private static final GetFunctionAttribute singleton = new GetFunctionAttribute();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
index 8084cb7..aabee17 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class GetPDXEnumById extends BaseCommand {
- private final static GetPDXEnumById singleton = new GetPDXEnumById();
+ private static final GetPDXEnumById singleton = new GetPDXEnumById();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
index 9bd5ba9..40b7eb4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class GetPDXIdForEnum extends BaseCommand {
- private final static GetPDXIdForEnum singleton = new GetPDXIdForEnum();
+ private static final GetPDXIdForEnum singleton = new GetPDXIdForEnum();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
index 167fa51..faa2d25 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
@@ -29,7 +29,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class GetPDXIdForType extends BaseCommand {
- private final static GetPDXIdForType singleton = new GetPDXIdForType();
+ private static final GetPDXIdForType singleton = new GetPDXIdForType();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
index 71b1145..e46e9d9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class GetPDXTypeById extends BaseCommand {
- private final static GetPDXTypeById singleton = new GetPDXTypeById();
+ private static final GetPDXTypeById singleton = new GetPDXTypeById();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
index ced58e3..8930f81 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.internal.EnumInfo;
public class GetPdxEnums70 extends BaseCommand {
- private final static GetPdxEnums70 singleton = new GetPdxEnums70();
+ private static final GetPdxEnums70 singleton = new GetPdxEnums70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
index 1cbb717..9ab876a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
@@ -28,7 +28,7 @@ import org.apache.geode.pdx.internal.PdxType;
public class GetPdxTypes70 extends BaseCommand {
- private final static GetPdxTypes70 singleton = new GetPdxTypes70();
+ private static final GetPdxTypes70 singleton = new GetPdxTypes70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
index 5066b12..e3b1fa7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
@@ -13,10 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.*;
@@ -24,11 +26,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class Invalid extends BaseCommand {
- private final static Invalid singleton = new Invalid();
+ private static final Invalid singleton = new Invalid();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
index 0624e5e..52fe9ef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Invalidate extends BaseCommand {
- private final static Invalidate singleton = new Invalidate();
+ private static final Invalidate singleton = new Invalidate();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
index 2531e1d..7dfe925 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.cache.client.internal.DestroyOp;
import org.apache.geode.cache.client.internal.InvalidateOp;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -23,14 +25,12 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.cache.versions.VersionTag;
-import java.io.IOException;
-
/**
*
*/
public class Invalidate70 extends Invalidate {
- private final static Invalidate70 singleton = new Invalidate70();
+ private static final Invalidate70 singleton = new Invalidate70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
index cc4fcb5..9c18e3b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class KeySet extends BaseCommand {
- private final static KeySet singleton = new KeySet();
+ private static final KeySet singleton = new KeySet();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
index bc023ad..dce247b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
@@ -13,21 +13,21 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class MakePrimary extends BaseCommand {
- private final static MakePrimary singleton = new MakePrimary();
+ private static final MakePrimary singleton = new MakePrimary();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
index ff8c9f2..f9091da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
@@ -13,20 +13,20 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class PeriodicAck extends BaseCommand {
- private final static PeriodicAck singleton = new PeriodicAck();
+ private static final PeriodicAck singleton = new PeriodicAck();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
index 5408e29..8de4257 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
@@ -13,22 +13,22 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
+import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.*;
-import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class Ping extends BaseCommand {
- private final static Ping singleton = new Ping();
+ private static final Ping singleton = new Ping();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
index fa049f6..eebe96e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Put extends BaseCommand {
- private final static Put singleton = new Put();
+ private static final Put singleton = new Put();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
index bfda2bd..b3adcb6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
@@ -48,7 +48,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
*/
public class Put61 extends BaseCommand {
- private final static Put61 singleton = new Put61();
+ private static final Put61 singleton = new Put61();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
index fcfe487..8732717 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
@@ -59,7 +59,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
*/
public class Put65 extends BaseCommand {
- private final static Put65 singleton = new Put65();
+ private static final Put65 singleton = new Put65();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
index 395dbce..eb7ec27 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
@@ -13,10 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.cache.client.internal.PutOp;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -26,14 +28,12 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.cache.versions.VersionTag;
-import java.io.IOException;
-
/**
*
*/
public class Put70 extends Put65 {
- private final static Put70 singleton = new Put70();
+ private static final Put70 singleton = new Put70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
index eec6ef4..8c9b4d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
@@ -49,7 +49,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class PutAll extends BaseCommand {
- private final static PutAll singleton = new PutAll();
+ private static final PutAll singleton = new PutAll();
public static Command getCommand() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
index 71e8053..f344c83 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
@@ -52,7 +52,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class PutAll70 extends BaseCommand {
- private final static PutAll70 singleton = new PutAll70();
+ private static final PutAll70 singleton = new PutAll70();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
index 2769cca..74485a1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
@@ -54,7 +54,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class PutAll80 extends BaseCommand {
- private final static PutAll80 singleton = new PutAll80();
+ private static final PutAll80 singleton = new PutAll80();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAllWithCallback.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAllWithCallback.java
index efeabb6..c6b96d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAllWithCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAllWithCallback.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
+
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
@@ -25,7 +26,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
*/
public class PutAllWithCallback extends PutAll80 {
- private final static PutAllWithCallback singleton = new PutAllWithCallback();
+ private static final PutAllWithCallback singleton = new PutAllWithCallback();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
index 02ecce0..8a40e5c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
@@ -26,7 +26,7 @@ import org.apache.geode.security.GemFireSecurityException;
public class PutUserCredentials extends BaseCommand {
- private final static PutUserCredentials singleton = new PutUserCredentials();
+ private static final PutUserCredentials singleton = new PutUserCredentials();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
index d1be057..c5b0756 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.security.SecurityService;
public class Query extends BaseCommandQuery {
- private final static Query singleton = new Query();
+ private static final Query singleton = new Query();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
index d47a284..fd8079b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.security.SecurityService;
public class Query651 extends BaseCommandQuery {
- private final static Query651 singleton = new Query651();
+ private static final Query651 singleton = new Query651();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java
index 36ee1f5..db78c82 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.tier.Command;
public class QueryGeode10 extends Query {
- private final static QueryGeode10 singleton = new QueryGeode10();
+ private static final QueryGeode10 singleton = new QueryGeode10();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java
index 1137a30..5ee2473 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
@@ -23,7 +23,7 @@ import org.apache.geode.internal.cache.tier.Command;
public class QueryWithParametersGeode10 extends Query651 {
- private final static QueryWithParametersGeode10 singleton = new QueryWithParametersGeode10();
+ private static final QueryWithParametersGeode10 singleton = new QueryWithParametersGeode10();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
index 3460376..e5fcf5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.security.SecurityService;
public class RegisterDataSerializers extends BaseCommand {
- private final static RegisterDataSerializers singleton = new RegisterDataSerializers();
+ private static final RegisterDataSerializers singleton = new RegisterDataSerializers();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
index 92e740a..442977e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
@@ -40,7 +40,7 @@ import org.apache.geode.internal.security.SecurityService;
public class RegisterInstantiators extends BaseCommand {
- private final static RegisterInstantiators singleton = new RegisterInstantiators();
+ private static final RegisterInstantiators singleton = new RegisterInstantiators();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
index 64291b6..5a4cc1c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets.command;
@@ -42,7 +42,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class RegisterInterest extends BaseCommand {
- private final static RegisterInterest singleton = new RegisterInterest();
+ private static final RegisterInterest singleton = new RegisterInterest();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
index e6ebfa5..a358274 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -46,7 +46,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
*/
public class RegisterInterest61 extends BaseCommand {
- private final static RegisterInterest61 singleton = new RegisterInterest61();
+ private static final RegisterInterest61 singleton = new RegisterInterest61();
/**
* A debug flag used for testing vMotion during CQ registration
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
index 5621092..d27f2c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
@@ -41,7 +41,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class RegisterInterestList extends BaseCommand {
- private final static RegisterInterestList singleton = new RegisterInterestList();
+ private static final RegisterInterestList singleton = new RegisterInterestList();
public static Command getCommand() {
return singleton;
@@ -131,7 +131,7 @@ public class RegisterInterestList extends BaseCommand {
/*
* AcceptorImpl acceptor = servConn.getAcceptor();
- *
+ *
* // Check if the Server is running in NotifyBySubscription=true mode. if
* (!acceptor.getCacheClientNotifier().getNotifyBySubscription()) { // This should have been
* taken care at the client. String err = LocalizedStrings.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
index c1a3657..ae44028 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
*/
public class RegisterInterestList61 extends BaseCommand {
- private final static RegisterInterestList61 singleton = new RegisterInterestList61();
+ private static final RegisterInterestList61 singleton = new RegisterInterestList61();
public static Command getCommand() {
return singleton;
@@ -144,7 +144,7 @@ public class RegisterInterestList61 extends BaseCommand {
/*
* AcceptorImpl acceptor = servConn.getAcceptor();
- *
+ *
* // Check if the Server is running in NotifyBySubscription=true mode. if
* (!acceptor.getCacheClientNotifier().getNotifyBySubscription()) { // This should have been
* taken care at the client. String err = LocalizedStrings.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
index a5fd685..f81c4ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -48,7 +48,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
*/
public class RegisterInterestList66 extends BaseCommand {
- private final static RegisterInterestList66 singleton = new RegisterInterestList66();
+ private static final RegisterInterestList66 singleton = new RegisterInterestList66();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
index c61c2c5..5155c40 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
@@ -50,7 +50,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class RemoveAll extends BaseCommand {
- private final static RemoveAll singleton = new RemoveAll();
+ private static final RemoveAll singleton = new RemoveAll();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
index ead5469..449e394 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
@@ -27,7 +27,7 @@ import org.apache.geode.security.GemFireSecurityException;
public class RemoveUserAuth extends BaseCommand {
- private final static RemoveUserAuth singleton = new RemoveUserAuth();
+ private static final RemoveUserAuth singleton = new RemoveUserAuth();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
index 921e4b1..2ad2aa8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
@@ -43,7 +43,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Request extends BaseCommand {
- private final static Request singleton = new Request();
+ private static final Request singleton = new Request();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
index 0d64747..43d369b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
@@ -37,12 +37,12 @@ import org.apache.geode.internal.security.SecurityService;
/**
* Represents a request for (full) value of a given event from ha container
* (client-messages-region).
- *
+ *
* @since GemFire 6.1
*/
public class RequestEventValue extends BaseCommand {
- private final static RequestEventValue singleton = new RequestEventValue();
+ private static final RequestEventValue singleton = new RequestEventValue();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
index 2100c76..e30f37e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.security.SecurityService;
*/
public class RollbackCommand extends BaseCommand {
- private final static RollbackCommand singleton = new RollbackCommand();
+ private static final RollbackCommand singleton = new RollbackCommand();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
index db96345..70dfe54 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
@@ -36,7 +36,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class Size extends BaseCommand {
- private final static Size singleton = new Size();
+ private static final Size singleton = new Size();
private Size() {}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
index eb70700..b7b90d2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
@@ -15,6 +15,11 @@
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+
+import javax.transaction.Status;
+
import org.apache.geode.cache.client.internal.TXSynchronizationOp.CompletionType;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyException;
@@ -32,14 +37,9 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-import java.util.concurrent.Executor;
-
-import javax.transaction.Status;
-
public class TXSynchronizationCommand extends BaseCommand {
- private final static TXSynchronizationCommand singleton = new TXSynchronizationCommand();
+ private static final TXSynchronizationCommand singleton = new TXSynchronizationCommand();
public static Command getCommand() {
return singleton;
@@ -47,7 +47,7 @@ public class TXSynchronizationCommand extends BaseCommand {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.tier.sockets.BaseCommand#shouldMasqueradeForTx(org.apache.geode
* .internal.cache.tier.sockets.Message,
@@ -62,7 +62,7 @@ public class TXSynchronizationCommand extends BaseCommand {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.tier.sockets.BaseCommand#cmdExecute(org.apache.geode.internal.
* cache.tier.sockets.Message, org.apache.geode.internal.cache.tier.sockets.ServerConnection,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
index fc6d559..791963f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
@@ -35,7 +35,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class UnregisterInterest extends BaseCommand {
- private final static UnregisterInterest singleton = new UnregisterInterest();
+ private static final UnregisterInterest singleton = new UnregisterInterest();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
index cd45df7..6c184e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
@@ -40,7 +40,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
public class UnregisterInterestList extends BaseCommand {
- private final static UnregisterInterestList singleton = new UnregisterInterestList();
+ private static final UnregisterInterestList singleton = new UnregisterInterestList();
public static Command getCommand() {
return singleton;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
index 8e50f64..c611e9f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -22,8 +24,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
-import java.io.IOException;
-
public class UpdateClientNotification extends BaseCommand {
private static final UpdateClientNotification singleton = new UpdateClientNotification();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXRegionStub.java
index 0cff828..7bc5069 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXRegionStub.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.tx;
+import java.util.Set;
+
import org.apache.geode.cache.EntryExistsException;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Operation;
@@ -29,8 +31,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import java.util.Set;
-
public class ClientTXRegionStub implements TXRegionStub {
// private final LocalRegion region;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
index ab5701c..9f72c06 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.transaction.Status;
import org.apache.logging.log4j.Logger;
+
import org.apache.geode.GemFireException;
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.cache.TransactionDataNodeHasDepartedException;
@@ -83,7 +84,7 @@ public class ClientTXStateStub extends TXStateStub {
/**
* test hook
- *
+ *
* @param t a ThreadLocal to hold lists of TransactionalOperations
*/
public static void setTransactionalOperationContainer(
@@ -117,7 +118,7 @@ public class ClientTXStateStub extends TXStateStub {
/**
* Lock the keys in a local transaction manager
- *
+ *
* @throws CommitConflictException if the key is already locked by some other transaction
*/
private void obtainLocalLocks() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistClientTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistClientTXStateStub.java
index 89f419a..1df1775 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistClientTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistClientTXStateStub.java
@@ -23,15 +23,15 @@ import org.apache.geode.cache.UnsupportedOperationInTransactionException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.internal.cache.DistTXCommitMessage;
-import org.apache.geode.internal.cache.DistTXPrecommitMessage;
import org.apache.geode.internal.cache.DistTXCoordinatorInterface;
+import org.apache.geode.internal.cache.DistTXPrecommitMessage;
import org.apache.geode.internal.cache.DistTXRollbackMessage;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
+ *
*/
public class DistClientTXStateStub extends ClientTXStateStub implements DistTXCoordinatorInterface {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
index 6df6eb9..729d811 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
@@ -25,6 +25,8 @@ import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DistributedPutAllOperation;
+import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
+import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllEntryData;
import org.apache.geode.internal.cache.DistributedRemoveAllOperation;
import org.apache.geode.internal.cache.DistributedRemoveAllOperation.RemoveAllEntryData;
import org.apache.geode.internal.cache.EntryEventImpl;
@@ -32,8 +34,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
-import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllEntryData;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.annotations.Retained;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistributedTXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistributedTXRegionStub.java
index 17bd83b..c607baf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistributedTXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistributedTXRegionStub.java
@@ -18,11 +18,11 @@ import java.util.Collections;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.TransactionDataNodeHasDepartedException;
import org.apache.geode.cache.TransactionDataNotColocatedException;
import org.apache.geode.cache.TransactionException;
-import org.apache.geode.cache.Region.Entry;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DistributedPutAllOperation;
@@ -33,19 +33,19 @@ import org.apache.geode.internal.cache.KeyInfo;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegionException;
import org.apache.geode.internal.cache.RemoteContainsKeyValueMessage;
+import org.apache.geode.internal.cache.RemoteContainsKeyValueMessage.RemoteContainsKeyValueResponse;
import org.apache.geode.internal.cache.RemoteDestroyMessage;
import org.apache.geode.internal.cache.RemoteFetchEntryMessage;
import org.apache.geode.internal.cache.RemoteGetMessage;
import org.apache.geode.internal.cache.RemoteInvalidateMessage;
import org.apache.geode.internal.cache.RemoteOperationException;
+import org.apache.geode.internal.cache.RemoteOperationMessage.RemoteOperationResponse;
import org.apache.geode.internal.cache.RemotePutAllMessage;
import org.apache.geode.internal.cache.RemotePutMessage;
-import org.apache.geode.internal.cache.RemoteRemoveAllMessage;
-import org.apache.geode.internal.cache.TXStateStub;
-import org.apache.geode.internal.cache.RemoteContainsKeyValueMessage.RemoteContainsKeyValueResponse;
-import org.apache.geode.internal.cache.RemoteOperationMessage.RemoteOperationResponse;
import org.apache.geode.internal.cache.RemotePutMessage.PutResult;
import org.apache.geode.internal.cache.RemotePutMessage.RemotePutResponse;
+import org.apache.geode.internal.cache.RemoteRemoveAllMessage;
+import org.apache.geode.internal.cache.TXStateStub;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
index 5673c68..d8c9673 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.internal.cache.tx;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.geode.CancelException;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.EntryNotFoundException;
@@ -48,12 +54,6 @@ import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.offheap.annotations.Released;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
/**
@@ -396,7 +396,7 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
/**
* Create PutAllPRMsgs for each bucket, and send them.
- *
+ *
* @param putallO DistributedPutAllOperation object.
*/
public void postPutAll(DistributedPutAllOperation putallO, VersionedObjectList successfulPuts,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TXRegionStub.java
index 04f00b4..9ec64c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TXRegionStub.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.tx;
+import java.util.Set;
+
import org.apache.geode.cache.Region.Entry;
import org.apache.geode.internal.cache.DistributedPutAllOperation;
import org.apache.geode.internal.cache.DistributedRemoveAllOperation;
@@ -23,8 +25,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import java.util.Set;
-
public interface TXRegionStub {
void destroyExistingEntry(EntryEventImpl event, boolean cacheWrite, Object expectedOldValue);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java
index 32bb750..9f19eca 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java
@@ -23,7 +23,7 @@ import java.util.Set;
*
*/
public class TransactionalOperation {
- static public enum ServerRegionOperation {
+ public static enum ServerRegionOperation {
CONTAINS_KEY,
CONTAINS_VALUE,
CONTAINS_VALUE_FOR_KEY,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/CompactVersionHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/CompactVersionHolder.java
index 866cc3d..508036b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/CompactVersionHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/CompactVersionHolder.java
@@ -17,10 +17,10 @@ package org.apache.geode.internal.cache.versions;
/**
* A in memory representation of a VersionTag that is more compact than the VersionTag.
- *
+ *
* The version tag class has accumulated some temporary flags that make in undesirable to retain a
* reference for long periods of type.
- *
+ *
* This class is used store version tags that are pending writing to a krf.
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
index c970486..09bd830 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.versions;
@@ -22,7 +22,7 @@ import java.util.ConcurrentModificationException;
/**
* ConcurrentCacheModification is thrown by the internal concurrency-checking mechanism when a
* conflict is detected. It is not currently meant to be exposed to customers.
- *
+ *
* @since GemFire 7.0
*/
public class ConcurrentCacheModificationException extends ConcurrentModificationException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskRegionVersionVector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskRegionVersionVector.java
index 6967ee4..010b52a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskRegionVersionVector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskRegionVersionVector.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.versions;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.persistence.DiskStoreID;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+
/**
* A region version vector for regions with persistent data. This region version vector uses the
* persistent disk store UUID as the member id.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java
index a924f1b..42503d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/DiskVersionTag.java
@@ -50,7 +50,7 @@ public class DiskVersionTag extends VersionTag<DiskStoreID> {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
*/
public int getDSFID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
index 81dcd50..82ab0c1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
@@ -25,31 +25,31 @@ import org.apache.geode.internal.VersionedDataSerializable;
/**
* RVV exceptions are part of a RegionVersionVector. They are held by RegionVersionHolders.
* <p>
- *
+ *
* An RVV exception represents a missing range of versions from a member. This is represented as a
* pair of version numbers: the last version we've received from the member and the next version
* we've received from the member. The span of versions between (but not including) these two
* numbers are the versions that are missing.
* <p>
- *
+ *
* RVVException also tracks the scattering of versions we've received that fall within the range of
* the exception. As these missing versions are received the RVVException coalesces the range. If
* isFilled() returns true after adding a missing version to the RVVException, the hole has been
* filled and the RVVException is no longer needed.
* <p>
- *
+ *
* New exceptions are common to see as operations arrive from parallel threads operating on the same
* region. These exceptions are soon mended and disappear.
* <p>
- *
+ *
* Old exceptions indicate that we missed something that we are unlikely to receive without asking
* for it.
* <p>
- *
+ *
* RVVException currently depends on external synchronization. Typically the RegionVersionHolder
* that holds the exception is locked while accessing its RVVExceptions. This is what is done in
* RegionVersionVector.
- *
+ *
*/
abstract class RVVException
implements Comparable<RVVException>, Cloneable, VersionedDataSerializable {
@@ -149,7 +149,7 @@ abstract class RVVException
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
public int compareTo(RVVException o) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java
index 46f75a2..7bcc8d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java
@@ -101,7 +101,7 @@ public class RVVExceptionB extends RVVException {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
public int compareTo(RVVException o) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionT.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionT.java
index ff0d9ac..4a003af 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionT.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionT.java
@@ -26,8 +26,8 @@ import org.apache.geode.internal.cache.versions.RVVException.ReceivedVersionsIte
/**
* This subclass of RVVException is the original class that uses TreeSets to hold received versions.
* It is now only used if the exception represents a large gap.
- *
- *
+ *
+ *
*
*/
public class RVVExceptionT extends RVVException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
index 92181ee..681de34 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
@@ -38,17 +38,17 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* member.
*
* RegionVersionHolders should be modified under synchronization on the holder.
- *
+ *
* Starting in 7.0.1 the holder has a BitSet that records the most recent versions. The variable
* bitSetVersion corresponds to bit zero, and subsequent bits represent bitSetVersion+1, +2, etc.
* The method mergeBitSet() should be used to dump the BitSet's exceptions into the regular
* exceptions list prior to performing operations like exceptions- comparisons or dominance checks.
- *
+ *
* Starting in 8.0, the holder introduced a special exception to describe following use case of
* unfinished operation: Operation R4 and R5 are applied locally, but never distributed to P. So P's
* RVV for R is still 3. After R GIIed from P, R's RVV becomes R5(3-6), i.e. Exception's nextVersion
* is currentVersion+1.
- *
+ *
*/
public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
@@ -70,7 +70,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/**
* This contructor should only be used for cloning a RegionVersionHolder or initializing and
* invalid version holder (with version -1)
- *
+ *
* @param ver
*/
public RegionVersionHolder(long ver) {
@@ -260,7 +260,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
* corresponds to this.bitSetVersion. This scans the bitset looking for gaps that are recorded as
* RVV exceptions. The scan terminates at numBits or when the last set bit is found. The bitSet is
* adjusted and a new bitSetVersion is established.
- *
+ *
* @param newVersion the desired new bitSetVersion, which may be > the max representable in the
* bitset
* @param numBits the desired number of bits to flush from the bitset
@@ -412,7 +412,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/**
* Initialize this version holder from another version holder This is called during GII.
- *
+ *
* It's more likely that the other holder has seen most of the versions, and this version holder
* only has a few updates that happened since the GII started. So we apply our seen versions to
* the other version holder and then initialize this version holder from the other version holder.
@@ -502,7 +502,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/**
* Returns true if this version hold has an exception in the exception list for the given version
* number.
- *
+ *
* This differs from contains because it returns true if v is greater than the last seen version
* for this holder.
*/
@@ -629,9 +629,9 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializable#toData(java.io.DataOutput)
- *
+ *
* Version Holders serialized to disk, so if the serialization format of version holder changes,
* we need to upgrade our persistence format.
*/
@@ -650,7 +650,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializable#fromData(java.io.DataInput)
*/
public void fromData(DataInput in) throws IOException {
@@ -671,9 +671,9 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/*
* Warning: this hashcode uses mutable state and is only good for as long as the holder is not
* modified. It was added for unit testing.
- *
+ *
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
public synchronized int hashCode() {
@@ -747,7 +747,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
/**
* Canonicalize an ordered set of exceptions. In the canonical form, none of the RVVExceptions
* have any received versions.
- *
+ *
* @param exceptions
* @return The canonicalized set of exceptions.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
index be22f38..aaa40a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
@@ -14,6 +14,18 @@
*/
package org.apache.geode.internal.cache.versions;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DM;
@@ -31,17 +43,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.logging.log4j.Logger;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* RegionVersionVector tracks the highest region-level version number of operations applied to a
@@ -88,7 +89,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* The list of exceptions for the local member. The version held in this RegionVersionHolder may
* not be accurate, but the exception list is. We can have exceptions for our own id if we recover
* from disk or GII from a peer that has exceptions from us.
- *
+ *
* The version held in this object can lag behind the localVersion atomic long, because that long
* is incremented without obtaining a lock. Operations that use the localException list are
* responsible for updating the version of the local exceptions under lock.
@@ -134,13 +135,13 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* operation is allowed at a time on a region across the distributed system. If that changes then
* the locking scheme here may need additional work.
*/
- private transient final ReentrantReadWriteLock versionLock = new ReentrantReadWriteLock();
+ private final transient ReentrantReadWriteLock versionLock = new ReentrantReadWriteLock();
private transient volatile boolean locked; // this is only modified by the version locking thread
private transient volatile boolean doUnlock; // this is only modified by the version locking
// thread
private transient InternalDistributedMember lockOwner; // guarded by lockWaitSync
- private transient final Object clearLockSync = new Object(); // sync for coordinating thread
+ private final transient Object clearLockSync = new Object(); // sync for coordinating thread
// startup and lockOwner setting
/** create a live version vector for a region */
@@ -249,7 +250,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* locks against new version generation and returns the current region version number
- *
+ *
* @param regionPath
*/
public long lockForClear(String regionPath, DM dm, InternalDistributedMember locker) {
@@ -279,7 +280,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* This schedules a thread that owns the version-generation write-lock for this vector. The method
* unlockVersionGeneration notifies the thread to release the lock and terminate its run.
- *
+ *
* @param regionPath
* @param dm the distribution manager - used to obtain an executor to hold the thread
* @param locker the member requesting the lock (currently not used)
@@ -588,7 +589,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* Records a received region-version. These are transmitted in VersionTags in messages between
* peers and from servers to clients.
- *
+ *
* @param tag the version information
*/
public void recordVersion(T mbr, VersionTag<T> tag) {
@@ -622,9 +623,9 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* peers and from servers to clients. In general you should use recordVersion(mbr, versionTag) so
* that the tag is marked as having been recorded. This will keep
* DistributedCacheOperation.basicProcess() from trying to record it again.
- *
+ *
* This method is also called for versions which have been recovered from disk.
- *
+ *
* @param member the peer that performed the operation
* @param version the version of the peers region that reflects the operation
*/
@@ -678,7 +679,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* Records a version holder that we have recovered from disk. This version holder replaces the
* current version holder if it dominates the version holder we already have. This method will
* called once for each oplog we recover.
- *
+ *
* @param latestOplog
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(
@@ -758,7 +759,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* Test to see if this vector has seen the given version.
- *
+ *
* @return true if this vector has seen the given version
*/
public boolean contains(T id, long version) {
@@ -785,7 +786,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* Removes departed members not in the given collection of IDs from the version vector
- *
+ *
* @param idsToKeep collection of the kind of IDs appropriate for this vector
*/
public void removeOldMembers(Set<VersionSource<T>> idsToKeep) {
@@ -824,7 +825,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* This marks the given entry as departed, making it eligible to be removed during an operation
* like DistributedRegion.synchronizeWith()
- *
+ *
* @param id
*/
protected void markDepartedMember(T id) {
@@ -840,7 +841,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* check to see if tombstone removal in this RVV indicates that tombstones have been removed from
* its Region that have not been removed from the argument's Region. If this is the case, then a
* delta GII may leave entries in the other RVV's Region that should be deleted.
- *
+ *
* @param other
* @return true if there have been tombstone removals in this vector's Region that were not done
* in the argument's region
@@ -986,7 +987,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* wait for this vector to dominate the given vector. This means that the receiver has seen all
* version changes that the given vector has seen.
- *
+ *
* @param otherVector the vector, usually from another member, that we want to dominate
* @param region the region owning this vector
* @return true if dominance was achieved
@@ -1042,7 +1043,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* Remove any exceptions for the given member that are older than the given version. This is used
* after a synchronization operation to get rid of unneeded history.
- *
+ *
* @param mbr
* @param version
*/
@@ -1093,7 +1094,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* constructor used to create a cloned vector
- *
+ *
* @param localExceptions
*/
protected RegionVersionVector(T ownerId, ConcurrentHashMap<T, RegionVersionHolder<T>> vector,
@@ -1120,7 +1121,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* after deserializing a version tag or RVV the IDs in it should be replaced with references to
* IDs returned by this method. This vastly reduces the memory footprint of tags/stamps/rvvs
- *
+ *
* @param id
* @return the canonical reference
*/
@@ -1152,7 +1153,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#toData(java.io.DataOutput)
*/
public void toData(DataOutput out) throws IOException {
@@ -1182,7 +1183,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.DataSerializableFixedID#fromData(java.io.DataInput)
*/
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
@@ -1219,7 +1220,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* When a tombstone is removed from the entry map this method must be called to record the max
* region-version of any tombstone reaped. Any older versions are then immediately eligible for
* reaping.
- *
+ *
* @param mbr
* @param regionVersion
*/
@@ -1254,7 +1255,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* record all of the GC versions in the given vector
- *
+ *
* @param other
*/
public void recordGCVersions(RegionVersionVector<T> other) {
@@ -1269,7 +1270,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* returns true if tombstones newer than the given version have already been reaped. This means
* that a clear or GC has been received that should have wiped out the operation this version
* stamp represents, but this operation had not yet been received
- *
+ *
* @param mbr
* @param gcVersion
* @return true if the given version should be rejected
@@ -1406,7 +1407,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/*
* (non-Javadoc) this ensures that the version generation lock is released
- *
+ *
* @see org.apache.geode.distributed.internal.MembershipListener#memberDeparted(org.apache.geode.
* distributed.internal.membership.InternalDistributedMember, boolean)
*/
@@ -1447,7 +1448,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
/**
* For test purposes, see if two RVVs have seen the same events and GC version vectors
- *
+ *
* @return true if the RVVs are the same.
*/
public boolean sameAs(RegionVersionVector<T> other) {
@@ -1479,7 +1480,7 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
* Note: test only. If put in production will cause ConcurrentModificationException see if two
* RVVs have seen the same events and GC version vectors This will treat member with null version
* the same as member with version=0
- *
+ *
* @return true if the RVVs are the same logically.
*/
public boolean logicallySameAs(RegionVersionVector<T> other) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMRegionVersionVector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMRegionVersionVector.java
index 185d1fe..6ebdb3e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMRegionVersionVector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMRegionVersionVector.java
@@ -77,7 +77,7 @@ public class VMRegionVersionVector extends RegionVersionVector<InternalDistribut
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.internal.cache.versions.RegionVersionVector#memberDeparted(org.apache.geode.
* distributed.internal.membership.InternalDistributedMember, boolean)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMVersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMVersionTag.java
index 151e020..92201be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMVersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VMVersionTag.java
@@ -25,8 +25,8 @@ import org.apache.geode.internal.Version;
/**
* The version tag class for version tags for non-persistent regions. The VersionSource held in
* these tags is an InternalDistributedMember.
- *
- *
+ *
+ *
*/
public class VMVersionTag extends VersionTag<InternalDistributedMember> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
index d89c6c7..e52dfe4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
@@ -22,10 +22,10 @@ import org.apache.geode.internal.DataSerializableFixedID;
/**
* The member that originated an update that is stored in the version information of a region entry,
* or in the regions version vector.
- *
+ *
* A VersionMember could either be an InternalDistributedMember (for an in memory region), or a UUID
* (for a persistent region).
- *
+ *
* VersionMembers should implement equals and hashcode.
*/
public interface VersionSource<T> extends DataSerializableFixedID, Comparable<T> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java
index aad85b4..26bf343 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java
@@ -27,7 +27,7 @@ public interface VersionStamp<T extends VersionSource<T>> extends VersionHolder<
/**
* Sets the version information with what is in the tag
- *
+ *
* @param tag the entryVersion to set
*/
void setVersions(VersionTag<T> tag);
@@ -52,7 +52,7 @@ public interface VersionStamp<T extends VersionSource<T>> extends VersionHolder<
/**
* Perform a versioning check with the given GII information. Throws a
* ConcurrentCacheModificationException if there is a problem.
- *
+ *
* @param region the region being modified
* @param tag the version info for the modification
* @param isTombstoneFromGII it's a tombstone
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
index d502299..0e1a1a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
@@ -215,7 +215,7 @@ public abstract class VersionTag<T extends VersionSource>
/**
* Set canonical ID objects into this version tag using the DM's cache of IDs
- *
+ *
* @param distributionManager
*/
public void setCanonicalIDs(DM distributionManager) {}
@@ -270,7 +270,7 @@ public abstract class VersionTag<T extends VersionSource>
/**
* set or clear the flag that this tag was blessed by a conflict resolver
- *
+ *
* @param flag
* @return this tag
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index fbf8c71..50df09c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -493,9 +493,9 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return this.isForInternalUse;
}
- abstract public void start();
+ public abstract void start();
- abstract public void stop();
+ public abstract void stop();
/**
* Destroys the GatewaySender. Before destroying the sender, caller needs to to ensure that the
@@ -504,7 +504,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
* following steps: 1. Take the lifeCycleLock. 2. If the sender is attached to any application
* region, throw an exception. 3. Close the GatewaySenderAdvisor. 4. Remove the sender from the
* cache. 5. Destroy the region underlying the GatewaySender.
- *
+ *
* In case of ParallelGatewaySender, the destroy operation does distributed destroy of the QPR. In
* case of SerialGatewaySender, the queue region is destroyed locally.
*/
@@ -819,7 +819,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
/**
* Check if this event can be distributed by senders.
- *
+ *
* @param event
* @param stats
* @return boolean True if the event is allowed.
@@ -1009,7 +1009,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
* During sender is getting started, if there are any cache operation on queue then that event
* will be stored in temp queue. Once sender is started, these event from tmp queue will be added
* to sender queue.
- *
+ *
* Apart from sender's start() method, this method also gets called from
* ParallelGatewaySenderQueue.addPartitionedRegionForRegion(). This is done to support the
* postCreateRegion scenario i.e. the sender is already running and region is created later. The
@@ -1053,7 +1053,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
/**
* Removes the EntryEventImpl, whose tailKey matches with the provided tailKey, from
* tmpQueueEvents.
- *
+ *
* @param tailKey
*/
public boolean removeFromTempQueueEvents(Object tailKey) {
@@ -1221,7 +1221,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
/**
* @param clonedEvent
*/
- abstract protected void setModifiedEventId(EntryEventImpl clonedEvent);
+ protected abstract void setModifiedEventId(EntryEventImpl clonedEvent);
public static class DefaultGatewayEventFilter
implements org.apache.geode.internal.cache.GatewayEventFilter {
@@ -1302,7 +1302,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
/**
* Timeout events received from secondary after 5 minutes
*/
- static private final int EVENT_TIMEOUT =
+ private static final int EVENT_TIMEOUT =
Integer.getInteger("Gateway.EVENT_TIMEOUT", 5 * 60 * 1000).intValue();
public final long timeout;
public final GatewaySenderEventImpl event;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 52df2c5..7a2cee1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -64,7 +64,7 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
* The queue could be SerialGatewaySenderQueue or ParallelGatewaySenderQueue or
* {@link ConcurrentParallelGatewaySenderQueue}. The dispatcher could be either
* GatewaySenderEventRemoteDispatcher or GatewaySenderEventCallbackDispatcher.
- *
+ *
* @since GemFire 7.0
*/
public abstract class AbstractGatewaySenderEventProcessor extends Thread {
@@ -153,7 +153,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
this.batchSize = sender.getBatchSize();
}
- abstract protected void initializeMessageQueue(String id);
+ protected abstract void initializeMessageQueue(String id);
public abstract void enqueueEvent(EnumListenerEvent operation, EntryEvent event,
Object substituteValue) throws IOException, CacheException;
@@ -231,7 +231,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
/**
* Returns the current batch id to be used to identify the next batch.
- *
+ *
* @return the current batch id to be used to identify the next batch
*/
protected int getBatchId() {
@@ -464,7 +464,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
/*
* // Check if paused. If so, wait for resumption if (this.isPaused) {
* waitForResumption(); }
- *
+ *
* synchronized (this.getQueue()) { // its quite possible that the queue region is //
* destroyed(userRegion // localdestroy destroys shadow region locally). In this case
* // better to // wait for shadows region to get recreated instead of keep loop //
@@ -851,7 +851,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
/**
* Mark all PDX types as requiring dispatch so that they will be sent over the connection again.
- *
+ *
* @param remotePdxSize
*/
public void checkIfPdxNeedsResend(int remotePdxSize) {
@@ -1104,7 +1104,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
/**
* Stops the dispatcher from dispatching events . The dispatcher will stay alive for a predefined
* time OR until its queue is empty.
- *
+ *
* @see AbstractGatewaySender#MAXIMUM_SHUTDOWN_WAIT_TIME
*/
public void stopProcessing() {
@@ -1233,7 +1233,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
/**
* Logs a batch of events.
- *
+ *
* @param events The batch of events to log
**/
public void logBatchFine(String message, List<GatewaySenderEventImpl> events) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueConfigurationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueConfigurationException.java
index 72e13e8..eddc76f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueConfigurationException.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.OperationAbortedException;
/**
* Exception to inform user that AsyncEventQueue is wrongly configured.
- *
+ *
*
*/
public class AsyncEventQueueConfigurationException extends OperationAbortedException {
@@ -35,7 +35,7 @@ public class AsyncEventQueueConfigurationException extends OperationAbortedExcep
/**
* Constructor. Creates an instance of <code>AsyncEventQueueConfigurationException</code> with the
* specified detail message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -47,7 +47,7 @@ public class AsyncEventQueueConfigurationException extends OperationAbortedExcep
/**
* Constructor. Creates an instance of <code>GatewaySenderException</code> with the specified
* detail message.
- *
+ *
* @param msg the detail message
*/
public AsyncEventQueueConfigurationException(String msg) {
@@ -57,7 +57,7 @@ public class AsyncEventQueueConfigurationException extends OperationAbortedExcep
/**
* Constructor. Creates an instance of <code>AsyncEventQueueConfigurationException</code> with the
* specified cause.
- *
+ *
* @param cause the causal Throwable
*/
public AsyncEventQueueConfigurationException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java
index 15ed24a..2028c2c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.wan;
-import org.apache.geode.GemFireCheckedException;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.geode.GemFireCheckedException;
+
/**
* An exception thrown during batch processing.
*
@@ -38,7 +38,7 @@ public class BatchException70 extends GemFireCheckedException {
/**
* Required for serialization
- *
+ *
* @param l
*/
public BatchException70(List<BatchException70> l) {
@@ -57,7 +57,7 @@ public class BatchException70 extends GemFireCheckedException {
/**
* Answers the index in the batch where the exception occurred
- *
+ *
* @return the index in the batch where the exception occurred
*/
public int getIndex() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java
index 7d9817b..c8d80fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.wan;
/**
* This interface is for Jayesh's use case for WAN BootStrapping and will not be part of the product
* release.
- *
+ *
*
*/
public interface DistributedSystemListener {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverException.java
index bf0153b..b8aa005 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverException.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.OperationAbortedException;
/**
* Exception observed during GatewayReceiver operations.
- *
+ *
* @since GemFire 8.1
*/
public class GatewayReceiverException extends OperationAbortedException {
@@ -33,7 +33,7 @@ public class GatewayReceiverException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewayReceiverException</code> with the specified
* detail message.
- *
+ *
* @param msg the detail message
*/
public GatewayReceiverException(String msg) {
@@ -43,7 +43,7 @@ public class GatewayReceiverException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewayReceiverException</code> with the specified
* detail message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -54,7 +54,7 @@ public class GatewayReceiverException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewayReceiverException</code> with the specified
* cause.
- *
+ *
* @param cause the causal Throwable
*/
public GatewayReceiverException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverStats.java
index 6935dc6..1c6c202 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverStats.java
@@ -265,7 +265,7 @@ public class GatewayReceiverStats extends CacheServerStats {
/**
* Returns the current time (ns).
- *
+ *
* @return the current time (ns)
*/
public long startTime() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index 9ed5f64..dee7545 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -332,7 +332,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
* Find out if this sender is the eldest in the DS. Returns true if: 1. No other sender is running
* 2. At least one sender is running in the system apart from this sender AND this sender's start
* time is lesser of all (i.e. this sender is oldest)
- *
+ *
* @return boolean true if this eldest sender; false otherwise
*/
private boolean adviseEldestGatewaySender() {
@@ -673,7 +673,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
}
}
- private final static Version[] serializationVersions = new Version[] {Version.GFE_80};
+ private static final Version[] serializationVersions = new Version[] {Version.GFE_80};
@Override
public Version[] getSerializationVersions() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java
index 1ebe480..e58be44 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java
@@ -13,16 +13,16 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.wan;
/**
* An exception indicating that a gateway configuration will not work with the remote side of the
* gateway's configuration.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
public class GatewaySenderConfigurationException extends GatewaySenderException {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index d944997..b1d4757 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -15,13 +15,6 @@
package org.apache.geode.internal.cache.wan;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.WrappedCallbackArgument;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -29,6 +22,14 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.wan.GatewaySender;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.WrappedCallbackArgument;
+
/**
* Class <code>GatewayEventCallbackArgument</code> is a wrapper on a callback arg plus the id of the
* <code>GatewaySender</code> making the request. It is created during a batch update request so
@@ -38,7 +39,7 @@ import java.util.Set;
* the event sent to CacheListener, CacheWriter and CacheLoader.
* <p>
* This class used to be in package <code>org.apache.geode.util</code>.
- *
+ *
* @since GemFire 7.0
*/
public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
@@ -67,7 +68,7 @@ public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
/**
* Constructor.
- *
+ *
* @param geca The original callback argument set by the caller or null if there was not callback
* arg
*/
@@ -82,7 +83,7 @@ public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
/**
* Constructor.
- *
+ *
* @param originalCallbackArg The original callback argument set by the caller or null if there
* was not callback arg
* @param originatingDSId The id of the originating <code>GatewayReceiver</code> making the
@@ -99,7 +100,7 @@ public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
/**
* Returns the id of the originating <code>GatewayReceiver</code> making the request.
- *
+ *
* @return the id of the originating <code>GatewayReceiver</code> making the request
*/
public int getOriginatingDSId() {
@@ -108,7 +109,7 @@ public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
/**
* Sets the originating <code>SenderId</code> id
- *
+ *
* @param originatingDSId The originating <code>SenderId</code> id
*/
public void setOriginatingDSId(int originatingDSId) {
@@ -117,7 +118,7 @@ public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
/**
* Returns the list of <code>Gateway</code> s to which the event has been sent.
- *
+ *
* @return the list of <code>Gateway</code> s to which the event has been sent
*/
public IntOpenHashSet getRecipientDSIds() {
@@ -126,7 +127,7 @@ public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
/**
* Initialize the original set of recipient <code>Gateway</code>s.
- *
+ *
* @param originalGatewaysReceivers The original recipient <code>Gateway</code>s.
*/
public void initializeReceipientDSIds(List<Integer> originalGatewaysReceivers) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
index b94132b..8c5e718 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
@@ -23,16 +23,16 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.i18n.StringId;
/**
* Class <code>SerialGatewayEventCallbackDispatcher</code> dispatches batches of
* <code>GatewayEvent</code>s to <code>AsyncEventListener</code> callback implementers. This
* dispatcher is used in the write-behind case.
- *
+ *
* @since GemFire 7.0
*/
public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventDispatcher {
@@ -63,7 +63,7 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
/**
* Dispatches a batch of messages to all registered <code>AsyncEventListener</code>s.
- *
+ *
* @param events The <code>List</code> of events to send
* @param removeFromQueueOnException Unused.
* @return whether the batch of messages was successfully processed
@@ -99,7 +99,7 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
/**
* Registers a <code>AsyncEventListener</code>.
- *
+ *
* @param listener A AsyncEventListener to be registered
*/
public void registerAsyncEventListener(AsyncEventListener listener) {
@@ -115,7 +115,7 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
/**
* Removes registration of a previously registered <code>AsyncEventListener</code>.
- *
+ *
* @param listener A AsyncEventListener to be unregistered
*/
public void unregisterGatewayEventListener(AsyncEventListener listener) {
@@ -138,9 +138,9 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
/**
* Sends a batch of messages to the registered <code>AsyncEventListener</code>s.
- *
+ *
* @param events The <code>List</code> of events to send
- *
+ *
* @throws GatewaySenderException
*/
protected boolean dispatchBatch(List events) throws GatewaySenderException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index ec89ef4..4d201b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -60,10 +60,10 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
/**
* Class <code>GatewaySenderEventImpl</code> represents an event sent between
* <code>GatewaySender</code>
- *
- *
+ *
+ *
* @since GemFire 7.0
- *
+ *
*/
public class GatewaySenderEventImpl
implements AsyncEvent, DataSerializableFixedID, Conflatable, Sizeable, Releasable {
@@ -89,7 +89,7 @@ public class GatewaySenderEventImpl
/**
* The number of parts for the <code>Message</code>
- *
+ *
* @see org.apache.geode.internal.cache.tier.sockets.Message
*/
protected int numberOfParts;
@@ -223,18 +223,18 @@ public class GatewaySenderEventImpl
/**
* Constructor. No-arg constructor for data serialization.
- *
+ *
* @see DataSerializer
*/
public GatewaySenderEventImpl() {}
/**
* Constructor. Creates an initialized <code>GatewayEventImpl</code>
- *
+ *
* @param operation The operation for this event (e.g. AFTER_CREATE)
* @param event The <code>CacheEvent</code> on which this <code>GatewayEventImpl</code> is based
* @param substituteValue The value to be enqueued instead of the value in the event.
- *
+ *
* @throws IOException
*/
@Retained
@@ -252,12 +252,12 @@ public class GatewaySenderEventImpl
/**
* Constructor.
- *
+ *
* @param operation The operation for this event (e.g. AFTER_CREATE)
* @param ce The <code>CacheEvent</code> on which this <code>GatewayEventImpl</code> is based
* @param substituteValue The value to be enqueued instead of the value in the event.
* @param initialize Whether to initialize this instance
- *
+ *
* @throws IOException
*/
@Retained
@@ -348,7 +348,7 @@ public class GatewaySenderEventImpl
/**
* Returns this event's action
- *
+ *
* @return this event's action
*/
public int getAction() {
@@ -357,7 +357,7 @@ public class GatewaySenderEventImpl
/**
* Returns this event's operation
- *
+ *
* @return this event's operation
*/
public Operation getOperation() {
@@ -430,7 +430,7 @@ public class GatewaySenderEventImpl
/**
* Return this event's region name
- *
+ *
* @return this event's region name
*/
public String getRegionPath() {
@@ -443,7 +443,7 @@ public class GatewaySenderEventImpl
/**
* Returns this event's key
- *
+ *
* @return this event's key
*/
public Object getKey() {
@@ -456,7 +456,7 @@ public class GatewaySenderEventImpl
/**
* Returns whether this event's value is a serialized object
- *
+ *
* @return whether this event's value is a serialized object
*/
public byte getValueIsObject() {
@@ -465,7 +465,7 @@ public class GatewaySenderEventImpl
/**
* Return this event's callback argument
- *
+ *
* @return this event's callback argument
*/
public Object getCallbackArgument() {
@@ -483,7 +483,7 @@ public class GatewaySenderEventImpl
/**
* Return this event's number of parts
- *
+ *
* @return this event's number of parts
*/
public int getNumberOfParts() {
@@ -494,9 +494,9 @@ public class GatewaySenderEventImpl
* Return the value as a byte[] array, if it is plain byte array, otherwise return a cache
* deserializable or plain object, depending on if the currently held form of the object is
* serialized or not.
- *
+ *
* If the object is held off heap, this will copy it to the heap return the heap copy.
- *
+ *
* //OFFHEAP TODO: Optimize callers by returning a reference to the off heap value
*/
public Object getValue() {
@@ -554,7 +554,7 @@ public class GatewaySenderEventImpl
/**
* Return this event's deserialized value
- *
+ *
* @return this event's deserialized value
*/
public Object getDeserializedValue() {
@@ -800,7 +800,7 @@ public class GatewaySenderEventImpl
* message's operation is AFTER_UPDATE and its region has enabled are conflation. Otherwise, this
* method will answer false. Messages whose operation is AFTER_CREATE, AFTER_DESTROY,
* AFTER_INVALIDATE or AFTER_REGION_DESTROY are not conflated.
- *
+ *
* @return Whether to conflate this message
*/
public boolean shouldBeConflated() {
@@ -837,7 +837,7 @@ public class GatewaySenderEventImpl
/**
* Returns whether this <code>GatewayEvent</code> represents an update.
- *
+ *
* @return whether this <code>GatewayEvent</code> represents an update
*/
protected boolean isUpdate() {
@@ -854,7 +854,7 @@ public class GatewaySenderEventImpl
/**
* Returns whether this <code>GatewayEvent</code> represents a create.
- *
+ *
* @return whether this <code>GatewayEvent</code> represents a create
*/
protected boolean isCreate() {
@@ -865,7 +865,7 @@ public class GatewaySenderEventImpl
/**
* Returns whether this <code>GatewayEvent</code> represents a destroy.
- *
+ *
* @return whether this <code>GatewayEvent</code> represents a destroy
*/
protected boolean isDestroy() {
@@ -978,7 +978,7 @@ public class GatewaySenderEventImpl
/**
* Initialize this event's action and number of parts
- *
+ *
* @param operation The operation from which to initialize this event's action and number of parts
*/
protected void initializeAction(EnumListenerEvent operation) {
@@ -1047,7 +1047,7 @@ public class GatewaySenderEventImpl
/**
* Return the EventSequenceID of the Event
- *
+ *
* @return EventSequenceID
*/
public EventSequenceID getEventSequenceID() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderException.java
index 21c3741..7af6520 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderException.java
@@ -28,7 +28,7 @@ public class GatewaySenderException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewaySenderException</code> with the specified
* detail message.
- *
+ *
* @param msg the detail message
*/
public GatewaySenderException(String msg) {
@@ -38,7 +38,7 @@ public class GatewaySenderException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewaySenderException</code> with the specified
* detail message and cause.
- *
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -49,7 +49,7 @@ public class GatewaySenderException extends OperationAbortedException {
/**
* Constructor. Creates an instance of <code>GatewaySenderException</code> with the specified
* cause.
- *
+ *
* @param cause the causal Throwable
*/
public GatewaySenderException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
index 61317c5..c7fd370 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
@@ -20,8 +20,8 @@ import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.distributed.internal.DistributionStats;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
public class GatewaySenderStats {
@@ -299,7 +299,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventsReceived" stat.
- *
+ *
* @return the current value of the "eventsReceived" stat
*/
public int getEventsReceived() {
@@ -315,7 +315,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventsQueued" stat.
- *
+ *
* @return the current value of the "eventsQueued" stat
*/
public int getEventsQueued() {
@@ -324,7 +324,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventsNotQueuedConflated" stat.
- *
+ *
* @return the current value of the "eventsNotQueuedConflated" stat
*/
public int getEventsNotQueuedConflated() {
@@ -333,7 +333,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventsConflatedFromBatches" stat.
- *
+ *
* @return the current value of the "eventsConflatedFromBatches" stat
*/
public int getEventsConflatedFromBatches() {
@@ -342,7 +342,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventQueueSize" stat.
- *
+ *
* @return the current value of the "eventQueueSize" stat
*/
public int getEventQueueSize() {
@@ -351,7 +351,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "tempQueueSize" stat.
- *
+ *
* @return the current value of the "tempQueueSize" stat.
*/
public int getTempEventQueueSize() {
@@ -371,7 +371,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventsDistributed" stat.
- *
+ *
* @return the current value of the "eventsDistributed" stat
*/
public int getEventsDistributed() {
@@ -380,7 +380,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "eventsExceedingAlertThreshold" stat.
- *
+ *
* @return the current value of the "eventsExceedingAlertThreshold" stat
*/
public int getEventsExceedingAlertThreshold() {
@@ -396,7 +396,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "batchDistributionTime" stat.
- *
+ *
* @return the current value of the "batchDistributionTime" stat
*/
public long getBatchDistributionTime() {
@@ -405,7 +405,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the batchesDistributed" stat.
- *
+ *
* @return the current value of the batchesDistributed" stat
*/
public int getBatchesDistributed() {
@@ -414,7 +414,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the batchesRedistributed" stat.
- *
+ *
* @return the current value of the batchesRedistributed" stat
*/
public int getBatchesRedistributed() {
@@ -423,7 +423,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the batchesResized" stat.
- *
+ *
* @return the current value of the batchesResized" stat
*/
public int getBatchesResized() {
@@ -446,7 +446,7 @@ public class GatewaySenderStats {
/**
* Sets the "eventQueueSize" stat.
- *
+ *
* @param size The size of the queue
*/
public void setQueueSize(int size) {
@@ -455,7 +455,7 @@ public class GatewaySenderStats {
/**
* Sets the "tempQueueSize" stat.
- *
+ *
* @param size The size of the temp queue
*/
public void setTempQueueSize(int size) {
@@ -479,7 +479,7 @@ public class GatewaySenderStats {
/**
* Increments the "eventQueueSize" stat by given delta.
- *
+ *
* @param delta an integer by which queue size to be increased
*/
public void incQueueSize(int delta) {
@@ -488,7 +488,7 @@ public class GatewaySenderStats {
/**
* Increments the "tempQueueSize" stat by given delta.
- *
+ *
* @param delta an integer by which temp queue size to be increased
*/
public void incTempQueueSize(int delta) {
@@ -511,7 +511,7 @@ public class GatewaySenderStats {
/**
* Decrements the "eventQueueSize" stat by given delta.
- *
+ *
* @param delta an integer by which queue size to be increased
*/
public void decQueueSize(int delta) {
@@ -520,7 +520,7 @@ public class GatewaySenderStats {
/**
* Decrements the "tempQueueSize" stat by given delta.
- *
+ *
* @param delta an integer by which temp queue size to be increased
*/
public void decTempQueueSize(int delta) {
@@ -544,7 +544,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "unprocessedTokensAddedByPrimary" stat.
- *
+ *
* @return the current value of the "unprocessedTokensAddedByPrimary" stat
*/
public int getUnprocessedTokensAddedByPrimary() {
@@ -553,7 +553,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "unprocessedEventsAddedBySecondary" stat.
- *
+ *
* @return the current value of the "unprocessedEventsAddedBySecondary" stat
*/
public int getUnprocessedEventsAddedBySecondary() {
@@ -562,7 +562,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "unprocessedEventsRemovedByPrimary" stat.
- *
+ *
* @return the current value of the "unprocessedEventsRemovedByPrimary" stat
*/
public int getUnprocessedEventsRemovedByPrimary() {
@@ -571,7 +571,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "unprocessedTokensRemovedBySecondary" stat.
- *
+ *
* @return the current value of the "unprocessedTokensRemovedBySecondary" stat
*/
public int getUnprocessedTokensRemovedBySecondary() {
@@ -580,7 +580,7 @@ public class GatewaySenderStats {
/**
* Returns the current value of the "unprocessedEventMapSize" stat.
- *
+ *
* @return the current value of the "unprocessedEventMapSize" stat
*/
public int getUnprocessedEventMapSize() {
@@ -704,7 +704,7 @@ public class GatewaySenderStats {
/**
* Returns the current time (ns).
- *
+ *
* @return the current time (ns)
*/
public long startTime() {
@@ -713,7 +713,7 @@ public class GatewaySenderStats {
/**
* Increments the "eventsDistributed" and "batchDistributionTime" stats.
- *
+ *
* @param start The start of the batch (which is decremented from the current time to determine
* the batch processing time).
* @param numberOfEvents The number of events to add to the events distributed stat
@@ -734,7 +734,7 @@ public class GatewaySenderStats {
/**
* Increments the "eventsQueued" and "eventQueueTime" stats.
- *
+ *
* @param start The start of the put (which is decremented from the current time to determine the
* queue processing time).
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinator.java
index 07c4e19..61caf59 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinator.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.internal.cache.wan;
-import org.apache.geode.internal.logging.LogService;
+import java.util.concurrent.TimeUnit;
+
import org.apache.logging.log4j.Logger;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.internal.logging.LogService;
public abstract class WaitUntilGatewaySenderFlushedCoordinator {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
index c925166..4fc940c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
@@ -13,10 +13,14 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.wan.parallel;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.Region;
@@ -29,22 +33,17 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-
import org.apache.geode.internal.size.SingleObjectSizer;
/**
* Queue built on top of {@link ParallelGatewaySenderQueue} which allows multiple dispatcher to
* register and do peek/remove from the underlying {@link ParallelGatewaySenderQueue}
- *
+ *
* There is only one queue, but this class co-ordinates access by multiple threads such that we get
* zero contention while peeking or removing.
- *
+ *
* It implements RegionQueue so that AbstractGatewaySenderEventProcessor can work on it.
- *
+ *
*
*/
public class ConcurrentParallelGatewaySenderQueue implements RegionQueue {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index f8771f7..18883be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -220,9 +220,9 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
}
- final protected int index;
+ protected final int index;
- final protected int nDispatcher;
+ protected final int nDispatcher;
private MetaRegionFactory metaRegionFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
index cd0ba30..eb0c07a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
@@ -50,10 +50,10 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* Removes a batch of events from the remote secondary queues
- *
- *
+ *
+ *
* @since GemFire 7.0
- *
+ *
*/
public class ParallelQueueBatchRemovalMessage extends PartitionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index 2802697..1a674f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Removes a batch of events from the remote secondary queues
- *
+ *
* @since GemFire 8.0
*/
public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/RREventIDResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/RREventIDResolver.java
index 4ee469d..f7507d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/RREventIDResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/RREventIDResolver.java
@@ -25,11 +25,11 @@ import org.apache.geode.internal.cache.EventID;
* different from the bucket id calculated using EventID's hashcode. To not to break the contract of
* key and its bucket id, we are providing an internal resolver which will return a correct bucketId
* when EventID will be used as the key in RR with PArallelGatewaySender
- *
+ *
* We are assuming here, before calling getRoutingObejct in this Resolver, key of EntryOperation
* i.e. EventID as already been processed by ParallelGatewaySenderImpl#setModifiedEvent where we are
* calculating bucketId from original event's key and storing it in EventID.
- *
+ *
*/
public class RREventIDResolver implements PartitionResolver {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
index 42ce68c..2d39a0e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
@@ -14,13 +14,6 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.*;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.internal.cache.wan.WaitUntilGatewaySenderFlushedCoordinator;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -29,9 +22,16 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.*;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.internal.cache.wan.WaitUntilGatewaySenderFlushedCoordinator;
+
public class WaitUntilParallelGatewaySenderFlushedCoordinator
extends WaitUntilGatewaySenderFlushedCoordinator {
- final static private int CALLABLES_CHUNK_SIZE = 10;
+ private static final int CALLABLES_CHUNK_SIZE = 10;
public WaitUntilParallelGatewaySenderFlushedCoordinator(AbstractGatewaySender sender,
long timeout, TimeUnit unit, boolean initiator) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
index b23615a..90951cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
@@ -46,10 +46,10 @@ import org.apache.geode.internal.offheap.annotations.Retained;
/**
* Handles distribution messaging for destroying a batch of entry in a queue region. In this message
* key represents the lastDestroyedKey and tailKey represent the last dispatched key.
- *
+ *
* We iterate from key to tailKey and destroy all the keys.
- *
- *
+ *
+ *
*/
public class BatchDestroyOperation extends DistributedCacheOperation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
index 2f05d56..89773df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.wan.serial;
@@ -56,8 +56,8 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.offheap.annotations.Released;
/**
- *
- *
+ *
+ *
*/
public class ConcurrentSerialGatewaySenderEventProcessor
extends AbstractGatewaySenderEventProcessor {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 2f5da89..734b560 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -46,12 +46,12 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySender.EventWrapper;
import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackArgument;
import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySender.EventWrapper;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
@@ -60,7 +60,7 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
/**
* @since GemFire 7.0
- *
+ *
*/
public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEventProcessor {
private static final Logger logger = LogService.getLogger();
@@ -99,7 +99,7 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
* When the Number of unchecked events exceeds this threshold and the number of tokens in the map
* exceeds this threshold then a check will be done for old tokens.
*/
- static protected final int REAP_THRESHOLD = 1000;
+ protected static final int REAP_THRESHOLD = 1000;
/*
* How many events have happened without a reap check being done?
@@ -254,7 +254,7 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
/**
* Handle failover. This method is called when a secondary <code>GatewaySender</code> becomes a
* primary <code>GatewaySender</code>.
- *
+ *
* Once this secondary becomes the primary, it must:
* <ul>
* <li>Remove the queue's CacheListener
@@ -540,17 +540,17 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
* <code>GatewaySender</code> to store a gateway event until it is processed by a primary
* <code>GatewaySender</code>. The complexity of this method is the fact that the event could be
* processed first by either the primary or secondary <code>GatewaySender</code>.
- *
+ *
* If the primary processes the event first, the map will already contain an entry for the event
* (through
* {@link org.apache.geode.internal.cache.wan.serial.SerialSecondaryGatewayListener#afterDestroy}
* ). When the secondary processes the event, it will remove it from the map.
- *
+ *
* If the secondary processes the event first, it will add it to the map. When the primary
* processes the event (through
* {@link org.apache.geode.internal.cache.wan.serial.SerialSecondaryGatewayListener#afterDestroy}
* ), it will then be removed from the map.
- *
+ *
* @param senderEvent The event being processed
*/
protected void handleSecondaryEvent(GatewaySenderEventImpl senderEvent) {
@@ -565,14 +565,14 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
* event has been added to the queue, the secondary no longer needs to keep track of it in the
* unprocessed events map. The complexity of this method is the fact that the event could be
* processed first by either the primary or secondary <code>Gateway</code>.
- *
+ *
* If the primary processes the event first, the map will not contain an entry for the event. It
* will be added to the map in this case so that when the secondary processes it, it will know
* that the primary has already processed it, and it can be safely removed.
- *
+ *
* If the secondary processes the event first, the map will already contain an entry for the
* event. In this case, the event can be removed from the map.
- *
+ *
* @param gatewayEvent The event being processed
*/
protected void handlePrimaryEvent(final GatewaySenderEventImpl gatewayEvent) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 9bad91a..c651dc3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -52,15 +52,15 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.Conflatable;
-import org.apache.geode.internal.cache.event.EventTracker;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.event.NonDistributedEventTracker;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.event.EventTracker;
+import org.apache.geode.internal.cache.event.NonDistributedEventTracker;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
@@ -410,7 +410,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* This method removes batchSize entries from the queue. It will only remove entries that were
* previously peeked.
- *
+ *
* @param size the number of entries to remove
*/
public void remove(int size) throws CacheException {
@@ -660,7 +660,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* returns true if key a is before key b. This test handles keys that have wrapped around
- *
+ *
* @param a
* @param b
*/
@@ -685,7 +685,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Finds the next object after the last key peeked
- *
+ *
* @throws CacheException
*/
private Long getCurrentKey() {
@@ -763,7 +763,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Returns the value of the tail key. The tail key points to an empty where the next queue entry
* will be stored.
- *
+ *
* @return the value of the tail key
* @throws CacheException
*/
@@ -789,7 +789,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Increments the value of the tail key by one.
- *
+ *
* @throws CacheException
*/
private void incrementTailKey() throws CacheException {
@@ -802,15 +802,15 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* If the keys are not yet initialized, initialize them from the region .
- *
+ *
* TODO - We could initialize the indexes maps at the time here. However, that would require
* iterating over the values of the region rather than the keys, which could be much more
* expensive if the region has overflowed to disk.
- *
+ *
* We do iterate over the values of the region in SerialGatewaySender at the time of failover. see
* SerialGatewaySender.handleFailover. So there's a possibility we can consolidate that code with
* this method and iterate over the region once.
- *
+ *
* @throws CacheException
*/
private void initializeKeys() throws CacheException {
@@ -872,7 +872,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Returns the value of the head key. The head key points to the next entry to be removed from the
* queue.
- *
+ *
* @return the value of the head key
* @throws CacheException
*/
@@ -897,7 +897,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Increments the value of the head key by one.
- *
+ *
* @throws CacheException
*/
private void updateHeadKey(long destroyedKey) throws CacheException {
@@ -912,7 +912,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
* Initializes the <code>Region</code> backing this queue. The <code>Region</code>'s scope is
* DISTRIBUTED_NO_ACK and mirror type is KEYS_VALUES and is set to overflow to disk based on the
* <code>GatewayQueueAttributes</code>.
- *
+ *
* @param sender The GatewaySender <code>SerialGatewaySenderImpl</code>
* @param listener The GemFire <code>CacheListener</code>. The <code>CacheListener</code> can be
* null.
@@ -1019,7 +1019,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Constructor : Creates and initializes the thread
- *
+ *
* @param c
*/
public BatchRemovalThread(InternalCache c) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParser.java
index 2b0c4c7..3998cfe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParser.java
@@ -25,7 +25,7 @@ import org.apache.geode.i18n.LogWriterI18n;
/**
* Abstract for {@link XmlParser} that throws {@link UnsupportedOperationException} on unused
* methods. Also keeps references for {@link #logWriter} and {@link #stack}
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
index 50bd998..d158cb2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
@@ -15,7 +15,7 @@
/*
* Created on Apr 18, 2005
*
- *
+ *
*/
package org.apache.geode.internal.cache.xmlcache;
@@ -25,7 +25,7 @@ import java.util.*;
* This class represents the data given for binding a DataSource to JNDI tree. It encapsulates to
* Map objects , one for gemfire jndi tree specific data & another for vendor specific data. This
* object will get created for every <jndi-binding></jndi-binding>
- *
+ *
*/
public class BindingCreation {
@@ -40,7 +40,7 @@ public class BindingCreation {
/**
* This function returns the VendorSpecific data Map
- *
+ *
* @return List
*/
List getVendorSpecificList() {
@@ -49,7 +49,7 @@ public class BindingCreation {
/**
* This function returns the Gemfire Specific data Map
- *
+ *
* @return Map
*/
Map getGFSpecificMap() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index 2aead11..2319776 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -14,6 +14,29 @@
*/
package org.apache.geode.internal.cache.xmlcache;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+import javax.naming.Context;
+import javax.transaction.TransactionManager;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.GemFireIOException;
import org.apache.geode.LogWriter;
@@ -80,6 +103,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.SystemTimer;
+import org.apache.geode.internal.cache.BackupManager;
import org.apache.geode.internal.cache.CacheConfig;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.CacheServerImpl;
@@ -90,11 +114,10 @@ import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.DiskStoreMonitor;
import org.apache.geode.internal.cache.DistributedRegion;
-import org.apache.geode.internal.cache.InitialImageOperation;
-import org.apache.geode.internal.cache.event.EventTrackerExpiryTask;
import org.apache.geode.internal.cache.ExpirationScheduler;
import org.apache.geode.internal.cache.FilterProfile;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InitialImageOperation;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
@@ -107,11 +130,11 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TombstoneService;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.control.ResourceAdvisor;
+import org.apache.geode.internal.cache.event.EventTrackerExpiryTask;
import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
import org.apache.geode.internal.cache.ha.HARegionQueue;
-import org.apache.geode.internal.cache.BackupManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
@@ -133,28 +156,6 @@ import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.PdxSerializer;
import org.apache.geode.pdx.internal.TypeRegistry;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import javax.naming.Context;
-import javax.transaction.TransactionManager;
-
/**
* Represents a {@link Cache} that is created declaratively. Notice that it implements the
* {@link Cache} interface so that this class must be updated when {@link Cache} is modified. This
@@ -239,7 +240,7 @@ public class CacheCreation implements InternalCache {
/**
* {@link ExtensionPoint} support.
- *
+ *
* @since GemFire 8.1
*/
private final SimpleExtensionPoint<Cache> extensionPoint = new SimpleExtensionPoint<>(this, this);
@@ -376,7 +377,7 @@ public class CacheCreation implements InternalCache {
/**
* create diskstore factory
- *
+ *
* @since GemFire prPersistSprint2
*/
@Override
@@ -387,7 +388,7 @@ public class CacheCreation implements InternalCache {
/**
* Store the current CacheCreation that is doing a create. Used from PoolManager to defer to
* CacheCreation as a manager of pools.
- *
+ *
* @since GemFire 5.7
*/
private static final ThreadLocal<PoolManagerImpl> createInProgress = new ThreadLocal<>();
@@ -395,7 +396,7 @@ public class CacheCreation implements InternalCache {
/**
* Returns null if the current thread is not doing a CacheCreation create. Otherwise returns the
* PoolManagerImpl of the CacheCreation of the create being invoked.
- *
+ *
* @since GemFire 5.7
*/
public static PoolManagerImpl getCurrentPoolManager() {
@@ -1297,7 +1298,7 @@ public class CacheCreation implements InternalCache {
/**
* Implementation of {@link Cache#setCopyOnRead}
- *
+ *
* @since GemFire 4.0
*/
@Override
@@ -1308,7 +1309,7 @@ public class CacheCreation implements InternalCache {
/**
* Implementation of {@link Cache#getCopyOnRead}
- *
+ *
* @since GemFire 4.0
*/
@Override
@@ -1323,7 +1324,7 @@ public class CacheCreation implements InternalCache {
/**
* Adds a CacheTransactionManagerCreation for this Cache (really just a placeholder since a
* CacheTransactionManager is really a Cache singleton)
- *
+ *
* @since GemFire 4.0
* @see GemFireCacheImpl
*/
@@ -1521,7 +1522,7 @@ public class CacheCreation implements InternalCache {
/**
* Returns whether PdxInstance is preferred for PDX types instead of Java object.
- *
+ *
* @see org.apache.geode.cache.CacheFactory#setPdxReadSerialized(boolean)
*
* @since GemFire 6.6
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java
index 2da4a67..a2dd8bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java
@@ -52,7 +52,7 @@ public class CacheServerCreation extends AbstractCacheServer {
/**
* Constructor for retaining bridge server information during auto-reconnect
- *
+ *
* @param cache
* @param other
*/
@@ -193,7 +193,7 @@ public class CacheServerCreation extends AbstractCacheServer {
* Compare configured cacheServer port against the running cacheServer port. If the current
* cacheServer port is set to 0 a random ephemeral port will be used so there is no need to
* compare returning <code>true</code>. If a port is specified, return the proper comparison.
- *
+ *
* @param other CacheServer
* @return
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
index 4cca8b0..c0c05d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.internal.cache.xmlcache;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ServiceLoader;
+
+import org.xml.sax.*;
+import org.xml.sax.ext.EntityResolver2;
+
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.xml.sax.*;
-import org.xml.sax.ext.EntityResolver2;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ServiceLoader;
/**
* The abstract superclass of classes that convert XML into a {@link org.apache.geode.cache.Cache}
@@ -65,28 +66,28 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/**
* Namespace URI for {@link CacheXml} documents.
- *
+ *
* @since GemFire 8.1
*/
public static final String GEODE_NAMESPACE = "http://geode.apache.org/schema/cache";
/**
* Namespace prefix for {@link CacheXml} documents.
- *
+ *
* @since GemFire 8.1
*/
public static final String PREFIX = "cache";
/**
* Latest schema location for {@link #GEODE_NAMESPACE}.
- *
+ *
* @since GemFire 8.1
*/
public static final String LATEST_SCHEMA_LOCATION = CacheXml.SCHEMA_1_0_LOCATION;
/**
* Location of the latest DTD file for Gemfire
- *
+ *
* @deprecated As of 8.1 use {@link #LATEST_SCHEMA_LOCATION}
*/
@Deprecated
@@ -94,28 +95,28 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/**
* Version string for GemFire 8.1
- *
+ *
* @since GemFire 8.1
*/
public static final String VERSION_8_1 = "8.1";
/**
* Version string for Geode 1.0
- *
+ *
* @since Geode 1.0
*/
public static final String VERSION_1_0 = "1.0";
/**
* The location of the GemFire 8.1 schema file.
- *
+ *
* @since GemFire 8.1
*/
public static final String SCHEMA_8_1_LOCATION =
"http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
/**
* The location of the Geode 1.0 schema file.
- *
+ *
* @since Geode 1.0
*/
protected static final String SCHEMA_1_0_LOCATION =
@@ -746,7 +747,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
protected static final String COMPRESSOR = "compressor";
/**
* The name of the <code>off-heap</code> attribute
- *
+ *
* @since Geode 1.0
*/
protected static final String OFF_HEAP = "off-heap";
@@ -761,7 +762,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/**
* Given a public id, attempt to resolve it to a DTD. Returns an <code>InputSoure</code> for the
* DTD.
- *
+ *
* @throws IOException
*/
public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId)
@@ -834,7 +835,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/*
* (non-Javadoc)
- *
+ *
* @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
*/
@Override
@@ -845,7 +846,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/*
* (non-Javadoc)
- *
+ *
* @see org.xml.sax.ext.EntityResolver2#getExternalSubset(java.lang.String, java.lang.String)
*/
@Override
@@ -856,7 +857,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
/**
* Resolve entity using discovered {@link EntityResolver2}s.
- *
+ *
* @param publicId
* @param systemId
* @return {@link InputSource} for resolved entity if found, otherwise null.
@@ -900,7 +901,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @return String value for named attribute or null if attribute not defined.
@@ -911,7 +912,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @param defaultValue
@@ -928,7 +929,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @return Integer value for named attribute or null if attribute not defined.
@@ -939,7 +940,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @param defaultValue
@@ -957,7 +958,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @return Boolean value for named attribute or null if attribute not defined.
@@ -968,7 +969,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @param defaultValue
@@ -986,7 +987,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @param clazz
@@ -999,7 +1000,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
}
/**
- *
+ *
* @param attributes
* @param name
* @param clazz
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
index 5de07ee..39209ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
@@ -145,7 +145,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
private ContentHandler handler;
/** The Cache that we're generating XML for */
- final private Cache cache;
+ private final Cache cache;
/**
* Will the generated XML file reference an XML schema instead of the DTD?
@@ -847,7 +847,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
/**
* Generates the <code>serializer-registration</code> element.
- *
+ *
* @throws SAXException
*/
private void generateSerializerRegistration() throws SAXException {
@@ -902,9 +902,9 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
/**
* Generates XML for the client-subscription tag
- *
+ *
* @param bridge instance of <code>CacheServer</code>
- *
+ *
* @since GemFire 5.7
*/
private void generateClientHaQueue(CacheServer bridge) throws SAXException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
index 022f289..5db6d53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
@@ -35,9 +35,8 @@ import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.geode.cache.util.GatewayConflictResolver;
-import org.apache.logging.log4j.Logger;
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -93,6 +92,7 @@ import org.apache.geode.cache.query.internal.index.IndexCreationData;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.apache.geode.cache.server.ServerLoadProbe;
+import org.apache.geode.cache.util.GatewayConflictResolver;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter;
@@ -161,14 +161,14 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Delegate {@link XmlParser}s mapped by namespace URI.
- *
+ *
* @since GemFire 8.1
*/
private HashMap<String, XmlParser> delegates = new HashMap<>();
/**
* Document {@link Locator} used for {@link SAXParseException}.
- *
+ *
* @since GemFire 8.2
*/
protected Locator documentLocator;
@@ -197,7 +197,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
*
* In order to block the parser from closing the stream, we wrap the InputStream in a filter,
* i.e., UnclosableInputStream, whose close() function does nothing.
- *
+ *
*/
class UnclosableInputStream extends BufferedInputStream {
public UnclosableInputStream(InputStream stream) {
@@ -1296,7 +1296,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* finish parsing a "group" element which is just a string
- *
+ *
* @since GemFire 5.7
*/
private void endGroup() {
@@ -1777,7 +1777,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* When index element is ending we need to verify all attributes because of new index tag
* definition since 6.6.1 and support previous definition also.
- *
+ *
* if <code>functional</code> element was not there then we need to validate expression and
* fromClause as not null.
*/
@@ -2102,7 +2102,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
* Create an <code>lru-entry-count</code> eviction controller, assigning it to the enclosed
* <code>region-attributes</code>. Allow any combination of attributes to be provided. Use the
* default values for any attribute that is not provided.
- *
+ *
* @param atts
*/
/**
@@ -2127,7 +2127,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
* Start the configuration of a <code>lru-memory-size</code> eviction controller. Allow for any of
* the attributes to be missing. Store the attributes on the stack anticipating the declaration of
* an {@link ObjectSizer}.
- *
+ *
* @param atts
*/
private void startLRUMemorySize(Attributes atts) {
@@ -2172,7 +2172,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Create an <code>lru-heap-percentage</code> eviction controller, assigning it to the enclosed
* <code>region-attributes</code>
- *
+ *
* @param atts
*/
private void startLRUHeapPercentage(Attributes atts) {
@@ -2424,7 +2424,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Start the Resource Manager element configuration
- *
+ *
* @param atts XML attributes for the resource-manager
*/
private void startResourceManager(final Attributes atts) {
@@ -2779,7 +2779,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Get delegate {@link XmlParser} for the given <code>namespaceUri</code>
- *
+ *
* @param namespaceUri to find {@link XmlParser} for.
* @return {@link XmlParser} if found, otherwise null.
* @since GemFire 8.1
@@ -2832,7 +2832,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
* <p>
* <code>capacity</code> and <code>overflow-directory</code>, then pass these values to Bridge
* Server
- *
+ *
* @since GemFire 5.7
*/
private void startClientHaQueue(Attributes atts) {
@@ -2859,7 +2859,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Add a marker string to look for when in endPartitionProperties
- *
+ *
* @param atts
* @param localOrGlobal either the string LOCAL_PROPERTIES or GLOBAL_PROPERTIES
*/
@@ -3197,7 +3197,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
}
/**
- *
+ *
*/
private void endPdxSerializer() {
Declarable d = createDeclarable();
@@ -3243,7 +3243,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Do nothing
- *
+ *
* @since GemFire 5.7
*/
private void endClientHaQueue() {}
@@ -3251,7 +3251,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
/**
* Process either the <code>local-properties</code> or <code>global-properties</code> for a
* {@link org.apache.geode.internal.cache.PartitionedRegion}
- *
+ *
* @param globalOrLocal either the string {@link CacheXml#LOCAL_PROPERTIES} or
* {@link CacheXml#GLOBAL_PROPERTIES}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
index 4748366..372cc31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Property resolver for resolving ${} like strings with system or Gemfire properties in Cache.xml
- *
+ *
* @since GemFire 6.6
*/
public class CacheXmlPropertyResolver implements PropertyResolver {
@@ -65,7 +65,7 @@ public class CacheXmlPropertyResolver implements PropertyResolver {
/**
* Sets <code>propertyOverridden</code> with one of the constants specified in this
* {@link CacheXmlPropertyResolver} class.
- *
+ *
* @param propertyOverridden
*/
public void setPropertyOverridden(int propertyOverridden) {
@@ -85,7 +85,7 @@ public class CacheXmlPropertyResolver implements PropertyResolver {
* returns the replacement of the property found in available properties. If no string replacement
* is found then {@link IllegalArgumentException} would be thrown based on
* <code>ignoreUnresolvedProperties</code> flag being set by {@link CacheXmlParser}.
- *
+ *
* @param replaceString
* @return resolvedString
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
index ff179de..43f1b17 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* Helper class for CacheXmlPropertyResolver. Helps in parsing ${...${}..}..${} strings.
- *
+ *
* @since GemFire 6.6
*/
public class CacheXmlPropertyResolverHelper {
@@ -77,7 +77,7 @@ public class CacheXmlPropertyResolverHelper {
/**
* Parses the given string which are supposed to be like ${} for system and/or Gemfire properties
* to be replaced. This will return property.name from ${property.name}.
- *
+ *
* @param unparsedString
* @return parsedString
*/
@@ -134,7 +134,7 @@ public class CacheXmlPropertyResolverHelper {
/**
* Finds index of suffix in a string from a specified index. Like finds index of "}" in string
* "${my.prop.name}" starting from index 2, which is 14.
- *
+ *
* @param buf
* @param index
* @return suffix
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
index 460f107..521db37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
@@ -74,9 +74,9 @@ public enum CacheXmlVersion {
* The version of the DTD or Schema. Prior to 8.1 this value was of the format "8_0". With 8.1 and
* later the value is of the format "8.1". Values should match constants in {@link CacheXml} like
* {@link CacheXml#VERSION_8_1}.
- *
+ *
* @return the version
- *
+ *
* @since GemFire 8.1
*/
public String getVersion() {
@@ -96,7 +96,7 @@ public enum CacheXmlVersion {
/**
* The namespace.
- *
+ *
* @return the namespace if schema exists, otherwise null.
*/
public String getNamespace() {
@@ -105,7 +105,7 @@ public enum CacheXmlVersion {
/**
* The DTD public id.
- *
+ *
* @return the publicId if DTD exists, otherwise null.
* @since GemFire 8.1
*/
@@ -115,7 +115,7 @@ public enum CacheXmlVersion {
/**
* The DTD system id.
- *
+ *
* @return the systemId if DTD exists, otherwise null.
* @since GemFire 8.1
*/
@@ -127,7 +127,7 @@ public enum CacheXmlVersion {
* Get {@link CacheXmlVersion} for given <code>version</code> string. Use constants from
* {@link CacheXml} for example:
* <code>CacheXmlVersion.valueForVersion(CacheXml.GEMFIRE_8_1);</code>
- *
+ *
* @param version string to lookup.
* @return {@link CacheXmlVersion} if exists.
* @throws IllegalArgumentException if version does not exist.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ClientHaQueueCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ClientHaQueueCreation.java
index f153e3d..b5264a3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ClientHaQueueCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ClientHaQueueCreation.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* This class represents the data given for binding an overflow mechanism to a client subscription.
* It encapsulates eviction policy, capacity and overflowDirectory. This object will get created for
* every <b>client-subscription</b> tag
- *
+ *
* @since GemFire 5.7
*/
public class ClientHaQueueCreation {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java
index d2d8feb..0111446 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import org.apache.geode.cache.Declarable;
import java.util.Properties;
+import org.apache.geode.cache.Declarable;
+
/**
* An extension of {@link Declarable} that allows a <code>Declarable</code> to provides its
* configuration (as a {@link Properties}). This allows us to convert a <code>Declarable</code> into
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
index 410ca0c..4749abf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
@@ -52,7 +52,7 @@ public abstract class DefaultEntityResolver2 implements EntityResolver2 {
/**
* Get {@link InputSource} for path in class path.
- *
+ *
* @param path to resource to get {@link InputSource} for.
* @return InputSource if resource found, otherwise null.
* @since GemFire 8.1
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
index 2316666..9a4b561 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
@@ -50,7 +50,7 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
* NOTE: Currently attrs will not be an instance of DiskStoreAttributesCreation. If it could be
* then this code should be changed to use attrs' hasXXX methods to initialize the has booleans
* when defaults is false.
- *
+ *
* @param attrs the attributes to initialize this guy with.
*/
public DiskStoreAttributesCreation(DiskStoreAttributes attrs) {
@@ -101,7 +101,7 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
/**
* returns true if two long[] are equal
- *
+ *
* @param array1
* @param array2
* @return true if equal
@@ -121,7 +121,7 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
/**
* returns true if two int[] are equal
- *
+ *
* @param array1
* @param array2
* @return true if equal
@@ -314,7 +314,7 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
/**
* Checks if directories exist
- *
+ *
* @param disk_dirs
*/
private void checkIfDirectoriesExist(File[] disk_dirs) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GatewayReceiverCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GatewayReceiverCreation.java
index f298bab..441290b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GatewayReceiverCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GatewayReceiverCreation.java
@@ -25,10 +25,10 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayTransportFilter;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.net.SocketCreator;
public class GatewayReceiverCreation implements GatewayReceiver {
private static final Logger logger = LogService.getLogger();
@@ -147,7 +147,7 @@ public class GatewayReceiverCreation implements GatewayReceiver {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.wan.GatewayReceiver#getStartPort()
*/
public int getStartPort() {
@@ -156,7 +156,7 @@ public class GatewayReceiverCreation implements GatewayReceiver {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.wan.GatewayReceiver#getEndPort()
*/
public int getEndPort() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
index cdd9659..fd61252 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
@@ -25,11 +25,11 @@ import org.xml.sax.ext.EntityResolver2;
/**
* Resolves entities for XSDs or DTDs with SYSTEM IDs rooted at http://geode.apache.org/schema from
* the classpath at /META-INF/schemas/geode.apache.org/.
- *
+ *
* Loaded by {@link ServiceLoader} on {@link EntityResolver2} class. See file
* <code>META-INF/services/org.xml.sax.ext.EntityResolver2</code>
- *
- *
+ *
+ *
* @since GemFire 8.1
*/
public class GeodeEntityResolver extends DefaultEntityResolver2 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/IndexCreationData.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/IndexCreationData.java
index b5ed245..ab01c54 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/IndexCreationData.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/IndexCreationData.java
@@ -15,7 +15,7 @@
/*
* Created on Apr 18, 2005
*
- *
+ *
*/
package org.apache.geode.internal.cache.xmlcache;
@@ -25,7 +25,7 @@ import org.apache.geode.cache.query.IndexStatistics;
import org.apache.geode.cache.query.IndexType;
/**
- *
+ *
* This class contains the information needed to create an index It will contain the callback data
* between <index></index> invocation
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
index 791c3f5..f982bf5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
@@ -22,8 +22,8 @@ import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
import org.apache.geode.distributed.internal.DistributionAdvisor;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.InternalCache;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
index 68e43dc..539c66c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
@@ -25,11 +25,11 @@ import org.xml.sax.ext.EntityResolver2;
/**
* Resolves entities for XSDs or DTDs with SYSTEM IDs rooted at http://www.pivotal.io/xml/ns from
* the classpath at /META-INF/schemas/schema.pivotal.io/.
- *
+ *
* Loaded by {@link ServiceLoader} on {@link EntityResolver2} class. See file
* <code>META-INF/services/org.xml.sax.ext.EntityResolver2</code>
- *
- *
+ *
+ *
* @since GemFire 8.1
*/
public class PivotalEntityResolver extends DefaultEntityResolver2 {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java
index 9879b6a..4e29aae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.xmlcache;
@@ -36,7 +36,7 @@ public interface PropertyResolver {
* returns the replacement of the property found in available properties. If no string replacement
* is found then {@link IllegalFormatException} would be thrown based on
* <code>ignoreUnresolvedProperties</code> flag being set by {@link CacheXmlParser}.
- *
+ *
* @param replaceString
* @return resolvedString
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
index cf8c4c9..4b4d070 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
@@ -116,7 +116,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
private int[] diskSizes;
/**
* disk store name of the region
- *
+ *
* @since GemFire prPersistPrint2
*/
private String diskStoreName;
@@ -172,21 +172,21 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* The client to server Connection Pool
- *
+ *
* @since GemFire 5.7
*/
private String poolName;
/**
* The region compressor.
- *
+ *
* @since GemFire 8.0
*/
private Compressor compressor;
/**
* True if usage of off-heap memory is enabled for this region.
- *
+ *
* @since Geode 1.0
*/
private boolean offHeap;
@@ -219,7 +219,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
* Currently attrs will not be an instance of RegionAttributesCreation. If it could be then this
* code should be changed to use attrs' hasXXX methods to initialize the has booleans when
* defaults is false.
- *
+ *
* @param attrs the attributes to initialize this guy with.
* @param defaults true if <code>attrs</code> are defaults; false if they are not
*/
@@ -307,7 +307,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* returns true if two long[] are equal
- *
+ *
* @param array1
* @param array2
* @return true if equal
@@ -327,7 +327,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* returns true if two int[] are equal
- *
+ *
* @param array1
* @param array2
* @return true if equal
@@ -1009,7 +1009,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* Checks if directories exist
- *
+ *
* @param diskDirs
*/
private void checkIfDirectoriesExist(File[] diskDirs) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
index 1754d1b..b8c550a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
@@ -74,7 +74,7 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
/**
* If true then someone explicitly added region attributes to this region
- *
+ *
* @since GemFire 6.5
*/
private boolean hasAttributes;
@@ -101,7 +101,7 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
/**
* {@link ExtensionPoint} to {@link Region}.
- *
+ *
* @since GemFire 8.1
*/
private final SimpleExtensionPoint<Region<?, ?>> extensionPoint =
@@ -259,7 +259,7 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
/**
* Called by CacheXmlParser to add the IndexCreationData object to the list. It is called when
* functional element is encounetered
- *
+ *
* @param icd
*/
void addIndexData(IndexCreationData icd) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java
index e2d46e3..220a100 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java
@@ -43,7 +43,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#createRebalanceFactory()
*/
public RebalanceFactory createRebalanceFactory() {
@@ -52,7 +52,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#getRebalanceOperations()
*/
public Set<RebalanceOperation> getRebalanceOperations() {
@@ -61,7 +61,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#getCriticalHeapPercentage()
*/
public float getCriticalHeapPercentage() {
@@ -70,7 +70,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#setCriticalHeapPercentage(int)
*/
public void setCriticalHeapPercentage(float heapPercentage) {
@@ -84,7 +84,7 @@ public class ResourceManagerCreation implements ResourceManager {
/**
* Determine if the critical heap was configured
- *
+ *
* @return true if it was configured
*/
public boolean hasCriticalHeap() {
@@ -93,7 +93,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#getCriticalOffHeapPercentage()
*/
@Override
@@ -103,7 +103,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#setCriticalOffHeapPercentage(int)
*/
@Override
@@ -118,7 +118,7 @@ public class ResourceManagerCreation implements ResourceManager {
/**
* Determine if the critical off-heap was configured
- *
+ *
* @return true if it was configured
*/
public boolean hasCriticalOffHeap() {
@@ -172,7 +172,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#getEvictionHeapPercentage()
*/
public float getEvictionHeapPercentage() {
@@ -181,7 +181,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#setEvictionHeapPercentage(int)
*/
public void setEvictionHeapPercentage(float heapPercentage) {
@@ -195,7 +195,7 @@ public class ResourceManagerCreation implements ResourceManager {
/**
* Determine if the eviction heap was configured
- *
+ *
* @return true if the eviction heap was configured
*/
public boolean hasEvictionHeap() {
@@ -204,7 +204,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#getEvictionOffHeapPercentage()
*/
public float getEvictionOffHeapPercentage() {
@@ -213,7 +213,7 @@ public class ResourceManagerCreation implements ResourceManager {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceManager#setEvictionOffHeapPercentage(int)
*/
public void setEvictionOffHeapPercentage(final float offHeapPercentage) {
@@ -227,7 +227,7 @@ public class ResourceManagerCreation implements ResourceManager {
/**
* Determine if the eviction off-heap was configured
- *
+ *
* @return true if the eviction off-heap was configured
*/
public boolean hasEvictionOffHeap() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
index 89f345b..6776b33 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
@@ -21,8 +21,8 @@ import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
import org.apache.geode.distributed.internal.DistributionAdvisor;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.InternalCache;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
index 9fcf06a..affe72b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
@@ -22,8 +22,8 @@ import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
import org.apache.geode.distributed.internal.DistributionAdvisor;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.InternalCache;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java
index d8574a6..a6744ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java
@@ -13,10 +13,16 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.xmlcache;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
@@ -24,12 +30,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import java.util.Map;
-import java.util.Vector;
-import java.util.HashMap;
-
-import org.apache.logging.log4j.Logger;
-
/**
*
*/
@@ -53,7 +53,7 @@ public class SerializerCreation {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.Instantiator#newInstance()
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
index a618236..a973e6b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
@@ -20,7 +20,7 @@ import org.xml.sax.SAXException;
/**
* Interface for configuration XML generators. Used by {@link CacheXmlGenerator} to generate
* entities defined in the XML Namespace returned by {@link #getNamespaceUri()} .
- *
+ *
*
* @since GemFire 8.1
*/
@@ -28,7 +28,7 @@ public interface XmlGenerator<T> {
/**
* Get XML Namespace this parser is responsible for.
- *
+ *
* @return XML Namespace.
* @since GemFire 8.1
*/
@@ -47,7 +47,7 @@ public interface XmlGenerator<T> {
/**
* Generate XML configuration to the given {@link CacheXmlGenerator}.
- *
+ *
* @param cacheXmlGenerator to generate configuration to.
* @throws SAXException
* @since GemFire 8.1
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
index 864cbce..d16e267 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
@@ -15,27 +15,28 @@
package org.apache.geode.internal.cache.xmlcache;
+import static org.apache.geode.internal.cache.xmlcache.CacheXml.CLASS_NAME;
+import static org.apache.geode.internal.cache.xmlcache.CacheXml.DECLARABLE;
+import static org.apache.geode.internal.cache.xmlcache.CacheXml.NAME;
+import static org.apache.geode.internal.cache.xmlcache.CacheXml.PARAMETER;
+import static org.apache.geode.internal.cache.xmlcache.CacheXml.STRING;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
import javax.xml.XMLConstants;
-import org.apache.geode.cache.Declarable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.apache.geode.internal.cache.xmlcache.CacheXml.CLASS_NAME;
-import static org.apache.geode.internal.cache.xmlcache.CacheXml.DECLARABLE;
-import static org.apache.geode.internal.cache.xmlcache.CacheXml.NAME;
-import static org.apache.geode.internal.cache.xmlcache.CacheXml.PARAMETER;
-import static org.apache.geode.internal.cache.xmlcache.CacheXml.STRING;
+import org.apache.geode.cache.Declarable;
/**
* Utilities for use in {@link XmlGenerator} implementation to provide common helper methods.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -50,13 +51,13 @@ public class XmlGeneratorUtils {
* Adds attribute with <code>localName</code> to <code>attributes</code> if value is not null.
* Follows the same rules as
* {@link AttributesImpl#addAttribute(String, String, String, String, String)} .
- *
+ *
* @param attributes to add to.
* @param localName of attribute to add.
* @param value to add to attribute.
* @since GemFire 8.1
*/
- static public void addAttribute(final AttributesImpl attributes, final String localName,
+ public static void addAttribute(final AttributesImpl attributes, final String localName,
final Object value) {
if (null != value) {
attributes.addAttribute(XMLConstants.NULL_NS_URI, localName, localName, "", value.toString());
@@ -67,14 +68,14 @@ public class XmlGeneratorUtils {
* Adds attribute with <code>prefix</code> and <code>localName</code> to <code>attributes</code>
* if value is not null. Follows the same rules as
* {@link AttributesImpl#addAttribute(String, String, String, String, String)} .
- *
+ *
* @param attributes to add to.
* @param prefix of the attribute.
* @param localName of attribute to add.
* @param value to add to attribute.
* @since GemFire 8.1
*/
- static public void addAttribute(final AttributesImpl attributes, final String prefix,
+ public static void addAttribute(final AttributesImpl attributes, final String prefix,
final String localName, final Object value) {
if (null != value) {
attributes.addAttribute(XMLConstants.NULL_NS_URI, localName, prefix + ":" + localName, "",
@@ -85,7 +86,7 @@ public class XmlGeneratorUtils {
/**
* Start new element on <code>contentHandler</code> with given <code>prefix</code>,
* <code>localName</code> and <code>attributes</code>.
- *
+ *
* @param contentHandler to start element on.
* @param prefix of element
* @param localName of element
@@ -94,7 +95,7 @@ public class XmlGeneratorUtils {
* throws {@link SAXException}.
* @since GemFire 8.1
*/
- static public void startElement(final ContentHandler contentHandler, final String prefix,
+ public static void startElement(final ContentHandler contentHandler, final String prefix,
final String localName, final AttributesImpl attributes) throws SAXException {
contentHandler.startElement(XMLConstants.NULL_NS_URI, localName, prefix + ":" + localName,
attributes);
@@ -103,7 +104,7 @@ public class XmlGeneratorUtils {
/**
* End element on <code>contentHandler</code> with given <code>prefix</code> and
* <code>localName</code>.
- *
+ *
* @param contentHandler to start element on.
* @param prefix of element
* @param localName of element
@@ -111,7 +112,7 @@ public class XmlGeneratorUtils {
* {@link SAXException}.
* @since GemFire 8.1
*/
- static public void endElement(final ContentHandler contentHandler, final String prefix,
+ public static void endElement(final ContentHandler contentHandler, final String prefix,
final String localName) throws SAXException {
contentHandler.endElement(XMLConstants.NULL_NS_URI, localName, prefix + ":" + localName);
}
@@ -119,7 +120,7 @@ public class XmlGeneratorUtils {
/**
* Creates new empty element on <code>contentHandler</code> with given <code>prefix</code>,
* <code>localName</code> and <code>attributes</code>.
- *
+ *
* @param contentHandler to create empty element on.
* @param prefix of element
* @param localName of element
@@ -129,7 +130,7 @@ public class XmlGeneratorUtils {
* {@link SAXException}.
* @since GemFire 8.1
*/
- static public void emptyElement(final ContentHandler contentHandler, final String prefix,
+ public static void emptyElement(final ContentHandler contentHandler, final String prefix,
final String localName, final AttributesImpl attributes) throws SAXException {
startElement(contentHandler, prefix, localName, attributes);
endElement(contentHandler, prefix, localName);
@@ -137,7 +138,7 @@ public class XmlGeneratorUtils {
- static public void addDeclarable(final ContentHandler handler, Declarable declarable)
+ public static void addDeclarable(final ContentHandler handler, Declarable declarable)
throws SAXException {
AttributesImpl EMPTY = new AttributesImpl();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
index 926786d..b561537 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
@@ -23,10 +23,10 @@ import org.xml.sax.ContentHandler;
/**
* Interface for configuration XML parsers. Used by {@link CacheXmlParser} to parse entities defined
* in the XML Namespace returned by {@link #getNamespaceUri()} .
- *
+ *
* Loaded by {@link ServiceLoader} on {@link XmlParser} class. See file
* <code>META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser</code>
- *
+ *
*
* @since GemFire 8.1
*/
@@ -34,7 +34,7 @@ public interface XmlParser extends ContentHandler {
/**
* Get XML Namespace this parser is responsible for.
- *
+ *
* @return XML Namespace.
* @since GemFire 8.1
*/
@@ -42,7 +42,7 @@ public interface XmlParser extends ContentHandler {
/**
* Sets the XML config stack on this parser.
- *
+ *
* @param stack current XML config stack.
* @since GemFire 8.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java
index 35ff4d5..f866528 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.concurrent;
/**
* These methods are the same ones on the JDK 5 version java.util.concurrent.atomic.AtomicLong. Note
* that unlike AtomicLong this interface does not support <code>java.lang.Number</code>.
- *
+ *
* @deprecated used AtomicLong instead
*/
public interface AL {
@@ -116,7 +116,7 @@ public interface AL {
* Atomically sets the value to the given updated value if the given value {@code >} the current
* value. This could be sub-optimat when the update being done by multiple thread is not in in an
* incremental fashion.
- *
+ *
* @param update
*/
public boolean setIfGreater(long update);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/Atomics.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/Atomics.java
index 87ac6b4..3e9c036 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/Atomics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/Atomics.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.concurrent;
+import java.util.concurrent.atomic.AtomicLong;
+
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -23,8 +25,6 @@ import org.apache.geode.internal.statistics.StatisticsManager;
import org.apache.geode.internal.statistics.StatisticsTypeImpl;
import org.apache.geode.internal.stats50.Atomic50StatisticsImpl;
-import java.util.concurrent.atomic.AtomicLong;
-
public class Atomics {
private Atomics() {}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
index 9c40f0a..9948cd0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
@@ -19,9 +19,9 @@ package org.apache.geode.internal.concurrent;
* (current as of 27 March 2015). The modifications made for GemFire turn it into a Set instead of a
* Map by removing the map's storage for values and removing the methods that are associated with
* values.
- *
+ *
* JSR 166 interest web site: http://gee.cs.oswego.edu/dl/concurrency-interest/
- *
+ *
* File download location:
* http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/jdk7/java/util/concurrent/
* CompactConcurrentHashSet2.java?revision=1.43
@@ -862,7 +862,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Saves the state of the {@code CompactConcurrentHashSet2} instance to a stream (i.e., serializes
* it).
- *
+ *
* @param s the stream
* @serialData the key (Object) and value (Object) for each key-value mapping, followed by a null
* pair. The key-value mappings are emitted in no particular order.
@@ -902,7 +902,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Reconstitutes the instance from a stream (that is, deserializes it).
- *
+ *
* @param s the stream
*/
private void readObject(java.io.ObjectInputStream s)
@@ -1599,12 +1599,12 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Finds or adds a node.
- *
+ *
* @return null if added
*/
/**
* Finds or adds a node.
- *
+ *
* @return null if added
*/
TreeNode<K> putTreeVal(int h, K k) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/ConcurrentHashSet.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/ConcurrentHashSet.java
index 4dcc6f7..b8af771 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/ConcurrentHashSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/ConcurrentHashSet.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* This class is similar to HashSet supporting all the feature of ConcurrentHashMap
- *
+ *
*
*/
public class ConcurrentHashSet<E> extends AbstractSet<E> implements Set<E>, Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/LI.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/LI.java
index 4363903..791f11f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/LI.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/LI.java
@@ -19,9 +19,9 @@ import java.io.Serializable;
/**
* These methods are the same as on the jdk 1.6 java.lang.management.LockInfo, but this class is
* serializable.
- *
+ *
* Retained for backwards compatibility reasons.
- *
+ *
*/
public class LI implements Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java
index 08e4126..b07d7c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java
@@ -23,9 +23,9 @@ import java.util.concurrent.ConcurrentMap;
* ultimately thrown away.
* <p>
* Now also has a bunch of callbacks including for replace/remove etc.
- *
+ *
* @since GemFire 7.0
- *
+ *
* @param <K> the type of key of the map
* @param <V> the type of value of the map
* @param <C> the type of context parameter passed to the creation/removal methods
@@ -47,11 +47,11 @@ public interface MapCallback<K, V, C, P> {
/**
* Create a new instance of the value object given the key and provided parameters for
* construction. Invoked by the <code>create</code> method in custom map impls.
- *
+ *
* @param key the key for which the value is being created
* @param context any context in which this method has been invoked
* @param createParams parameters, if any, required for construction of a new value object
- *
+ *
* @return the new value to be inserted in the map
*/
public V newValue(K key, C context, P createParams, MapResult result);
@@ -59,12 +59,12 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked when an existing value in map is read by the <code>create</code> method in custom map
* impls.
- *
+ *
* @param key the key for which the value is being created
* @param oldValue the value read by create that will be returned
* @param context any context in which this method has been invoked
* @param params parameters, if any, required for construction of value
- *
+ *
* @return updated value to be put in the map, if non-null; if null then retry the map operation
* internally
*/
@@ -72,7 +72,7 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked after put is successful with the result of {@link #updateValue}.
- *
+ *
* @param key the key provided to the put() operation
* @param mapKey the existing key in the map
* @param newValue the new value to be replaced
@@ -87,7 +87,7 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked when an existing value in map is read by read ops.
- *
+ *
* @param oldValue the value read by create that will be returned
*/
public void oldValueRead(V oldValue);
@@ -95,11 +95,11 @@ public interface MapCallback<K, V, C, P> {
/**
* Check if the existing value should be removed by the custom <code>remove</code> methods that
* take MapCallback as argument.
- *
+ *
* If this method returns null, then proceed with remove as usual, if this method returns
* {@link #ABORT_REMOVE_TOKEN} then don't do the remove, and if this method returns any other
* object then replace the map value instead of removing.
- *
+ *
* @param key the key of the entry to be removed from the map
* @param value the value to be removed
* @param existingValue the current value in the map
@@ -112,7 +112,7 @@ public interface MapCallback<K, V, C, P> {
* Invoked after removal of an entry. Some implementations (CustomEntryConcurrentHashMap) will
* invoke this for both successful or failed removal (in latter case existingValue will be null)
* while others invoke this only for successful remove.
- *
+ *
* @param key the key of the entry removed from the map; some implementations
* (ConcurrentSkipListMap) will return the actual key in the map while others will provide
* the passed key
@@ -126,14 +126,14 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked when an existing value in map is read by the <code>replace</code> method in custom map
* impls, and is to be replaced by a new value.
- *
+ *
* @param key the key for which the value is being replaced
* @param oldValue the old value passed to replace method
* @param existingValue the current value in the map
* @param newValue the new value passed to replace method
* @param context any context in which this method has been invoked
* @param params parameters, if any, required for construction of a value
- *
+ *
* @return updated value to be actually put in the map, if non-null; if null then retry the map
* operation internally
*/
@@ -142,7 +142,7 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked after the node is found and just before the replace. The replace may still either
* succeed or fail.
- *
+ *
* @param mapKey the existing key in the map
* @param newValue the new value to be replaced
* @param context any context argument passed to replace
@@ -152,7 +152,7 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked after replace is successful and passing it the result of {@link #beforeReplace}.
- *
+ *
* @param mapKey the existing key in the map
* @param newValue the new value to be replaced
* @param beforeResult the result of {@link #beforeReplace}
@@ -163,7 +163,7 @@ public interface MapCallback<K, V, C, P> {
/**
* Invoked after replace fails and passing it the result of {@link #beforeReplace}.
- *
+ *
* @param mapKey the existing key in the map
* @param newValue the new value to be replaced
* @param beforeResult the result of {@link #beforeReplace}
@@ -176,7 +176,7 @@ public interface MapCallback<K, V, C, P> {
* Invoked after replace or delete fails at the end, passing it the intermediate values that were
* returned by {@link #replaceValue}, {@link #updateValue} or {@link #removeValue} so it can
* revert any side-affects of those methods.
- *
+ *
* @param key the key for which the operation failed
* @param oldValue the expected oldValue passed for a replace or remove operation
* @param updatedValue the new replacement value for the map that failed (possibly changed by
@@ -185,7 +185,7 @@ public interface MapCallback<K, V, C, P> {
* delete or insert operation
* @param context any context argument passed to the original method
* @param params any callback parameters passed to the original method
- *
+ *
* @return value to be returned as result of operation ignoring failure (or null for failure)
*/
public V onOperationFailed(K key, Object oldValue, V updatedValue, V newValue, C context,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java
index f493858..fa4de77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java
@@ -18,7 +18,7 @@ package org.apache.geode.internal.concurrent;
/**
* Any additional result state needed to be passed to {@link MapCallback} which returns values by
* reference.
- *
+ *
* @since GemFire Helios
*/
public interface MapResult {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractDataSource.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractDataSource.java
index 25cfccb..32e6ae9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractDataSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractDataSource.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* AbstractDataSource implements the Datasource interface. This is base class for the datasouce
* types. The class also implements the Serializable and Referenceable behavior.
- *
+ *
* This class now contains only those paramaters which are needed by the Gemfire DataSource
* configuration. This maps to those paramaters which are specified as attributes of
* <jndi-binding>tag. Those parameters which are specified as attributes of <property>tag are not
@@ -51,11 +51,11 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Constructor for the AbstractDataSource.
- *
+ *
* @param configs ConfiguredDataSourceProperties object containing all the data required to
* construct the datasource object.
* @throws SQLException
- *
+ *
*/
public AbstractDataSource(ConfiguredDataSourceProperties configs) throws SQLException {
loginTimeOut = configs.getLoginTimeOut();
@@ -70,7 +70,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Behavior from the dataSource interface. This is an abstract function which will implemented in
* the Datasource classes.
- *
+ *
* @throws SQLException
* @return Connection Connection object for the Database connection.
*/
@@ -79,7 +79,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Behavior from the dataSource interface. This is an abstract function which will be implemented
* in the Datasource classes.
- *
+ *
* @param username Username used for making database connection.
* @param password Passowrd used for making database connection.
* @throws SQLException
@@ -90,7 +90,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
// DataSource Interface functions
/**
* Returns the writer for logging
- *
+ *
* @throws SQLException
* @return PrintWriter for logs.
*/
@@ -101,7 +101,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Returns the amount of time that login will wait for the connection to happen before it gets
* time out.
- *
+ *
* @throws SQLException
* @return int login time out.
*/
@@ -111,7 +111,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* sets the log writer for the datasource.
- *
+ *
* @param out PrintWriter for writing the logs.
* @throws SQLException
*/
@@ -121,7 +121,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Sets the login time out for the database connection
- *
+ *
* @param seconds login time out in seconds.
* @throws SQLException
*/
@@ -153,7 +153,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
// Get Methods for DataSource Properties
/**
* Returns the default user for the database.
- *
+ *
* @return String
*/
public String getUser() {
@@ -162,7 +162,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Returns the default password for the database.
- *
+ *
* @return String
*/
public String getPassword() {
@@ -171,7 +171,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* The name of the JDBC driver for the database.
- *
+ *
* @return String
*/
public String getJDBCDriver() {
@@ -181,7 +181,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
// Set Method for Datasource Properties
/**
* Sets the default username for the database
- *
+ *
* @param usr
*/
public void setUser(String usr) {
@@ -190,7 +190,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Sets the default passord for the database user.
- *
+ *
* @param passwd Password for the user
*/
public void setPassword(String passwd) {
@@ -199,7 +199,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Sets the JDBC driver name of the datasource
- *
+ *
* @param confDriver
*/
public void setJDBCDriver(String confDriver) {
@@ -208,7 +208,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
/**
* Authenticates the username and password for the database connection.
- *
+ *
* @param clUser The username for the database connection
* @param clPass The password for the database connection
* @throws SQLException
@@ -223,7 +223,7 @@ public abstract class AbstractDataSource implements Serializable, DataSource {
}
/**
- *
+ *
*/
public void clearUp() {
isActive = false;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractPoolCache.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractPoolCache.java
index dc4c32b..2af7f47 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractPoolCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/AbstractPoolCache.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.logging.LoggingThreadGroup;
* connection pools. The class also implements the Serializable interface. The pool maintain a list
* for keeping the available connections(not assigned to user) and the active connections(assigned
* to user) This is a thread safe class.
- *
+ *
* Second Version .Modified the synchronization code & objects on which locks were being taken.
* Changed the logic of retrieval of connection & returning of connection. The beahviour of cleaner
* thread has been modified such that it waits on activeCache if it is empty. Prevention of
@@ -74,7 +74,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
/**
* Constructor initializes the AbstractPoolCache properties.
- *
+ *
* @param eventListner The event listner for the database connections.
* @param configs The ConfiguredDataSourceProperties object containing the configuration for the
* pool.
@@ -120,11 +120,11 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
/**
* Authenticates the username and password for the database connection.
- *
+ *
* @param user The username for the database connection
* @param pass The password for the database connection
* @throws SQLException
- *
+ *
* public abstract void checkCredentials(String user, String pass)
*/
/**
@@ -137,9 +137,9 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
* Returns the connection to the available pool Asif: When the connection is returned to the pool,
* notify any one thread waiting on availableCache so that it can go into connection seeking
* state.
- *
+ *
* @param connectionObject PooledConnection object for return.
- *
+ *
*/
public void returnPooledConnectionToPool(Object connectionObject) {
boolean returnedHappened = false;
@@ -179,14 +179,14 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
/**
* Expires connection in the available pool.
- *
+ *
* @param connectionObject
*/
abstract void destroyPooledConnection(Object connectionObject);
/**
* Returns number of connections currently in use.
- *
+ *
* @return int Number of active connections
*/
public int getActiveCacheSize() {
@@ -195,7 +195,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
/**
* Returns number of connections available for use
- *
+ *
* @return Size of available cache.
*/
public int getAvailableCacheSize() {
@@ -210,7 +210,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
* is no way client can return the object. But it is possible that the cleaner thread may
* have already picked it up ,so we still have to check whether it is contained in the map
* or not
- *
+ *
*/
public void expirePooledConnection(Object connectionObject) {
synchronized (connectionObject) {
@@ -229,7 +229,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
* empty and the total connections in the pool(available + active) are less then the Max limit, a
* new connection is created and returned to the client. If the Max limit is reached the client
* waits for the connection to be available.
- *
+ *
* Asif: The client thread checks if the total number of active connections have exhausted the
* limit. If yes it waits on the availableCache. When another thread returns the connection to the
* pool, the waiting thread gets notified. If a thread experiences timeout while waiting , a
@@ -238,7 +238,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
* connection in available map may have expired. But if the checkOutConnection() returns null ,
* this iteslf guarantees that atleast one connection expired so the current thread can safely
* demand one new connection.
- *
+ *
* @throws PoolException
* @return Object connection object from the pool.
*/
@@ -296,7 +296,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
/**
* Returns the max pool limit.
- *
+ *
* @return int
*/
public int getMaxLimit() {
@@ -306,7 +306,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, Serializ
/**
* Remove a connection from the pool. Modified by Asif : This function is called from a synch
* block where the lock is taken on this.availableCache
- *
+ *
* @param now Current time in milliseconds
* @throws PoolException
* @return Object Connection object from the pool.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ClientConnectionFactoryWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ClientConnectionFactoryWrapper.java
index b095395..ce41e55 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ClientConnectionFactoryWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ClientConnectionFactoryWrapper.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.datasource;
/**
* This class wraps the client connection factory and the corresponding connection manager Object.
- *
+ *
*/
public class ClientConnectionFactoryWrapper {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfigProperty.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfigProperty.java
index 574e59a..6ea815a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfigProperty.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfigProperty.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.datasource;
/**
* This class represents the config property for vendor specific data. This has a name, value and
* type.
- *
+ *
*/
public class ConfigProperty {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java
index dc44e7c..c947de8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java
@@ -16,12 +16,12 @@ package org.apache.geode.internal.datasource;
/**
* JavaBean for datasource and poold properties.
- *
+ *
* This class now contains only those paramaters which are needed by the Gemfire DataSource
* configuration. This maps to those paramaters which are specified as attributes of
* <jndi-binding>tag. Those parameters which are specified as attributes of <property>tag are not
* stored.
- *
+ *
*/
import java.io.*;
@@ -133,7 +133,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Returns the class name for managed connection factory.
- *
+ *
* @return String
*/
public String getMCFClass() {
@@ -142,7 +142,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Returns the transaction type.
- *
+ *
* @return "XATransaction"|"NoTransaction"|"LocalTransaction"
*/
public String getTranType() {
@@ -151,7 +151,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the login time
- *
+ *
* @param loginTime
*/
public void setLoginTimeOut(int loginTime) {
@@ -161,7 +161,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the database user name .
- *
+ *
* @param usr
*/
public void setUser(String usr) {
@@ -170,7 +170,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the database user password .
- *
+ *
* @param passwd
*/
public void setPassword(String passwd) {
@@ -179,7 +179,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the database driver name.
- *
+ *
* @param confDriver
*/
public void setJDBCDriver(String confDriver) {
@@ -188,7 +188,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the initiale pool size.
- *
+ *
* @param inpoolSize
*/
public void setInitialPoolSize(int inpoolSize) {
@@ -198,7 +198,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the maximum pool size
- *
+ *
* @param mxpoolSize
*/
public void setMaxPoolSize(int mxpoolSize) {
@@ -208,12 +208,12 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the max idle time
- *
+ *
* @param mxIdleTime
*/
/**
* * Sets the db URL.
- *
+ *
* @param urlStr
*/
public void setURL(String urlStr) {
@@ -222,7 +222,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the connection expiration time
- *
+ *
* @param time
*/
public void setConnectionExpirationTime(int time) {
@@ -232,7 +232,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the connection time out.
- *
+ *
* @param time
*/
public void setConnectionTimeOut(int time) {
@@ -242,7 +242,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the ConnectionPoolDataSource class name
- *
+ *
* @param classname
*/
public void setConnectionPoolDSClass(String classname) {
@@ -251,7 +251,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the XADatasource class name
- *
+ *
* @param classname
*/
public void setXADSClass(String classname) {
@@ -260,7 +260,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the log writer.
- *
+ *
* @param pw
*/
public void setPrintWriter(PrintWriter pw) {
@@ -269,7 +269,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the MCFClass class name.
- *
+ *
* @param classname
*/
public void setMCFClass(String classname) {
@@ -279,7 +279,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
/**
* Sets the Transaction support type for Managed Connections. It can be one of "XATransaction" |
* "NoTransaction" |"LocalTransaction"
- *
+ *
* @param type transaction type.
*/
public void setTransactionType(String type) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionEventListenerAdaptor.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionEventListenerAdaptor.java
index c6f1b76..0a1be75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionEventListenerAdaptor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionEventListenerAdaptor.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.datasource;
/**
- *
+ *
* To change the template for this generated type comment go to Window - Preferences - Java - Code
* Generation - Code and Comments
*/
@@ -50,7 +50,7 @@ public class ConnectionEventListenerAdaptor
/**
* Implementation of call back function from ConnectionEventListener interface. This callback will
* be invoked on connection close event.
- *
+ *
* @param event Connection event object
*/
public void connectionClosed(javax.sql.ConnectionEvent event) {}
@@ -58,7 +58,7 @@ public class ConnectionEventListenerAdaptor
/**
* Implementation of call back function from ConnectionEventListener interface. This callback will
* be invoked on connection error event.
- *
+ *
* @param event Connection event object
*/
public void connectionErrorOccurred(javax.sql.ConnectionEvent event) {}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
index 823db71..98636c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
@@ -16,14 +16,14 @@ package org.apache.geode.internal.datasource;
/**
* This interface outlines the behavior of a connection pool.
- *
+ *
*/
public interface ConnectionPoolCache {
/**
* This method is used to get the connection from the pool. The default username and password are
* used for making the conections.
- *
+ *
* @return Object - connection from the pool.
* @throws PoolException
*/
@@ -31,7 +31,7 @@ public interface ConnectionPoolCache {
/**
* This method will return the Pooled connection object back to the pool.
- *
+ *
* @param connectionObject - Connection object returned to the pool.
*/
public void returnPooledConnectionToPool(Object connectionObject);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java
index 84cc298..c4d7425 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.datasource;
/**
* This class models a connection pool for non-transactional database connection. Extends the
* AbstractPoolCache to inherit the pool bahavior.
- *
+ *
*/
import java.sql.SQLException;
@@ -71,7 +71,7 @@ public class ConnectionPoolCacheImpl extends AbstractPoolCache {
/**
* Creates a new connection for the pool.
- *
+ *
* @return the connection from the database as Object.
* @throws PoolException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
index 8ec0d70..0d861d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
@@ -16,20 +16,20 @@ package org.apache.geode.internal.datasource;
/**
* This interface outlines the behavior of a Connection provider.
- *
+ *
*/
public interface ConnectionProvider {
/**
* Provides a PooledConnection from the connection pool. Default user and password are used.
- *
+ *
* @return a PooledConnection object to the user.
*/
public Object borrowConnection() throws PoolException;
/**
* Returns a PooledConnection object to the pool.
- *
+ *
* @param connectionObject to be returned to the pool
*/
public void returnConnection(Object connectionObject);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProviderException.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProviderException.java
index dda3995..24eb6f0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProviderException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProviderException.java
@@ -23,7 +23,7 @@ import org.apache.geode.GemFireCheckedException;
/**
* Exception thrown from the connection provider.
- *
+ *
*/
public class ConnectionProviderException extends GemFireCheckedException {
private static final long serialVersionUID = -7406652144153958227L;
@@ -45,7 +45,7 @@ public class ConnectionProviderException extends GemFireCheckedException {
/**
* Single Argument constructor to construct a new exception with the specified detail message.
* Calls Exception class constructor.
- *
+ *
* @param message The detail message. The detail message is saved for later retrieval.
*/
public ConnectionProviderException(String message, Exception ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceCreateException.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceCreateException.java
index f6b0f74..743de21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceCreateException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceCreateException.java
@@ -18,7 +18,7 @@ import org.apache.geode.GemFireCheckedException;
/**
* Exception thrown from DataSource factory.
- *
+ *
*/
public class DataSourceCreateException extends GemFireCheckedException {
private static final long serialVersionUID = 8759147832954825309L;
@@ -40,7 +40,7 @@ public class DataSourceCreateException extends GemFireCheckedException {
/**
* Single Argument constructor to construct a new exception with the specified detail message.
* Calls Exception class constructor.
- *
+ *
* @param message The detail message. The detail message is saved for later retrieval.
*/
public DataSourceCreateException(String message, Exception ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
index 7d3082c..4bec4d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
@@ -18,14 +18,14 @@ package org.apache.geode.internal.datasource;
* This class models a datasource factory.The datasource factory has funtions to create 3 types of
* datasources. 1) Basic datasource without any connection pooling. 2) Datasource with pooled
* connections. 3) Datasource with pooled connection and transaction capabilities.
- *
+ *
* The invokeAllMethods was setting only some specific properties Modified the code so that any key
* value mentioned in <property>tag is attempted for setting. If the property has a key as
* serverName , then the setter method is invoked with the name setServerName & the value present in
* value attribute is passed Made the Exception handling robust
- *
+ *
* Changed invokeAllMethods wrt the change in cache.xml for vendor specific properties.
- *
+ *
*/
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -57,7 +57,7 @@ public class DataSourceFactory {
/**
* This function returns the Basic datasource without any pooling.
- *
+ *
* @param configMap a map containing configurations required for datasource.
* @throws DataSourceCreateException
* @return ??
@@ -95,7 +95,7 @@ public class DataSourceFactory {
/**
* This function creats a data dource from the ManagedConnectionFactory class using the
* connectionManager.
- *
+ *
* @param configMap
* @param props
* @return javax.sql.DataSource
@@ -150,7 +150,7 @@ public class DataSourceFactory {
/**
* This function returns the datasource with connection pooling.
- *
+ *
* @param configMap a map containing configurations required for datasource.
* @throws DataSourceCreateException
* @return ???
@@ -185,7 +185,7 @@ public class DataSourceFactory {
/**
* This function returns the datasource with connection pooling and transaction participation
* capabilities.
- *
+ *
* @param configMap a map containing configurations required for datasource.
* @throws DataSourceCreateException
* @return ???
@@ -225,7 +225,7 @@ public class DataSourceFactory {
/**
* Creates ConfiguredDataSourceProperties from map.
- *
+ *
* @param configMap a map containing configurations required for datasource.
* @return ConfiguredDataSourceProperties
*/
@@ -308,17 +308,17 @@ public class DataSourceFactory {
/**
- *
+ *
* dynamically invokes all the methods in the specified object.
- *
+ *
* Asif: Rewrote the function as the number of properties to be set for a given datasource is
* dynamic
- *
+ *
* Rohit: Rewrote to accomodate the change in cache.xml. property tag is now replaced by
* config-property for vendor specific data to get the Class name dynamically. CLass name is
* specified in config-property-type tag and is stored in ConfigProperty Data Object after parsing
* cache.xml.
- *
+ *
* @param c class of the object
* @param cpdsObj The object
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/FacetsJCAConnectionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/FacetsJCAConnectionManagerImpl.java
index d581ceb..652c1a5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/FacetsJCAConnectionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/FacetsJCAConnectionManagerImpl.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* and non-transactional resource connection. Implements ConnectionManager interface. QoS
* (Transaction, Security etc is taken into account while allocating a connection). Security related
* features are remaining.
- *
+ *
*/
public class FacetsJCAConnectionManagerImpl
implements ConnectionManager, ConnectionEventListener, Synchronization {
@@ -70,7 +70,7 @@ public class FacetsJCAConnectionManagerImpl
/*
* Constructor.
- *
+ *
*/
public FacetsJCAConnectionManagerImpl(ManagedConnectionFactory mcf,
ConfiguredDataSourceProperties configs) {
@@ -89,9 +89,9 @@ public class FacetsJCAConnectionManagerImpl
/*
* allocates a ManagedConnection from the ConnectionPool or creates a new
* ManagedConnection. @param javax.resource.spi.ManagedConnectionFactory
- *
+ *
* @param javax.resource.spi.ConnectionRequestInfo
- *
+ *
* @throws ResourceException
*/
public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo reqInfo)
@@ -156,7 +156,7 @@ public class FacetsJCAConnectionManagerImpl
/**
* CallBack for Connection Error.
- *
+ *
* @param event ConnectionEvent
*/
public void connectionErrorOccurred(ConnectionEvent event) {
@@ -192,7 +192,7 @@ public class FacetsJCAConnectionManagerImpl
/**
* Callback for Connection Closed.
- *
+ *
* @param event ConnectionEvent Object.
*/
public void connectionClosed(ConnectionEvent event) {
@@ -243,7 +243,7 @@ public class FacetsJCAConnectionManagerImpl
/*
* (non-Javadoc)
- *
+ *
* @see javax.transaction.Synchronization#afterCompletion(int)
*/
public void afterCompletion(int arg0) {
@@ -261,7 +261,7 @@ public class FacetsJCAConnectionManagerImpl
/*
* (non-Javadoc)
- *
+ *
* @see javax.transaction.Synchronization#beforeCompletion()
*/
public void beforeCompletion() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireBasicDataSource.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireBasicDataSource.java
index d9806a3..daa5d4c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireBasicDataSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireBasicDataSource.java
@@ -22,17 +22,17 @@ import java.util.Properties;
import org.apache.logging.log4j.Logger;
import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.jta.TransactionUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.i18n.StringId;
/**
* GemFireBasicDataSource extends AbstractDataSource. This is a datasource class which provides
* connections. fromthe databse without any pooling.
- *
+ *
*/
public class GemFireBasicDataSource extends AbstractDataSource {
private static final Logger logger = LogService.getLogger();
@@ -68,7 +68,7 @@ public class GemFireBasicDataSource extends AbstractDataSource {
/**
* Creates a new instance of GemFireBasicDataSource
- *
+ *
* @param configs The ConfiguredDataSourceProperties containing the datasource properties.
* @throws SQLException
*/
@@ -80,7 +80,7 @@ public class GemFireBasicDataSource extends AbstractDataSource {
/**
* Implementation of datasource interface function. This method is used to get the connection from
* the database. Default user name and password will be used.
- *
+ *
* @throws SQLException
* @return ???
*/
@@ -113,7 +113,7 @@ public class GemFireBasicDataSource extends AbstractDataSource {
/**
* Implementation of datasource function. This method is used to get the connection. The specified
* user name and passowrd will be used.
- *
+ *
* @param clUsername The username for the database connection.
* @param clPassword The password for the database connection.
* @throws SQLException
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnPooledDataSource.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnPooledDataSource.java
index 0a51165..a02a4f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnPooledDataSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnPooledDataSource.java
@@ -23,16 +23,16 @@ import javax.sql.PooledConnection;
import org.apache.logging.log4j.Logger;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.i18n.StringId;
/**
* GemFireTransactionDataSource extends AbstractDataSource. This is a datasource class which
* provides connections from the pool. The objects of these class are ConnectionEventListener for
* connection close and error events.
- *
+ *
* Modified Exception handling & changed name of the function
*/
public class GemFireConnPooledDataSource extends AbstractDataSource
@@ -45,7 +45,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Creates a new instance of GemFireConnPooledDataSource
- *
+ *
* @param connPoolDS The ConnectionPoolDataSource object for the database driver.
* @param configs The ConfiguredDataSourceProperties containing the datasource properties.
* @throws SQLException
@@ -89,7 +89,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Implementation of datasource interface function. This method is used to get the connection from
* the pool. Default user name and password will be used.
- *
+ *
* @throws SQLException
* @return ???
*/
@@ -112,7 +112,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Implementation of datasource function. This method is used to get the connection. The specified
* user name and passowrd will be used.
- *
+ *
* @param clUsername The username for the database connection.
* @param clPassword The password for the database connection.
* @throws SQLException
@@ -127,7 +127,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Implementation of call back function from ConnectionEventListener interface. This callback will
* be invoked on connection close event.
- *
+ *
* @param event
*/
public void connectionClosed(ConnectionEvent event) {
@@ -147,7 +147,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Implementation of call back function from ConnectionEventListener interface. This callback will
* be invoked on connection error event.
- *
+ *
* @param event
*/
public void connectionErrorOccurred(ConnectionEvent event) {
@@ -168,7 +168,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Returns true if the connection is not closed.
- *
+ *
* @param conn Connection object
* @return boolean True is the connection is alive.
*/
@@ -183,7 +183,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* gets tha connection from the pool
- *
+ *
* @param poolC
* @return ???
*/
@@ -202,7 +202,7 @@ public class GemFireConnPooledDataSource extends AbstractDataSource
/**
* Returns the connection provider for the datasource.
- *
+ *
* @return ConnectionProvider object for the datasource
*/
public ConnectionProvider getConnectionProvider() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java
index 51d2d15..cf2749f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.datasource;
/**
*/
import java.io.Serializable;
+
import javax.sql.*;
/**
* GemFireConnectionPoolManager implements ConnectionProvider interface for managing the the
* conection pools(with and wothout transactions).
- *
+ *
*/
public class GemFireConnectionPoolManager implements ConnectionProvider, Serializable {
private static final long serialVersionUID = 23723212980453813L;
@@ -30,7 +31,7 @@ public class GemFireConnectionPoolManager implements ConnectionProvider, Seriali
/**
* Creates a new instance of GemFireConnectionPoolManager
- *
+ *
* @param connPool ConnectionPoolDataSource object from the database driver
* @param configs The ConfiguredDataSourceProperties containing the pool properties.
* @param listener Connection event listner for the connections.
@@ -43,7 +44,7 @@ public class GemFireConnectionPoolManager implements ConnectionProvider, Seriali
/**
* Creates a new instance of GemFireConnectionPoolManager. Overloaded function
- *
+ *
* @param connPool XADataSource object from the database driver
* @param configs The ConfiguredDataSourceProperties containing the pool properties.
* @param listener Connection event listner for the connections.
@@ -55,7 +56,7 @@ public class GemFireConnectionPoolManager implements ConnectionProvider, Seriali
/**
* Returns a PooledConnection object from the pool. Default username and password are used.
- *
+ *
* @return Connection Object from Pool.
*/
public Object borrowConnection() throws PoolException {
@@ -64,9 +65,9 @@ public class GemFireConnectionPoolManager implements ConnectionProvider, Seriali
/**
* Returns the connection to the pool and the closes it.
- *
+ *
* @param connectionObject
- *
+ *
*/
public void returnAndExpireConnection(Object connectionObject) {
// Asif : The connection is already in the activeCache, but the
@@ -79,7 +80,7 @@ public class GemFireConnectionPoolManager implements ConnectionProvider, Seriali
/**
* Return connection to pool
- *
+ *
* @param connectionObject
*/
public void returnConnection(Object connectionObject) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireTransactionDataSource.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireTransactionDataSource.java
index d940095..e8a1dec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireTransactionDataSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireTransactionDataSource.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.logging.LogService;
* GemFireTransactionDataSource extends AbstractDataSource. This is a datasource class which
* provides connections from the pool. These connection can participate in the transaction. The
* objects of these class are ConnectionEventListener for connection close and error events.
- *
+ *
* Modified the exception handling & changed the name of some functions.
*/
public class GemFireTransactionDataSource extends AbstractDataSource
@@ -69,7 +69,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Place holder for abstract method java.lang Object unwrap(java.lang.Class) in java.sql.Wrapper
* required by jdk 1.6
- *
+ *
* @param iface - a Class defining an interface.
* @throws SQLException
* @return java.lang.Object
@@ -81,7 +81,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Creates a new instance of GemFireTransactionDataSource
- *
+ *
* @param xaDS The XADataSource object for the database driver.
* @param configs - The ConfiguredDataSourceProperties containing the datasource properties.
* @throws SQLException
@@ -109,7 +109,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Implementation of datasource function. This method is used to get the connection from the pool.
* Default user name and password will be used.
- *
+ *
* @throws SQLException
* @return ???
*/
@@ -136,7 +136,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Implementation of datasource function. This method is used to get the connection. The specified
* user name and passowrd will be used.
- *
+ *
* @param clUsername The username for the database connection.
* @param clPassword The password for the database connection.
* @throws SQLException
@@ -151,7 +151,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Implementation of call back function from ConnectionEventListener interface. This callback will
* be invoked on connection close event.
- *
+ *
* @param event Connection event object
*/
public void connectionClosed(ConnectionEvent event) {
@@ -177,7 +177,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Implementation of call back function from ConnectionEventListener interface. This callback will
* be invoked on connection error event.
- *
+ *
* @param event Connection event object
*/
public void connectionErrorOccurred(ConnectionEvent event) {
@@ -197,7 +197,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
}
/**
- *
+ *
*/
void registerTranxConnection(XAConnection xaConn) throws Exception {
try {
@@ -224,7 +224,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* gets the connection from the pool
- *
+ *
* @param poolC
* @return ???
*/
@@ -243,7 +243,7 @@ public class GemFireTransactionDataSource extends AbstractDataSource
/**
* Returns the connection provider for the datasource.
- *
+ *
* @return ConnectionProvider object for the datasource
*/
public ConnectionProvider getConnectionProvider() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/JCAConnectionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/JCAConnectionManagerImpl.java
index d5f66d0..fab8516 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/JCAConnectionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/JCAConnectionManagerImpl.java
@@ -24,7 +24,6 @@ import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnection;
import javax.resource.spi.ManagedConnectionFactory;
import javax.security.auth.Subject;
-// import javax.sql.PooledConnection;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
@@ -44,7 +43,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* and non-transactional resource connection. Implements ConnectionManager interface. QoS
* (Transaction, Security etc is taken into account while allocating a connection). Security related
* features are remaining.
- *
+ *
*/
public class JCAConnectionManagerImpl implements ConnectionManager, ConnectionEventListener {
@@ -60,7 +59,7 @@ public class JCAConnectionManagerImpl implements ConnectionManager, ConnectionEv
/*
* Constructor.
- *
+ *
*/
public JCAConnectionManagerImpl(ManagedConnectionFactory mcf,
ConfiguredDataSourceProperties configs) {
@@ -79,9 +78,9 @@ public class JCAConnectionManagerImpl implements ConnectionManager, ConnectionEv
/*
* allocates a ManagedConnection from the ConnectionPool or creates a new
* ManagedConnection. @param javax.resource.spi.ManagedConnectionFactory
- *
+ *
* @param javax.resource.spi.ConnectionRequestInfo
- *
+ *
* @throws ResourceException
*/
public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo reqInfo)
@@ -137,7 +136,7 @@ public class JCAConnectionManagerImpl implements ConnectionManager, ConnectionEv
/**
* CallBack for Connection Error.
- *
+ *
* @param event ConnectionEvent
*/
public void connectionErrorOccurred(ConnectionEvent event) {
@@ -169,7 +168,7 @@ public class JCAConnectionManagerImpl implements ConnectionManager, ConnectionEv
/**
* Callback for Connection Closed.
- *
+ *
* @param event ConnectionEvent Object.
*/
public void connectionClosed(ConnectionEvent event) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ManagedPoolCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ManagedPoolCacheImpl.java
index 80cad5d..8702f70 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ManagedPoolCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ManagedPoolCacheImpl.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* This class implements a connection pool for Managed connection. Extends the AbstractPoolCache to
* inherit the pool bahavior.
- *
+ *
*/
public class ManagedPoolCacheImpl extends AbstractPoolCache {
@@ -57,7 +57,7 @@ public class ManagedPoolCacheImpl extends AbstractPoolCache {
/**
* Creates a new connection for the managed connection pool.
- *
+ *
* @return the managed connection from the EIS as ManagedConnection object.
* @throws PoolException
*/
@@ -80,7 +80,7 @@ public class ManagedPoolCacheImpl extends AbstractPoolCache {
/**
* Destroys the underline physical connection to EIS.
- *
+ *
* @param connectionObject connection Object.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/PoolException.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/PoolException.java
index dce2e05..be3d0bd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/PoolException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/PoolException.java
@@ -18,7 +18,7 @@ import org.apache.geode.GemFireCheckedException;
/**
* Exception thrown from Connection Pool.
- *
+ *
*/
public class PoolException extends GemFireCheckedException {
private static final long serialVersionUID = -6178632158204356727L;
@@ -40,7 +40,7 @@ public class PoolException extends GemFireCheckedException {
/**
* Single Argument constructor to construct a new exception with the specified detail message.
* Calls Exception class constructor.
- *
+ *
* @param message The detail message. The detail message is saved for later retrieval.
*/
public PoolException(String message, Exception ex) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/TranxPoolCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/TranxPoolCacheImpl.java
index 4f98086..9a59aeb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/TranxPoolCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/TranxPoolCacheImpl.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* This class models a connection pool for transactional database connection. Extends the
* AbstractPoolCache to inherit the pool bahavior.
- *
+ *
*/
public class TranxPoolCacheImpl extends AbstractPoolCache {
private static final long serialVersionUID = 3295652525163658888L;
@@ -50,7 +50,7 @@ public class TranxPoolCacheImpl extends AbstractPoolCache {
}
/**
- *
+ *
*/
@Override
void destroyPooledConnection(Object connectionObject) {
@@ -69,7 +69,7 @@ public class TranxPoolCacheImpl extends AbstractPoolCache {
/**
* Creates a new connection for the pool. This connection can participate in the transactions.
- *
+ *
* @return the connection from the database as PooledConnection object.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLog.java b/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLog.java
index 4bdf81c..7430707 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLog.java
@@ -13,8 +13,6 @@
*/
package org.apache.geode.internal.hll;
-import org.apache.geode.redis.internal.executor.hll.HllExecutor;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -27,6 +25,8 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
+import org.apache.geode.redis.internal.executor.hll.HllExecutor;
+
/**
* Java implementation of HyperLogLog (HLL) algorithm from this paper:
* <p/>
diff --git a/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLogPlus.java b/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLogPlus.java
index fc4b6e5..1160f0f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLogPlus.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/hll/HyperLogLogPlus.java
@@ -13,8 +13,6 @@
*/
package org.apache.geode.internal.hll;
-import org.apache.geode.redis.internal.executor.hll.Varint;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -33,6 +31,8 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
+import org.apache.geode.redis.internal.executor.hll.Varint;
+
/**
* Implementation of HyperLogLog++ described in
diff --git a/geode-core/src/main/java/org/apache/geode/internal/hll/RegisterSet.java b/geode-core/src/main/java/org/apache/geode/internal/hll/RegisterSet.java
index cad691b..50e861b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/hll/RegisterSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/hll/RegisterSet.java
@@ -16,8 +16,8 @@ package org.apache.geode.internal.hll;
public class RegisterSet {
- public final static int LOG2_BITS_PER_WORD = 6;
- public final static int REGISTER_SIZE = 5;
+ public static final int LOG2_BITS_PER_WORD = 6;
+ public static final int REGISTER_SIZE = 5;
public final int count;
public final int size;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java
index 2c7b045..20ab4a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java
@@ -15,22 +15,22 @@
package org.apache.geode.internal.i18n;
-import org.apache.geode.InternalGemFireException;
-import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.ClassPathLoader;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Locale;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.ClassPathLoader;
+
/**
* Baseclass for all {@link StringId} based ResourceBundles
- *
+ *
* @see java.util.ResourceBundle
*
* @since GemFire 5.7
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 586241f..f8e0e24 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -32,7 +32,7 @@ import org.apache.geode.i18n.StringId;
* }
* }
* </code>
- *
+ *
* @since GemFire 6.0
*/
public class LocalizedStrings {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
index d247c00..bc41be0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
@@ -18,13 +18,13 @@ package org.apache.geode.internal.i18n;
/**
* This class forms the basis of the i18n strategy. Its primary function is to be used as a key to
* be passed to an instance of StringIdResourceBundle.
- *
+ *
* @since GemFire 6.0
*/
public interface StringId {
/**
* Accessor for the raw (unformatted) text of this StringId
- *
+ *
* @return unformated text
**/
public String getRawText();
@@ -38,7 +38,7 @@ public interface StringId {
/**
* Substitutes parameter Objects into the text
- *
+ *
* @see java.text.MessageFormat
* @return the English translation of this StringId
**/
@@ -51,7 +51,7 @@ public interface StringId {
/**
* Substitutes parameter Objects into the text
- *
+ *
* @see java.text.MessageFormat
* @return the translation of this StringId based on the current {@link java.util.Locale}
**/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java
index af835c8..8ca8b72 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java
@@ -23,7 +23,7 @@ import java.util.Set;
/**
* Delegates all operations to a collection of OutputStreams.
- *
+ *
* @since GemFire 7.0
*/
public class CompositeOutputStream extends OutputStream implements Iterable<OutputStream> {
@@ -34,7 +34,7 @@ public class CompositeOutputStream extends OutputStream implements Iterable<Outp
/**
* Constructs a new instance of CompositeOutputStream with zero or more OutputStreams.
- *
+ *
* @param out zero or more OutputStreams to add to the new instance of CompositeOutputStream
*/
public CompositeOutputStream(OutputStream... out) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java b/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
index 8666799..cabc9f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.io;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.File;
import java.util.Arrays;
import java.util.Comparator;
import java.util.regex.Pattern;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Extracted from ManagerLogWriter. MainWithChildrenRollingFileHandler is used for both rolling of
* log files and stat archive files.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/RollingFileHandler.java b/geode-core/src/main/java/org/apache/geode/internal/io/RollingFileHandler.java
index 288ca39..7a43ba8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/io/RollingFileHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/RollingFileHandler.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.internal.io;
-import org.apache.geode.i18n.LogWriterI18n;
-
import java.io.File;
+import org.apache.geode.i18n.LogWriterI18n;
+
/**
* Defines the constants and methods for rolling files (logs and stat archives).
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/TeeOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/io/TeeOutputStream.java
index 6b0e706..44616b7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/io/TeeOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/TeeOutputStream.java
@@ -21,7 +21,7 @@ import java.io.OutputStream;
/**
* Delegates all operations to the original underlying OutputStream and a mutable branch
* OutputStream.
- *
+ *
* @since GemFire 7.0
*/
public class TeeOutputStream extends FilterOutputStream {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java
index 561bf93..203169b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java
@@ -14,29 +14,31 @@
*/
package org.apache.geode.internal.jndi;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
import java.util.NoSuchElementException;
import java.util.Vector;
-import java.util.Iterator;
+
import javax.naming.Binding;
import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.ContextNotEmptyException;
import javax.naming.InvalidNameException;
import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
import javax.naming.NameNotFoundException;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.NoPermissionException;
import javax.naming.NotContextException;
-import javax.naming.NameAlreadyBoundException;
import javax.transaction.SystemException;
+
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.jta.TransactionUtils;
import org.apache.geode.internal.jta.UserTransactionImpl;
@@ -47,7 +49,7 @@ import org.apache.geode.internal.jta.UserTransactionImpl;
* separator character - '/' or '.'. It is possible to use both separator characters in the same
* name. In such cases any occurrences of '.' are replaced with '/' before parsing. This rule can be
* altered/modified by making changes in NameParserImpl class.
- *
+ *
*/
public class ContextImpl implements Context {
@@ -85,7 +87,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public Object addToEnvironment(String key, Object value) throws NamingException {
throw new NamingException(
@@ -96,7 +98,7 @@ public class ContextImpl implements Context {
/**
* Binds object to a name in this context. Intermediate contexts that do not exist will be
* created.
- *
+ *
* @param name Name of the object to bind
* @param obj Object to bind. Can be null.
* @throws NoPermissionException if this context has been destroyed.
@@ -114,11 +116,11 @@ public class ContextImpl implements Context {
/**
* Binds object to name in this context.
- *
+ *
* @param name * name of the object to add
* @param obj object to bind
* @throws NamingException if naming error occurs
- *
+ *
*/
public void bind(String name, Object obj) throws NamingException {
bind(nameParser.parse(name), obj);
@@ -131,10 +133,10 @@ public class ContextImpl implements Context {
/**
* Returns composition of prefix and name .
- *
+ *
* @param name name relative to this context
* @param prefix name of this context Example: composeName("a","b") : b/a composeName("a","") : a
- *
+ *
*/
public Name composeName(Name name, Name prefix) throws NamingException {
checkIsDestroyed();
@@ -147,10 +149,10 @@ public class ContextImpl implements Context {
/**
* Returns composition of prefix and name .
- *
+ *
* @param name name relative to this context
* @param prefix name of this context Example: composeName("a","b") : b/a composeName("a","") : a
- *
+ *
*/
public String composeName(String name, String prefix) throws NamingException {
checkIsDestroyed();
@@ -159,7 +161,7 @@ public class ContextImpl implements Context {
/**
* Creates subcontext with name, relative to this Context.
- *
+ *
* @param name subcontext name.
* @return new subcontext named name relative to this context.
* @throws NoPermissionException if this context has been destroyed.
@@ -168,7 +170,7 @@ public class ContextImpl implements Context {
* @throws NameAlreadyBoundException if name is already bound in this Context
* @throws NotContextException if any intermediate name from name is not bound to instance of
* javax.naming.Context.
- *
+ *
*/
public Context createSubcontext(Name name) throws NamingException {
checkIsDestroyed();
@@ -206,11 +208,11 @@ public class ContextImpl implements Context {
/**
* Creates subcontext with name, relative to this Context.
- *
+ *
* @param name subcontext name
* @return new subcontext named name relative to this context.
* @throws NamingException if naming error occurs.
- *
+ *
*/
public Context createSubcontext(String name) throws NamingException {
return createSubcontext(nameParser.parse(name));
@@ -220,7 +222,7 @@ public class ContextImpl implements Context {
* Destroys subcontext with name name. The subcontext must be empty otherwise
* ContextNotEmptyException is thrown. Once a context is destroyed, the instance should not be
* used.
- *
+ *
* @param name subcontext to destroy
* @throws NoPermissionException if this context has been destroyed.
* @throws InvalidNameException if name is empty or is CompositeName that spans more than one
@@ -228,7 +230,7 @@ public class ContextImpl implements Context {
* @throws ContextNotEmptyException if Context name is not empty.
* @throws NameNotFoundException if subcontext with name name can not be found.
* @throws NotContextException if name is not bound to instance of ContextImpl.
- *
+ *
*/
public void destroySubcontext(Name name) throws NamingException {
checkIsDestroyed();
@@ -265,7 +267,7 @@ public class ContextImpl implements Context {
/**
* Destroys subcontext with name name.
- *
+ *
* @param name name of subcontext to destroy.
* @throws NamingException if naming error occurs
*/
@@ -275,7 +277,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public Hashtable getEnvironment() throws NamingException {
throw new NamingException(
@@ -284,7 +286,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public String getNameInNamespace() throws NamingException {
throw new NamingException(
@@ -293,12 +295,12 @@ public class ContextImpl implements Context {
/**
* Retrieves NameParser used to parse context with name name.
- *
+ *
* @param name context name.
* @return NameParser.
* @throws NoPermissionException if this context has been destroyed.
* @throws NamingException if any other naming error occurs.
- *
+ *
*/
public NameParser getNameParser(Name name) throws NamingException {
checkIsDestroyed();
@@ -307,12 +309,12 @@ public class ContextImpl implements Context {
/**
* Retrieves NameParser used to parse context with name name.
- *
+ *
* @param name context name.
* @return NameParser.
* @throws NoPermissionException if this context has been destroyed.
* @throws NamingException if any other naming error occurs.
- *
+ *
*/
public NameParser getNameParser(String name) throws NamingException {
checkIsDestroyed();
@@ -321,12 +323,12 @@ public class ContextImpl implements Context {
/**
* The same as listBindings(String).
- *
+ *
* @param name name of Context, relative to this Context
* @return NamingEnumeration of all name-class pairs. Each element from the enumeration is
* instance of NameClassPair
* @throws NamingException if naming error occurs
- *
+ *
*/
public NamingEnumeration list(Name name) throws NamingException {
return listBindings(name);
@@ -334,12 +336,12 @@ public class ContextImpl implements Context {
/**
* The same as listBindings(String).
- *
+ *
* @param name name of Context, relative to this Context
* @return NamingEnumeration of all name-class pairs. Each element from the enumeration is
* instance of NameClassPair
* @throws NamingException if naming error occurs
- *
+ *
*/
public NamingEnumeration list(String name) throws NamingException {
return list(nameParser.parse(name));
@@ -347,7 +349,7 @@ public class ContextImpl implements Context {
/**
* Lists all bindings for Context with name name. If name is empty then this Context is assumed.
- *
+ *
* @param name name of Context, relative to this Context
* @return NamingEnumeration of all name-object pairs. Each element from the enumeration is
* instance of Binding.
@@ -357,7 +359,7 @@ public class ContextImpl implements Context {
* @throws NotContextException component of name is not bound to instance of ContextImpl, when
* name is not an atomic name
* @throws NamingException if any other naming error occurs
- *
+ *
*/
public NamingEnumeration listBindings(Name name) throws NamingException {
checkIsDestroyed();
@@ -392,7 +394,7 @@ public class ContextImpl implements Context {
/**
* Lists all bindings for Context with name name. If name is empty then this Context is assumed.
- *
+ *
* @param name name of Context, relative to this Context
* @return NamingEnumeration of all name-object pairs. Each element from the enumeration is
* instance of Binding.
@@ -402,7 +404,7 @@ public class ContextImpl implements Context {
* @throws NotContextException component of name is not bound to instance of ContextImpl, when
* name is not an atomic name
* @throws NamingException if any other naming error occurs
- *
+ *
*/
public NamingEnumeration listBindings(String name) throws NamingException {
return listBindings(nameParser.parse(name));
@@ -410,7 +412,7 @@ public class ContextImpl implements Context {
/**
* Looks up object with binding name name in this context.
- *
+ *
* @param name name to look up
* @return object reference bound to name name.
* @throws NoPermissionException if this context has been destroyed.
@@ -419,7 +421,7 @@ public class ContextImpl implements Context {
* @throws NotContextException component of name is not bound to instance of ContextImpl, when
* name is not atomic name.
* @throws NamingException if any other naming error occurs
- *
+ *
*/
public Object lookup(Name name) throws NamingException {
checkIsDestroyed();
@@ -467,11 +469,11 @@ public class ContextImpl implements Context {
/**
* Looks up the object in this context. If the object is not found and the remote context was
* provided, calls the remote context to lookup the object.
- *
+ *
* @param name object to search
* @return object reference bound to name name.
* @throws NamingException if naming error occurs.
- *
+ *
*/
public Object lookup(String name) throws NamingException {
checkIsDestroyed();
@@ -489,7 +491,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public Object lookupLink(Name name) throws NamingException {
throw new NamingException(
@@ -498,7 +500,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public Object lookupLink(String name) throws NamingException {
throw new NamingException(
@@ -507,7 +509,7 @@ public class ContextImpl implements Context {
/**
* Rebinds object obj to name name . If there is existing binding it will be overwritten.
- *
+ *
* @param name name of the object to rebind.
* @param obj object to add. Can be null.
* @throws NoPermissionException if this context has been destroyed
@@ -516,7 +518,7 @@ public class ContextImpl implements Context {
* @throws NotContextException if name has more than one atomic name and intermediate context is
* not found
* @throws NamingException if any other naming error occurs
- *
+ *
*/
public void rebind(Name name, Object obj) throws NamingException {
checkIsDestroyed();
@@ -550,7 +552,7 @@ public class ContextImpl implements Context {
/**
* Rebinds object obj to String name. If there is existing binding it will be overwritten.
- *
+ *
* @param name name of the object to rebind.
* @param obj object to add. Can be null.
* @throws NoPermissionException if this context has been destroyed
@@ -559,7 +561,7 @@ public class ContextImpl implements Context {
* @throws NotContextException if name has more than one atomic name and intermediate context is
* not found
* @throws NamingException if any other naming error occurs
- *
+ *
*/
public void rebind(String name, Object obj) throws NamingException {
rebind(nameParser.parse(name), obj);
@@ -567,7 +569,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public Object removeFromEnvironment(String key) throws NamingException {
throw new NamingException(
@@ -577,7 +579,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public void rename(Name name1, Name name2) throws NamingException {
throw new NamingException(
@@ -587,7 +589,7 @@ public class ContextImpl implements Context {
/**
* Not implemented
- *
+ *
*/
public void rename(String name1, String name2) throws NamingException {
throw new NamingException(
@@ -597,7 +599,7 @@ public class ContextImpl implements Context {
/**
* Removes name and its associated object from the context.
- *
+ *
* @param name name to remove
* @throws NoPermissionException if this context has been destroyed.
* @throws InvalidNameException if name is empty or is CompositeName that spans more than one
@@ -606,7 +608,7 @@ public class ContextImpl implements Context {
* @throws NotContextException if name has more than one atomic name and intermediate context is
* not found.
* @throws NamingException if any other naming exception occurs
- *
+ *
*/
public void unbind(Name name) throws NamingException {
checkIsDestroyed();
@@ -640,9 +642,9 @@ public class ContextImpl implements Context {
}
/**
- *
+ *
* Removes name and its associated object from the context.
- *
+ *
* @param name name to remove
* @throws NoPermissionException if this context has been destroyed.
* @throws InvalidNameException if name is empty or is CompositeName that spans more than one
@@ -651,7 +653,7 @@ public class ContextImpl implements Context {
* @throws NotContextException if name has more than one atomic name and intermediate context is
* not found.
* @throws NamingException if any other naming exception occurs
- *
+ *
*/
public void unbind(String name) throws NamingException {
unbind(nameParser.parse(name));
@@ -660,7 +662,7 @@ public class ContextImpl implements Context {
/**
* Checks if this context has been destroyed. isDestroyed is set to true when a context is
* destroyed by calling destroySubcontext method.
- *
+ *
* @throws NoPermissionException if this context has been destroyed
*/
private void checkIsDestroyed() throws NamingException {
@@ -682,7 +684,7 @@ public class ContextImpl implements Context {
* Parses name which is CompositeName or CompoundName . If name is not CompositeName then it is
* assumed to be CompoundName. If the name contains leading and/or terminal empty components, they
* will not be included in the result.
- *
+ *
* @param name Name to parse.
* @return parsed name as instance of CompoundName.
* @throws InvalidNameException if name is CompositeName and spans more than one name space.
@@ -729,7 +731,7 @@ public class ContextImpl implements Context {
/**
* Returns the compound string name of this context. Suppose a/b/c/d is the full name and this
* context is "c". It's compound string name is a/b/c
- *
+ *
* @return compound string name of the context
*/
String getCompoundStringName() throws NamingException {
@@ -752,7 +754,7 @@ public class ContextImpl implements Context {
/*
* Returns the "atomic" (as opposed to "composite") name of the context.
- *
+ *
* @return name of the context
*/
String getAtomicName() {
@@ -767,7 +769,7 @@ public class ContextImpl implements Context {
return getParentContext() == null;
}
- static private class NamingEnumerationImpl implements NamingEnumeration {
+ private static class NamingEnumerationImpl implements NamingEnumeration {
private Vector elements;
private int currentElement;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/InitialContextFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/InitialContextFactoryImpl.java
index 77c5f3f..510c120 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/InitialContextFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/InitialContextFactoryImpl.java
@@ -16,18 +16,19 @@ package org.apache.geode.internal.jndi;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import javax.naming.Context;
/**
* Factory class to creates ContextImpl. Provides implementation for InitialContextFactory.
- *
+ *
* Optionally, this also facilitates the backup of original system property which can be restored
* later.
- *
+ *
*/
public class InitialContextFactoryImpl implements InitialContextFactory {
@@ -40,7 +41,7 @@ public class InitialContextFactoryImpl implements InitialContextFactory {
* will be used as starting point for all naming operations. ContextImpl is then used by
* javax.naming.InitialContext object. InitialContextFactoryImpl caches the context once it's
* created.
- *
+ *
* @param environment Hashtable, contains the Context property to set to get the instance of this
* context.
* @return ContextImpl object.
@@ -59,7 +60,7 @@ public class InitialContextFactoryImpl implements InitialContextFactory {
* called from from setup. These properties can be set directly directly too or through
* application resource file (jndi.properties).
* java.naming.factory.initial=org.apache.geode.internal.jndi.InitialContextFactoryImpl
- *
+ *
* @throws NamingException
*/
public void setAsInitial() throws NamingException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
index 82f7374..73377b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
@@ -14,6 +14,16 @@
*/
package org.apache.geode.internal.jndi;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.*;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.i18n.LogWriterI18n;
@@ -27,15 +37,6 @@ import org.apache.geode.internal.jta.TransactionManagerImpl;
import org.apache.geode.internal.jta.TransactionUtils;
import org.apache.geode.internal.jta.UserTransactionImpl;
-import javax.naming.*;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
/**
* <p>
* Utility class for binding DataSources and Transactional resources to JNDI Tree. If there is a
@@ -53,7 +54,7 @@ import java.util.Map;
* available JNDI tree. The transactional datasource (XADataSource) will make use of available
* TransactionManager.
* </p>
- *
+ *
*/
public class JNDIInvoker {
@@ -112,7 +113,7 @@ public class JNDIInvoker {
* UserTransaction is not available, the GemFire TransactionManager / UserTransaction will be
* bound to the JNDI tree.
* </p>
- *
+ *
*/
public static void mapTransactions(DistributedSystem distSystem) {
try {
@@ -290,7 +291,7 @@ public class JNDIInvoker {
/**
* Initialises the GemFire context. This is called when no external JNDI Context is found.
- *
+ *
* @throws NamingException
*/
private static void initializeGemFireContext() throws NamingException {
@@ -304,7 +305,7 @@ public class JNDIInvoker {
* Binds a single Datasource to the existing JNDI tree. The JNDI tree may be The Datasource
* properties are contained in the map. The Datasource implementation class is populated based on
* properties in the map.
- *
+ *
* @param map contains Datasource configuration properties.
*/
public static void mapDatasource(Map map, List props) {
@@ -367,7 +368,7 @@ public class JNDIInvoker {
/**
* returns the GemFire TransactionManager.
- *
+ *
* @return TransactionManager
*/
public static TransactionManager getTransactionManager() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/NameParserImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/NameParserImpl.java
index 785e6e0..0326fe3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/NameParserImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/NameParserImpl.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.internal.jndi;
-import javax.naming.NameParser;
+import java.util.Properties;
+
+import javax.naming.CompoundName;
import javax.naming.Name;
+import javax.naming.NameParser;
import javax.naming.NamingException;
-import javax.naming.CompoundName;
-import java.util.Properties;
/**
* ContextImpl name parser.
- *
+ *
*/
class NameParserImpl implements NameParser {
@@ -42,7 +43,7 @@ class NameParserImpl implements NameParser {
* <p>
* Any characters '.' in the name <code>name</code> will be replaced with the separator character
* specified above, before parsing.
- *
+ *
* @param name name to parse
* @throws NamingException if naming error occurrs
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
index 4444d6f..5db5b8b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
@@ -18,22 +18,24 @@ package org.apache.geode.internal.jta;
* <p>
* GlobalTransaction is the JTA concept of a Global Transaction.
* </p>
- *
- *
+ *
+ *
* @since GemFire 4.0
- *
+ *
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import java.util.*;
-import javax.transaction.xa.*;
+
import javax.transaction.*;
+import javax.transaction.xa.*;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.i18n.LocalizedStrings;
@Deprecated
public class GlobalTransaction {
@@ -101,7 +103,7 @@ public class GlobalTransaction {
* Add a transaction to the list of transactions participating in this global Transaction The list
* of transactions is being maintained so that we can remove the local transaction to global
* transaction entries from the map being maintained by the Transaction Manager
- *
+ *
* @param txn Transaction instance which is participating in this Global Transaction
*/
public void addTransaction(Transaction txn) throws SystemException {
@@ -121,11 +123,11 @@ public class GlobalTransaction {
* Delists the XAResources associated with the Global Transaction and Completes the Global
* transaction associated with the current thread. If any exception is encountered, rollback is
* called on the current transaction.
- *
+ *
* Concurrency: Some paths invoke this method after taking a lock on "this" while other paths
* invoke this method without taking a lock on "this". Since both types of path do act on the
* resourceMap collection, it is being protected by a lock on resourceMap too.
- *
+ *
* @throws RollbackException - Thrown to indicate that the transaction has been rolled back rather
* than committed.
* @throws HeuristicMixedException - Thrown to indicate that a heuristic decision was made and
@@ -138,7 +140,7 @@ public class GlobalTransaction {
* transaction.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.TransactionManager#commit()
*/
// Asif : Changed the return type to int indicating the nature of Exception
@@ -226,18 +228,18 @@ public class GlobalTransaction {
/**
* Delists the XAResources associated with the Global Transaction and Roll back the transaction
* associated with the current thread.
- *
+ *
* Concurrency: Some paths invoke this method after taking a lock on "this" while other paths
* invoke this method without taking a lock on "this". Since both types of path do act on the
* resourceMap collection, it is being protected by a lock on resourceMap too.
- *
+ *
* @throws java.lang.SecurityException - Thrown to indicate that the thread is not allowed to roll
* back the transaction.
* @throws java.lang.IllegalStateException - Thrown if the current thread is not associated with a
* transaction.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.TransactionManager#rollback()
*/
public void rollback() throws IllegalStateException, SystemException {
@@ -315,12 +317,12 @@ public class GlobalTransaction {
* being supported. enlistResource checks if there is no XAResource, then enlists the current
* XAResource. For subsequent XAResources, it checks if is the same Resource Manager. If it is,
* then the XAResources are addded, else an exception is thrown
- *
+ *
* Concurrency: The order of acquiring lock will be lock on "this" followed by lock on
* resourceMap. It is possible that in some functions of this class both the locks are not needed
* , but if the two are acquired then the realitive order will always be"this" followed by
* resourceMap.
- *
+ *
* @param xaRes XAResource to be enlisted
* @return true, if resource was enlisted successfully, otherwise false.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
@@ -329,7 +331,7 @@ public class GlobalTransaction {
* prepared state or the transaction is inactive.
* @throws RollbackException - Thrown to indicate that the transaction has been marked for
* rollback only.
- *
+ *
* @see javax.transaction.Transaction#enlistResource(javax.transaction.xa.XAResource)
*/
public boolean enlistResource(XAResource xaRes)
@@ -409,17 +411,17 @@ public class GlobalTransaction {
/**
* Disassociate the XAResource specified from this transaction.
- *
+ *
* In the current implementation this call will never be made by the application server. The
* delisting is happening at the time of commit/rollback
- *
+ *
* @param xaRes XAResource to be delisted
* @param flag One of the values of TMSUCCESS, TMSUSPEND, or TMFAIL.
* @return true, if resource was delisted successfully, otherwise false.
* @throws SystemException Thrown if the transaction manager encounters an unexpected error
* condition.
* @throws IllegalStateException Thrown if the transaction in the target object is not active.
- *
+ *
* @see javax.transaction.Transaction#delistResource(javax.transaction.xa.XAResource, int)
*/
public boolean delistResource(XAResource xaRes, int flag)
@@ -447,7 +449,7 @@ public class GlobalTransaction {
/**
* Set the transaction state of the Global Transaction
- *
+ *
* @param new_status Status (int)
*/
public void setStatus(int new_status) {
@@ -526,7 +528,7 @@ public class GlobalTransaction {
/**
* String for current distributed system
- *
+ *
* @see #IdsForId
* @guarded.By {@link #DmidMutex}
*/
@@ -534,7 +536,7 @@ public class GlobalTransaction {
/**
* Distributed system for given string
- *
+ *
* @see #DMid
* @guarded.By {@link #DmidMutex}
*/
@@ -542,7 +544,7 @@ public class GlobalTransaction {
/**
* Mutex controls update of {@link #DMid}
- *
+ *
* @see #DMid
* @see #IdsForId
*/
@@ -550,7 +552,7 @@ public class GlobalTransaction {
/**
* Read current {@link #DMid} and return it
- *
+ *
* @return current DMid
*/
private static String getId() {
@@ -571,7 +573,7 @@ public class GlobalTransaction {
/**
* Returns a byte array which uses a static synchronized counter to ensure uniqueness
- *
+ *
*/
private static byte[] generateGTid() {
// Asif: The counter should be attached to the string inside Synch block
@@ -613,7 +615,7 @@ public class GlobalTransaction {
/**
* Set the transaction TimeOut of the Global Transaction Asif : It returns the new expiry time for
* the GTX.
- *
+ *
* @param seconds
* @throws SystemException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
index 3279abe..a76629c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
@@ -16,18 +16,18 @@ package org.apache.geode.internal.jta;
/**
* TransactionImpl implements the JTA Transaction interface.
- *
+ *
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
-import javax.transaction.xa.*;
+import java.util.*;
+
import javax.transaction.*;
+import javax.transaction.xa.*;
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.util.*;
-
@Deprecated
public class TransactionImpl implements Transaction {
@@ -56,7 +56,7 @@ public class TransactionImpl implements Transaction {
/**
* Calls the commit() of the TransactionManager that owns the current Transaction
- *
+ *
* @throws RollbackException - Thrown to indicate that the transaction has been rolled back rather
* than committed.
* @throws HeuristicMixedException - Thrown to indicate that a heuristic decision was made and
@@ -69,7 +69,7 @@ public class TransactionImpl implements Transaction {
* transaction.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.Transaction#commit()
*/
public void commit() throws RollbackException, HeuristicMixedException,
@@ -79,14 +79,14 @@ public class TransactionImpl implements Transaction {
/**
* Calls the rollback() of the TransactionManager that owns the current Transaction
- *
+ *
* @throws java.lang.SecurityException - Thrown to indicate that the thread is not allowed to
* commit the transaction.
* @throws java.lang.IllegalStateException - Thrown if the current thread is not associated with a
* transaction.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.Transaction#rollback()
*/
public void rollback() throws IllegalStateException, SystemException {
@@ -95,7 +95,7 @@ public class TransactionImpl implements Transaction {
/**
* Sets the status of the Global Transaction associated with this transaction to be RollBack only
- *
+ *
* @see javax.transaction.Transaction#setRollbackOnly()
*/
public void setRollbackOnly() throws IllegalStateException, SystemException {
@@ -114,7 +114,7 @@ public class TransactionImpl implements Transaction {
/**
* Get the status of the Global Transaction associated with this local transaction
- *
+ *
* @see javax.transaction.Transaction#getStatus()
*/
public int getStatus() throws SystemException {
@@ -139,7 +139,7 @@ public class TransactionImpl implements Transaction {
/**
* Enlist the XAResource specified to the Global Transaction associated with this transaction.
- *
+ *
* @param xaRes XAResource to be enlisted
* @return true, if resource was enlisted successfully, otherwise false.
* @throws SystemException Thrown if the transaction manager encounters an unexpected error
@@ -148,7 +148,7 @@ public class TransactionImpl implements Transaction {
* state or the transaction is inactive.
* @throws RollbackException Thrown to indicate that the transaction has been marked for rollback
* only.
- *
+ *
* @see javax.transaction.Transaction#enlistResource(javax.transaction.xa.XAResource)
*/
public boolean enlistResource(XAResource xaRes)
@@ -169,14 +169,14 @@ public class TransactionImpl implements Transaction {
/**
* Disassociate the resource specified from the global transaction. associated with this
* transaction
- *
+ *
* @param xaRes XAResource to be delisted
* @param flag One of the values of TMSUCCESS, TMSUSPEND, or TMFAIL.
* @return true, if resource was delisted successfully, otherwise false.
* @throws SystemException Thrown if the transaction manager encounters an unexpected error
* condition.
* @throws IllegalStateException Thrown if the transaction in the target object is not active.
- *
+ *
* @see javax.transaction.Transaction#delistResource(javax.transaction.xa.XAResource, int)
*/
public boolean delistResource(XAResource xaRes, int flag)
@@ -197,9 +197,9 @@ public class TransactionImpl implements Transaction {
/**
* Register the Synchronizations by adding the synchronization object to a list of
* synchronizations
- *
+ *
* @param synchronisation Synchronization the Synchronization which needs to be registered
- *
+ *
* @see javax.transaction.Transaction#registerSynchronization(javax.transaction.Synchronization)
*/
public void registerSynchronization(Synchronization synchronisation)
@@ -259,7 +259,7 @@ public class TransactionImpl implements Transaction {
/**
* Iterate over the list of Synchronizations to complete all the methods to be performed after
* completion
- *
+ *
* @param status int The status of the Global transaction associated with the transaction
*/
void notifyAfterCompletion(int status) throws SystemException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
index b7a60b8..5fc9593 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
@@ -18,9 +18,9 @@ package org.apache.geode.internal.jta;
* <p>
* TransactionManager: A JTA compatible Transaction Manager.
* </p>
- *
+ *
* @since GemFire 4.1.1
- *
+ *
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager instead.
*/
import java.io.Serializable;
@@ -74,7 +74,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* Transaction TimeOut Class
*/
- transient private TransactionTimeOutThread cleaner;
+ private transient TransactionTimeOutThread cleaner;
/**
* Singleton transactionManager
*/
@@ -82,7 +82,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* Transaction TimeOut thread
*/
- transient private Thread cleanUpThread = null;
+ private transient Thread cleanUpThread = null;
/**
* Default Transaction Time Out
*/
@@ -107,7 +107,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
*/
private boolean isActive = true;
- transient private final AtomicBoolean loggedJTATransactionManagerDeprecatedWarning =
+ private final transient AtomicBoolean loggedJTATransactionManagerDeprecatedWarning =
new AtomicBoolean(false);
/**
@@ -143,14 +143,14 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* Create a new transaction and associate it with the current thread if none exists with the
* current thread else throw an exception since nested transactions are not supported
- *
+ *
* Create a global transaction and associate the transaction created with the global transaction
- *
+ *
* @throws NotSupportedException - Thrown if the thread is already associated with a transaction
* and the Transaction Manager implementation does not support nested transactions.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.TransactionManager#begin()
*/
public void begin() throws NotSupportedException, SystemException {
@@ -196,7 +196,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
* Complete the transaction associated with the current thread by calling the
* GlobalTransaction.commit(). When this method completes, the thread is no longer associated with
* a transaction.
- *
+ *
* @throws RollbackException - Thrown to indicate that the transaction has been rolled back rather
* than committed.
* @throws HeuristicMixedException - Thrown to indicate that a heuristic decision was made and
@@ -209,7 +209,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
* transaction.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.TransactionManager#commit()
*/
public void commit() throws HeuristicRollbackException, RollbackException,
@@ -387,14 +387,14 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
* Rolls back the transaction associated with the current thread by calling the
* GlobalTransaction.rollback(). When this method completes, the thread is no longer associated
* with a transaction.
- *
+ *
* @throws java.lang.SecurityException - Thrown to indicate that the thread is not allowed to
* commit the transaction.
* @throws java.lang.IllegalStateException - Thrown if the current thread is not associated with a
* transaction.
* @throws SystemException - Thrown if the transaction manager encounters an unexpected error
* condition.
- *
+ *
* @see javax.transaction.TransactionManager#commit()
*/
public void rollback() throws IllegalStateException, SecurityException, SystemException {
@@ -492,9 +492,9 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* Set the Global Transaction status (Associated with the current thread) to be RollBackOnly
- *
+ *
* Becauce we are using one phase commit, we are not considering Prepared and preparing states.
- *
+ *
* @see javax.transaction.TransactionManager#setRollbackOnly()
*/
public void setRollbackOnly() throws IllegalStateException, SystemException {
@@ -538,7 +538,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* Get the status of the global transaction associated with this thread
- *
+ *
* @see javax.transaction.TransactionManager#getStatus()
*/
public int getStatus() throws SystemException {
@@ -555,7 +555,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* not supported
- *
+ *
* @see javax.transaction.TransactionManager#setTransactionTimeout(int)
*/
public void setTransactionTimeout(int seconds) throws SystemException {
@@ -696,7 +696,7 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
/**
* Get the transaction associated with the calling thread
- *
+ *
* @see javax.transaction.TransactionManager#getTransaction()
*/
public Transaction getTransaction() throws SystemException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionUtils.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionUtils.java
index be5dab5..425433d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionUtils.java
@@ -20,7 +20,7 @@ import org.apache.geode.internal.logging.PureLogWriter;
/**
* Contains Utility functions for use by JTA
- *
+ *
*/
public class TransactionUtils {
@@ -30,7 +30,7 @@ public class TransactionUtils {
/**
* Returns the logWriter associated with the existing DistributedSystem. If DS is null then the
* PureLogWriter is returned
- *
+ *
* @return LogWriterI18n
*/
public static LogWriterI18n getLogWriterI18n() {
@@ -47,7 +47,7 @@ public class TransactionUtils {
/**
* To be used by mapTransaction method of JNDIInvoker to set the dsLogwriter before the binding of
* the datasources
- *
+ *
* @param logWriter
*/
public static void setLogWriter(LogWriterI18n logWriter) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
index 2f287d4..1f731a5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
@@ -20,14 +20,15 @@ package org.apache.geode.internal.jta;
* hard-coded to <code> TransactionManagerImpl
* </code>.
* </p>
- *
- *
+ *
+ *
* @since GemFire 4.0
- *
+ *
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
import java.io.Serializable;
+
import javax.transaction.*;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -61,12 +62,12 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
/**
* defaultTimeOut in seconds;
- *
+ *
*/
// private int defaultTimeOut = 600;
/**
* Calls begin() of the transaction manager owning this user transaction
- *
+ *
* @see javax.transaction.UserTransaction#begin()
*/
public synchronized void begin() throws NotSupportedException, SystemException {
@@ -82,7 +83,7 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
/**
* Calls commit() of the transaction manager owning this user transaction
- *
+ *
* @see javax.transaction.UserTransaction#commit()
*/
public void commit() throws RollbackException, HeuristicMixedException,
@@ -92,7 +93,7 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
/**
* Calls rollback() of the transaction manager owning this user transaction
- *
+ *
* @see javax.transaction.UserTransaction#rollback()
*/
public void rollback() throws IllegalStateException, SecurityException, SystemException {
@@ -101,7 +102,7 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
/**
* Calls setRollbackOnly() of the transaction manager owning this user transaction
- *
+ *
* @see javax.transaction.UserTransaction#setRollbackOnly()
*/
public void setRollbackOnly() throws IllegalStateException, SystemException {
@@ -110,7 +111,7 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
/**
* Calls getStatus() of the transaction manager owning this user transaction
- *
+ *
* @see javax.transaction.UserTransaction#getStatus()
*/
public int getStatus() throws SystemException {
@@ -119,7 +120,7 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
/**
* Checks if transaction has begun. If yes, then call the tm.setTransactionTimeOut else stores and
- *
+ *
* @see javax.transaction.UserTransaction#setTransactionTimeout
*/
public void setTransactionTimeout(int timeOut) throws SystemException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
index 7f093fb..6202a40 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
@@ -18,9 +18,9 @@ package org.apache.geode.internal.jta;
* <p>
* XidImpl: A JTA compatible implementation of Xid
* </p>
- *
+ *
* @since GemFire 4.0
- *
+ *
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
@@ -53,7 +53,7 @@ public class XidImpl implements Xid {
/**
* Returns the FormatId
- *
+ *
* @see javax.transaction.xa.Xid#getFormatId()
*/
public int getFormatId() {
@@ -62,7 +62,7 @@ public class XidImpl implements Xid {
/**
* Returns the BranchQualifier
- *
+ *
* @see javax.transaction.xa.Xid#getBranchQualifier()
*/
public byte[] getBranchQualifier() {
@@ -71,7 +71,7 @@ public class XidImpl implements Xid {
/**
* Returns the GlobalTransactionId
- *
+ *
* @see javax.transaction.xa.Xid#getGlobalTransactionId()
*/
public byte[] getGlobalTransactionId() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java
index ecd37ec..ab7d8df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.lang;
* The ClassUtils class is an abstract utility class for working with and invoking methods on Class
* objects.
* <p/>
- *
+ *
* @see java.lang.Class
* @see java.lang.Object
* @since GemFire 7.0
@@ -33,7 +33,7 @@ public abstract class ClassUtils {
* then this method handles the ClassNotFoundException and throws the specified RuntimeException
* instead.
* </p>
- *
+ *
* @param className a String indicating the fully qualified name of the class to load.
* @param e the RuntimeException to throw in place of the ClassNotFoundException if the class
* could not be found and loaded.
@@ -54,7 +54,7 @@ public abstract class ClassUtils {
/**
* Gets the Class type for the specified Object, or returns null if the Object reference is null.
* <p/>
- *
+ *
* @param obj the Object who's class type is determined.
* @return the Class type of the Object parameter, or null if the Object reference is null.
* @see java.lang.Object#getClass()
@@ -66,7 +66,7 @@ public abstract class ClassUtils {
/**
* Gets the name of the Object's Class type or null if the Object reference is null.
* <p/>
- *
+ *
* @param obj the Object's who's class name is returned or null if the Object reference is null.
* @return a String value specifying the name of the Object's class type.
* @see #getClass(Object)
@@ -80,7 +80,7 @@ public abstract class ClassUtils {
/**
* Determine whether the specified class is on the classpath. <
* <p/>
- *
+ *
* @param className a String value specifying the fully-qualified name of the class.
* @return a boolean value indicating whether the specified class is on the classpath.
* @see #forName(String, RuntimeException)
@@ -101,7 +101,7 @@ public abstract class ClassUtils {
* assignment-compatible with the given Class type. Note, this method is null-safe for both Class
* and Object value references.
* <p/>
- *
+ *
* @param type the Class type used in an instanceof determination with the given Object.
* @param obj the Object being determined for assignment-compatibility with the specified Class
* type.
@@ -118,7 +118,7 @@ public abstract class ClassUtils {
* Object is considered not an instance of the Class types if the condition holds for all Class
* types.
* <p/>
- *
+ *
* @param obj the Object who's Class type is in question.
* @param types an array of Class types that the Object is being tested as an instance of.
* @return a boolean value of true if the Object is not an instance of any of the specified Class
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
index 99d822f..45bbfea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.lang;
* The Filter interface defines a contract for implementing objects that act as a filter to
* segregate other objects.
* </p>
- *
+ *
* @since GemFire 7.0
*/
public interface Filter<T> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/InOutParameter.java b/geode-core/src/main/java/org/apache/geode/internal/lang/InOutParameter.java
index 8f2b1cc..4b8e8a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/InOutParameter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/InOutParameter.java
@@ -21,7 +21,7 @@ package org.apache.geode.internal.lang;
* this class is the same thing as it's value, as determined by the equals method and so this class
* just serves as a kind of holder for it's value.
* <p/>
- *
+ *
* @param <T> the expected Class type of the parameter's value.
* @since GemFire 6.8
*/
@@ -37,7 +37,7 @@ public class InOutParameter<T> {
/**
* Constructs an instance of the InOutParameter with the specified value.
* <p/>
- *
+ *
* @param value the initial value of this parameter.
*/
public InOutParameter(final T value) {
@@ -47,7 +47,7 @@ public class InOutParameter<T> {
/**
* Gets the value of this in/out parameter.
* <p/>
- *
+ *
* @return the value of this in/out parameter.
*/
public T getValue() {
@@ -57,7 +57,7 @@ public class InOutParameter<T> {
/**
* Sets the value of this in/out parameter.
* <p/>
- *
+ *
* @param value the Object value to set this in/out parameter to.
*/
public void setValue(final T value) {
@@ -69,7 +69,7 @@ public class InOutParameter<T> {
* this is not typically how an equals method should be coded, but then this is not your typical
* class either!
* <p/>
- *
+ *
* @param obj the Object value being compared for equality with this in/out parameter value.
* @return boolean value indicating whether this in/out parameter value is equal to the specified
* Object.
@@ -86,7 +86,7 @@ public class InOutParameter<T> {
/**
* Computes the hash value of this in/out parameter value.
* <p/>
- *
+ *
* @return an integer value constituting the computed hash value of this in/out parameter.
*/
@Override
@@ -97,7 +97,7 @@ public class InOutParameter<T> {
/**
* Gets the String representation of this in/out parameter value.
* <p/>
- *
+ *
* @return a String value representing the value of this in/out parameter.
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
index 65d4618..cf0102e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.lang;
* The Initable interface defines a contract for implementing classes who's Object instances can be
* initialized after construction.
* <p/>
- *
+ *
* @since GemFire 6.8
*/
public interface Initable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java b/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
index 88356da..8d1c1c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
@@ -21,7 +21,7 @@ import org.apache.geode.lang.Identifiable;
* can be uniquely identified relative to other Object instances within the same class type
* hierarchy.
* <p/>
- *
+ *
* @param <T> the class type of the identifier.
* @see java.lang.Comparable
* @since GemFire 7.0
@@ -31,7 +31,7 @@ public interface MutableIdentifiable<T> extends Identifiable {
/**
* Set the identifier uniquely identifying this Object instance.
* <p/>
- *
+ *
* @param id an identifier uniquely identifying this Object.
*/
public void setId(T id);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/ObjectUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/ObjectUtils.java
index 849ccba..888f672 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/ObjectUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/ObjectUtils.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
* The ObjectUtils class is an abstract utility class for working with and invoking methods on
* Objects.
* <p/>
- *
+ *
* @see java.lang.Object
* @since GemFire 6.8
*/
@@ -36,7 +36,7 @@ public abstract class ObjectUtils {
* returned, otherwise the first non-null array element is returned. If the array is not null and
* all the array elements are null, then null is still returned.
* <p/>
- *
+ *
* @param <T> a type parameter specifying the array element type.
* @param values the array of values being iterated for the first non-null value.
* @return the first non-null value from the array of values, otherwise return null if either the
@@ -58,7 +58,7 @@ public abstract class ObjectUtils {
* Determines whether 2 Objects are equal in value. The Objects are equal if and only if neither
* are null and are equal according to the equals method of the Object's class type.
* <p/>
- *
+ *
* @param obj1 the first Object in the equality comparison.
* @param obj2 the second Object in the equality comparison.
* @return a boolean value indicating whether the 2 Objects are equal in value.
@@ -73,7 +73,7 @@ public abstract class ObjectUtils {
* are null, then they are considered equal, or neither must be null and the Objects must be equal
* in value as determined by their equals method.
* <p/>
- *
+ *
* @param obj1 the first Object in the equality comparison.
* @param obj2 the second Object in the equality comparison.
* @return a boolean value indicating whether the 2 Objects are equal in value. If both Object
@@ -89,7 +89,7 @@ public abstract class ObjectUtils {
* then this method returns 0 and will be consistent with the equalsIgnoreNull equality
* comparison.
* <p/>
- *
+ *
* @param obj the Object who's hash value will be computed.
* @return an integer signifying the hash value of the Object or 0 if the Object reference is
* null.
@@ -102,7 +102,7 @@ public abstract class ObjectUtils {
/**
* Null-safe implementation of the Object.toString method.
* </p>
- *
+ *
* @param obj the Object on which to call toString.
* @return the String representation of the specified Object or null if the Object reference is
* null.
@@ -115,7 +115,7 @@ public abstract class ObjectUtils {
/**
* Gets the Class types of all arguments in the Object array.
* <p/>
- *
+ *
* @param args the Object array of arguments to determine the Class types for.
* @return a Class array containing the Class types of each argument in the arguments Object
* array.
@@ -138,7 +138,7 @@ public abstract class ObjectUtils {
/**
* Invokes a method by name on the specified Object using Java Reflection.
* <p/>
- *
+ *
* @param obj the Object in which to invoke the method on.
* @param methodName a String value indication the name of the method to invoke.
* @param <T> a generic type parameter for the method return value.
@@ -152,7 +152,7 @@ public abstract class ObjectUtils {
/**
* Invokes a method by name on the specified Object using Java Reflection.
* <p/>
- *
+ *
* @param obj the Object in which to invoke the method on.
* @param methodName a String value indication the name of the method to invoke.
* @param arguments the Object arguments to the method based on its parameters.
@@ -168,7 +168,7 @@ public abstract class ObjectUtils {
/**
* Invokes a method by name on the specified Object using Java Reflection.
* <p/>
- *
+ *
* @param obj the Object in which to invoke the method on.
* @param methodName a String value indication the name of the method to invoke.
* @param parameterTypes the Class types of parameters indicating the exact method to invoke
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
index 11dbec5..a998b1e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.lang;
* The Orderable interface defines a contract for classes whose Objects can be sorted, or ordered
* according to the order property of a Comparable type.
* <p/>
- *
+ *
* @see java.lang.Comparable
* @since GemFire 6.8
*/
@@ -31,7 +31,7 @@ public interface Orderable<T extends Comparable<T>> {
* in sorting operations, or in maintaining Orderable objects in ordered data structures like
* arrays or Lists, or even for defining a precedence not directly related order.
* <p/>
- *
+ *
* @return a value that is Comparable to other value of the same type and defines the relative
* order of this Object instance to it's peers.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
index 6e17eb2..1f2f457 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.lang;
* participate in some type of ordered data structure, such as an array or List, or exist in a
* context where order relative to other peer instances matter.
* <p/>
- *
+ *
* @since GemFire 6.8
*/
public interface Ordered {
@@ -28,7 +28,7 @@ public interface Ordered {
/**
* Gets the order of this instance relative to it's peers.
* <p/>
- *
+ *
* @return an integer value indicating the order of this instance relative to it's peers.
*/
public int getIndex();
@@ -36,7 +36,7 @@ public interface Ordered {
/**
* Sets the order of this instance relative to it's peers.
* <p/>
- *
+ *
* @param index an integer value specifying the the order of this instance relative to it's peers.
*/
public void setIndex(int index);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java
index 178f14c..4063307 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.lang;
/**
* The SystemPropertyHelper class is an helper class for accessing system properties used in geode.
* The method name to get the system property should be the same as the system property name.
- *
+ *
* @since Geode 1.4.0
*/
@@ -28,7 +28,7 @@ public class SystemPropertyHelper {
/**
* This method will try to look up "geode." and "gemfire." versions of the system property. It
* will check and prefer "geode." setting first, then try to check "gemfire." setting.
- *
+ *
* @param name system property name set in Geode
* @return a boolean value of the system property
*/
@@ -58,10 +58,10 @@ public class SystemPropertyHelper {
/**
* As of Geode 1.4.0, idle expiration on a replicate or partitioned region will now do a
* distributed check for a more recent last access time on one of the other copies of the region.
- *
+ *
* This system property can be set to true to turn off this new check and restore the previous
* behavior of only using the local last access time as the basis for expiration.
- *
+ *
* @since Geode 1.4.0
*/
public static boolean restoreIdleExpirationBehavior() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
index 4c50851..92ac898 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
@@ -22,7 +22,7 @@ import java.util.StringTokenizer;
/**
* The SystemUtils class is an abstract utility class for working with, invoking methods and
* accessing properties of the Java System class.
- *
+ *
* @see java.lang.System
* @since GemFire 6.8
*/
@@ -57,7 +57,7 @@ public class SystemUtils {
* version as the suffix like so "-zing_NN.NN.N.N". So on azul we instead use the
* "java.specification.version" sys prop and only compare the major and minor version numbers. All
* the stuff after the second "." in expectedVersion is ignored.
- *
+ *
* @param expectedVersion an string value specifying the minimum expected version of the Java
* Runtime.
* @return a boolean value indicating if the Java Runtime meets the expected version requirement.
@@ -92,7 +92,7 @@ public class SystemUtils {
/**
* Utility method to determine whether the Java application process is executing on the Apple JVM.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing and
* running on the Apple JVM.
* @see #isJvmVendor(String)
@@ -133,7 +133,7 @@ public class SystemUtils {
/**
* Utility method to determine whether the Java application process is executing on the Java
* HotSpot VM. Client or Server VM does not matter.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing on the
* Java HotSpot VM.
* @see #isJVM(String)
@@ -144,7 +144,7 @@ public class SystemUtils {
/**
* Utility method to determine whether the Java application process is executing on the IBM J9 VM.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing on the IBM
* J9 VM.
* @see #isJVM(String)
@@ -156,7 +156,7 @@ public class SystemUtils {
/**
* Utility method to determine whether the Java application process is executing on the Oracle
* JRockit VM. Client or Server VM does not matter.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing on the
* Oracle JRockit VM.
* @see #isJVM(String)
@@ -176,7 +176,7 @@ public class SystemUtils {
/**
* Utility method that determines whether the Java application process is executing in a Linux
* operating system environment.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing in Linux.
* @see #isOS(String)
*/
@@ -187,7 +187,7 @@ public class SystemUtils {
/**
* Utility method that determines whether the Java application process is executing in a Apple Mac
* OSX operating system environment.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing in Mac
* OSX.
* @see #isOS(String)
@@ -199,7 +199,7 @@ public class SystemUtils {
/**
* Utility method that determines whether the Java application process is executing in a Microsoft
* Windows-based operating system environment.
- *
+ *
* @return a boolean value indicating whether the Java application process is executing in
* Windows.
* @see #isOS(String)
@@ -224,7 +224,7 @@ public class SystemUtils {
* Returns true if the specified location is in the JVM classpath. This may ignore additions to
* the classpath that are not reflected by the value in
* {@code System.getProperty("java.class.path")}.
- *
+ *
* @param location the directory or jar name to test for
* @return true if location is in the JVM classpath
*/
@@ -236,7 +236,7 @@ public class SystemUtils {
* Returns true if the specified location is in the JVM classpath. This may ignore additions to
* the classpath that are not reflected by the value in
* {@code System.getProperty("java.class.path")}.
- *
+ *
* @param location the directory or jar URL to test for
* @return true if location is in the JVM classpath
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/ThrowableUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/ThrowableUtils.java
index 32448d0..e4b3c3d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/ThrowableUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/ThrowableUtils.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.lang;
/**
* The ThrowableUtils class is an abstract utility class for working with {@code Throwable}s.
* <p/>
- *
+ *
* @see java.lang.Throwable
*/
public abstract class ThrowableUtils {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
index 4fa45e6..6df52fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
@@ -20,20 +20,20 @@ import java.util.Date;
/**
* Defines the common date format for GemFire and provides DateFormat instances.
- *
+ *
*/
public class DateFormatter {
/**
* The format string used to format the timestamp of GemFire log messages
*/
- public final static String FORMAT_STRING = "yyyy/MM/dd HH:mm:ss.SSS z";
+ public static final String FORMAT_STRING = "yyyy/MM/dd HH:mm:ss.SSS z";
- private final static DateFormat timeFormatter = createDateFormat();
+ private static final DateFormat timeFormatter = createDateFormat();
/**
* Creates a SimpleDateFormat using {@link #FORMAT_STRING}.
- *
+ *
* Thread Safety Issue: (From SimpleDateFormat) Date formats are not synchronized. It is
* recommended to create separate format instances for each thread. If multiple threads access a
* format concurrently, it must be synchronized externally.
@@ -51,7 +51,7 @@ public class DateFormatter {
/**
* Gets a String representation of the current time.
- *
+ *
* @return a String representation of the current time.
*/
public static String getTimeStamp() {
@@ -60,7 +60,7 @@ public class DateFormatter {
/**
* Convert a Date to a timestamp String.
- *
+ *
* @param d a Date to format as a timestamp String.
* @return a String representation of the current time.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/DebugLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/DebugLogWriter.java
index 6463d26..9402b2b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/DebugLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/DebugLogWriter.java
@@ -20,7 +20,7 @@ import org.apache.geode.i18n.StringId;
/**
* A log writer that logs all types of log messages as a warning. Intended usage was for individual
* classes that had their own logger reference and switched it for debugging purposes. e.g.
- *
+ *
* <pre>
* Foo() { // constructor for class Foo
* if (Boolean.getBoolean(getClass().getName() + "-logging")) {
@@ -30,10 +30,10 @@ import org.apache.geode.i18n.StringId;
* }
* }
* </pre>
- *
+ *
* @since GemFire 5.0
*/
-final public class DebugLogWriter extends LogWriterImpl {
+public final class DebugLogWriter extends LogWriterImpl {
private final LogWriterImpl realLogWriter;
private final String prefix;
@@ -62,7 +62,7 @@ final public class DebugLogWriter extends LogWriterImpl {
/**
* Handles internationalized log messages.
- *
+ *
* @param params each Object has toString() called and substituted into the msg
* @see org.apache.geode.i18n.StringId
* @since GemFire 6.0
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
index 4c04ca6..16a30bb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
@@ -33,7 +33,7 @@ import org.apache.geode.i18n.StringId;
* <li>{@link #SEVERE_LEVEL}
* <li>{@link #NONE_LEVEL}
* </ol>
- *
+ *
* @deprecated use log4j api instead
*/
@Deprecated
@@ -42,50 +42,50 @@ public interface InternalLogWriter extends LogWriter, LogWriterI18n {
/**
* If the writer's level is <code>ALL_LEVEL</code> then all messages will be logged.
*/
- public final static int ALL_LEVEL = Integer.MIN_VALUE;
+ public static final int ALL_LEVEL = Integer.MIN_VALUE;
/**
* If the writer's level is <code>FINEST_LEVEL</code> then finest, finer, fine, config, info,
* warning, error, and severe messages will be logged.
*/
- public final static int FINEST_LEVEL = 300;
+ public static final int FINEST_LEVEL = 300;
/**
* If the writer's level is <code>FINER_LEVEL</code> then finer, fine, config, info, warning,
* error, and severe messages will be logged.
*/
- public final static int FINER_LEVEL = 400;
+ public static final int FINER_LEVEL = 400;
/**
* If the writer's level is <code>FINE_LEVEL</code> then fine, config, info, warning, error, and
* severe messages will be logged.
*/
- public final static int FINE_LEVEL = 500;
+ public static final int FINE_LEVEL = 500;
/**
* If the writer's level is <code>CONFIG_LEVEL</code> then config, info, warning, error, and
* severe messages will be logged.
*/
- public final static int CONFIG_LEVEL = 700;
+ public static final int CONFIG_LEVEL = 700;
/**
* If the writer's level is <code>INFO_LEVEL</code> then info, warning, error, and severe messages
* will be logged.
*/
- public final static int INFO_LEVEL = 800;
+ public static final int INFO_LEVEL = 800;
/**
* If the writer's level is <code>WARNING_LEVEL</code> then warning, error, and severe messages
* will be logged.
*/
- public final static int WARNING_LEVEL = 900;
+ public static final int WARNING_LEVEL = 900;
/**
* If the writer's level is <code>SEVERE_LEVEL</code> then only severe messages will be logged.
*/
- public final static int SEVERE_LEVEL = 1000;
+ public static final int SEVERE_LEVEL = 1000;
/**
* If the writer's level is <code>ERROR_LEVEL</code> then error and severe messages will be
* logged.
*/
- public final static int ERROR_LEVEL = (WARNING_LEVEL + SEVERE_LEVEL) / 2;
+ public static final int ERROR_LEVEL = (WARNING_LEVEL + SEVERE_LEVEL) / 2;
/**
* If the writer's level is <code>NONE_LEVEL</code> then no messages will be logged.
*/
- public final static int NONE_LEVEL = Integer.MAX_VALUE;
+ public static final int NONE_LEVEL = Integer.MAX_VALUE;
public static final String[] levelNames = new String[] {"all", "finest", "finer", "fine",
"config", "info", "warning", "error", "severe", "none"};
@@ -103,7 +103,7 @@ public interface InternalLogWriter extends LogWriter, LogWriterI18n {
/**
* Logs a message and an exception of the given level.
- *
+ *
* @param msgLevel the level code for the message to log
* @param msg the actual message to log
* @param exception the actual Exception to log
@@ -112,7 +112,7 @@ public interface InternalLogWriter extends LogWriter, LogWriterI18n {
/**
* Logs a message and an exception of the given level.
- *
+ *
* @param msgLevel the level code for the message to log
* @param msgId A locale agnostic form of the message
* @param params the Object arguments to plug into the message
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java
index a1ef8d8..ee0d5dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java
@@ -25,7 +25,7 @@ public class LocalLogWriter extends PureLogWriter {
// Constructors
/**
* Creates a writer that logs to <code>System.out</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @throws IllegalArgumentException if level is not in legal range
*/
@@ -35,7 +35,7 @@ public class LocalLogWriter extends PureLogWriter {
/**
* Creates a writer that logs to <code>logWriter</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
* @throws IllegalArgumentException if level is not in legal range
@@ -59,7 +59,7 @@ public class LocalLogWriter extends PureLogWriter {
/**
* Creates a writer that logs to <code>logWriter</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
* @throws IllegalArgumentException if level is not in legal range
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogConfig.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogConfig.java
index 213abed..f578dff 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LogConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LogConfig.java
@@ -50,7 +50,7 @@ public interface LogConfig {
* <p>
* The default value is:
* {@link org.apache.geode.distributed.internal.DistributionConfig#DEFAULT_NAME}.
- *
+ *
* @return the system's name.
*/
String getName();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogService.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogService.java
index 5a229d3..0ad7d84 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LogService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LogService.java
@@ -14,12 +14,10 @@
*/
package org.apache.geode.internal.logging;
-import org.apache.geode.internal.logging.log4j.AppenderContext;
-import org.apache.geode.internal.logging.log4j.ConfigLocator;
-import org.apache.geode.internal.logging.log4j.Configurator;
-import org.apache.geode.internal.logging.log4j.FastLogger;
-import org.apache.geode.internal.logging.log4j.LogWriterLogger;
-import org.apache.geode.internal.logging.log4j.message.GemFireParameterizedMessageFactory;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -31,9 +29,12 @@ import org.apache.logging.log4j.core.lookup.StrLookup;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
import org.apache.logging.log4j.status.StatusLogger;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
+import org.apache.geode.internal.logging.log4j.AppenderContext;
+import org.apache.geode.internal.logging.log4j.ConfigLocator;
+import org.apache.geode.internal.logging.log4j.Configurator;
+import org.apache.geode.internal.logging.log4j.FastLogger;
+import org.apache.geode.internal.logging.log4j.LogWriterLogger;
+import org.apache.geode.internal.logging.log4j.message.GemFireParameterizedMessageFactory;
/**
* Centralizes log configuration and initialization.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterFactory.java
index e8c283c..ee85a7c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterFactory.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.logging.log4j.LogWriterLogger;
/**
* Creates LogWriterLogger instances.
- *
+ *
*/
public class LogWriterFactory {
@@ -40,7 +40,7 @@ public class LogWriterFactory {
/**
* Creates the log writer for a distributed system based on the system's parsed configuration. The
* initial banner and messages are also entered into the log by this method.
- *
+ *
* @param isLoner Whether the distributed system is a loner or not
* @param isSecure Whether a logger for security related messages has to be created
* @param config The DistributionConfig for the target distributed system
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java
index f97451c..fa0f726 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LogWriterImpl.java
@@ -14,12 +14,6 @@
*/
package org.apache.geode.internal.logging;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.process.StartupStatusListener;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.BreakIterator;
@@ -32,6 +26,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Handler;
import java.util.logging.Level;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.process.StartupStatusListener;
+
/**
* Abstract implementation of {@link InternalLogWriter}. Each logger has a level and it will only
* print messages whose level is greater than or equal to the logger's level. The supported logger
@@ -64,13 +64,13 @@ public abstract class LogWriterImpl implements InternalLogWriter {
* A bit mask to remove any potential flags added to the msgLevel. Intended to be used in
* {@link #getRealLogLevel}.
*/
- private final static int LOGGING_FLAGS_MASK = 0x00FFFFFF;
+ private static final int LOGGING_FLAGS_MASK = 0x00FFFFFF;
/**
* A flag to indicate the {@link SecurityLogWriter#SECURITY_PREFIX} should be appended to the log
* level.
*/
- protected final static int SECURITY_LOGGING_FLAG = 0x40000000;
+ protected static final int SECURITY_LOGGING_FLAG = 0x40000000;
static {
Assert.assertTrue(ALL_LEVEL == Level.ALL.intValue());
@@ -200,7 +200,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Gets the level code for the given <code>levelName</code>.
- *
+ *
* @throws IllegalArgumentException if an unknown level name is given.
* @deprecated
*/
@@ -249,7 +249,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Gets a String representation of the current time.
- *
+ *
* @return a String representation of the current time.
*/
protected String getTimeStamp() {
@@ -258,7 +258,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Convert a Date to a timestamp String.
- *
+ *
* @param d a Date to format as a timestamp String.
* @return a String representation of the current time.
*/
@@ -316,7 +316,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object[] params, Throwable ex) {
@@ -327,7 +327,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object param, Throwable ex) {
@@ -338,7 +338,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Throwable ex) {
@@ -347,7 +347,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object[] params) {
@@ -356,7 +356,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID, Object param) {
@@ -365,7 +365,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "severe".
- *
+ *
* @since GemFire 6.0
*/
public void severe(StringId msgID) {
@@ -404,7 +404,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object[] params, Throwable ex) {
@@ -415,7 +415,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object param, Throwable ex) {
@@ -426,7 +426,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Throwable ex) {
@@ -435,7 +435,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object[] params) {
@@ -444,7 +444,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID, Object param) {
@@ -453,7 +453,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "error".
- *
+ *
* @since GemFire 6.0
*/
public void error(StringId msgID) {
@@ -492,7 +492,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object[] params, Throwable ex) {
@@ -503,7 +503,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object param, Throwable ex) {
@@ -514,7 +514,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Throwable ex) {
@@ -523,7 +523,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object[] params) {
@@ -532,7 +532,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID, Object param) {
@@ -541,7 +541,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "warning".
- *
+ *
* @since GemFire 6.0
*/
public void warning(StringId msgID) {
@@ -581,7 +581,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object[] params, Throwable ex) {
@@ -592,7 +592,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object param, Throwable ex) {
@@ -603,7 +603,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Throwable ex) {
@@ -612,7 +612,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object[] params) {
@@ -621,7 +621,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID, Object param) {
@@ -630,7 +630,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "info".
- *
+ *
* @since GemFire 6.0
*/
public void info(StringId msgID) {
@@ -669,7 +669,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object[] params, Throwable ex) {
@@ -680,7 +680,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object param, Throwable ex) {
@@ -691,7 +691,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Throwable ex) {
@@ -700,7 +700,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object[] params) {
@@ -709,7 +709,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID, Object param) {
@@ -718,7 +718,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. The message level is "config".
- *
+ *
* @since GemFire 6.0
*/
public void config(StringId msgID) {
@@ -793,7 +793,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
* <p>
* The logging is done using the <code>finer</code> level. The string message will start with
* <code>"ENTRY"</code> and include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
*/
@@ -808,7 +808,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
* <p>
* The logging is done using the <code>finer</code> level. The string message will start with
* <code>"RETURN"</code> and include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
*/
@@ -827,7 +827,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
* This is a convenience method that could be done instead by calling
* {@link #finer(String, Throwable)}. The string message will start with <code>"THROW"</code> and
* include the class and method names.
- *
+ *
* @param sourceClass Name of class that issued the logging request.
* @param sourceMethod Name of the method that issued the logging request.
* @param thrown The Throwable that is being thrown.
@@ -873,7 +873,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Writes both a message and exception to this writer. If a startup listener is registered, the
* message will be written to the listener as well to be reported to a user.
- *
+ *
* @since GemFire 7.0
*/
public void startup(StringId msgID, Object[] params) {
@@ -892,7 +892,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
// internal implemenation methods
/**
* Logs a message and an exception of the given level.
- *
+ *
* @param msgLevel the level code for the message to log
* @param msg the actual message to log
* @param exception the actual Exception to log
@@ -901,7 +901,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Logs a message and an exception of the given level.
- *
+ *
* @param msgLevel the level code for the message to log
* @param msgId A locale agnostic form of the message
* @param params the Object arguments to plug into the message
@@ -960,7 +960,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Check if a message of the given level would actually be logged by this logger. This check is
* based on the Logger effective level.
- *
+ *
* @param level a message logging level
* @return true if the given message level is currently being logged.
*/
@@ -971,7 +971,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Log a message, with associated Throwable information. If the logger is currently enabled for
* the given message level then the given message is logged.
- *
+ *
* @param level One of the message level identifiers, e.g. SEVERE
* @param message The string message
* @param thrown - Throwable associated with log message.
@@ -985,7 +985,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Log a message. If the logger is currently enabled for the given message level then the given
* message is logged.
- *
+ *
* @param level One of the message level identifiers, e.g. SEVERE
* @param message The string message
*/
@@ -1009,7 +1009,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/**
* Utility to periodically log a stack trace for a thread. The thread should be alive when this
* method is invoked.
- *
+ *
* @param toStdout whether to log to stdout or to this log writer
* @param targetThread the thread to snapshot
* @param interval millis to wait betweeen snaps
@@ -1076,7 +1076,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/*
* @see org.apache.geode.LogWriter
- *
+ *
* @since GemFire 6.0
*/
public org.apache.geode.LogWriter convertToLogWriter() {
@@ -1085,7 +1085,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
/*
* @see org.apache.geode.LogWriterI18n
- *
+ *
* @since GemFire 6.0
*/
public LogWriterI18n convertToLogWriterI18n() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java
index ee61dc3..e7c853d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java
@@ -22,10 +22,10 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.i18n.StringId;
/**
* A <code>ThreadGroup</code> that logs all {@linkplain #uncaughtException uncaught exceptions} to a
@@ -316,7 +316,7 @@ public class LoggingThreadGroup extends ThreadGroup {
/**
* clean up the threadgroup, releasing resources that could be problematic (bug 35388)
- *
+ *
* @since GemFire 4.2.3
*/
public synchronized void cleanup() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/ManagerLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/ManagerLogWriter.java
index 4b333ed..5c78f52 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/ManagerLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/ManagerLogWriter.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.internal.logging;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.Date;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.OSProcess;
@@ -23,14 +31,6 @@ import org.apache.geode.internal.io.RollingFileHandler;
import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.util.LogFileUtils;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.util.Date;
-
/**
* Implementation of {@link LogWriterI18n} for distributed system members. It's just like
* {@link LocalLogWriter} except it has support for rolling and alerts.
@@ -67,7 +67,7 @@ public class ManagerLogWriter extends LocalLogWriter {
/**
* Creates a writer that logs to <code>System.out</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @throws IllegalArgumentException if level is not in legal range
*/
@@ -312,7 +312,7 @@ public class ManagerLogWriter extends LocalLogWriter {
public static File getLogNameForOldMainLog(File log, boolean useOldFile) {
/*
* this is just searching for the existing logfile name we need to search for meta log file name
- *
+ *
*/
RollingFileHandler rollingFileHandler = new MainWithChildrenRollingFileHandler();
File dir = rollingFileHandler.getParentFile(log.getAbsoluteFile());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
index 0c1306e..d1a81e7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
@@ -71,12 +71,12 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* emitted the log entry, and <i>x</i> is the position of this log file in the ordered set of log
* files created by that process.
* <p>
- *
+ *
* Normally, one log file reader is created per log file, and they are iterated over repeatedly to
* find and write the next earliest timestamped line to the output stream. Text without a timestamp
* is associated with the prior timestamped line in the file.
* <p>
- *
+ *
* The <i>-threads</i> option will cause the program to also create threads for each reader that are
* backed by bounded {@link BlockingQueue queues}, as outlined in the diagram below. This can
* consume more memory, so it is wise to increase the Xmx of the java virtual machine if you are
@@ -104,7 +104,7 @@ public class MergeLogFiles {
* @param logFiles The log files to be merged
* @param logFileNames The names of the log files to be printed in the merged log
* @param mergedFile Where the merged logs are printed to
- *
+ *
* @return Whether or not problems occurred while merging the log files.
*
* @throws IllegalArgumentException If the length of <code>logFiles</code> is not the same as the
@@ -184,7 +184,7 @@ public class MergeLogFiles {
/**
* Find all of the .log files in the given directory
- *
+ *
* @param dirName directory to search
* @return all of the .log files found (Files)
*/
@@ -514,7 +514,7 @@ public class MergeLogFiles {
/**
* Creates a new <code>Reader</code> that reads from the given log file with the given name.
* Invoking this constructor will start this reader thread.
- *
+ *
* @param patterns java regular expressions that an entry must match one or more of
*/
public NonThreadedReader(InputStream logFile, String logFileName, ThreadGroup group,
@@ -651,7 +651,7 @@ public class MergeLogFiles {
/**
* Creates a new <code>Reader</code> that reads from the given log file with the given name.
* Invoking this constructor will start this reader thread.
- *
+ *
* @param patterns TODO
*
* @see #run
@@ -975,5 +975,3 @@ public class MergeLogFiles {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
index dadf79a..158e215 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
@@ -20,8 +20,8 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Date;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Implementation of {@link org.apache.geode.i18n.LogWriterI18n} that will write to a local stream
@@ -38,7 +38,7 @@ public class PureLogWriter extends LogWriterImpl {
// Constructors
/**
* Creates a writer that logs to <code>System.out</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @throws IllegalArgumentException if level is not in legal range
*/
@@ -48,7 +48,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Creates a writer that logs to <code>logWriter</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
* @throws IllegalArgumentException if level is not in legal range
@@ -59,7 +59,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Creates a writer that logs to <code>logWriter</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
* @throws IllegalArgumentException if level is not in legal range
@@ -70,7 +70,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Creates a writer that logs to <code>logWriter</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
* @param connectionName The name of the connection associated with this log writer
@@ -94,7 +94,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Sets the writer's level.
- *
+ *
* @throws IllegalArgumentException if level is not in legal range
*/
public void setLevel(int newLevel) {
@@ -123,7 +123,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Logs a message and an exception to the specified log destination.
- *
+ *
* @param msgLevel a string representation of the level
* @param msg the actual message to log
* @param ex the actual Exception to log
@@ -148,7 +148,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Logs a message and an exception to the specified log destination.
- *
+ *
* @param msgLevel a string representation of the level
* @param msgId the actual message to log
* @param ex the actual Exception to log
@@ -236,7 +236,7 @@ public class PureLogWriter extends LogWriterImpl {
/**
* Sets the target that this logger will sends its output to.
- *
+ *
* @return the previous target.
*/
public PrintWriter setTarget(PrintWriter logWriter) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLocalLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLocalLogWriter.java
index c8a676d..efad649 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLocalLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLocalLogWriter.java
@@ -22,17 +22,17 @@ import org.apache.geode.i18n.StringId;
/**
* Implementation of {@link org.apache.geode.LogWriter} that will write security related logs to a
* local stream.
- *
+ *
* @since GemFire 5.5
*/
public class SecurityLocalLogWriter extends PureLogWriter {
/**
* Creates a writer that logs to given <code>{@link PrintStream}</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
- *
+ *
* @throws IllegalArgumentException if level is not in legal range
*/
public SecurityLocalLogWriter(int level, PrintStream logWriter) {
@@ -42,11 +42,11 @@ public class SecurityLocalLogWriter extends PureLogWriter {
/**
* Creates a writer that logs to given <code>{@link PrintStream}</code> and having the given
* <code>connectionName</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @param logWriter is the stream that message will be printed to.
* @param connectionName Name of connection associated with this log writer
- *
+ *
* @throws IllegalArgumentException if level is not in legal range
*/
public SecurityLocalLogWriter(int level, PrintStream logWriter, String connectionName) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogConfig.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogConfig.java
index c0ac0e6..cec2eb3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogConfig.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.logging;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.io.File;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
* LogConfig implementation for Security logging configuration that delegates to a
* DistributionConfig.
- *
+ *
*/
public class SecurityLogConfig implements LogConfig {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
index d791835..f400a96 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
@@ -22,10 +22,10 @@ import org.apache.geode.i18n.StringId;
* level part of log-line for easy recognition and filtering if required. Intended usage is in all
* places where security related logging (authentication, authorization success and failure of
* clients and peers) as well as for security callbacks.
- *
+ *
* This class wraps an existing {@link InternalLogWriter} instance to add the security prefix
* feature mentioned above.
- *
+ *
* @since GemFire 5.5
*/
public class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
index d0c6eaa..9e5ede6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
@@ -14,19 +14,19 @@
*/
package org.apache.geode.internal.logging;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.io.PrintStream;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
* A log writer for security related logs. This will prefix all messages with "security-" in the
* level part of log-line for easy recognition and filtering if required. Intended usage is in all
* places where security related logging (authentication, authorization success and failure of
* clients and peers) as well as for security callbacks.
- *
+ *
* This class extends the {@link ManagerLogWriter} to add the security prefix feature mentioned
* above.
- *
+ *
* @since GemFire 5.5
*/
public class SecurityManagerLogWriter extends ManagerLogWriter {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/StandardErrorPrinter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/StandardErrorPrinter.java
index 216f905..fd64c5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/StandardErrorPrinter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/StandardErrorPrinter.java
@@ -16,13 +16,13 @@ package org.apache.geode.internal.logging;
/**
* Prints messages formatted like GemFire log messages to stderr.
- *
+ *
*/
public class StandardErrorPrinter extends LocalLogWriter {
/**
* Creates a writer that logs to <code>System.err</code>. All messages will be logged.
- *
+ *
* @throws IllegalArgumentException if level is not in legal range
*/
public StandardErrorPrinter() {
@@ -31,7 +31,7 @@ public class StandardErrorPrinter extends LocalLogWriter {
/**
* Creates a writer that logs to <code>System.err</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @throws IllegalArgumentException if level is not in legal range
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/StandardOutputPrinter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/StandardOutputPrinter.java
index b99f276..debc86d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/StandardOutputPrinter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/StandardOutputPrinter.java
@@ -16,13 +16,13 @@ package org.apache.geode.internal.logging;
/**
* Prints messages formatted like GemFire log messages to stderr.
- *
+ *
*/
public class StandardOutputPrinter extends LocalLogWriter {
/**
* Creates a writer that logs to <code>System.err</code>. All messages will be logged.
- *
+ *
* @throws IllegalArgumentException if level is not in legal range
*/
public StandardOutputPrinter() {
@@ -31,7 +31,7 @@ public class StandardOutputPrinter extends LocalLogWriter {
/**
* Creates a writer that logs to <code>System.err</code>.
- *
+ *
* @param level only messages greater than or equal to this value will be logged.
* @throws IllegalArgumentException if level is not in legal range
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
index 5f39257..f6eddea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.tcp.ReenteredConnectException;
/**
* A Log4j Appender which will notify listeners whenever a message of the requested level is written
* to the log file.
- *
+ *
*/
public class AlertAppender extends AbstractAppender implements PropertyChangeListener {
private static final String APPENDER_NAME = AlertAppender.class.getName();
@@ -255,7 +255,7 @@ public class AlertAppender extends AbstractAppender implements PropertyChangeLis
/**
* Will add (or replace) a listener to the list of sorted listeners such that listeners with a
* narrower level (e.g. FATAL) will be at the end of the list.
- *
+ *
* @param listener The listener to add to the list.
*/
private void addListenerToSortedList(final Listener listener) {
@@ -275,7 +275,7 @@ public class AlertAppender extends AbstractAppender implements PropertyChangeLis
/**
* Converts an int alert level to an int log level.
- *
+ *
* @param alertLevel The int value for the alert level
* @return The int value for the matching log level
* @throws java.lang.IllegalArgumentException If there is no matching log level
@@ -297,7 +297,7 @@ public class AlertAppender extends AbstractAppender implements PropertyChangeLis
/**
* Converts an int log level to an int alert level.
- *
+ *
* @param logLevel The int value for the log level
* @return The int value for the matching alert level
* @throws java.lang.IllegalArgumentException If there is no matching log level
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AppenderContext.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AppenderContext.java
index fc89ef4..b840a61 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AppenderContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AppenderContext.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.internal.logging.log4j;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LogService;
+
/**
* Provides the LoggerContext and LoggerConfig for GemFire appenders to attach to. These appenders
* include AlertAppender and LogWriterAppender.
- *
+ *
*/
public class AppenderContext {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ConfigLocator.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ConfigLocator.java
index 1a02e9f..11e3788 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ConfigLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ConfigLocator.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.util.LoaderUtil;
/**
* Utility methods for finding the Log4J 2 configuration file.
- *
+ *
*/
public class ConfigLocator {
@@ -47,7 +47,7 @@ public class ConfigLocator {
/**
* Finds a Log4j configuration file in the current working directory. The names of the files to
* look for are the same as those that Log4j would look for on the classpath.
- *
+ *
* @return configuration file or null if not found.
*/
public static File findConfigInWorkingDirectory() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/FastLogger.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/FastLogger.java
index 20179d5..754126b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/FastLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/FastLogger.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Overrides is-enabled checks for log levels below INFO to avoid performance penalties when the log
* level is INFO or above. If delegating is true then it will always delegate to
* ExtendedLoggerWrapper for is-enabled checks.
- *
+ *
*/
public class FastLogger extends ExtendedLoggerWrapper {
private static final long serialVersionUID = 7084130827962463327L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
index 59afa52..9ebddce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
@@ -24,13 +24,13 @@ import org.apache.geode.i18n.LogWriterI18n;
/**
* Extends Logger interface with convenience methods for the FINEST, FINER, FINE, CONFIG, INFO,
* WARNING, ERROR and SEVERE custom log levels.
- *
+ *
*/
public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code FINEST} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -38,7 +38,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code FINEST} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -47,7 +47,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINEST} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -56,7 +56,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINEST} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -65,7 +65,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINEST} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -73,7 +73,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with parameters at the;@code FINEST} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -84,7 +84,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINEST} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -93,14 +93,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs the specified Message at the;@code FINEST} level.
- *
+ *
* @param msg the message string to be logged
*/
public void finest(final Message msg);
/**
* Logs the specified Message at the;@code FINEST} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -108,7 +108,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINEST} level.
- *
+ *
* @param message the message object to log.
*/
public void finest(final Object message);
@@ -116,7 +116,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINEST} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -124,14 +124,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINEST} level.
- *
+ *
* @param message the message object to log.
*/
public void finest(final String message);
/**
* Logs a message with parameters at the;@code FINEST} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -141,7 +141,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINEST} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -149,7 +149,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code FINER} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -157,7 +157,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code FINER} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -166,7 +166,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINER} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -175,7 +175,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINER} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -184,7 +184,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINER} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -192,7 +192,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with parameters at the;@code FINER} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -203,7 +203,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINER} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -212,14 +212,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs the specified Message at the;@code FINER} level.
- *
+ *
* @param msg the message string to be logged
*/
public void finer(final Message msg);
/**
* Logs the specified Message at the;@code FINER} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -227,7 +227,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINER} level.
- *
+ *
* @param message the message object to log.
*/
public void finer(final Object message);
@@ -235,7 +235,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINER} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -243,14 +243,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINER} level.
- *
+ *
* @param message the message object to log.
*/
public void finer(final String message);
/**
* Logs a message with parameters at the;@code FINER} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -260,7 +260,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINER} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -268,7 +268,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code FINE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -276,7 +276,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code FINE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -285,7 +285,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -294,7 +294,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -303,7 +303,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -311,7 +311,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with parameters at the;@code FINE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -322,7 +322,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -331,14 +331,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs the specified Message at the;@code FINE} level.
- *
+ *
* @param msg the message string to be logged
*/
public void fine(final Message msg);
/**
* Logs the specified Message at the;@code FINE} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -346,7 +346,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINE} level.
- *
+ *
* @param message the message object to log.
*/
public void fine(final Object message);
@@ -354,7 +354,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -362,14 +362,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code FINE} level.
- *
+ *
* @param message the message object to log.
*/
public void fine(final String message);
/**
* Logs a message with parameters at the;@code FINE} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -379,7 +379,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code FINE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -387,7 +387,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code CONFIG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -395,7 +395,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code CONFIG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -404,7 +404,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code CONFIG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -413,7 +413,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -422,7 +422,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code CONFIG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -430,7 +430,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with parameters at the;@code CONFIG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -441,7 +441,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -450,14 +450,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs the specified Message at the;@code CONFIG} level.
- *
+ *
* @param msg the message string to be logged
*/
public void config(final Message msg);
/**
* Logs the specified Message at the;@code CONFIG} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -465,7 +465,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code CONFIG} level.
- *
+ *
* @param message the message object to log.
*/
public void config(final Object message);
@@ -473,7 +473,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -481,14 +481,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code CONFIG} level.
- *
+ *
* @param message the message object to log.
*/
public void config(final String message);
/**
* Logs a message with parameters at the;@code CONFIG} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -498,7 +498,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -506,7 +506,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code WARNING} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -514,7 +514,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code WARNING} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -523,7 +523,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code WARNING} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -532,7 +532,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code WARNING} level including the stack trace of the;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -541,7 +541,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code WARNING} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -549,7 +549,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with parameters at the;@code WARNING} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -560,7 +560,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code WARNING} level including the stack trace of the;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -569,14 +569,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs the specified Message at the;@code WARNING} level.
- *
+ *
* @param msg the message string to be logged
*/
public void warning(final Message msg);
/**
* Logs the specified Message at the;@code WARNING} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -584,7 +584,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code WARNING} level.
- *
+ *
* @param message the message object to log.
*/
public void warning(final Object message);
@@ -592,7 +592,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code WARNING} level including the stack trace of the;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -600,14 +600,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code WARNING} level.
- *
+ *
* @param message the message object to log.
*/
public void warning(final String message);
/**
* Logs a message with parameters at the;@code WARNING} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -617,7 +617,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code WARNING} level including the stack trace of the;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -625,7 +625,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code SEVERE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -633,7 +633,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with the specific Marker at the;@code SEVERE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -642,7 +642,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code SEVERE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -651,7 +651,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -660,7 +660,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code SEVERE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -668,7 +668,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message with parameters at the;@code SEVERE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -679,7 +679,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -688,14 +688,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs the specified Message at the;@code SEVERE} level.
- *
+ *
* @param msg the message string to be logged
*/
public void severe(final Message msg);
/**
* Logs the specified Message at the;@code SEVERE} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -703,7 +703,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code SEVERE} level.
- *
+ *
* @param message the message object to log.
*/
public void severe(final Object message);
@@ -711,7 +711,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -719,14 +719,14 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message object with the;@code SEVERE} level.
- *
+ *
* @param message the message object to log.
*/
public void severe(final String message);
/**
* Logs a message with parameters at the;@code SEVERE} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -736,7 +736,7 @@ public interface GemFireLogger extends Logger {
/**
* Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
* Throwable};@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack
* trace.LogService.getLogWriterLogger().enter()
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
index 717ae05..4aaaf53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
@@ -21,7 +21,7 @@ import org.apache.geode.i18n.StringId;
/**
* An implementation of a Log4j {@link Message} that wraps a {@link StringId}.
- *
+ *
*/
public class LocalizedMessage implements Message {
private static final long serialVersionUID = -8893339995741536401L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogLevel.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogLevel.java
index a1c5035..c64938e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogLevel.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogLevel.java
@@ -15,14 +15,15 @@
package org.apache.geode.internal.logging.log4j;
-import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.logging.log4j.Level;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.Level;
+
+import org.apache.geode.internal.logging.InternalLogWriter;
+
/**
* This class provides utility methods to hold all valid log4j levels and lgegacy geode log levels
* and the mapping between the two level hierarchy.
@@ -81,7 +82,7 @@ public class LogLevel {
/**
* resolve the log4j level from any log statement in the log file.
- *
+ *
* @param level either legacy level string or log4j level string
* @return log4j level. Level.OFF is invalid string
*/
@@ -93,7 +94,7 @@ public class LogLevel {
/**
* get Log4j Level from either legacy level string or log4j level string
- *
+ *
* @param level either legacy level string or log4j level string
* @return log4j level. null if invalid level string
*/
@@ -103,7 +104,7 @@ public class LogLevel {
/**
* convert log4j level to logwriter code
- *
+ *
* @param log4jLevel log4j level object
* @return legacy logwriter code
*/
@@ -118,7 +119,7 @@ public class LogLevel {
/**
* convert legacy logwriter code to log4j level
- *
+ *
* @param logWriterLevel logwriter code
* @return log4j level
*/
@@ -131,7 +132,7 @@ public class LogLevel {
/**
* convert a string to logwriter code, either log4j level or logwriter string, or a level-xxx
- *
+ *
* @param levelName a string of level name
* @return logwriter code
*/
@@ -157,7 +158,7 @@ public class LogLevel {
/**
* convert a legacy logwriter code to log4j level string
- *
+ *
* @param logWriterLevel integer code
* @return log4j level string
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
index 8559d47..bbb4937 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
@@ -14,10 +14,12 @@
*/
package org.apache.geode.internal.logging.log4j;
-import org.apache.geode.internal.logging.LogConfig;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.ManagerLogWriter;
-import org.apache.geode.internal.logging.PureLogWriter;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LoggerContext;
@@ -25,15 +27,14 @@ import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.layout.PatternLayout;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import org.apache.geode.internal.logging.LogConfig;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.ManagerLogWriter;
+import org.apache.geode.internal.logging.PureLogWriter;
/**
* A Log4j Appender which will copy all output to a LogWriter.
- *
+ *
*/
public class LogWriterAppender extends AbstractAppender implements PropertyChangeListener {
private static final org.apache.logging.log4j.Logger logger = LogService.getLogger();
@@ -67,7 +68,7 @@ public class LogWriterAppender extends AbstractAppender implements PropertyChang
/**
* Used by LogWriterAppenders and tests to create a new instance.
- *
+ *
* @return The new instance.
*/
static LogWriterAppender create(final AppenderContext[] contexts, final String name,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
index a500654..d0bf115 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.internal.logging.log4j;
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.geode.GemFireIOException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.OSProcess;
@@ -22,18 +27,13 @@ import org.apache.geode.internal.logging.*;
import org.apache.geode.internal.process.ProcessLauncherContext;
import org.apache.geode.internal.util.LogFileUtils;
-import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
* Holds on to one or many instances of LogWriterAppender and provides convenience methods for
* controlling their lifecycles.
- *
+ *
*/
public class LogWriterAppenders {
- public final static String APPEND_TO_LOG_FILE = DistributionConfig.GEMFIRE_PREFIX + "append-log";
+ public static final String APPEND_TO_LOG_FILE = DistributionConfig.GEMFIRE_PREFIX + "append-log";
private static final boolean ALLOW_REDIRECT = true;
public enum Identifier {
@@ -57,14 +57,14 @@ public class LogWriterAppenders {
/**
* Returns the named LogWriterAppender or null if it does not exist.
*/
- public synchronized static LogWriterAppender getAppender(final Identifier id) {
+ public static synchronized LogWriterAppender getAppender(final Identifier id) {
return appenders.get(id);
}
/**
* Returns the named LogWriterAppender or creates it if necessary.
*/
- public synchronized static LogWriterAppender getOrCreateAppender(final Identifier id,
+ public static synchronized LogWriterAppender getOrCreateAppender(final Identifier id,
final boolean appendToFile, final boolean isLoner, final LogConfig config,
final boolean logConfig) {
LogWriterAppender appender = appenders.get(id);
@@ -91,7 +91,7 @@ public class LogWriterAppenders {
/**
* Creates the log writer appender for a distributed system based on the system's parsed
* configuration. The initial banner and messages are also entered into the log by this method.
- *
+ *
* @param isLoner Whether the distributed system is a loner or not
* @param isSecurity Whether a log for security related messages has to be created
* @param config The DistributionConfig for the target distributed system
@@ -241,14 +241,14 @@ public class LogWriterAppenders {
return appender;
}
- public synchronized static void startupComplete(final Identifier id) {
+ public static synchronized void startupComplete(final Identifier id) {
LogWriterAppender appender = appenders.get(id);
if (appender != null) {
appender.startupComplete();
}
}
- public synchronized static void destroy(final Identifier id) {
+ public static synchronized void destroy(final Identifier id) {
// TODO:LOG:KIRK: new Exception("KIRK destroy called for " + id).printStackTrace();
LogWriterAppender appender = appenders.get(id);
if (appender == null) {
@@ -271,14 +271,14 @@ public class LogWriterAppenders {
}
}
- public synchronized static void stop(final Identifier id) {
+ public static synchronized void stop(final Identifier id) {
LogWriterAppender appender = appenders.get(id);
if (appender != null) {
appender.stop();
}
}
- public synchronized static void configChanged(final Identifier id) {
+ public static synchronized void configChanged(final Identifier id) {
LogWriterAppender appender = appenders.get(id);
if (appender != null) {
appender.configChanged();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
index fad126b..f46809c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
@@ -14,14 +14,8 @@
*/
package org.apache.geode.internal.logging.log4j;
-import org.apache.geode.LogWriter;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.logging.GemFireHandler;
-import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.message.GemFireParameterizedMessageFactory;
+import java.util.logging.Handler;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -30,12 +24,19 @@ import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.spi.AbstractLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
-import java.util.logging.Handler;
+import org.apache.geode.LogWriter;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.logging.GemFireHandler;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.message.GemFireParameterizedMessageFactory;
/**
* Implements GemFireLogger with custom levels while also bridging LogWriter and LogWriterI18n to
* Log4J.
- *
+ *
*/
@SuppressWarnings("unused")
public class LogWriterLogger extends FastLogger implements InternalLogWriter, GemFireLogger {
@@ -62,7 +63,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Returns a custom Logger with the specified name and null connectionName.
- *
+ *
* @param name The this.logger name. If null the name of the calling class will be used.
* @param isSecure True if creating a Logger for security logging.
* @return The custom Logger.
@@ -73,7 +74,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Returns a custom Logger with the specified name.
- *
+ *
* @param name The this.logger name. If null the name of the calling class will be used.
* @param connectionName The member name (also known as connection name)
* @param isSecure True if creating a Logger for security logging.
@@ -110,7 +111,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -120,7 +121,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -131,7 +132,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -142,7 +143,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -153,7 +154,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -163,7 +164,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -176,7 +177,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -187,7 +188,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.TRACE} level.
- *
+ *
* @param msg the message string to be logged
*/
public void finest(final Message msg) {
@@ -196,7 +197,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.TRACE} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -206,7 +207,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param message the message object to log.
*/
public void finest(final Object message) {
@@ -216,7 +217,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -226,7 +227,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -236,7 +237,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.TRACE} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -248,7 +249,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -259,7 +260,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -269,7 +270,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -280,7 +281,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -291,7 +292,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -302,7 +303,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -312,7 +313,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.TRACE} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -325,7 +326,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -336,7 +337,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.TRACE} level.
- *
+ *
* @param msg the message string to be logged
*/
public void finer(final Message msg) {
@@ -345,7 +346,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.TRACE} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -355,7 +356,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param message the message object to log.
*/
public void finer(final Object message) {
@@ -365,7 +366,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -375,7 +376,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.TRACE} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -385,7 +386,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.TRACE} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -397,7 +398,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.TRACE} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -408,7 +409,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.DEBUG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -418,7 +419,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.DEBUG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -429,7 +430,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.DEBUG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -440,7 +441,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.DEBUG} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -451,7 +452,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.DEBUG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -461,7 +462,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.DEBUG} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -474,7 +475,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.DEBUG} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -485,7 +486,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.DEBUG} level.
- *
+ *
* @param msg the message string to be logged
*/
public void fine(final Message msg) {
@@ -494,7 +495,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.DEBUG} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -504,7 +505,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.DEBUG} level.
- *
+ *
* @param message the message object to log.
*/
public void fine(final Object message) {
@@ -514,7 +515,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.DEBUG} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -524,7 +525,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.DEBUG} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -534,7 +535,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.DEBUG} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -546,7 +547,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.DEBUG} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -557,7 +558,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -567,7 +568,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -578,7 +579,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -589,7 +590,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -600,7 +601,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -610,7 +611,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -623,7 +624,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -634,7 +635,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.INFO} level.
- *
+ *
* @param msg the message string to be logged
*/
public void config(final Message msg) {
@@ -643,7 +644,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.INFO} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -653,7 +654,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param message the message object to log.
*/
public void config(final Object message) {
@@ -663,7 +664,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -673,7 +674,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -683,7 +684,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.INFO} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -695,7 +696,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -706,7 +707,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -717,7 +718,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -729,7 +730,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -741,7 +742,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -753,7 +754,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -764,7 +765,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.INFO} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -778,7 +779,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -790,7 +791,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.INFO} level.
- *
+ *
* @param msg the message string to be logged
*/
@Override
@@ -800,7 +801,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.INFO} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -811,7 +812,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -822,7 +823,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -833,7 +834,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.INFO} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -843,7 +844,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.INFO} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -856,7 +857,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.INFO} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -867,7 +868,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.WARN} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -877,7 +878,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.WARN} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -888,7 +889,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.WARN} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -899,7 +900,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.WARN} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -910,7 +911,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.WARN} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -920,7 +921,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.WARN} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -933,7 +934,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.WARN} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -944,7 +945,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.WARN} level.
- *
+ *
* @param msg the message string to be logged
*/
public void warning(final Message msg) {
@@ -953,7 +954,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.WARN} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -963,7 +964,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.WARN} level.
- *
+ *
* @param message the message object to log.
*/
public void warning(final Object message) {
@@ -973,7 +974,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.WARN} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -983,7 +984,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.WARN} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -993,7 +994,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.WARN} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -1005,7 +1006,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.WARN} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -1016,7 +1017,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.WARN} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -1027,7 +1028,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.ERROR} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -1039,7 +1040,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.ERROR} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -1051,7 +1052,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.ERROR} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -1063,7 +1064,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.ERROR} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -1074,7 +1075,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.ERROR} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -1088,7 +1089,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.ERROR} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -1100,7 +1101,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.ERROR} level.
- *
+ *
* @param msg the message string to be logged
*/
@Override
@@ -1110,7 +1111,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.ERROR} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -1121,7 +1122,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.ERROR} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -1132,7 +1133,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.ERROR} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -1143,7 +1144,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.ERROR} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -1153,7 +1154,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.ERROR} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -1166,7 +1167,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.ERROR} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -1177,7 +1178,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.FATAL} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
*/
@@ -1187,7 +1188,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with the specific Marker at the {@code Level.FATAL} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param msg the message string to be logged
* @param t A Throwable or null.
@@ -1198,7 +1199,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.FATAL} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -1209,7 +1210,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.FATAL} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -1220,7 +1221,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.FATAL} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message object to log.
*/
@@ -1230,7 +1231,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.FATAL} level.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
@@ -1243,7 +1244,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.FATAL} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param marker the marker data specific to this log statement
* @param message the message to log.
* @param t the exception to log, including its stack trace.
@@ -1254,7 +1255,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.FATAL} level.
- *
+ *
* @param msg the message string to be logged
*/
public void severe(final Message msg) {
@@ -1263,7 +1264,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs the specified Message at the {@code Level.FATAL} level.
- *
+ *
* @param msg the message string to be logged
* @param t A Throwable or null.
*/
@@ -1273,7 +1274,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.FATAL} level.
- *
+ *
* @param message the message object to log.
*/
public void severe(final Object message) {
@@ -1283,7 +1284,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.FATAL} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack trace.
*/
@@ -1293,7 +1294,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message object with the {@code Level.FATAL} level.
- *
+ *
* @param message the message object to log.
*/
@Override
@@ -1303,7 +1304,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message with parameters at the {@code Level.FATAL} level.
- *
+ *
* @param message the message to log; the format depends on the message factory.
* @param params parameters to the message.
* @see #getMessageFactory()
@@ -1315,7 +1316,7 @@ public class LogWriterLogger extends FastLogger implements InternalLogWriter, Ge
/**
* Logs a message at the {@code Level.FATAL} level including the stack trace of the
* {@link Throwable} {@code t} passed as parameter.
- *
+ *
* @param message the message to log.
* @param t the exception to log, including its stack
* trace.LogService.getLogWriterLogger().enter()
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessage.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessage.java
index de535fe..d07cb24 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessage.java
@@ -85,7 +85,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Creates a parameterized message.
- *
+ *
* @param messagePattern The message "format" string. This will be a String containing "{}"
* placeholders where parameters should be substituted.
* @param stringArgs The arguments for substitution.
@@ -100,7 +100,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Creates a parameterized message.
- *
+ *
* @param messagePattern The message "format" string. This will be a String containing "{}"
* placeholders where parameters should be substituted.
* @param objectArgs The arguments for substitution.
@@ -133,7 +133,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Constructor with a pattern and a single parameter.
- *
+ *
* @param messagePattern The message pattern.
* @param arg The parameter.
*/
@@ -143,7 +143,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Constructor with a pattern and two parameters.
- *
+ *
* @param messagePattern The message pattern.
* @param arg1 The first parameter.
* @param arg2 The second parameter.
@@ -183,7 +183,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Returns the formatted message.
- *
+ *
* @return the formatted message.
*/
@Override
@@ -196,7 +196,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Returns the message pattern.
- *
+ *
* @return the message pattern.
*/
@Override
@@ -206,7 +206,7 @@ public class GemFireParameterizedMessage implements Message {
/**
* Returns the message parameters.
- *
+ *
* @return the message parameters.
*/
@Override
@@ -377,7 +377,7 @@ public class GemFireParameterizedMessage implements Message {
* This means, in effect, that logging would produce a usable output even if an ordinary
* System.out.println(o) would produce a relatively hard-to-debug StackOverflowError.
* </p>
- *
+ *
* @param o The object.
* @return The String representation.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
index f0d40f2..8ccb42b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
@@ -44,7 +44,7 @@ public class GemFireParameterizedMessageFactory extends AbstractMessageFactory {
/**
* Creates {@link ParameterizedMessage} instances.
- *
+ *
* @param message The message pattern.
* @param params The message parameters.
* @return The Message.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/Command.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/Command.java
index f5e83e8..94c2fad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/Command.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/Command.java
@@ -434,7 +434,7 @@ public enum Command {
/**
* Returns a command processor to process the given {@link #Command}
- *
+ *
* @return a command processor
*/
public abstract CommandProcessor getCommandProcessor();
@@ -520,7 +520,7 @@ public enum Command {
}
}
- static public String byteToHex(byte b) {
+ public static String byteToHex(byte b) {
// Returns hex String representation of byte b
char hexDigit[] =
{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
index 3f0ed4f..2aeb9d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
@@ -22,13 +22,13 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* All memcached commands specified by {@link Command} implement this interface to process a command
* from the client.
- *
+ *
*
*/
public interface CommandProcessor {
/**
- *
+ *
* @param reader
* @param protocol
* @param cache
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/ConnectionHandler.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/ConnectionHandler.java
index 6bdc598..fb580e3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/ConnectionHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/ConnectionHandler.java
@@ -29,8 +29,8 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
* One instance of ConnectionHandle is created for each client that connects to
* {@link GemFireMemcachedServer} and is responsible for reading requests and sending responses to
* this client.
- *
- *
+ *
+ *
*
*/
public class ConnectionHandler implements Runnable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/KeyWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/KeyWrapper.java
index 0f7ee77..1423643 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/KeyWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/KeyWrapper.java
@@ -26,7 +26,7 @@ import org.apache.geode.DataSerializer;
* Since byte[] cannot be used as keys in a Region/Map, instances of this class are used. Instances
* of this class encapsulate byte[] keys and override equals and hashCode to base them on contents
* on byte[].
- *
+ *
*/
public class KeyWrapper implements DataSerializable {
@@ -45,7 +45,7 @@ public class KeyWrapper implements DataSerializable {
/**
* This method should be used to obtain instances of KeyWrapper.
- *
+ *
* @param key the key to wrap
* @return an instance of KeyWrapper that can be used as a key in Region/Map
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/Reply.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/Reply.java
index a655396..e33ceec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/Reply.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/Reply.java
@@ -113,4 +113,3 @@ public enum Reply {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/RequestReader.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/RequestReader.java
index d95716f..59fd8ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/RequestReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/RequestReader.java
@@ -31,7 +31,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* Reads the first line from the request and interprets the {@link Command} from the memcached
* client
- *
+ *
*
*/
public class RequestReader {
@@ -215,7 +215,7 @@ public class RequestReader {
/**
* Returns an initialized byteBuffer for sending the reply
- *
+ *
* @param size size of ByteBuffer
* @return the initialized response buffer
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/ResponseStatus.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/ResponseStatus.java
index 8ee81af..08dd2e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/ResponseStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/ResponseStatus.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.memcached;
/**
* encapsulate ResponseOpCodes for binary reply messages.
- *
+ *
*/
public enum ResponseStatus {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/ValueWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/ValueWrapper.java
index 0752544..f8d9049 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/ValueWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/ValueWrapper.java
@@ -26,7 +26,7 @@ import org.apache.geode.DataSerializer;
* For CAS operation, we have to store a unique long with all the values being stored. This class
* encapsulates the version and the value. Instances of this class can be obtained by using
* {@link #getWrappedValue(byte[], int)}
- *
+ *
*
*/
public class ValueWrapper implements DataSerializable {
@@ -64,7 +64,7 @@ public class ValueWrapper implements DataSerializable {
/**
* This method should be used to obtain instances of ValueWrapper.
- *
+ *
* @param value the value to be wrapped
* @param flags the flags sent by the client
* @return an instance of ValueWrapper that includes a version along with the given value.
@@ -77,7 +77,7 @@ public class ValueWrapper implements DataSerializable {
* For binary protocol we always have to compare the cas version. To avoid turning each put into a
* get and replace, use ValueWrapper instances from this method which only uses cas version. note
* that equals and hashCode of this class have also been changed to only use the cas version.
- *
+ *
* @param cas
* @return an instance with null value
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AbstractCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AbstractCommand.java
index ebe772a..65c6d18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AbstractCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AbstractCommand.java
@@ -32,13 +32,13 @@ import org.apache.geode.internal.memcached.CommandProcessor;
import org.apache.geode.internal.memcached.KeyWrapper;
import org.apache.geode.internal.memcached.RequestReader;
import org.apache.geode.internal.memcached.ResponseStatus;
+import org.apache.geode.internal.memcached.ValueWrapper;
import org.apache.geode.memcached.GemFireMemcachedServer;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
-import org.apache.geode.internal.memcached.ValueWrapper;
/**
* Abstract class with utility methods for all Command classes.
- *
+ *
*
*/
public abstract class AbstractCommand implements CommandProcessor {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddCommand.java
index f745638..084a45a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddCommand.java
@@ -26,9 +26,9 @@ import org.apache.geode.internal.memcached.ValueWrapper;
/**
* general format of the command is: <command name> <key> <flags> <exptime> <bytes> [noreply]\r\n
- *
+ *
* "add" means "store this data, but only if the server *doesn't* already hold data for this key".
- *
+ *
*/
public class AddCommand extends StorageCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddQCommand.java
index df323cb..1bcb9c4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AddQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*
*/
public class AddQCommand extends AddCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendCommand.java
index 2275bf3..958374e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendCommand.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.memcached.ValueWrapper;
/**
* "append" means "add this data to an existing key after existing data".
- *
+ *
*
*/
public class AppendCommand extends StorageCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendQCommand.java
index 7151f17..f3077c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/AppendQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class AppendQCommand extends AppendCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/CASCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/CASCommand.java
index 60c56b9..ae72721 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/CASCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/CASCommand.java
@@ -27,7 +27,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* "cas" is a check and set operation which means "store this data but only if no one else has
* updated since I last fetched it."
- *
+ *
*
*/
public class CASCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ClientError.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ClientError.java
index d1ceb53..7a8543d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ClientError.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ClientError.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.memcached.commands;
/**
* thrown when there is some sort of error in input line when this exception is thrown "CLIENT_ERROR
* <error>\r\n" is sent to the client
- *
+ *
*/
public class ClientError extends RuntimeException {
private static final long serialVersionUID = -2426928000696680541L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java
index bc18fba..d6f9889 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java
@@ -30,14 +30,14 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* decr <key> <value> [noreply]\r\n
- *
+ *
* value is the amount by which the client wants to increase/decrease the item. It is a decimal
* representation of a 64-bit unsigned integer.
- *
+ *
* The data for the item is treated as decimal representation of a 64-bit unsigned integer. Also,
* the item must already exist for incr/decr to work; these commands won't pretend that a
* non-existent key exists with value 0; instead, they will fail.
- *
+ *
*
*/
public class DecrementCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementQCommand.java
index e05c957..1f1ce4f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class DecrementQCommand extends DecrementCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteCommand.java
index 4e59de3..c142ffe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteCommand.java
@@ -29,7 +29,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* The command "delete" allows for explicit deletion of items: delete <key> [noreply]\r\n
- *
+ *
*
*/
public class DeleteCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteQCommand.java
index 0b467c5..e171688 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DeleteQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class DeleteQCommand extends DeleteCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/FlushAllQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/FlushAllQCommand.java
index 9086906..910a9dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/FlushAllQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/FlushAllQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class FlushAllQCommand extends FlushAllCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATCommand.java
index 8c2ec18..350f2a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class GATCommand extends TouchCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATQCommand.java
index 801c0b2..2497898 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GATQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class GATQCommand extends GATCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetCommand.java
index 1929eb8..372818c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetCommand.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.memcached.ValueWrapper;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
- *
+ *
* The retrieval commands "get" and "gets" operates like this:<br/>
* <code>
* get <key>*\r\n<br/>
@@ -44,7 +44,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
* VALUE <key> <flags> <bytes> [<cas unique>]\r\n<br/>
* <data block>\r\n
* </code>
- *
+ *
*
*/
public class GetCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKCommand.java
index 69862a2..3f16bda 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class GetKCommand extends GetCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKQCommand.java
index cc72a98..1d96333 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetKQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*
*/
public class GetKQCommand extends GetKCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetQCommand.java
index d50ec6c..0a7fa2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/GetQCommand.java
@@ -24,7 +24,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* Does not send a response on a cache miss.
- *
+ *
*/
public class GetQCommand extends GetCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java
index 4df597e..e9f1597 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java
@@ -33,11 +33,11 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
* </code><br/>
* value is the amount by which the client wants to increase/decrease the item. It is a decimal
* representation of a 64-bit unsigned integer.
- *
+ *
* The data for the item is treated as decimal representation of a 64-bit unsigned integer. Also,
* the item must already exist for incr/decr to work; these commands won't pretend that a
* non-existent key exists with value 0; instead, they will fail.
- *
+ *
*
*/
public class IncrementCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementQCommand.java
index 8ff358b..e66deed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class IncrementQCommand extends IncrementCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NoOpCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NoOpCommand.java
index 36e8220..5ebe03f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NoOpCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NoOpCommand.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.memcached.RequestReader;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
- *
+ *
*/
public class NoOpCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NotSupportedCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NotSupportedCommand.java
index 1362d80..d192b38 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NotSupportedCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/NotSupportedCommand.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.memcached.ResponseStatus;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
- *
+ *
*/
public class NotSupportedCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependCommand.java
index cd97235..5470ff3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependCommand.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.memcached.ValueWrapper;
/**
* "prepend" means "add this data to an existing key before existing data".
- *
+ *
*
*/
public class PrependCommand extends StorageCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependQCommand.java
index e69e42c..baa93b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/PrependQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class PrependQCommand extends PrependCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitCommand.java
index d9129d2..3029a66 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitCommand.java
@@ -23,13 +23,13 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* This command is currently no-op
- *
+ *
* "quit" is a command with no arguments: quit\r\n<br/>
* <br/>
- *
+ *
* Upon receiving this command, the server closes the connection. However, the client may also
* simply close the connection when it no longer needs it, without issuing this command.
- *
+ *
*
*/
public class QuitCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitQCommand.java
index 0ba6002..c71409b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/QuitQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class QuitQCommand extends QuitCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceCommand.java
index 2adaf3b..cadcb3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceCommand.java
@@ -28,9 +28,9 @@ import org.apache.geode.internal.memcached.ValueWrapper;
* <code>
* <command name> <key> <flags> <exptime> <bytes> [noreply]\r\n
* </code><br/>
- *
+ *
* "replace" means "store this data, but only if the server *does* already hold data for this key".
- *
+ *
*/
public class ReplaceCommand extends StorageCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceQCommand.java
index 82f8fe8..f4a71b8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/ReplaceQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*/
public class ReplaceQCommand extends ReplaceCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetCommand.java
index 93db1fc..448d921 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetCommand.java
@@ -27,9 +27,9 @@ import org.apache.geode.internal.memcached.ValueWrapper;
* general format of the command is: <code>
* <command name> <key> <flags> <exptime> <bytes> [noreply]\r\n
* </code><br/>
- *
+ *
* "set" means "store this data".
- *
+ *
*
*/
public class SetCommand extends StorageCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetQCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetQCommand.java
index 43d5ac7..ae491ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetQCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/SetQCommand.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.memcached.commands;
/**
- *
+ *
*
*/
public class SetQCommand extends SetCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StatsCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StatsCommand.java
index fc96bbb..092aaa6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StatsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StatsCommand.java
@@ -23,12 +23,12 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* This command is currently no-op.<br/>
- *
+ *
* The command "stats" is used to query the server about statistics it maintains and other internal
* data. It has two forms. Without arguments:
- *
+ *
* stats\r\n it causes the server to output general-purpose statistics
- *
+ *
*
*/
public class StatsCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StorageCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StorageCommand.java
index 63eee53..a7ea9c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StorageCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/StorageCommand.java
@@ -41,7 +41,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
* <code>
* <data block>\r\n
* </code>
- *
+ *
*/
public abstract class StorageCommand extends AbstractCommand {
@@ -146,7 +146,7 @@ public abstract class StorageCommand extends AbstractCommand {
* starting from current time. In the latter case, this number of seconds may not exceed
* 60*60*24*30 (number of seconds in 30 days); if the number sent by a client is larger than that,
* the server will consider it to be real Unix time value rather than an offset from current time.
- *
+ *
* @param key
* @param p_expTime
* @param cache
@@ -178,7 +178,7 @@ public abstract class StorageCommand extends AbstractCommand {
/**
* reschedules expiration for a key only if one was previously scheduled
- *
+ *
* @param key
* @param newExpTime
* @return true if successfully rescheduled, false otherwise
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/TouchCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/TouchCommand.java
index dbdff77..5f6e6cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/TouchCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/TouchCommand.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.memcached.ValueWrapper;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
- *
+ *
*/
public class TouchCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VerbosityCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VerbosityCommand.java
index 2dec53c..3a79e77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VerbosityCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VerbosityCommand.java
@@ -23,12 +23,12 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* This command is currently no-op
- *
+ *
* "verbosity" is a command with a numeric argument. It always succeeds, and the server sends
* "OK\r\n" in response (unless "noreply" is given as the last parameter). Its effect is to set the
* verbosity level of the logging output.
- *
- *
+ *
+ *
*
*/
public class VerbosityCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VersionCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VersionCommand.java
index 148ea9b..87fffa2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VersionCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/VersionCommand.java
@@ -23,7 +23,7 @@ import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
/**
* Sends current version of gemcached server to the client
- *
+ *
*
*/
public class VersionCommand extends AbstractCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/modules/util/RegionConfiguration.java b/geode-core/src/main/java/org/apache/geode/internal/modules/util/RegionConfiguration.java
index 5156b19..c1976e7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/modules/util/RegionConfiguration.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/modules/util/RegionConfiguration.java
@@ -87,7 +87,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Sets the name of the <code>Region</code> to be created
- *
+ *
* @param regionName The name of the <code>Region</code> to be created
*/
public void setRegionName(String regionName) {
@@ -96,7 +96,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Returns the name of the <code>Region</code> to be created
- *
+ *
* @return the name of the <code>Region</code> to be created
*/
public String getRegionName() {
@@ -105,7 +105,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Sets the id of the <code>RegionAttributes</code> to be used
- *
+ *
* @param regionAttributesId The id of the <code>RegionAttributes</code> to be used
*/
public void setRegionAttributesId(String regionAttributesId) {
@@ -114,7 +114,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Returns the id of the <code>RegionAttributes</code> to be used
- *
+ *
* @return the id of the <code>RegionAttributes</code> to be used
*/
public String getRegionAttributesId() {
@@ -123,7 +123,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Sets the maximum time interval in seconds before entries are expired
- *
+ *
* @param maxInactiveInterval The maximum time interval in seconds before entries are expired
*/
public void setMaxInactiveInterval(int maxInactiveInterval) {
@@ -132,7 +132,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Returns the maximum time interval in seconds entries are expired
- *
+ *
* @return the maximum time interval in seconds before entries are expired
*/
public int getMaxInactiveInterval() {
@@ -141,7 +141,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Sets the <code>CustomExpiry</code> to be used
- *
+ *
* @param customExpiry The <code>CustomExpiry</code> to be used
*/
public void setCustomExpiry(CustomExpiry customExpiry) {
@@ -150,7 +150,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Returns the <code>CustomExpiry</code> to be used
- *
+ *
* @return the <code>CustomExpiry</code> to be used
*/
public CustomExpiry getCustomExpiry() {
@@ -159,7 +159,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Enables/disables delta replication across a <code>Gateway</code>.
- *
+ *
* @param enableGatewayDeltaReplication true to enable, false to disable gateway delta
* replication.
*/
@@ -178,7 +178,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Enables/disables replication across a <code>Gateway</code>.
- *
+ *
* @param enableGatewayReplication true to enable, false to disable gateway replication.
*/
public void setEnableGatewayReplication(boolean enableGatewayReplication) {
@@ -196,7 +196,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Enables/disables a debug <code>CacheListener</code>.
- *
+ *
* @param enableDebugListener true to enable, false to disable debug <code>CacheListener</code>.
*/
public void setEnableDebugListener(boolean enableDebugListener) {
@@ -205,7 +205,7 @@ public class RegionConfiguration implements DataSerializable {
/**
* Returns whether a debug <code>CacheListener</code> is enabled.
- *
+ *
* @return whether a debug <code>CacheListener</code> is enabled
*/
public boolean getEnableDebugListener() {
@@ -259,7 +259,7 @@ public class RegionConfiguration implements DataSerializable {
* set the fully qualified name of the {@link CacheWriter} to be created on the server. The
* cacheWriter must have a zero arg constructor, and must be present on the classpath on the
* server.
- *
+ *
* @param cacheWriterName fully qualified class name of the cacheWriter
*/
public void setCacheWriterName(String cacheWriterName) {
@@ -270,4 +270,3 @@ public class RegionConfiguration implements DataSerializable {
return cacheWriterName;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
index 00ccb74..79aafb2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
@@ -43,7 +43,7 @@ public class SSLConfigurationFactory {
private SSLConfigurationFactory() {}
- private synchronized static SSLConfigurationFactory getInstance() {
+ private static synchronized SSLConfigurationFactory getInstance() {
if (instance == null) {
instance = new SSLConfigurationFactory();
}
@@ -197,7 +197,7 @@ public class SSLConfigurationFactory {
/**
* Configure a sslConfig for the cluster using the legacy configuration
- *
+ *
* @return A sslConfig object describing the ssl config for the server component
* @deprecated as of Geode 1.0
*/
@@ -218,7 +218,7 @@ public class SSLConfigurationFactory {
/**
* Configure a sslConfig for the server using the legacy configuration
- *
+ *
* @return A sslConfig object describing the ssl config for the server component
* @deprecated as of Geode 1.0
*/
@@ -239,7 +239,7 @@ public class SSLConfigurationFactory {
/**
* Configure a sslConfig for the jmx using the legacy configuration
- *
+ *
* @return A sslConfig object describing the ssl config for the jmx component
* @deprecated as of Geode 1.0
*/
@@ -260,7 +260,7 @@ public class SSLConfigurationFactory {
/**
* Configure a sslConfig for the gateway using the legacy configuration
- *
+ *
* @return A sslConfig object describing the ssl config for the gateway component
* @deprecated as of Geode 1.0
*/
@@ -280,7 +280,7 @@ public class SSLConfigurationFactory {
/**
* Configure a sslConfig for the http service using the legacy configuration
- *
+ *
* @return A sslConfig object describing the ssl config for the http service component
* @deprecated as of Geode 1.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
index 0a9a903..55d1e09 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
@@ -14,11 +14,6 @@
*/
package org.apache.geode.internal.net;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.LoggingThreadGroup;
-import org.apache.logging.log4j.Logger;
-
import java.io.IOException;
import java.net.Socket;
import java.util.concurrent.ConcurrentHashMap;
@@ -32,6 +27,12 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.LoggingThreadGroup;
+
/**
* This class allows sockets to be closed without blocking. In some cases we have seen a call of
* socket.close block for minutes. This class maintains a thread pool for every other member we have
@@ -183,7 +184,7 @@ public class SocketCloser {
* 33665). Depending on how the SocketCloser is configured (see ASYNC_CLOSE_WAIT_MILLISECONDS)
* this method may block for a certain amount of time. If it is called after the SocketCloser is
* closed then a normal synchronous close is done.
- *
+ *
* @param socket the socket to close
* @param address identifies who the socket is connected to
* @param extra an optional Runnable with stuff to execute in the async thread
@@ -245,7 +246,7 @@ public class SocketCloser {
/**
* Closes the specified socket
- *
+ *
* @param sock the socket to close
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index 47fd766..b9efeae 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -1301,4 +1301,3 @@ public class SocketCreator {
}
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreatorFactory.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreatorFactory.java
index d465214..f2c05b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreatorFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreatorFactory.java
@@ -52,14 +52,14 @@ public class SocketCreatorFactory {
return distributionConfig;
}
- private synchronized static SocketCreatorFactory getInstance(boolean closing) {
+ private static synchronized SocketCreatorFactory getInstance(boolean closing) {
if (instance == null && !closing) {
instance = new SocketCreatorFactory();
}
return instance;
}
- private synchronized static SocketCreatorFactory getInstance() {
+ private static synchronized SocketCreatorFactory getInstance() {
return getInstance(false);
}
@@ -126,7 +126,7 @@ public class SocketCreatorFactory {
/**
* This a legacy SocketCreator initializer.
- *
+ *
* @param useSSL
* @param needClientAuth
* @param protocols
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketUtils.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketUtils.java
index 8b0a2e4..9f97759 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketUtils.java
@@ -22,7 +22,7 @@ import java.net.Socket;
/**
* The SocketUtils class is utility class for performing operations on Sockets and ServerSockets.
* <p/>
- *
+ *
* @see java.net.ServerSocket
* @see java.net.Socket
* @since GemFire 7.0
@@ -33,7 +33,7 @@ public abstract class SocketUtils {
* Closes the specified Socket silently ignoring any IOException, guarding against null Object
* references.
* <p/>
- *
+ *
* @param socket the Socket to close.
* @return boolean value indicating whether the Socket was successfully closed. If the Socket
* Object reference is null, then this method will return true.
@@ -55,7 +55,7 @@ public abstract class SocketUtils {
* Closes the specified ServerSocket silently ignoring any IOException, guarding against null
* Object references.
* <p/>
- *
+ *
* @param serverSocket the ServerSocket to close.
* @return boolean value indicating whether the ServerSocket was successfully closed. If the
* ServerSocket Object reference is null, then this method will return true.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/AddressableMemoryManager.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/AddressableMemoryManager.java
index 98ff4af..91aefd5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/AddressableMemoryManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/AddressableMemoryManager.java
@@ -233,7 +233,7 @@ public class AddressableMemoryManager {
/**
* Create a direct byte buffer given its address and size. The returned ByteBuffer will be direct
* and use the memory at the given address.
- *
+ *
* @return the created direct byte buffer or null if it could not be created.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
index cd4814b..a6f3e02 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
@@ -34,7 +34,7 @@ import org.apache.geode.pdx.internal.PdxType;
/**
* Determines the data type of the bytes in an off-heap MemoryBlock. This is used by the tests for
* inspection of the off-heap memory.
- *
+ *
* @since Geode 1.0
*/
public class DataType implements DSCODE {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/Fragment.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/Fragment.java
index d134335..f156baf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/Fragment.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/Fragment.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
* always from the front so the free memory is always at the end. The freeIdx keeps track of the
* first byte of free memory in the fragment. The base memory address and the total size of a
* fragment never change. During defragmentation fragments go away and are recreated.
- *
+ *
*
*/
public class Fragment implements MemoryBlock {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
index ad9fa09..d964166 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
@@ -14,11 +14,6 @@
*/
package org.apache.geode.internal.offheap;
-import org.apache.geode.OutOfOffHeapMemoryException;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
import java.util.*;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -26,6 +21,12 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReferenceArray;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.OutOfOffHeapMemoryException;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LogService;
+
/**
* Manages the free lists and slabs for a MemoryAllocator
*/
@@ -39,7 +40,7 @@ public class FreeListManager {
private final Slab[] slabs;
private final long totalSlabSize;
- final private AtomicReferenceArray<OffHeapStoredObjectAddressStack> tinyFreeLists =
+ private final AtomicReferenceArray<OffHeapStoredObjectAddressStack> tinyFreeLists =
new AtomicReferenceArray<OffHeapStoredObjectAddressStack>(TINY_FREE_LIST_COUNT);
// hugeChunkSet is sorted by chunk size in ascending order. It will only contain chunks larger
// than MAX_TINY.
@@ -178,7 +179,7 @@ public class FreeListManager {
* It might be better not to include step 3 since we expect and freed chunk to be reallocated in
* the future. Maybe it would be better for 3 to look for adjacent free blocks that can be merged
* together. For now we will just try 1 and 2 and then report out of mem.
- *
+ *
* @param size minimum bytes the returned chunk must have.
* @return the allocated chunk
* @throws IllegalStateException if a chunk can not be allocated.
@@ -294,7 +295,7 @@ public class FreeListManager {
* not account for the additional internal fragmentation caused by the off-heap header which
* currently is always 8 bytes.
*/
- public final static int TINY_MULTIPLE =
+ public static final int TINY_MULTIPLE =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_ALIGNMENT", 8);
static {
verifyOffHeapAlignment(TINY_MULTIPLE);
@@ -302,7 +303,7 @@ public class FreeListManager {
/**
* Number of free lists to keep for tiny allocations.
*/
- public final static int TINY_FREE_LIST_COUNT =
+ public static final int TINY_FREE_LIST_COUNT =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_FREE_LIST_COUNT", 65536);
static {
verifyOffHeapFreeListCount(TINY_FREE_LIST_COUNT);
@@ -310,11 +311,11 @@ public class FreeListManager {
/**
* How many unused bytes are allowed in a huge memory allocation.
*/
- public final static int HUGE_MULTIPLE = 256;
+ public static final int HUGE_MULTIPLE = 256;
static {
verifyHugeMultiple(HUGE_MULTIPLE);
}
- public final static int MAX_TINY = TINY_MULTIPLE * TINY_FREE_LIST_COUNT;
+ public static final int MAX_TINY = TINY_MULTIPLE * TINY_FREE_LIST_COUNT;
/**
* Return true if the two chunks have been combined into one. If low and high are adjacent to each
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
index 25216ea..b2b9ff5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
@@ -20,35 +20,35 @@ import java.util.concurrent.CopyOnWriteArrayList;
/**
* Used by tests to get notifications about the lifecycle of a MemoryAllocatorImpl.
- *
+ *
*/
public interface LifecycleListener {
/**
* Callback is invoked after creating a new MemoryAllocatorImpl.
- *
+ *
* Create occurs during the first initialization of an InternalDistributedSystem within the JVM.
- *
+ *
* @param allocator the instance that has just been created
*/
public void afterCreate(MemoryAllocatorImpl allocator);
/**
* Callback is invoked after reopening an existing MemoryAllocatorImpl for reuse.
- *
+ *
* Reuse occurs during any intialization of an InternalDistributedSystem after the first one was
* connected and then disconnected within the JVM.
- *
+ *
* @param allocator the instance that has just been reopened for reuse
*/
public void afterReuse(MemoryAllocatorImpl allocator);
/**
* Callback is invoked before closing the MemoryAllocatorImpl
- *
+ *
* Close occurs after the InternalDistributedSystem and DistributionManager have completely
* disconnected.
- *
+ *
* @param allocator the instance that is about to be closed
*/
public void beforeClose(MemoryAllocatorImpl allocator);
@@ -76,7 +76,7 @@ public interface LifecycleListener {
/**
* Removes a LifecycleListener. Does nothing if the instance has not been added.
- *
+ *
* @param listener the instance to remove
*/
public static void removeLifecycleListener(LifecycleListener listener) {
@@ -85,7 +85,7 @@ public interface LifecycleListener {
/**
* Adds a LifecycleListener.
- *
+ *
* @param listener the instance to add
*/
public static void addLifecycleListener(LifecycleListener listener) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
index 80189a4..db57629 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.offheap;
/**
* Basic contract for a heap that manages off heap memory. Any MemoryChunks allocated from a heap
* are returned to that heap when freed.
- *
+ *
* @since Geode 1.0
*/
public interface MemoryAllocator {
@@ -31,7 +31,7 @@ public interface MemoryAllocator {
/**
* Allocates off heap memory for the given data and returns a StoredObject that is backed by this
* allocated memory and that contains the data.
- *
+ *
* @param data the bytes of the data to put in the allocated StoredObject
* @param isSerialized true if data contains a serialized object; false if it is an actual byte
* array.
@@ -44,7 +44,7 @@ public interface MemoryAllocator {
/**
* Allocates off heap memory for the given data and returns a StoredObject that is backed by this
* allocated memory and that contains the data and keeps a reference to the original heap data.
- *
+ *
* @param data the bytes of the data to put in the allocated StoredObject
* @param isSerialized true if data contains a serialized object; false if it is an actual byte
* array.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
index 36113b5..b87e8dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
* size. If no close fits exist then it allocates the next slice from the front of one the original
* large chunks. If we can not find enough free memory then all the existing free memory is
* defragmented. If we still do not have enough to make the allocation an exception is thrown.
- *
+ *
* @since Geode 1.0
*/
public class MemoryAllocatorImpl implements MemoryAllocator {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
index 904cfe0..2fba809 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
@@ -18,7 +18,7 @@ package org.apache.geode.internal.offheap;
/**
* Basic size and usage information about an off-heap memory block under inspection. For test
* validation only.
- *
+ *
* @since Geode 1.0
*/
public interface MemoryBlock {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
index 0e3bee3..73ee007 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
@@ -18,7 +18,7 @@ import java.util.List;
/**
* Provides for inspection of meta-data for off-heap memory blocks.
- *
+ *
* @since Geode 1.0
*/
public interface MemoryInspector {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
index 18d1dc8..1e9b438 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.offheap;
/**
* Defines callback for notification when off-heap memory usage changes.
- *
+ *
* @since Geode 1.0
*/
public interface MemoryUsageListener {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapHelper.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapHelper.java
index 3789d4d..79248c3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapHelper.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
/**
* Utility class that provides static method to do some common tasks for off-heap references.
- *
+ *
* @since Geode 1.0
*/
public class OffHeapHelper {
@@ -42,7 +42,7 @@ public class OffHeapHelper {
/**
* Just like {@link #copyIfNeeded(Object)} except that if off-heap is copied it is also released.
- *
+ *
* @param v If this value is off-heap then the caller must have already retained it.
* @return the heap copy to use in place of v
*/
@@ -71,7 +71,7 @@ public class OffHeapHelper {
* serialized off-heap object it will be copied to the heap as a CachedDeserializable. If you
* prefer to have the serialized object also deserialized and copied to the heap use
* {@link #getHeapForm(Object)}.
- *
+ *
* @param v possible OFF_HEAP_REFERENCE
* @return v or a heap copy of v
*/
@@ -103,7 +103,7 @@ public class OffHeapHelper {
/**
* Just like {@link #release(Object)} but also disable debug tracking of the release.
- *
+ *
* @return true if release was done
*/
public static boolean releaseWithNoTracking(@Released Object o) {
@@ -124,7 +124,7 @@ public class OffHeapHelper {
/**
* Just like {@link #release(Object)} but also set the owner for debug tracking of the release.
- *
+ *
* @return true if release was done
*/
public static boolean releaseAndTrackOwner(@Released final Object o, final Object owner) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
index cf80639..a8da697 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
@@ -18,7 +18,7 @@ import org.apache.geode.Statistics;
/**
* Statistics for off-heap memory storage.
- *
+ *
* @since Geode 1.0
*/
public interface OffHeapMemoryStats {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java
index 39a569a..b913aea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelper.java
@@ -16,12 +16,12 @@ package org.apache.geode.internal.offheap;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.entries.DiskEntry;
+import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
@@ -30,7 +30,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
* The class just has static methods that operate on instances of {@link OffHeapRegionEntry}. It
* allows common code to be shared for all the classes we have that implement
* {@link OffHeapRegionEntry}.
- *
+ *
* @since Geode 1.0
*/
public class OffHeapRegionEntryHelper {
@@ -77,7 +77,7 @@ public class OffHeapRegionEntryHelper {
/**
* This method may release the object stored at ohAddress if the result needs to be decompressed
* and the decompress parameter is true. This decompressed result will be on the heap.
- *
+ *
* @param ohAddress OFF_HEAP_ADDRESS
* @param decompress true if off-heap value should be decompressed before returning
* @param context used for decompression
@@ -287,7 +287,7 @@ public class OffHeapRegionEntryHelper {
/**
* Returns the bytes encoded in the given address. Note that compressed addresses are not
* supported by this method.
- *
+ *
* @throws UnsupportedOperationException if the address has compressed data
*/
static byte[] decodeUncompressedAddressToBytes(long addr) {
@@ -367,7 +367,7 @@ public class OffHeapRegionEntryHelper {
* value returned is 're' decompressed into another off-heap location, then 're' will be
* Unretained but the new, decompressed value will be Retained. Therefore, whichever is returned
* (the value at the address in 're' or the decompressed value) it will have been Retained.
- *
+ *
* @return possible OFF_HEAP_OBJECT (caller must release)
*/
@Retained
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java
index b2bdd38..e9044ba 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.offheap;
+import java.lang.reflect.Method;
+
import org.apache.geode.*;
import org.apache.geode.cache.CacheException;
import org.apache.geode.distributed.DistributedSystem;
@@ -22,14 +24,12 @@ import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
-
-import java.lang.reflect.Method;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* Enables off-heap storage by creating a MemoryAllocator.
- *
+ *
* @since Geode 1.0
*/
public class OffHeapStorage implements OffHeapMemoryStats {
@@ -179,7 +179,7 @@ public class OffHeapStorage implements OffHeapMemoryStats {
/**
* Constructs a MemoryAllocator for off-heap storage.
- *
+ *
* @return MemoryAllocator for off-heap storage
*/
public static MemoryAllocator createOffHeapStorage(StatisticsFactory sf, long offHeapMemorySize,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
index 4bb83c6..e370c58 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
@@ -48,16 +48,16 @@ public class OffHeapStoredObject extends AbstractStoredObject
* The useCount, chunkSize, dataSizeDelta, isSerialized, and isCompressed are all stored in
* addressable memory in a HEADER. This saves heap memory by using off heap.
*/
- public final static int HEADER_SIZE = 4 + 4;
+ public static final int HEADER_SIZE = 4 + 4;
/**
* We need to smallest chunk to at least have enough room for a hdr and for an off heap ref (which
* is a long).
*/
- public final static int MIN_CHUNK_SIZE = HEADER_SIZE + 8;
+ public static final int MIN_CHUNK_SIZE = HEADER_SIZE + 8;
/**
* int field. The number of bytes in this chunk.
*/
- private final static int CHUNK_SIZE_OFFSET = 0;
+ private static final int CHUNK_SIZE_OFFSET = 0;
/**
* Volatile int field The upper two bits are used for the isSerialized and isCompressed flags. The
* next three bits are unused. The lower 3 bits of the most significant byte contains a magic
@@ -67,21 +67,21 @@ public class OffHeapStoredObject extends AbstractStoredObject
* changes, we have dataSize be a delta whose max value would be HUGE_MULTIPLE-1. The lower two
* bytes contains the use count.
*/
- final static int REF_COUNT_OFFSET = 4;
+ static final int REF_COUNT_OFFSET = 4;
/**
* The upper two bits are used for the isSerialized and isCompressed flags.
*/
- final static int IS_SERIALIZED_BIT = 0x80000000;
- final static int IS_COMPRESSED_BIT = 0x40000000;
+ static final int IS_SERIALIZED_BIT = 0x80000000;
+ static final int IS_COMPRESSED_BIT = 0x40000000;
// UNUSED 0x38000000
- final static int MAGIC_MASK = 0x07000000;
- final static int MAGIC_NUMBER = 0x05000000;
- final static int DATA_SIZE_DELTA_MASK = 0x00ff0000;
- final static int DATA_SIZE_SHIFT = 16;
- final static int REF_COUNT_MASK = 0x0000ffff;
- final static int MAX_REF_COUNT = 0xFFFF;
- final static long FILL_PATTERN = 0x3c3c3c3c3c3c3c3cL;
- final static byte FILL_BYTE = 0x3c;
+ static final int MAGIC_MASK = 0x07000000;
+ static final int MAGIC_NUMBER = 0x05000000;
+ static final int DATA_SIZE_DELTA_MASK = 0x00ff0000;
+ static final int DATA_SIZE_SHIFT = 16;
+ static final int REF_COUNT_MASK = 0x0000ffff;
+ static final int MAX_REF_COUNT = 0xFFFF;
+ static final long FILL_PATTERN = 0x3c3c3c3c3c3c3c3cL;
+ static final byte FILL_BYTE = 0x3c;
protected OffHeapStoredObject(long memoryAddress, int chunkSize) {
MemoryAllocatorImpl.validateAddressAndSize(memoryAddress, chunkSize);
@@ -316,7 +316,7 @@ public class OffHeapStoredObject extends AbstractStoredObject
/**
* Returns an address that can be used with AddressableMemoryManager to access this object's data.
- *
+ *
* @param offset the offset from this chunk's first byte of the byte the returned address should
* point to. Must be >= 0.
* @param size the number of bytes that will be read using the returned address. Assertion will
@@ -423,7 +423,7 @@ public class OffHeapStoredObject extends AbstractStoredObject
/**
* This method should only be called on uncompressed objects
- *
+ *
* @return byte array of the StoredObject value.
*/
protected byte[] getRawBytes() {
@@ -511,7 +511,7 @@ public class OffHeapStoredObject extends AbstractStoredObject
/**
* Fills the chunk with a repeated byte fill pattern.
- *
+ *
* @param baseAddress the starting address for a {@link OffHeapStoredObject}.
*/
public static void fill(long baseAddress) {
@@ -524,7 +524,7 @@ public class OffHeapStoredObject extends AbstractStoredObject
/**
* Validates that the fill pattern for this chunk has not been disturbed. This method assumes the
* TINY_MULTIPLE is 8 bytes.
- *
+ *
* @throws IllegalStateException when the pattern has been violated.
*/
public void validateFill() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
index b64e44e..9604e70 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
@@ -18,17 +18,17 @@ import org.apache.geode.OutOfOffHeapMemoryException;
/**
* Listens to the MemoryAllocator for notification of OutOfOffHeapMemoryError.
- *
+ *
* The implementation created by OffHeapStorage for a real DistribytedSystem connection causes the
* System and Cache to close in order to avoid data inconsistency.
- *
+ *
* @since Geode 1.0
*/
public interface OutOfOffHeapMemoryListener {
/**
* Notification that an OutOfOffHeapMemoryError has occurred.
- *
+ *
* @param cause the actual OutOfOffHeapMemoryError that was thrown
*/
public void outOfOffHeapMemory(OutOfOffHeapMemoryException cause);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelper.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelper.java
index 2e54a1f..1e98cc52 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelper.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.offheap;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
* This class provides static methods to help debug off-heap reference count problems. To enable
* reference count tracking set: -Dgemfire.trackOffHeapRefCounts=true. To enable free operation
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelperImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelperImpl.java
index 45b22a7..88af4e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelperImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/ReferenceCountHelperImpl.java
@@ -34,8 +34,8 @@ class ReferenceCountHelperImpl {
private ConcurrentMap<Long, List<RefCountChangeInfo>> freedStacktraces;
private ThreadLocal<Object> refCountOwner;
private ThreadLocal<AtomicInteger> refCountReenterCount;
- final static private Object SKIP_REF_COUNT_TRACKING = new Object();
- final static private List<RefCountChangeInfo> LOCKED = Collections.emptyList();
+ private static final Object SKIP_REF_COUNT_TRACKING = new Object();
+ private static final List<RefCountChangeInfo> LOCKED = Collections.emptyList();
ReferenceCountHelperImpl(boolean trackRefCounts, boolean trackFreedRefCounts) {
this.trackRefCounts = trackRefCounts;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
index 75ec9b4..2573ebc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.offheap;
/**
* Instances that implement this interface must have release called on them before the instance
* becomes garbage.
- *
+ *
* @since Geode 1.0
*/
public interface Releasable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
index e502d8f..25b3f66 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.offheap;
public interface SlabFactory {
/**
* Create and return a Slab
- *
+ *
* @throws OutOfMemoryError if the create fails
*/
public Slab create(int size);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabImpl.java
index 19232cc..73d6055 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabImpl.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.offheap;
/**
* Implements the Slab interface using AddressableMemoryManager.
- *
+ *
* @since Geode 1.0
*/
public class SlabImpl implements Slab {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
index 348476e..e8d44f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
* if the object is still allocated. To increment the count call {@link #retain()}. To decrement the
* count call {@link #release()}. At some point in the future it may also be used for values stored
* in heap regions.
- *
+ *
* @since Geode 1.0
*/
public interface StoredObject extends Sendable, CachedDeserializable, Releasable {
@@ -44,7 +44,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
* Returns the data stored in this object as a deserialized heap object. If it is not serialized
* then the result will be a byte[]. Otherwise the deserialized heap form of the stored object is
* returned.
- *
+ *
* @return the data stored in this object as a deserialized heap object.
*/
public Object getValueAsDeserializedHeapObject();
@@ -53,7 +53,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
* Returns the data stored in this object as a heap byte array. If it is not serialized then the
* result will only contain the raw bytes stored in this object. Otherwise the serialized heap
* form of the stored object is returned.
- *
+ *
* @return the data stored in this object as a heap byte array.
*/
public byte[] getValueAsHeapByteArray();
@@ -63,7 +63,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
* StoredObject is not serialized then its raw byte array is sent. But if it is serialized then
* the serialized byte array is sent. The corresponding de-serialization will need to call
* readByteArray.
- *
+ *
* @param out the data output to send this object to
* @throws IOException
*/
@@ -74,7 +74,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
* StoredObject is not serialized then an exception will be thrown. The corresponding
* deserialization will need to call readObject and will get an instance of
* VMCachedDeserializable.
- *
+ *
* @param out the data output to send this object to
* @throws IOException
*/
@@ -85,7 +85,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
* allocated until {@link #release()} is called. It is ok for a thread other than the one that
* called this method to call release. This method is called implicitly at the time the chunk is
* allocated. Note: @Retained tells you that "this" is retained by this method.
- *
+ *
* @throws IllegalStateException if the max ref count is exceeded.
* @return true if we are able to retain this chunk; false if we need to retry
*/
@@ -159,7 +159,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
* Creates and returns a direct ByteBuffer that contains the data of this stored object. Note that
* the returned ByteBuffer has a reference to the address of this stored object so it can only be
* used while this stored object is retained.
- *
+ *
* @return the created direct byte buffer or null if it could not be created.
*/
@Unretained
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/OffHeapIdentifier.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/OffHeapIdentifier.java
index 859b7fc..0f0398d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/OffHeapIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/OffHeapIdentifier.java
@@ -53,7 +53,7 @@ public enum OffHeapIdentifier {
/**
* Creates a new OffHeapIdentifier.
- *
+ *
* @param id a unique identifier.
*/
OffHeapIdentifier(final String id) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java
index fc64793..6f83990 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java
@@ -33,10 +33,10 @@ import java.lang.annotation.Target;
* within the containing method (typically in a finally block).</li>
* <li>Can also be used on fields to augment the @Retained annotation.</li>
* </ul>
- *
+ *
* One or more OffHeapIdentifiers may be supplied if the developer wishes to link this annotation
* with other off-heap annotations.
- *
+ *
*/
@Retention(RetentionPolicy.SOURCE)
@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.LOCAL_VARIABLE, ElementType.FIELD})
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java
index 4398aec..a195b8b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java
@@ -39,10 +39,10 @@ import java.lang.annotation.Target;
* count during the lifetime of the containing object. Typically, these fields will have their
* reference counts decremented in release method.</li>
* </ul>
- *
+ *
* One or more OffHeapIdentifiers may be supplied if the developer wishes to link this annotation
* with other off-heap annotations.
- *
+ *
*/
@Retention(RetentionPolicy.SOURCE)
@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java
index fe1bb84..22f2885 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java
@@ -37,10 +37,10 @@ import java.lang.annotation.Target;
* that is neither retained or released by containing object.</li>
* <li>Use this annotation on a constructor that does not retain off-heap field members.</li>
* </ul>
- *
+ *
* One or more OffHeapIdentifiers may be supplied if the developer wishes to link this annotation
* with other off-heap annotations.
- *
+ *
*/
@Retention(RetentionPolicy.SOURCE)
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.FIELD,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
index 3b5da76..2ef63bd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.process.ProcessUtils.InternalProcessUtils;
/**
* Implementation of the {@link ProcessUtils} SPI that uses the JDK Attach API.
- *
+ *
* @since GemFire 8.0
*/
class AttachProcessUtils implements InternalProcessUtils {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
index 62bded4..0cf1f49 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
@@ -27,9 +27,9 @@ import org.apache.geode.internal.logging.LogService;
/**
* Reads the output stream of a Process. Default implementation performs blocking per-line reading
* of the InputStream.
- *
+ *
* Extracted from ProcessStreamReader.
- *
+ *
* @since GemFire 8.2
*/
public class BlockingProcessStreamReader extends ProcessStreamReader {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
index 52d7cc7..b79fcb8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.process;
/**
* A ConnectionFailedException is thrown if connection to a process fails.
- *
+ *
* @since GemFire 7.0
*/
public class ConnectionFailedException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
index efebe70..14decbc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Invokes a ControlRequestHandler when a control file has been created.
- *
+ *
* @since GemFire 8.0
*/
class ControlFileWatchdog implements Runnable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
index a49d3a6..88d36ec 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
@@ -20,7 +20,7 @@ import org.apache.geode.distributed.AbstractLauncher.ServiceState;
* Defines the callbacks for handling stop and status by a {@link ControllableProcess}. Separated
* from ControllableProcess so that an internal object can implement this to avoid exposing these
* methods via the customer API.
- *
+ *
* @since GemFire 8.0
*/
public interface ControlNotificationHandler {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
index e44b34f..9c0e9e1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.process.ControlFileWatchdog.ControlRequestHandl
/**
* Creates the {@link PidFile} and uses {@link ControlFileWatchdog} to monitor the directory for
* creation of stop or status request files.
- *
+ *
* @since GemFire 8.0
*/
public class ControllableProcess {
@@ -80,7 +80,7 @@ public class ControllableProcess {
/**
* Returns the process id (PID).
- *
+ *
* @return the process id (PID)
*/
public int getPid() {
@@ -89,7 +89,7 @@ public class ControllableProcess {
/**
* Returns the PID file.
- *
+ *
* @return the PID file
*/
public File getPidFile() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
index 19be21d..03204ab 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.process;
/**
* A FileAlreadyExistsException is thrown when a pid file already exists and the launcher expects to
* create a new pid file without forcing the deletion of the old one.
- *
+ *
* @since GemFire 7.0
*/
public class FileAlreadyExistsException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
index d181894..a9d71c4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.process.ProcessController.Arguments;
/**
* Defines {@link ProcessController} {@link Arguments} that must be implemented to support the
* {@link FileProcessController}.
- *
+ *
* @since GemFire 8.0
*/
interface FileControllerParameters extends Arguments {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
index fcb61d1..d590783 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
@@ -33,7 +33,7 @@ import org.apache.geode.lang.AttachAPINotFoundException;
/**
* Controls a {@link ControllableProcess} using files to communicate between processes.
- *
+ *
* @since GemFire 8.0
*/
class FileProcessController implements ProcessController {
@@ -46,10 +46,10 @@ class FileProcessController implements ProcessController {
/**
* Constructs an instance for controlling a local process.
- *
+ *
* @param parameters details about the controllable process
* @param pid process id identifying the process to control
- *
+ *
* @throws IllegalArgumentException if pid is not a positive integer
*/
FileProcessController(final FileControllerParameters parameters, final int pid) {
@@ -58,12 +58,12 @@ class FileProcessController implements ProcessController {
/**
* Constructs an instance for controlling a local process.
- *
+ *
* @param parameters details about the controllable process
* @param pid process id identifying the process to control
* @param timeout the timeout that operations must complete within
* @param units the units of the timeout
- *
+ *
* @throws IllegalArgumentException if pid is not a positive integer
*/
FileProcessController(final FileControllerParameters parameters, final int pid,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
index 598a75e..e5222cf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
@@ -37,7 +37,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
* <li>http://weblogs.java.net/blog/kohsuke/archive/2009/01/writing_a_unix.html
* <li>http://www.enderunix.org/docs/eng/daemon.php
* </ul>
- *
+ *
* @since GemFire 7.0
*/
class LocalProcessLauncher {
@@ -51,14 +51,14 @@ class LocalProcessLauncher {
/**
* Constructs a new ProcessLauncher. Parses this process's RuntimeMXBean name for the pid (process
* id).
- *
+ *
* @param pidFile the file to create and write pid into
* @param force if true then the pid file will be replaced if it already exists
- *
+ *
* @throws FileAlreadyExistsException if the pid file already exists and force is false
* @throws IOException if unable to write pid (process id) to pid file
* @throws PidUnavailableException if the pid cannot be parsed from the RuntimeMXBean name
- *
+ *
* @see java.lang.management.RuntimeMXBean
*/
LocalProcessLauncher(final File pidFile, final boolean force)
@@ -72,7 +72,7 @@ class LocalProcessLauncher {
/**
* Returns the process id (pid).
- *
+ *
* @return the process id (pid)
*/
int getPid() {
@@ -81,7 +81,7 @@ class LocalProcessLauncher {
/**
* Returns the pid file.
- *
+ *
* @return the pid file
*/
File getPidFile() {
@@ -110,9 +110,9 @@ class LocalProcessLauncher {
/**
* Creates a new pid file and writes this process's pid into it.
- *
+ *
* @param force if true then the pid file will be replaced if it already exists it
- *
+ *
* @throws FileAlreadyExistsException if the pid file already exists and force is false
* @throws IOException if unable to create or write to the file
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
index 2ea0fa4..3392106 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.process.ProcessController.Arguments;
/**
* Defines {@link ProcessController} {@link Arguments} that must be implemented to support the
* {@link MBeanProcessController}.
- *
+ *
* @since GemFire 8.0
*/
interface MBeanControllerParameters extends Arguments {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
index d4ba3ec..646de3d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.process;
/**
* A MBeanInvocationFailedException is thrown if invocation of the mbean failed.
- *
+ *
* @since GemFire 7.0
*/
public class MBeanInvocationFailedException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
index 1a19719..7996bee 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
@@ -40,7 +40,7 @@ import com.sun.tools.attach.VirtualMachine;
/**
* Controls a {@link ControllableProcess} using the Attach API to manipulate MBeans.
- *
+ *
* @since GemFire 8.0
*/
class MBeanProcessController implements ProcessController {
@@ -60,9 +60,9 @@ class MBeanProcessController implements ProcessController {
/**
* Constructs an instance for controlling a local process.
- *
+ *
* @param pid process id identifying the process to attach to
- *
+ *
* @throws IllegalArgumentException if pid is not a positive integer
*/
MBeanProcessController(final MBeanControllerParameters arguments, final int pid) {
@@ -99,7 +99,7 @@ class MBeanProcessController implements ProcessController {
/**
* Connects to the process and tells it to shut down.
- *
+ *
* @param namePattern the name pattern of the MBean to use for stopping
* @param pidAttribute the name of the MBean attribute with the process id to compare against
* @param stopMethod the name of the MBean operation to invoke
@@ -119,13 +119,13 @@ class MBeanProcessController implements ProcessController {
/**
* Connects to the process and acquires its status.
- *
+ *
* @param namePattern the name pattern of the MBean to use for stopping
* @param pidAttribute the name of the MBean attribute with the process id to compare against
* @param statusMethod the name of the MBean operation to invoke
* @param attributes the names of the MBean attributes to compare with expected values
* @param values the expected values of the specified MBean attributes
- *
+ *
* @return string describing the status of the process
*
* @throws ConnectionFailedException if there was a failure to connect to the local JMX connector
@@ -142,7 +142,7 @@ class MBeanProcessController implements ProcessController {
/**
* Connects to the process and use its MBean to stop it.
- *
+ *
* @param namePattern the name pattern of the MBean to use for stopping
* @param pidAttribute the name of the MBean attribute with the process id to compare against
* @param methodName the name of the MBean operation to invoke
@@ -185,7 +185,7 @@ class MBeanProcessController implements ProcessController {
/**
* Connects to the JMX agent in the local process.
- *
+ *
* @throws ConnectionFailedException if there was a failure to connect to the local JMX connector
* in the process
* @throws IOException if the JDK management agent cannot be found and loaded
@@ -219,9 +219,9 @@ class MBeanProcessController implements ProcessController {
* Uses the Attach API to connect to the local process and ensures that it has loaded the JMX
* management agent. The JMXServiceURL identifying the local connector address for the JMX agent
* in the process is returned.
- *
+ *
* @return the address of the JMX API connector server for connecting to the local process
- *
+ *
* @throws AttachNotSupportedException if unable to use the Attach API to connect to the process
* @throws IOException if the JDK management agent cannot be found and loaded
*/
@@ -277,7 +277,7 @@ class MBeanProcessController implements ProcessController {
/**
* Builds the QueryExp used to identify the target MBean.
- *
+ *
* @param pidAttribute the name of the MBean attribute with the process id to compare against
* @param attributes the names of additional MBean attributes to compare with expected values
* @param values the expected values of the specified MBean attributes
@@ -301,7 +301,7 @@ class MBeanProcessController implements ProcessController {
* Builds an optional QueryExp to aid in matching the correct MBean using additional attributes
* with the specified values. Returns null if no attributes and values were specified during
* construction.
- *
+ *
* @param attributes the names of additional MBean attributes to compare with expected values
* @param values the expected values of the specified MBean attributes
*
@@ -338,12 +338,12 @@ class MBeanProcessController implements ProcessController {
/**
* Invokes an operation on the specified MBean.
- *
+ *
* @param objectName identifies the MBean
* @param method the name of the operation method invoke
- *
+ *
* @return the result of invoking the operation on the MBean specified or null
- *
+ *
* @throws InstanceNotFoundException if the specified MBean is not registered in the MBean server
* @throws IOException if a communication problem occurred when talking to the MBean server
* @throws MBeanException if the MBean operation throws an exception
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
index cea73de..01b8421 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.shared.NativeCalls;
/**
* Implementation of the {@link ProcessUtils} SPI that uses {@link NativeCalls}.
- *
+ *
* @since GemFire 8.0
*/
class NativeProcessUtils implements InternalProcessUtils {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
index 9096fae..d53704d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.util.StopWatch;
* Reads the InputStream per-byte instead of per-line. Uses BufferedReader.ready() to ensure that
* calls to read() will not block. Uses continueReadingMillis to continue reading after the Process
* terminates in order to fully read the last of that Process' output (such as a stack trace).
- *
+ *
* @since GemFire 8.2
*/
class NonBlockingProcessStreamReader extends ProcessStreamReader {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/PidFile.java b/geode-core/src/main/java/org/apache/geode/internal/process/PidFile.java
index 0e7adf2..b9fe184 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/PidFile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/PidFile.java
@@ -27,7 +27,7 @@ import java.io.IOException;
/**
* File wrapper that adds support for reading process id (pid) from a pid file written to disk by
* GemFire processes.
- *
+ *
* @since GemFire 8.2
*/
public class PidFile {
@@ -36,9 +36,9 @@ public class PidFile {
/**
* Constructs a PidFile for reading pid stored in a file.
- *
+ *
* @param file the file containing the pid of the process
- *
+ *
* @throws IllegalArgumentException if the specified file is null or does not exist
*/
public PidFile(final File file) {
@@ -50,10 +50,10 @@ public class PidFile {
/**
* Constructs a PidFile for reading pid stored in a file.
- *
+ *
* @param directory directory containing a file of name pidFileName
* @param filename name of the file containing the pid of the process to stop
- *
+ *
* @throws FileNotFoundException if the specified filename is not found within the directory
* @throws IllegalArgumentException if directory is null, does not exist or is not a directory
*/
@@ -74,9 +74,9 @@ public class PidFile {
/**
* Reads in the pid from the specified file.
- *
+ *
* @return the process id (pid) contained within the pidFile
- *
+ *
* @throws IllegalArgumentException if the pid in the pidFile is not a positive integer
* @throws IOException if unable to read from the specified file
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java b/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
index 934e65c..fc7047e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.process;
/**
* A PidUnavailableException is thrown when the pid cannot be parsed from the RuntimeMXBean name or
* otherwise determined.
- *
+ *
* @since GemFire 7.0
*/
public class PidUnavailableException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
index 2e5cb0c..4767517 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeoutException;
/**
* Defines the operations for controlling a running process.
- *
+ *
* @since GemFire 8.0
*/
public interface ProcessController {
@@ -45,7 +45,7 @@ public interface ProcessController {
* Checks if {@link #status} and {@link #stop} are supported if only the PID is provided. Only the
* {@link MBeanProcessController} supports the use of specifying a PID because it uses the Attach
* API.
- *
+ *
* @throws org.apache.geode.lang.AttachAPINotFoundException if the Attach API is not found
*/
void checkPidSupport();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
index ef276c3..be662df 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
@@ -27,7 +27,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
/**
* Manages which implementation of {@link ProcessController} will be used and constructs the
* instance.
- *
+ *
* @since GemFire 8.0
*/
public class ProcessControllerFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerParameters.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerParameters.java
index a20faf1..90b923f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerParameters.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerParameters.java
@@ -16,10 +16,10 @@ package org.apache.geode.internal.process;
/**
* Defines the methods for providing input arguments to the {@code ProcessController}.
- *
+ *
* Implementations of {@code ProcessController} are in this package. Classes that implement
* {@code ProcessController} would typically be in a different package.
- *
+ *
* @since GemFire 8.0
*/
public interface ProcessControllerParameters
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
index 9b10550..1cab534 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
@@ -23,7 +23,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
/**
* Thread based context for launching a process. GemFire internals can acquire optional
* configuration details from a process launcher via this context.
- *
+ *
* @since GemFire 7.0
*/
public class ProcessLauncherContext {
@@ -53,7 +53,7 @@ public class ProcessLauncherContext {
/**
* Returns true if this process should redirect output to the system log.
- *
+ *
* @return true if this process should redirect output to the system log
*/
public static boolean isRedirectingOutput() {
@@ -68,7 +68,7 @@ public class ProcessLauncherContext {
* Returns the gemfire properties to be used if none of the specified properties are defined by
* any other mechanism. This will only override default values. If a property is defined by System
* property, API, or within gemfire.properties then the contingent value will be ignored.
- *
+ *
* @return the contingent gemfire properties values to be used as an alternative default value
*/
public static Properties getOverriddenDefaults() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
index 39b900a..f68e6fb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang.SystemUtils;
/**
* Reads the output stream of a Process.
- *
+ *
* @since GemFire 7.0
*/
public abstract class ProcessStreamReader implements Runnable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessType.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessType.java
index 86f9dc1..c0466d4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessType.java
@@ -21,7 +21,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
/**
* Enumeration of GemFire {@link ControllableProcess} types and the file names associated with
* controlling its lifecycle.
- *
+ *
* @since GemFire 8.0
*/
public enum ProcessType {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
index 3cf850f..a2c876a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
@@ -26,7 +26,7 @@ import java.lang.management.ManagementFactory;
/**
* Utility operations for processes such as identifying the process id (pid).
- *
+ *
* @since GemFire 7.0
*/
public class ProcessUtils {
@@ -39,9 +39,9 @@ public class ProcessUtils {
/**
* Returns the pid for this process.
- *
+ *
* @throws PidUnavailableException if parsing the pid from the name of the RuntimeMXBean fails
- *
+ *
* @see java.lang.management.RuntimeMXBean#getName()
*/
public static int identifyPid() throws PidUnavailableException {
@@ -50,7 +50,7 @@ public class ProcessUtils {
/**
* Returns the pid for this process using the specified name from RuntimeMXBean.
- *
+ *
* @throws PidUnavailableException if parsing the pid from the RuntimeMXBean name fails
*/
public static int identifyPid(final String name) throws PidUnavailableException {
@@ -71,7 +71,7 @@ public class ProcessUtils {
/**
* Returns true if a process identified by the process id is currently running on this host
* machine.
- *
+ *
* @param pid process id to check for
* @return true if the pid matches a currently running process
*/
@@ -84,7 +84,7 @@ public class ProcessUtils {
/**
* Returns true if a process identified by the specified Process is currently running on this host
* machine.
- *
+ *
* @param process the Process to check
* @return true if the Process is a currently running process
*/
@@ -97,7 +97,7 @@ public class ProcessUtils {
/**
* Returns true if a process identified by the process id was running on this host machine and has
* been terminated by this operation.
- *
+ *
* @param pid process id
* @return true if the process was terminated by this operation
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java b/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
index 3e8daec..e4091f7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.process;
/**
* Exception indicating that an attempt to control a {@link ControllableProcess} has failed for some
* reason.
- *
+ *
* @since GemFire 8.0
*/
public class UnableToControlProcessException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
index b42930b..81d4d17 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.NotAuthorizedException;
* check for authorization (pre-processing) that may modify the arguments to the operations. The
* data being passed for the operation is encapsulated in a {@link OperationContext} object that can
* be modified by the pre-processing authorization callbacks.
- *
+ *
* @since GemFire 5.5
*/
public class AuthorizeRequest {
@@ -177,7 +177,7 @@ public class AuthorizeRequest {
* value = mapEntry.getValue(); boolean isObject = true; if (value instanceof byte[]) {
* isObject = false; } byte[] serializedValue =
* ((CachedDeserializable)value).getSerializedValue();
- *
+ *
* PutOperationContext putContext = new PutOperationContext(currkey, serializedValue,
* isObject, PutOperationContext.UNKNOWN, false); putContext.setCallbackArg(null); if
* (!this.authzCallback.authorizeOperation(regionName, putContext)) { String errStr =
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
index 18280f7..7dd84f9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
@@ -37,7 +37,7 @@ import org.apache.geode.security.NotAuthorizedException;
* post-processing callback that may modify the results. The data being passed for the operation is
* encapsulated in a {@link OperationContext} object that can be modified by the post-processing
* authorization callbacks.
- *
+ *
* @since GemFire 5.5
*/
public class AuthorizeRequestPP {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/CallbackInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/security/CallbackInstantiator.java
index 2cb8d08..3f82b5b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/CallbackInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/CallbackInstantiator.java
@@ -19,14 +19,15 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST
import static org.apache.geode.internal.ClassLoadUtil.classFromName;
import static org.apache.geode.internal.ClassLoadUtil.methodFromName;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
import org.apache.commons.lang.StringUtils;
+
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import java.lang.reflect.Method;
-import java.util.Properties;
-
/**
* Utility methods for instantiating security callback objects by reflection.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
index a05170c..901efb2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
@@ -30,8 +30,8 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.*;
import org.apache.geode.cache.operations.OperationContext.OperationCode;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.internal.ResultsCollectionWrapper;
import org.apache.geode.cache.query.internal.CqEntry;
+import org.apache.geode.cache.query.internal.ResultsCollectionWrapper;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.i18n.LogWriterI18n;
@@ -45,7 +45,7 @@ import org.apache.geode.security.NotAuthorizedException;
* An authorization implementation for testing that checks for authorization information in
* post-operation filtering, removes that field and allows the operation only if the authorization
* field in {@link ObjectWithAuthz} object allows the current principal.
- *
+ *
* @since GemFire 5.5
*/
public class FilterPostAuthorization implements AccessControl {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
index 9235062..8465126 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
@@ -25,14 +25,14 @@ import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.PutAllOperationContext;
-import org.apache.geode.cache.operations.PutOperationContext;
import org.apache.geode.cache.operations.OperationContext;
import org.apache.geode.cache.operations.OperationContext.OperationCode;
+import org.apache.geode.cache.operations.PutAllOperationContext;
+import org.apache.geode.cache.operations.PutOperationContext;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
@@ -42,7 +42,7 @@ import org.apache.geode.security.NotAuthorizedException;
/**
* An authorization implementation for testing that changes a string value in pre-operation phase to
* add an integer denoting which <code>Principal</code>s would be allowed to get that object.
- *
+ *
* @since GemFire 5.5
*/
public class FilterPreAuthorization implements AccessControl {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
index 5ed0961..2a60723 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
@@ -61,7 +61,7 @@ public class IntegratedSecurityService implements SecurityService {
/**
* this creates a security service using a SecurityManager
- *
+ *
* @param provider this provides shiro security manager
* @param postProcessor this can be null
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurableCommunicationChannel.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurableCommunicationChannel.java
index 2ec557b..3d1e3e7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurableCommunicationChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurableCommunicationChannel.java
@@ -14,9 +14,8 @@
*/
package org.apache.geode.internal.security;
-import org.apache.geode.security.SecurableCommunicationChannels;
-
import org.apache.geode.GemFireConfigException;
+import org.apache.geode.security.SecurableCommunicationChannels;
public enum SecurableCommunicationChannel {
ALL(SecurableCommunicationChannels.ALL),
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
index 19645b6..ed5fe72 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
@@ -18,17 +18,18 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIE
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
+import java.util.Properties;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+
import org.apache.geode.internal.cache.CacheConfig;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.security.shiro.SecurityManagerProvider;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-
-import java.util.Properties;
public class SecurityServiceFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/CustomAuthRealm.java b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/CustomAuthRealm.java
index 0e5029b..8d94af1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/CustomAuthRealm.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/CustomAuthRealm.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.security.shiro;
-import org.apache.geode.security.ResourcePermission;
-import org.apache.geode.security.SecurityManager;
+import java.io.Serializable;
+import java.util.Properties;
+
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
@@ -25,8 +26,8 @@ import org.apache.shiro.authz.Permission;
import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection;
-import java.io.Serializable;
-import java.util.Properties;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
public class CustomAuthRealm extends AuthorizingRealm {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
index 4f6c3cf..86bd945 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
@@ -16,13 +16,10 @@ package org.apache.geode.internal.security.shiro;
import static org.apache.geode.management.internal.security.ResourceConstants.MISSING_CREDENTIALS_MESSAGE;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.security.AuthenticationFailedException;
-
import java.security.Principal;
import java.util.Collections;
import java.util.Properties;
+
import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.remote.JMXAuthenticator;
@@ -30,6 +27,10 @@ import javax.management.remote.JMXConnectionNotification;
import javax.management.remote.JMXPrincipal;
import javax.security.auth.Subject;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.security.AuthenticationFailedException;
+
/**
* this will make JMX authentication to use Shiro for Authentication
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/RegionLogger.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/RegionLogger.java
index e966856..86cb89e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/RegionLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/RegionLogger.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
/**
* A Wrapper around the graph logger that logs region level events.
- *
+ *
*/
public class RegionLogger {
@@ -30,7 +30,7 @@ public class RegionLogger {
/**
* Log the creation of a region. This should only be called if the region was not recovered from
* disk or GII'd from another member.
- *
+ *
* @param regionName
* @param source
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java
index 530737f..40a68f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java
@@ -26,18 +26,18 @@ public interface SequenceLogger {
*
* There can be many independent sequence diagrams that are logged. Each sequence diagram is
* identified by a graphName and a graphType.
- *
+ *
* Each log statement creates a transition in the diagram
- *
+ *
* <pre>
* Source Dest
* | |
* |-(edgeName)->| (now in state "state")
* </pre>
- *
+ *
* The graphName can a Pattern, at which point it will be considered a transition for all
* graphNames that match the pattern at that time to the given state.
- *
+ *
* @param type the type of graph this is.
* @param graphName The name of the graph we're recording. For example, an individual key, like
* "Object_123"
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLoggerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLoggerImpl.java
index 6ef33f4..f238c62 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLoggerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLoggerImpl.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.internal.sequencelog;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.OSProcess;
-import org.apache.geode.internal.sequencelog.io.OutputStreamAppender;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.util.EnumSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.OSProcess;
+import org.apache.geode.internal.sequencelog.io.OutputStreamAppender;
+
/**
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/GemfireLogConverter.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/GemfireLogConverter.java
index b4a8d66..669f441 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/GemfireLogConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/GemfireLogConverter.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.sequencelog.Transition;
public class GemfireLogConverter {
/**
- *
+ *
*/
private static final Pattern DATE_PATTERN =
Pattern.compile("(\\d\\d\\d\\d)/(\\d\\d)/(\\d\\d) (\\d\\d):(\\d\\d):(\\d\\d).(\\d\\d\\d)");
@@ -280,7 +280,7 @@ public class GemfireLogConverter {
}
- private static abstract class Test {
+ private abstract static class Test {
private Pattern pattern;
public Test(String pattern) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/Graph.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/Graph.java
index e3d5047..1cd40e0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/Graph.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/Graph.java
@@ -44,7 +44,7 @@ public class Graph {
/**
* Add an edge to this graph.
- *
+ *
* @param timestamp
* @param edgeName
* @param source
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
index 238abcf..2ae21b9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
@@ -34,7 +34,7 @@ import org.apache.geode.SystemFailure;
/**
* Encapsulates native C/C++ calls via JNA. To obtain an instance of implementation for a platform,
* use {@link NativeCalls#getInstance()}.
- *
+ *
* @since GemFire 8.0
*/
public abstract class NativeCalls {
@@ -43,7 +43,7 @@ public abstract class NativeCalls {
* Static instance of NativeCalls implementation. This can be one of JNA implementations in
* <code>NativeCallsJNAImpl</code> or can fall back to a generic implementation in case JNA is not
* available for the platform.
- *
+ *
* Note: this variable is deliberately not final so that other clients can plug in their own
* native implementations of NativeCalls.
*/
@@ -109,10 +109,10 @@ public abstract class NativeCalls {
* dependent code checking various cases to get to the underlying kernel socket descriptor but
* works for the JDK's we support or intend to support directly or indirectly (e.g. GCJ for ODBC
* clients).
- *
+ *
* @param sock the java socket
* @param sockStream the {@link InputStream} of the java socket, if available
- *
+ *
* @throws UnsupportedOperationException if the kernel descriptor could not be extracted
*/
protected int getSocketKernelDescriptor(Socket sock, InputStream sockStream)
@@ -257,7 +257,7 @@ public abstract class NativeCalls {
* Get the value of given environment variable. This is different from
* {@link System#getenv(String)} in that it returns the current value of the environment variable
* in the process rather than from a static unmodifiable map created on the first call.
- *
+ *
* @param name the name of the environment variable to be modified
*/
public abstract String getEnvironment(String name);
@@ -266,7 +266,7 @@ public abstract class NativeCalls {
* Set the value of an environment variable. This modifies both the value in the process, and the
* cached static map maintained by JVM on the first call so further calls to
* {@link System#getenv(String)} will also return the modified value.
- *
+ *
* @param name the name of the environment variable to be modified
* @param value the new value of the environment variable; a value of null clears the existing
* value
@@ -280,7 +280,7 @@ public abstract class NativeCalls {
/**
* Check whether a process with given ID is still running.
- *
+ *
* @throws UnsupportedOperationException if no native API to determine the process status could be
* invoked
*/
@@ -289,19 +289,19 @@ public abstract class NativeCalls {
/**
* Kill the process with given process ID immediately (i.e. without giving it a chance to cleanup
* properly).
- *
+ *
* @param processId the PID of the process to be kill
- *
+ *
* @throws UnsupportedOperationException if no native API to kill the process could be invoked
*/
public abstract boolean killProcess(int processId) throws UnsupportedOperationException;
/**
* Perform the steps necessary to make the current JVM a proper UNIX daemon.
- *
+ *
* @param callback register callback to be invoked on catching a SIGHUP signal; SIGHUP signal is
* ignored if the callback is null
- *
+ *
* @throws UnsupportedOperationException if the native calls could not be completed for some
* reason or are not available
* @throws IllegalStateException for a non-UNIX platform
@@ -333,13 +333,13 @@ public abstract class NativeCalls {
/**
* Set given extended socket options on a Java {@link Socket}.
- *
+ *
* @throws UnsupportedOperationException if the native API to set the option could not be found or
* invoked
- *
+ *
* @return the unsupported {@link TCPSocketOptions} for the current platform and the underlying
* exception
- *
+ *
* @see TCPSocketOptions
*/
public abstract Map<TCPSocketOptions, Throwable> setSocketOptions(Socket sock,
@@ -428,7 +428,7 @@ public abstract class NativeCalls {
* Callback invoked when an OS-level SIGHUP signal is caught after handler has been installed by
* {@link NativeCalls#daemonize}. This is provided to allow for re-reading configuration files or
* any other appropriate actions on receiving HUP signal as is the convention in other servers.
- *
+ *
* @since GemFire 8.0
*/
public static interface RehashServerOnSIGHUP {
@@ -441,7 +441,7 @@ public abstract class NativeCalls {
/**
* whether o/s supports high resolution clock or equivalent perf counter.
- *
+ *
* @return true if implemented, otherwise false.
*/
public boolean isNativeTimerEnabled() {
@@ -451,10 +451,10 @@ public abstract class NativeCalls {
/**
* This is fall back for jni based library implementation of NanoTimer which is more efficient
* than current impl through jna.
- *
+ *
* Linux impls create temporary timespec object and marshals that for invoking native api.
* Shouldn't be used if to be called too many times, instead jni implementation is more desirable.
- *
+ *
* @param clock_id
* @return nanosecond precision performance counter.
*/
@@ -474,7 +474,7 @@ public abstract class NativeCalls {
* A generic fallback implementation of {@link NativeCalls} when no JNA based implementation could
* be initialized (e.g. if JNA itself does not provide an implementation for the platform, or JNA
* is not found).
- *
+ *
* @since GemFire 8.0
*/
public static class NativeCallsGeneric extends NativeCalls {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
index 760144a..fbd679c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
@@ -15,24 +15,6 @@
package org.apache.geode.internal.shared;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.cache.DiskStoreImpl;
-import org.apache.geode.internal.process.signal.Signal;
-import org.apache.geode.internal.shared.NativeCalls.RehashServerOnSIGHUP;
-import com.sun.jna.Callback;
-import com.sun.jna.LastErrorException;
-import com.sun.jna.Library;
-import com.sun.jna.Native;
-import com.sun.jna.NativeLibrary;
-import com.sun.jna.NativeLong;
-import com.sun.jna.Platform;
-import com.sun.jna.Pointer;
-import com.sun.jna.Structure;
-import com.sun.jna.ptr.IntByReference;
-import com.sun.jna.win32.StdCallLibrary;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -44,19 +26,38 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
+
+import com.sun.jna.Callback;
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLibrary;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Platform;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.process.signal.Signal;
+import org.apache.geode.internal.shared.NativeCalls.RehashServerOnSIGHUP;
/**
* Implementation of {@link NativeCalls} interface that encapsulates native C calls via JNA. To
* obtain an instance of JNA based implementation for the current platform, use
* {@link NativeCallsJNAImpl#getInstance()}.
- *
+ *
* BridJ is supposed to be cleaner, faster but it does not support Solaris/SPARC yet and its not a
* mature library yet, so not using it. Can revisit once this changes.
- *
+ *
* @since GemFire 8.0
*/
public class NativeCallsJNAImpl {
@@ -648,7 +649,7 @@ public class NativeCallsJNAImpl {
/**
* Get the file store type of a path. for example, /dev/sdd1(store name) /w2-gst-dev40d(mount
* point) ext4(type)
- *
+ *
* @param path
* @return file store type
*/
@@ -720,7 +721,7 @@ public class NativeCallsJNAImpl {
return false;
}
- public final static String[] FallocateFileSystems = {"ext4", "xfs", "btrfs", "ocfs2"};
+ public static final String[] FallocateFileSystems = {"ext4", "xfs", "btrfs", "ocfs2"};
@Override
protected boolean hasFallocate(String path) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
index 2a2193b..b520fb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.shared;
* Encapsulates an error in invoking OS native calls. A counterpart of JNA's
* <code>LastErrorException</code> so as to not expose the JNA <code>LastErrorException</code>
* class, and also for ODBC/.NET drivers that don't use JNA.
- *
+ *
* @since GemFire 8.0
*/
public class NativeErrorException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/StringPrintWriter.java b/geode-core/src/main/java/org/apache/geode/internal/shared/StringPrintWriter.java
index d4764b7..54bc0ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/StringPrintWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/StringPrintWriter.java
@@ -23,13 +23,13 @@ import java.security.PrivilegedAction;
/**
* A {@link PrintWriter} that collects its output in a string builder, which can then be used to
* construct a string. This completely avoids any locking etc.
- *
+ *
*/
public class StringPrintWriter extends PrintWriter {
private final StringBuilder sb;
- private final static Writer dummyLock = new StringWriter();
+ private static final Writer dummyLock = new StringWriter();
private final String lineSep;
@@ -42,7 +42,7 @@ public class StringPrintWriter extends PrintWriter {
/**
* Create a new string writer using the specified string-builder.
- *
+ *
* @param sb the {@link StringBuilder} to use as the internal buffer
*/
public StringPrintWriter(StringBuilder sb) {
@@ -51,7 +51,7 @@ public class StringPrintWriter extends PrintWriter {
/**
* Create a new string writer using the specified string-builder and line separator.
- *
+ *
* @param sb the {@link StringBuilder} to use as the internal buffer
* @param lineSep the line separator to use, or null to use the default from system
* "line.separator" property
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/TCPSocketOptions.java b/geode-core/src/main/java/org/apache/geode/internal/shared/TCPSocketOptions.java
index b14fd25..fb3b43d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/TCPSocketOptions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/TCPSocketOptions.java
@@ -22,7 +22,7 @@ import java.net.Socket;
* Extended TCP socket options to set socket-specific KEEPALIVE settings etc. Passed to
* {@link NativeCalls} API to set these options on the Java {@link Socket} using native OS specific
* calls.
- *
+ *
* @since GemFire 8.0
*/
public enum TCPSocketOptions {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java
index 9b64148..1cffb94 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java
@@ -14,10 +14,6 @@
*/
package org.apache.geode.internal.size;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.size.ObjectTraverser.Visitor;
-
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
import java.util.HashMap;
@@ -25,6 +21,10 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.size.ObjectTraverser.Visitor;
+
public class ObjectGraphSizer {
private static final String SIZE_OF_CLASS_NAME =
@@ -52,11 +52,11 @@ public class ObjectGraphSizer {
/**
* Find the size of an object and all objects reachable from it using breadth first search. This
* is equivalent to calling
- *
+ *
* <pre>
* size(root, false);
* </pre>
- *
+ *
*/
// TODO
// - native byte buffers
@@ -69,7 +69,7 @@ public class ObjectGraphSizer {
* Find the size of an object and all objects reachable from it using breadth first search. This
* is equivalent to calling set(root, filter, includeStatics) where the filter will accept all
* objects.
- *
+ *
*/
public static long size(Object root, boolean includeStatics)
throws IllegalArgumentException, IllegalAccessException {
@@ -80,17 +80,17 @@ public class ObjectGraphSizer {
* Find the size of an object and all objects reachable from it using breadth first search. This
* method will include objects reachable from static fields. Using this method requires some heap
* space - probably between 8 - 30 bytes per reachable object.
- *
+ *
* Objects reachable only through weak or soft references will not be considered part of the total
* size.
- *
+ *
* @param root the object to size
* @param filter that can exclude objects from being counted in the results. If an object is not
* accepted, it's size will not be included and it's children will not be visited unless
* they are reachable by some other path.
* @param includeStatics if set to true, static members of a class will be traversed the first
* time that a class is encountered.
- *
+ *
*/
public static long size(Object root, ObjectFilter filter, boolean includeStatics)
throws IllegalArgumentException, IllegalAccessException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/ObjectTraverser.java b/geode-core/src/main/java/org/apache/geode/internal/size/ObjectTraverser.java
index 0669876..c352608 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/ObjectTraverser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/ObjectTraverser.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.size;
-import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
-
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -23,6 +21,8 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Map;
+import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
+
import org.apache.geode.internal.util.concurrent.CopyOnWriteWeakHashMap;
@@ -34,7 +34,7 @@ public class ObjectTraverser {
/**
* Visit all objects reachable from a given root object, using a breadth first search. Using this
* method requires some heap space - probably between 8 - 30 bytes per reachable object.
- *
+ *
* @param root object to traverse from
* @param visitor a visitor to visit each node
* @param includeStatics if true, the first time we see a new object type, we will visit all of
@@ -131,7 +131,7 @@ public class ObjectTraverser {
public interface Visitor {
/**
* Visit an object
- *
+ *
* @param parent the parent of the object
* @param object the object we are visiting
* @return true the search should continue on and visit the children of this object as well
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionObjectSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionObjectSizer.java
index 3a34e29..a0ceec1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionObjectSizer.java
@@ -18,6 +18,8 @@ import java.io.IOException;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -26,20 +28,18 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.size.ObjectGraphSizer.ObjectFilter;
-import org.apache.logging.log4j.Logger;
-
/**
* An implementation of {@link ObjectSizer} that calculates an accurate, in memory size of for each
* object that it sizes. This is the slowest method of calculating sizes, but it should accurately
* reflect the amount of heap memory used for objects.
- *
+ *
* This class will traverse all objects that are reachable from the passed in object by instance
* fields. So use this class with caution if you have instance fields that refer to shared objects.
- *
+ *
* For objects that are all approximately the same size, consider using
* {@link SizeClassOnceObjectSizer}
- *
- *
+ *
+ *
*/
public class ReflectionObjectSizer implements ObjectSizer, Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionSingleObjectSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionSingleObjectSizer.java
index 66b7a06..2fea2a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionSingleObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/ReflectionSingleObjectSizer.java
@@ -25,7 +25,7 @@ import org.apache.geode.pdx.internal.unsafe.UnsafeWrapper;
/**
* Figure out the size of an object using reflection. This class does not follow any object
* references, it just calculates the size of a flat object.
- *
+ *
*
*/
public class ReflectionSingleObjectSizer implements SingleObjectSizer {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/SingleObjectSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/SingleObjectSizer.java
index a316633..43260e2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/SingleObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/SingleObjectSizer.java
@@ -19,7 +19,7 @@ public interface SingleObjectSizer {
/**
* Returns the size of the object, WITHOUT descending into child objects includes primatives and
* object references.
- *
+ *
* @param object
*/
long sizeof(Object object);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/SizeClassOnceObjectSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/SizeClassOnceObjectSizer.java
index c2b7408..603b820 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/SizeClassOnceObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/SizeClassOnceObjectSizer.java
@@ -28,21 +28,21 @@ import org.apache.geode.internal.util.concurrent.CopyOnWriteWeakHashMap;
* An implementation of {@link ObjectSizer} that calculates an accurate, in memory size of for the
* first instance of each class that it sees. After the first size calculation, it will return the
* same size for every instance of that class.
- *
+ *
* This sizer is a compromise between generating accurate sizes for every object and performance. It
* should work well for objects that are fairly constant in size. For completely accurate sizing,
* use {@link ReflectionObjectSizer}
- *
- *
+ *
+ *
*/
public class SizeClassOnceObjectSizer implements ObjectSizer, Serializable, Declarable {
private static final SizeClassOnceObjectSizer INSTANCE = new SizeClassOnceObjectSizer();
- private transient final Map<Class, Integer> savedSizes =
+ private final transient Map<Class, Integer> savedSizes =
new CopyOnWriteWeakHashMap<Class, Integer>();
- private transient final ReflectionObjectSizer sizer = ReflectionObjectSizer.getInstance();
+ private final transient ReflectionObjectSizer sizer = ReflectionObjectSizer.getInstance();
public int sizeof(Object o) {
if (o == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/SizeOfUtil0.java b/geode-core/src/main/java/org/apache/geode/internal/size/SizeOfUtil0.java
index d467071..386976e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/SizeOfUtil0.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/SizeOfUtil0.java
@@ -18,8 +18,8 @@ package org.apache.geode.internal.size;
* A Size of util class which does nothing. This is useful for running the test with jprobe, because
* jprobe doesn't play nicely with the -javaagent flag. If we implement a 1.4 SizeOfUtil class, then
* we probably don't need this one.
- *
- *
+ *
+ *
*/
public class SizeOfUtil0 implements SingleObjectSizer {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/WellKnownClassSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/WellKnownClassSizer.java
index 6cf3603..96b3a97 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/WellKnownClassSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/WellKnownClassSizer.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.size;
/**
* An efficient sizer for some commonly used classes.
- *
+ *
* This will return 0 if it does not know how to size the object
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
index 95e8308..22343e0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
@@ -14,13 +14,6 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsFactory;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.StatisticsTypeFactory;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
@@ -28,6 +21,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* An abstract standalone implementation of {@link StatisticsFactory}. It can be used in contexts
* that do not have the GemFire product or in vm's that do not have a distributed system nor a
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/ArchiveSplitter.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/ArchiveSplitter.java
index 2336608..5cc7ebb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/ArchiveSplitter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/ArchiveSplitter.java
@@ -44,7 +44,7 @@ public class ArchiveSplitter implements StatArchiveFormat {
private DataInputStream dataIn;
private DataOutputStream dataOut;
private OutputStream output;
- private final static int BUFFER_SIZE = 1024 * 1024;
+ private static final int BUFFER_SIZE = 1024 * 1024;
private long splitDuration; // in millis
private byte[][] resourceTypes = new byte[256][];
private byte[][] resourceInstanceTypeCodes = new byte[256][];
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/CallbackSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/CallbackSampler.java
index 51b9b2f..0e51c92 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/CallbackSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/CallbackSampler.java
@@ -18,13 +18,13 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.Statistics;
import org.apache.geode.SystemFailure;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
public class CallbackSampler {
private static final Logger logger = LogService.getLogger();
private StatisticsManager statisticsManager;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java
index f2c1acd..91faa40 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java
@@ -15,16 +15,16 @@
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
-
import java.io.*;
+import org.apache.geode.*;
+
/**
* A StatisticsFactory that creates disconnected statistics
*/
public class DummyStatisticsFactory implements StatisticsFactory {
- private final static StatisticsTypeFactoryImpl tf =
+ private static final StatisticsTypeFactoryImpl tf =
(StatisticsTypeFactoryImpl) StatisticsTypeFactoryImpl.singleton();
/** Creates a new instance of DummyStatisticsFactory */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
index 1bc6b8a..c08eba1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal.statistics;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.Statistics;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -29,22 +40,11 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.statistics.platform.OsStatisticsFactory;
import org.apache.geode.internal.statistics.platform.ProcessStats;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.logging.log4j.Logger;
-
/**
* GemFireStatSampler adds listeners and rolling archives to HostStatSampler.
* <p>
* The StatisticsManager is implemented by DistributedSystem.
- *
+ *
*/
public class GemFireStatSampler extends HostStatSampler {
@@ -319,7 +319,7 @@ public class GemFireStatSampler extends HostStatSampler {
return result;
}
- protected static abstract class StatListenerImpl {
+ protected abstract static class StatListenerImpl {
protected Statistics stats;
protected StatisticDescriptorImpl stat;
protected boolean oldValueInitialized = false;
@@ -336,7 +336,7 @@ public class GemFireStatSampler extends HostStatSampler {
protected abstract double getBitsAsDouble(long bits);
}
- protected static abstract class LocalStatListenerImpl extends StatListenerImpl {
+ protected abstract static class LocalStatListenerImpl extends StatListenerImpl {
private LocalStatListener listener;
public LocalStatListener getListener() {
@@ -410,7 +410,7 @@ public class GemFireStatSampler extends HostStatSampler {
/**
* Used to register a StatListener.
*/
- protected static abstract class RemoteStatListenerImpl extends StatListenerImpl {
+ protected abstract static class RemoteStatListenerImpl extends StatListenerImpl {
private int listenerId;
private InternalDistributedMember recipient;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java
index 4106915..ebd15b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java
@@ -14,11 +14,13 @@
*/
package org.apache.geode.internal.statistics;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
import org.apache.geode.*;
import org.apache.geode.internal.PureJavaMode;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.i18n.LocalizedStrings;
-
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics;
import org.apache.geode.internal.statistics.platform.LinuxProcessStats;
import org.apache.geode.internal.statistics.platform.LinuxSystemStats;
@@ -31,9 +33,6 @@ import org.apache.geode.internal.statistics.platform.SolarisSystemStats;
import org.apache.geode.internal.statistics.platform.WindowsProcessStats;
import org.apache.geode.internal.statistics.platform.WindowsSystemStats;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
/**
* Provides native methods which fetch operating system statistics.
*/
@@ -285,7 +284,7 @@ public class HostStatHelper {
* Generate a systemid based off of the ip address of the host. This duplicates the common
* implementation of <code>long gethostid(void) </code>. Punt on the ipv6 case and just use the
* same algorithm.
- *
+ *
* @return a psuedo unique id based on the ip address
*/
private static long getHostSystemId() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index 928956e..188f245 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -14,32 +14,33 @@
*/
package org.apache.geode.internal.statistics;
+import java.io.File;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.Statistics;
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.statistics.platform.OsStatisticsFactory;
import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
/**
* HostStatSampler implements a thread which will monitor, sample, and archive statistics. It only
* has the common functionality that any sampler needs.
- *
+ *
*/
public abstract class HostStatSampler
implements Runnable, StatisticsSampler, StatArchiveHandlerConfig {
@@ -271,7 +272,7 @@ public abstract class HostStatSampler
/**
* Starts the main thread for this service.
- *
+ *
* @throws IllegalStateException if an instance of the {@link #statThread} is still running from a
* previous DistributedSystem.
*/
@@ -532,7 +533,7 @@ public abstract class HostStatSampler
/**
* Collect samples of any operating system statistics
- *
+ *
* @param prepareOnly set to true if you only want to call prepareForSample
*/
private void sampleSpecialStats(boolean prepareOnly) {
@@ -556,7 +557,7 @@ public abstract class HostStatSampler
/**
* Check the elapsed sleep time upon wakeup, and log a warning if it is longer than the delay
* threshold.
- *
+ *
* @param elapsedSleepTime duration of sleep in nanoseconds
*/
private void checkElapsedSleepTime(long elapsedSleepTime) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/IgnoreResourceException.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/IgnoreResourceException.java
index 3bc1c73..d7ea0f2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/IgnoreResourceException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/IgnoreResourceException.java
@@ -21,7 +21,7 @@ import org.apache.geode.GemFireCheckedException;
* statistics sampler.
* <p/>
* Extracted from {@link StatArchiveWriter}.
- *
+ *
* @since GemFire 7.0
*/
public class IgnoreResourceException extends GemFireCheckedException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java
index fe249af..278ef92 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java
@@ -19,10 +19,10 @@ package org.apache.geode.internal.statistics;
* be registered with statSampler. This can be done in the following manner: <code>
* InternalDistributedSystem internalSystem = (InternalDistributedSystem)cache
* .getDistributedSystem();
- * final GemFireStatSampler sampler = internalSystem.getStatSampler();
+ * final GemFireStatSampler sampler = internalSystem.getStatSampler();
* sampler.addLocalStatListener(l, stats, statName);
* </code>
- *
+ *
*
*/
public interface LocalStatListener {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
index 28056e5..c066285 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
@@ -19,8 +19,6 @@ import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.statistics.StatisticsImpl;
import org.apache.geode.internal.statistics.StatisticsManager;
import org.apache.geode.internal.statistics.StatisticsTypeImpl;
-// import org.apache.geode.util.IntArray;
-// import org.apache.geode.util.LongArray;
/**
* An implementation of {@link Statistics} that stores its statistics in local java memory.
@@ -45,17 +43,17 @@ public class LocalStatisticsImpl extends StatisticsImpl {
/**
* An array containing the JOM object used to lock a int statistic when it is incremented.
*/
- private transient final Object[] intLocks;
+ private final transient Object[] intLocks;
/**
* An array containing the JOM object used to lock a long statistic when it is incremented.
*/
- private transient final Object[] longLocks;
+ private final transient Object[] longLocks;
/**
* An array containing the JOM object used to lock a double statistic when it is incremented.
*/
- private transient final Object[] doubleLocks;
+ private final transient Object[] doubleLocks;
/** The StatisticsFactory that created this instance */
private final StatisticsManager dSystem;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceInstance.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceInstance.java
index 3c95fe4..c83b051 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceInstance.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceInstance.java
@@ -22,7 +22,7 @@ import org.apache.geode.Statistics;
* statistics type. The ResourceInstance holds an array of the latest stat values.
* <p/>
* Extracted from {@link StatArchiveWriter}.
- *
+ *
* @since GemFire 7.0
*/
public class ResourceInstance {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceType.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceType.java
index fa3c4ec..f2905a1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/ResourceType.java
@@ -22,7 +22,7 @@ import org.apache.geode.StatisticsType;
* The ResourceType holds an array of StatisticDescriptors for its StatisticsType.
* <p/>
* Extracted from {@link StatArchiveWriter}.
- *
+ *
* @since GemFire 7.0
*/
public class ResourceType {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
index 0fc76cf..0bc16c1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
@@ -25,8 +25,6 @@ import java.util.List;
import java.util.Map;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
-import org.apache.geode.internal.io.RollingFileHandler;
import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireException;
@@ -34,6 +32,7 @@ import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.io.RollingFileHandler;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
@@ -48,7 +47,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* to statistics.
* <p/>
* Extracted from StatArchiveWriter.
- *
+ *
* @since GemFire 7.0
*/
public class SampleCollector {
@@ -96,7 +95,7 @@ public class SampleCollector {
/**
* Constructs a new instance.
- *
+ *
* @param sampler the stat sampler using this collector
*/
public SampleCollector(StatisticsSampler sampler) {
@@ -110,9 +109,9 @@ public class SampleCollector {
/**
* Returns the {@link StatMonitorHandler}. If one does not currently exist it will be created.
- *
+ *
* @return the StatMonitorHandler for adding monitors
- *
+ *
* @throws IllegalStateException if no SampleCollector has been created and initialized yet
*/
static StatMonitorHandler getStatMonitorHandler() {
@@ -136,7 +135,7 @@ public class SampleCollector {
/**
* Initializes this collector by creating a {@link StatArchiveHandler} and registering it as a
* handler.
- *
+ *
* @param config defines the configuration for the StatArchiveHandler
* @param nanosTimeStamp the nanos time stamp to initialize stat archiver with
* @param rollingFileHandler provides file rolling behavior
@@ -167,7 +166,7 @@ public class SampleCollector {
/**
* Adds a {@link SampleHandler} to this collector.
- *
+ *
* @param handler the SampleHandler to add
*/
public void addSampleHandler(SampleHandler handler) {
@@ -176,7 +175,7 @@ public class SampleCollector {
/**
* Removes a {@link SampleHandler} from this collector.
- *
+ *
* @param handler the SampleHandler to remove
*/
public void removeSampleHandler(SampleHandler handler) {
@@ -198,7 +197,7 @@ public class SampleCollector {
* each sample. The delta in nanos can be determined by comparing any nano timeStamp to the first
* nano timeStamp written to the archive file. Adding this delta to the recorded initial time in
* milliseconds provides the actual (non-arbitrary) time for each sample.
- *
+ *
* @param nanosTimeStamp an arbitrary time stamp in nanoseconds for this sample
*/
public void sample(long nanosTimeStamp) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java
index b2572dd..d523a44 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* Defines the operations required to handle statistics samples and receive notifications of
* ResourceTypes and ResourceInstances.
- *
+ *
* @since GemFire 7.0
*/
public interface SampleHandler {
@@ -33,7 +33,7 @@ public interface SampleHandler {
* each sample. The delta in nanos can be determined by comparing any nano timeStamp to the first
* nano timeStamp written to the archive file. Adding this delta to the recorded initial time in
* milliseconds provides the actual (non-arbitrary) time for each sample.
- *
+ *
* @param nanosTimeStamp an arbitrary nanoseconds time stamp for this sample
* @param resourceInstances the statistics resource instances captured in this sample
*/
@@ -41,21 +41,21 @@ public interface SampleHandler {
/**
* Notification that a new statistics {@link ResourceType} has been created.
- *
+ *
* @param resourceType the new statistics ResourceType that was created
*/
public void allocatedResourceType(ResourceType resourceType);
/**
* Notification that a new statistics {@link ResourceInstance} has been created.
- *
+ *
* @param resourceInstance the new statistics ResourceInstance that was created
*/
public void allocatedResourceInstance(ResourceInstance resourceInstance);
/**
* Notification that an existing statistics {@link ResourceInstance} has been destroyed.
- *
+ *
* @param resourceInstance the existing statistics ResourceInstance that was destroyed
*/
public void destroyedResourceInstance(ResourceInstance resourceInstance);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
index 1707397..dbc86bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* <p>
* The StatisticsManager may be implemented by LocalStatisticsFactory and does not require a GemFire
* connection.
- *
+ *
*/
public class SimpleStatSampler extends HostStatSampler {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
index fd6bbb2..cce28bb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
@@ -23,7 +23,7 @@ import org.apache.geode.Statistics;
* A StatisticsType contains any number of StatisticDescriptors. A StatisticsType may describe one
* or more Statistics instances, while a StatisticDescriptor may describe one or more StatisticId
* instances.
- *
+ *
* @since GemFire 7.0
*/
public class SimpleStatisticId implements StatisticId {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveDescriptor.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveDescriptor.java
index 43a45c2..3f8a52c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveDescriptor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveDescriptor.java
@@ -23,7 +23,7 @@ package org.apache.geode.internal.statistics;
* {@link StatArchiveDescriptor.Builder} is used for constructing instances instead of a constructor
* with many similar parameters (ie, multiple Strings which could easily be interposed with one
* another).
- *
+ *
* @since GemFire 7.0
*/
public class StatArchiveDescriptor {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandler.java
index c96e672..24ea1f4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandler.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.internal.statistics;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.GemFireException;
import org.apache.geode.GemFireIOException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -26,13 +34,6 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.logging.log4j.LogWriterAppender;
import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
import org.apache.geode.internal.logging.log4j.LogWriterLogger;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
/**
* Extracted from {@link HostStatSampler} and {@link GemFireStatSampler}.
@@ -41,7 +42,7 @@ import java.util.List;
* provides archive file rolling (file size limit) and removal (disk space limit). This handler
* creates and uses an instance of {@link StatArchiveWriter} for the currently open archive file
* (unless archiving is disabled).
- *
+ *
* @since GemFire 7.0
*/
public class StatArchiveHandler implements SampleHandler {
@@ -87,7 +88,7 @@ public class StatArchiveHandler implements SampleHandler {
/**
* Initializes the stat archiver with nanosTimeStamp.
- *
+ *
* @param nanosTimeStamp
*/
public void initialize(long nanosTimeStamp) {
@@ -97,7 +98,7 @@ public class StatArchiveHandler implements SampleHandler {
/**
* Closes any {@link StatArchiveWriter} currently in use by this handler.
- *
+ *
* @throws GemFireException
*/
public void close() throws GemFireException {
@@ -263,7 +264,7 @@ public class StatArchiveHandler implements SampleHandler {
* trigger rolling and/or removal if appropriate based on
* {@link StatArchiveHandlerConfig#getArchiveFileSizeLimit() file size limit} and
* {@link StatArchiveHandlerConfig#getArchiveDiskSpaceLimit() disk space limit}.
- *
+ *
* @param newFile the new archive file to use or "" to disable archiving
* @param nanosTimeStamp
*/
@@ -286,10 +287,10 @@ public class StatArchiveHandler implements SampleHandler {
* If resetHandler is true, then this handler will reset itself with the SampleCollector by
* removing and re-adding itself in order to receive allocation notifications about all resource
* types and instances.
- *
+ *
* @param resetHandler true if the handler should reset itself with the SampleCollector in order
* to receive allocation notifications about all resource types and instances
- *
+ *
* @param nanosTimeStamp
*/
private void changeArchiveFile(boolean resetHandler, long nanosTimeStamp) {
@@ -307,7 +308,7 @@ public class StatArchiveHandler implements SampleHandler {
* If resetHandler is true, then this handler will reset itself with the SampleCollector by
* removing and re-adding itself in order to receive allocation notifications about all resource
* types and instances.
- *
+ *
* @param newFile
* @param resetHandler
* @param nanosTimeStamp
@@ -438,11 +439,11 @@ public class StatArchiveHandler implements SampleHandler {
* {@link #archiveId} based on existing files {@link #archiveDir}. This is only used if
* {@link StatArchiveHandlerConfig#getArchiveFileSizeLimit() file size limit} has been specified
* as non-zero (which enables file rolling).
- *
+ *
* @param archive the archive file name to modify
* @param archiveClosed true if archive was just being written by us; false if it was written by
* the previous process.
- *
+ *
* @return the modified archive file name to use; it is modified by applying mainArchiveId and
* archiveId to the name for supporting file rolling
*/
@@ -592,9 +593,9 @@ public class StatArchiveHandler implements SampleHandler {
* Modifies the desired archive file name with a main id (similar to {@link #mainArchiveId} if the
* archive file's dir already contains GemFire stat archive or log files containing a main id in
* the file name.
- *
+ *
* @param archive the archive file name to modify
- *
+ *
* @return the modified archive file name to use; it is modified by applying the next main id if
* any files in the dir already have a main id in the file name
*/
@@ -626,7 +627,7 @@ public class StatArchiveHandler implements SampleHandler {
* Remove old versions of the specified archive file name in order to stay under the specified
* disk space limit. Old versions of the archive file are those that match based on using a
* pattern which ignores mainArchiveId and archiveId.
- *
+ *
* @param archiveFile the archive file to remove old versions of
* @param spaceLimit the disk space limit
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java
index ef58b54..f63c326 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java
@@ -21,7 +21,7 @@ import java.io.File;
* (some of which may change at runtime).
* <p/>
* Implemented by {@link HostStatSampler}.
- *
+ *
* @since GemFire 7.0
* @see org.apache.geode.distributed.internal.RuntimeDistributionConfigImpl
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
index ef25e8f..6cb3bc7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
@@ -64,7 +64,7 @@ public class StatArchiveReader implements StatArchiveFormat {
/**
* Creates a StatArchiveReader that will read the named archive file.
- *
+ *
* @param autoClose if its <code>true</code> then the reader will close input files as soon as it
* finds their end.
* @throws IOException if <code>archiveName</code> could not be opened read, or closed.
@@ -86,7 +86,7 @@ public class StatArchiveReader implements StatArchiveFormat {
/**
* Creates a StatArchiveReader that will read the named archive file.
- *
+ *
* @throws IOException if <code>archiveName</code> could not be opened read, or closed.
*/
public StatArchiveReader(String archiveName) throws IOException {
@@ -127,7 +127,7 @@ public class StatArchiveReader implements StatArchiveFormat {
* maintained by the reader are updated.
* <p>
* Once closed a reader can no longer be updated.
- *
+ *
* @return true if update read some new data.
* @throws IOException if an archive could not be opened read, or closed.
*/
@@ -527,7 +527,7 @@ public class StatArchiveReader implements StatArchiveFormat {
* Sets the current filter used to calculate this statistic's values. The default filter is
* {@link #FILTER_NONE} unless the statistic is a counter,
* {@link StatArchiveReader.StatDescriptor#isCounter}, in which case its {@link #FILTER_PERSEC}.
- *
+ *
* @param filter It must be one of these values:
* <ul>
* <li>{@link #FILTER_NONE}
@@ -544,7 +544,7 @@ public class StatArchiveReader implements StatArchiveFormat {
StatDescriptor getDescriptor();
}
- protected static abstract class AbstractValue implements StatValue {
+ protected abstract static class AbstractValue implements StatValue {
protected StatDescriptor descriptor;
protected int filter;
@@ -1226,7 +1226,7 @@ public class StatArchiveReader implements StatArchiveFormat {
}
}
- private static abstract class BitInterval {
+ private abstract static class BitInterval {
/** Returns number of items added to values */
abstract int fill(double[] values, int valueOffset, int typeCode, int skipCount);
@@ -1287,7 +1287,7 @@ public class StatArchiveReader implements StatArchiveFormat {
}
}
- private static abstract class BitNonZeroInterval extends BitInterval {
+ private abstract static class BitNonZeroInterval extends BitInterval {
@Override
int getMemoryUsed() {
return super.getMemoryUsed() + 4;
@@ -1447,7 +1447,7 @@ public class StatArchiveReader implements StatArchiveFormat {
}
}
- private static abstract class BitZeroInterval extends BitInterval {
+ private abstract static class BitZeroInterval extends BitInterval {
@Override
int getMemoryUsed() {
return super.getMemoryUsed() + 4;
@@ -1982,7 +1982,7 @@ public class StatArchiveReader implements StatArchiveFormat {
}
private static class TimeStampSeries {
- static private final int GROW_SIZE = 256;
+ private static final int GROW_SIZE = 256;
int count; // number of items in this series
long base; // millis since midnight, Jan 1, 1970 UTC.
long[] timeStamps = new long[GROW_SIZE]; // elapsed millis from base
@@ -2161,7 +2161,7 @@ public class StatArchiveReader implements StatArchiveFormat {
/**
* Gets a stat descriptor contained in this type given the stats name.
- *
+ *
* @param name the name of the stat to find in the current type
* @return the descriptor that matches the name or null if the type does not have a stat of the
* given name
@@ -2531,7 +2531,7 @@ public class StatArchiveReader implements StatArchiveFormat {
/**
* Gets the value of the stat in the current instance given the stat name.
- *
+ *
* @param name the name of the stat to find in the current instance
* @return the value that matches the name or null if the instance does not have a stat of the
* given name
@@ -2709,7 +2709,7 @@ public class StatArchiveReader implements StatArchiveFormat {
private ResourceType[] resourceTypeTable = null;
private final TimeStampSeries timeSeries = new TimeStampSeries();
private final DateFormat timeFormatter = new SimpleDateFormat(DateFormatter.FORMAT_STRING);
- private final static int BUFFER_SIZE = 1024 * 1024;
+ private static final int BUFFER_SIZE = 1024 * 1024;
private final ArrayList fileComboValues = new ArrayList();
@@ -2792,7 +2792,7 @@ public class StatArchiveReader implements StatArchiveFormat {
/**
* Formats an archive timestamp in way consistent with GemFire log dates. It will also be
* formatted to reflect the time zone the archive was created in.
- *
+ *
* @param ts The difference, measured in milliseconds, between the time marked by this time
* stamp and midnight, January 1, 1970 UTC.
*/
@@ -2822,7 +2822,7 @@ public class StatArchiveReader implements StatArchiveFormat {
* instances maintained by the reader are updated.
* <p>
* Once closed a reader can no longer be updated.
- *
+ *
* @return true if update read some new data.
* @throws IOException if <code>archiveName</code> could not be opened read, or closed.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
index 71f491c..7bf1979 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
@@ -14,17 +14,6 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.GemFireIOException;
-import org.apache.geode.InternalGemFireException;
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.logging.log4j.Logger;
-
import java.io.BufferedOutputStream;
import java.io.DataInput;
import java.io.DataOutput;
@@ -43,6 +32,18 @@ import java.util.Set;
import java.util.TimeZone;
import java.util.zip.GZIPOutputStream;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.GemFireIOException;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.net.SocketCreator;
+
/**
* StatArchiveWriter provides APIs to write statistic snapshots to an archive file.
*
@@ -71,7 +72,7 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
/**
* Opens a StatArchiveWriter that will archive to the specified file.
- *
+ *
* @throws GemFireIOException if <code>archiveName</code> can not be written to
*/
public StatArchiveWriter(StatArchiveDescriptor archiveDescriptor) {
@@ -137,7 +138,7 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
/**
* Closes the statArchiver by flushing its data to disk a closing its output stream.
- *
+ *
* @throws GemFireIOException if the archive file could not be closed.
*/
public void close() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
index 170ba49..9cbe24d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.internal.statistics;
+import java.util.List;
+import java.util.concurrent.SynchronousQueue;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.concurrent.ConcurrentHashSet;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.logging.log4j.Logger;
-
-import java.util.List;
-import java.util.concurrent.SynchronousQueue;
/**
* @since GemFire 7.0
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java
index 2a0fdcd..b920e9a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java
@@ -20,24 +20,24 @@ import org.apache.geode.*;
* Statistics related to the statistic sampler.
*/
public class StatSamplerStats {
- public final static String SAMPLE_COUNT = "sampleCount"; // int
- public final static String SAMPLE_TIME = "sampleTime"; // long
- public final static String DELAY_DURATION = "delayDuration"; // int
- public final static String STAT_RESOURCES = "statResources"; // int
- public final static String JVM_PAUSES = "jvmPauses"; // int
- public final static String SAMPLE_CALLBACKS = "sampleCallbacks"; // int
- public final static String SAMPLE_CALLBACK_ERRORS = "sampleCallbackErrors"; // int
- public final static String SAMPLE_CALLBACK_DURATION = "sampleCallbackDuration"; // long
-
- private final static StatisticsType samplerType;
- private final static int sampleCountId;
- private final static int sampleTimeId;
- private final static int delayDurationId;
- private final static int statResourcesId;
- private final static int jvmPausesId;
- private final static int sampleCallbacksId;
- private final static int sampleCallbackErrorsId;
- private final static int sampleCallbackDurationId;
+ public static final String SAMPLE_COUNT = "sampleCount"; // int
+ public static final String SAMPLE_TIME = "sampleTime"; // long
+ public static final String DELAY_DURATION = "delayDuration"; // int
+ public static final String STAT_RESOURCES = "statResources"; // int
+ public static final String JVM_PAUSES = "jvmPauses"; // int
+ public static final String SAMPLE_CALLBACKS = "sampleCallbacks"; // int
+ public static final String SAMPLE_CALLBACK_ERRORS = "sampleCallbackErrors"; // int
+ public static final String SAMPLE_CALLBACK_DURATION = "sampleCallbackDuration"; // long
+
+ private static final StatisticsType samplerType;
+ private static final int sampleCountId;
+ private static final int sampleTimeId;
+ private static final int delayDurationId;
+ private static final int statResourcesId;
+ private static final int jvmPausesId;
+ private static final int sampleCallbacksId;
+ private static final int sampleCallbackErrorsId;
+ private static final int sampleCallbackDurationId;
static {
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
samplerType = f.createType("StatSampler", "Stats on the statistic sampler.",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java
index 596ba8c..7c94088 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java
@@ -23,7 +23,7 @@ import org.apache.geode.Statistics;
* A StatisticsType contains any number of StatisticDescriptors. A StatisticsType may describe one
* or more Statistics instances, while a StatisticDescriptor may describe one or more StatisticId
* instances.
- *
+ *
* @since GemFire 7.0
*/
public interface StatisticId {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
index 0e2f5f4..63547ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.internal.statistics;
-// import org.apache.geode.distributed.DistributedSystem;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -22,6 +21,8 @@ import java.util.function.DoubleSupplier;
import java.util.function.IntSupplier;
import java.util.function.LongSupplier;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
@@ -30,8 +31,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
-import org.apache.logging.log4j.Logger;
-
// @todo darrel Add statistics instances to archive when they are created.
/**
* An object that maintains the values of various application-defined statistics. The statistics
@@ -403,7 +402,7 @@ public abstract class StatisticsImpl implements Statistics {
/**
* For internal use only. Tells the implementation to prepare the data in this instance for
* sampling.
- *
+ *
* @since GemFire 5.1
*/
public void prepareForSample() {
@@ -413,7 +412,7 @@ public abstract class StatisticsImpl implements Statistics {
/**
* Invoke sample suppliers to retrieve the current value for the suppler controlled sets and
* update the stats to reflect the supplied values.
- *
+ *
* @return the number of callback errors that occurred while sampling stats
*/
public int invokeSuppliers() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
index a00a7a3..c7d1374 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.internal.concurrent.ConcurrentHashSet;
-
import java.util.List;
+import org.apache.geode.internal.concurrent.ConcurrentHashSet;
+
/**
* TODO: define another addStatistic for StatisticDescriptor which will enable static monitoring
* that will fire for all instances even ones that may not yet be created at the time this monitor
* is defined
- *
+ *
* @since GemFire 7.0
*/
public abstract class StatisticsMonitor {
@@ -88,7 +88,7 @@ public abstract class StatisticsMonitor {
/**
* This method may be overridden but please ensure that you invoke super.monitor(long, List) from
* this method in the subclass.
- *
+ *
* @param millisTimeStamp the real time in millis of the sample
* @param resourceInstances resources with one or more updated values
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java
index 6aefbec..c1ca990 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java
@@ -19,7 +19,7 @@ import org.apache.geode.Statistics;
/**
* Defines the minimal contract for a StatisticsSampler. This is used by classes that need to
* interact with the sampler.
- *
+ *
* @since GemFire 7.0
*/
public interface StatisticsSampler {
@@ -36,7 +36,7 @@ public interface StatisticsSampler {
/**
* Waits for the SampleCollector to be created and initialized.
- *
+ *
* @param timeout maximum number of milliseconds to wait
* @return the initialized SampleCollector or null if timed out
* @throws InterruptedException if the current thread is interrupted while waiting
@@ -45,7 +45,7 @@ public interface StatisticsSampler {
/**
* Waits for at least one statistics sample to occur before returning.
- *
+ *
* @param timeout maximum number of milliseconds to wait
* @return true if a statistics sample occurred; false if wait timed out
* @throws InterruptedException if the current thread is interrupted while waiting
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
index df67d74..343b503 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
import java.util.*;
+import org.apache.geode.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* The implementation of {@link StatisticsTypeFactory}. Each VM can any have a single instance of
* this class which can be accessed by calling {@link #singleton()}.
@@ -32,7 +32,7 @@ import java.util.*;
*/
public class StatisticsTypeFactoryImpl implements StatisticsTypeFactory {
// static fields
- private final static StatisticsTypeFactoryImpl singleton = new StatisticsTypeFactoryImpl();
+ private static final StatisticsTypeFactoryImpl singleton = new StatisticsTypeFactoryImpl();
// static methods
/**
@@ -56,7 +56,7 @@ public class StatisticsTypeFactoryImpl implements StatisticsTypeFactory {
/**
* Adds an already created type. If the type has already been added and is equal to the new one
* then the new one is dropped and the existing one returned.
- *
+ *
* @throws IllegalArgumentException if the type already exists and is not equal to the new type
*/
public StatisticsType addType(StatisticsType t) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
index c6594ef..50658f0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
import java.util.*;
+import org.apache.geode.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* Gathers together a number of {@link StatisticDescriptor statistics} into one logical type.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java
index 0144216..5df663f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java
@@ -14,20 +14,19 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.*;
import java.util.*;
+
import javax.xml.parsers.*;
-// import javax.xml.transform.*;
-// import javax.xml.transform.dom.*;
-// import javax.xml.transform.stream.*;
+
import org.w3c.dom.*;
import org.xml.sax.*;
+import org.apache.geode.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
// @todo davidw Use a SAX parser instead of DOM
/**
* This is an internal helper class for dealing with the SessionFactory XML configuration files.
@@ -183,9 +182,9 @@ public class StatisticsTypeXml implements EntityResolver, ErrorHandler {
return statFactory.createType(typeName, description, descriptors);
}
- private final static int INT_STORAGE = 0;
- private final static int LONG_STORAGE = 1;
- private final static int DOUBLE_STORAGE = 2;
+ private static final int INT_STORAGE = 0;
+ private static final int LONG_STORAGE = 1;
+ private static final int DOUBLE_STORAGE = 2;
/**
* <!ELEMENT stat (description?, unit?)> <!ATTLIST stat name CDATA #REQUIRED counter (true |
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java
index 54a4a9e..d94a879 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java
@@ -20,11 +20,11 @@ import org.apache.geode.*;
* Statistics related to a Java VM. Currently they all come from {@link java.lang.Runtime}.
*/
public class VMStats implements VMStatsContract {
- private final static StatisticsType vmType;
- private final static int cpusId;
- private final static int freeMemoryId;
- private final static int totalMemoryId;
- private final static int maxMemoryId;
+ private static final StatisticsType vmType;
+ private static final int cpusId;
+ private static final int freeMemoryId;
+ private static final int totalMemoryId;
+ private static final int maxMemoryId;
static {
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
vmType = f.createType("VMStats", "Stats available on any java virtual machine.",
@@ -68,7 +68,7 @@ public class VMStats implements VMStatsContract {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.statistics.VMStatsContract#getFdsOpen()
*/
public long getFdsOpen() {
@@ -77,7 +77,7 @@ public class VMStats implements VMStatsContract {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.statistics.VMStatsContract#getFdLimit()
*/
public long getFdLimit() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java
index 38c019e..569127e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.statistics;
* <p>
* I named this VMStatsContract because an implementation named VMStats already exists and I didn't
* want to rename it because of the svn merge issues.
- *
+ *
* @see VMStatsContractFactory
*/
public interface VMStatsContract {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/ValueMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/ValueMonitor.java
index e46723c..0afed13 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/ValueMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/ValueMonitor.java
@@ -28,18 +28,18 @@ import org.apache.geode.internal.CopyOnWriteHashSet;
* The following code is an example of how to find an existing Statistics instance and define a
* ValueMonitor listener for notifications of any stat sample containing updates to any stats in the
* instance being monitored:
- *
+ *
* <pre>
* StatisticsFactory factory = InternalDistributedSystem.getAnyInstance(); Statistics[] statistics =
* f.findStatisticsByTextId("statSampler"); if (statistics.length == 1) { ValueMonitor monitor = new
* ValueMonitor().addStatistics(statistics[0]);
- *
+ *
* monitor.addListener(new StatisticsListener() { public void
* handleNotification(StatisticsNotification notify) { System.out.println("One or more statSampler
* stats changed at " + notify.getTimeStamp()); for (StatisticId statId : notify) {
* System.out.println("\t" + statId.getStatisticDescriptor().getName() + " = " +
* notify.getValue(statId)); } } }; }
- *
+ *
* @since GemFire 7.0
* @see org.apache.geode.Statistics
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
index 27eabf3..83cbada 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.logging.log4j.Logger;
-
import java.io.*;
import java.util.ArrayList;
import java.util.List;
@@ -24,6 +21,10 @@ import java.util.NoSuchElementException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+
public class LinuxProcFsStatistics {
private enum CPU {
USER,
@@ -91,7 +92,7 @@ public class LinuxProcFsStatistics {
* get the statistics for the specified process. ( pid_rssSize, pid_imageSize ) vsize is assumed
* to be in units of kbytes System property gemfire.statistics.pagesSize can be used to configure
* pageSize. This is the mem_unit member of the struct returned by sysinfo()
- *
+ *
*/
public static void refreshProcess(int pid, int[] ints, long[] longs, double[] doubles) { // TODO:
// was
@@ -231,7 +232,7 @@ public class LinuxProcFsStatistics {
/**
* Returns the available system memory (free + cached).
- *
+ *
* @param logger the logger
* @return the available memory in bytes
*/
@@ -581,7 +582,7 @@ public class LinuxProcFsStatistics {
* Count the number of files in /proc that do not represent processes. This value is cached to
* make counting the number of running process a cheap operation. The assumption is that the
* contents of /proc will not change on a running system.
- *
+ *
* @return the files in /proc that do NOT match /proc/[0-9]*
*/
private static int getNumberOfNonProcessProcFiles() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java
index 695a0f0..f09b6d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java
@@ -28,10 +28,10 @@ import org.apache.geode.internal.statistics.platform.ProcessStats;
* using a GemFire system.
*/
public class LinuxProcessStats {
- final static int imageSizeINT = 0;
- final static int rssSizeINT = 1;
+ static final int imageSizeINT = 0;
+ static final int rssSizeINT = 1;
- private final static StatisticsType myType;
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java
index c3150b6..b4b514c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java
@@ -27,61 +27,61 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
public class LinuxSystemStats {
// shared fields
- final static int allocatedSwapINT = 0;
- final static int bufferMemoryINT = 1;
- final static int sharedMemoryINT = 2;
- final static int cpuActiveINT = 3;
- final static int cpuIdleINT = 4;
- final static int cpuNiceINT = 5;
- final static int cpuSystemINT = 6;
- final static int cpuUserINT = 7;
- final static int iowaitINT = 8;
- final static int irqINT = 9;
- final static int softirqINT = 10;
- final static int cpusINT = 11;
- final static int freeMemoryINT = 12;
- final static int physicalMemoryINT = 13;
- final static int processesINT = 14;
- final static int unallocatedSwapINT = 15;
- final static int cachedMemoryINT = 16;
- final static int dirtyMemoryINT = 17;
- final static int cpuNonUserINT = 18;
- final static int cpuStealINT = 19;
+ static final int allocatedSwapINT = 0;
+ static final int bufferMemoryINT = 1;
+ static final int sharedMemoryINT = 2;
+ static final int cpuActiveINT = 3;
+ static final int cpuIdleINT = 4;
+ static final int cpuNiceINT = 5;
+ static final int cpuSystemINT = 6;
+ static final int cpuUserINT = 7;
+ static final int iowaitINT = 8;
+ static final int irqINT = 9;
+ static final int softirqINT = 10;
+ static final int cpusINT = 11;
+ static final int freeMemoryINT = 12;
+ static final int physicalMemoryINT = 13;
+ static final int processesINT = 14;
+ static final int unallocatedSwapINT = 15;
+ static final int cachedMemoryINT = 16;
+ static final int dirtyMemoryINT = 17;
+ static final int cpuNonUserINT = 18;
+ static final int cpuStealINT = 19;
- final static int loopbackPacketsLONG = 0;
- final static int loopbackBytesLONG = 1;
- final static int recvPacketsLONG = 2;
- final static int recvBytesLONG = 3;
- final static int recvErrorsLONG = 4;
- final static int recvDropsLONG = 5;
- final static int xmitPacketsLONG = 6;
- final static int xmitBytesLONG = 7;
- final static int xmitErrorsLONG = 8;
- final static int xmitDropsLONG = 9;
- final static int xmitCollisionsLONG = 10;
- final static int contextSwitchesLONG = 11;
- final static int processCreatesLONG = 12;
- final static int pagesPagedInLONG = 13;
- final static int pagesPagedOutLONG = 14;
- final static int pagesSwappedInLONG = 15;
- final static int pagesSwappedOutLONG = 16;
- final static int readsCompletedLONG = 17;
- final static int readsMergedLONG = 18;
- final static int bytesReadLONG = 19;
- final static int timeReadingLONG = 20;
- final static int writesCompletedLONG = 21;
- final static int writesMergedLONG = 22;
- final static int bytesWrittenLONG = 23;
- final static int timeWritingLONG = 24;
- final static int iosInProgressLONG = 25;
- final static int timeIosInProgressLONG = 26;
- final static int ioTimeLONG = 27;
+ static final int loopbackPacketsLONG = 0;
+ static final int loopbackBytesLONG = 1;
+ static final int recvPacketsLONG = 2;
+ static final int recvBytesLONG = 3;
+ static final int recvErrorsLONG = 4;
+ static final int recvDropsLONG = 5;
+ static final int xmitPacketsLONG = 6;
+ static final int xmitBytesLONG = 7;
+ static final int xmitErrorsLONG = 8;
+ static final int xmitDropsLONG = 9;
+ static final int xmitCollisionsLONG = 10;
+ static final int contextSwitchesLONG = 11;
+ static final int processCreatesLONG = 12;
+ static final int pagesPagedInLONG = 13;
+ static final int pagesPagedOutLONG = 14;
+ static final int pagesSwappedInLONG = 15;
+ static final int pagesSwappedOutLONG = 16;
+ static final int readsCompletedLONG = 17;
+ static final int readsMergedLONG = 18;
+ static final int bytesReadLONG = 19;
+ static final int timeReadingLONG = 20;
+ static final int writesCompletedLONG = 21;
+ static final int writesMergedLONG = 22;
+ static final int bytesWrittenLONG = 23;
+ static final int timeWritingLONG = 24;
+ static final int iosInProgressLONG = 25;
+ static final int timeIosInProgressLONG = 26;
+ static final int ioTimeLONG = 27;
- final static int loadAverage1DOUBLE = 0;
- final static int loadAverage15DOUBLE = 1;
- final static int loadAverage5DOUBLE = 2;
+ static final int loadAverage1DOUBLE = 0;
+ static final int loadAverage15DOUBLE = 1;
+ static final int loadAverage5DOUBLE = 2;
- private final static StatisticsType myType;
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java
index ea738f5..95421ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java
@@ -27,10 +27,10 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
* is using a GemFire system.
*/
public class OSXProcessStats {
- // private final static int imageSizeINT = 0;
- // private final static int rssSizeINT = 1;
+ // private static final int imageSizeINT = 0;
+ // private static final int rssSizeINT = 1;
- private final static StatisticsType myType;
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java
index 81c64d4..066c9c2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java
@@ -27,43 +27,43 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
public class OSXSystemStats {
// shared fields
- // private final static int allocatedSwapINT = 0;
- // private final static int bufferMemoryINT = 1;
- // private final static int contextSwitchesINT = 2;
- // private final static int cpuActiveINT = 3;
- // private final static int cpuIdleINT = 4;
- // private final static int cpuNiceINT = 5;
- // private final static int cpuSystemINT = 6;
- // private final static int cpuUserINT = 7;
- // private final static int cpusINT = 8;
- // private final static int freeMemoryINT = 9;
- // private final static int pagesPagedInINT = 10;
- // private final static int pagesPagedOutINT = 11;
- // private final static int pagesSwappedInINT = 12;
- // private final static int pagesSwappedOutINT = 13;
- // private final static int physicalMemoryINT = 14;
- // private final static int processCreatesINT = 15;
- // private final static int processesINT = 16;
- // private final static int sharedMemoryINT = 17;
- // private final static int unallocatedSwapINT = 18;
+ // private static final int allocatedSwapINT = 0;
+ // private static final int bufferMemoryINT = 1;
+ // private static final int contextSwitchesINT = 2;
+ // private static final int cpuActiveINT = 3;
+ // private static final int cpuIdleINT = 4;
+ // private static final int cpuNiceINT = 5;
+ // private static final int cpuSystemINT = 6;
+ // private static final int cpuUserINT = 7;
+ // private static final int cpusINT = 8;
+ // private static final int freeMemoryINT = 9;
+ // private static final int pagesPagedInINT = 10;
+ // private static final int pagesPagedOutINT = 11;
+ // private static final int pagesSwappedInINT = 12;
+ // private static final int pagesSwappedOutINT = 13;
+ // private static final int physicalMemoryINT = 14;
+ // private static final int processCreatesINT = 15;
+ // private static final int processesINT = 16;
+ // private static final int sharedMemoryINT = 17;
+ // private static final int unallocatedSwapINT = 18;
//
- // private final static int loopbackPacketsLONG = 0;
- // private final static int loopbackBytesLONG = 1;
- // private final static int recvPacketsLONG = 2;
- // private final static int recvBytesLONG = 3;
- // private final static int recvErrorsLONG = 4;
- // private final static int recvDropsLONG = 5;
- // private final static int xmitPacketsLONG = 6;
- // private final static int xmitBytesLONG = 7;
- // private final static int xmitErrorsLONG = 8;
- // private final static int xmitDropsLONG = 9;
- // private final static int xmitCollisionsLONG = 10;
+ // private static final int loopbackPacketsLONG = 0;
+ // private static final int loopbackBytesLONG = 1;
+ // private static final int recvPacketsLONG = 2;
+ // private static final int recvBytesLONG = 3;
+ // private static final int recvErrorsLONG = 4;
+ // private static final int recvDropsLONG = 5;
+ // private static final int xmitPacketsLONG = 6;
+ // private static final int xmitBytesLONG = 7;
+ // private static final int xmitErrorsLONG = 8;
+ // private static final int xmitDropsLONG = 9;
+ // private static final int xmitCollisionsLONG = 10;
//
- // private final static int loadAverage1DOUBLE = 0;
- // private final static int loadAverage15DOUBLE = 1;
- // private final static int loadAverage5DOUBLE = 2;
+ // private static final int loadAverage1DOUBLE = 0;
+ // private static final int loadAverage15DOUBLE = 1;
+ // private static final int loadAverage5DOUBLE = 2;
- private final static StatisticsType myType;
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java
index 00a6188..7d112c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java
@@ -22,7 +22,7 @@ import org.apache.geode.*;
*
* {@link org.apache.geode.distributed.DistributedSystem} is an OS statistics factory.
* <P>
- *
+ *
* @see <A href="package-summary.html#statistics">Package introduction</A>
*
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java
index 9b47ee8..d6b87b1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java
@@ -28,38 +28,38 @@ import org.apache.geode.internal.statistics.platform.ProcessStats;
* using a GemFire system.
*/
public class SolarisProcessStats {
- private final static int allOtherSleepTimeINT = 0;
- private final static int characterIoINT = 1;
- private final static int dataFaultSleepTimeINT = 2;
- private final static int heapSizeINT = 3;
- private final static int imageSizeINT = 4;
- private final static int involContextSwitchesINT = 5;
- private final static int kernelFaultSleepTimeINT = 6;
- private final static int lockWaitSleepTimeINT = 7;
- private final static int lwpCurCountINT = 8;
- private final static int lwpTotalCountINT = 9;
- private final static int majorFaultsINT = 10;
- private final static int messagesRecvINT = 11;
- private final static int messagesSentINT = 12;
- private final static int minorFaultsINT = 13;
- private final static int rssSizeINT = 14;
- private final static int signalsReceivedINT = 15;
- private final static int systemCallsINT = 16;
- private final static int stackSizeINT = 17;
- private final static int stoppedTimeINT = 18;
- private final static int systemTimeINT = 19;
- private final static int textFaultSleepTimeINT = 20;
- private final static int trapTimeINT = 21;
- private final static int userTimeINT = 22;
- private final static int volContextSwitchesINT = 23;
- private final static int waitCpuTimeINT = 24;
-
- private final static int activeTimeLONG = 0;
-
- private final static int cpuUsedDOUBLE = 0;
- private final static int memoryUsedDOUBLE = 1;
-
- private final static StatisticsType myType;
+ private static final int allOtherSleepTimeINT = 0;
+ private static final int characterIoINT = 1;
+ private static final int dataFaultSleepTimeINT = 2;
+ private static final int heapSizeINT = 3;
+ private static final int imageSizeINT = 4;
+ private static final int involContextSwitchesINT = 5;
+ private static final int kernelFaultSleepTimeINT = 6;
+ private static final int lockWaitSleepTimeINT = 7;
+ private static final int lwpCurCountINT = 8;
+ private static final int lwpTotalCountINT = 9;
+ private static final int majorFaultsINT = 10;
+ private static final int messagesRecvINT = 11;
+ private static final int messagesSentINT = 12;
+ private static final int minorFaultsINT = 13;
+ private static final int rssSizeINT = 14;
+ private static final int signalsReceivedINT = 15;
+ private static final int systemCallsINT = 16;
+ private static final int stackSizeINT = 17;
+ private static final int stoppedTimeINT = 18;
+ private static final int systemTimeINT = 19;
+ private static final int textFaultSleepTimeINT = 20;
+ private static final int trapTimeINT = 21;
+ private static final int userTimeINT = 22;
+ private static final int volContextSwitchesINT = 23;
+ private static final int waitCpuTimeINT = 24;
+
+ private static final int activeTimeLONG = 0;
+
+ private static final int cpuUsedDOUBLE = 0;
+ private static final int memoryUsedDOUBLE = 1;
+
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java
index 3842b6e..d5924d9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java
@@ -25,80 +25,80 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
* running on.
*/
public class SolarisSystemStats {
- private final static int allocatedSwapINT = 0;
- private final static int cpuActiveINT = 1;
- private final static int cpuIdleINT = 2;
- private final static int cpuIoWaitINT = 3;
- private final static int cpuSwapWaitINT = 4;
- private final static int cpuSystemINT = 5;
- private final static int cpuUserINT = 6;
- private final static int cpuWaitingINT = 7;
- private final static int cpusINT = 8;
- private final static int freeMemoryINT = 9;
- private final static int physicalMemoryINT = 10;
- private final static int processesINT = 11;
- private final static int reservedSwapINT = 12;
- private final static int schedulerRunCountINT = 13;
- private final static int schedulerSwapCountINT = 14;
- private final static int schedulerWaitCountINT = 15;
- private final static int unreservedSwapINT = 16;
- private final static int unallocatedSwapINT = 17;
+ private static final int allocatedSwapINT = 0;
+ private static final int cpuActiveINT = 1;
+ private static final int cpuIdleINT = 2;
+ private static final int cpuIoWaitINT = 3;
+ private static final int cpuSwapWaitINT = 4;
+ private static final int cpuSystemINT = 5;
+ private static final int cpuUserINT = 6;
+ private static final int cpuWaitingINT = 7;
+ private static final int cpusINT = 8;
+ private static final int freeMemoryINT = 9;
+ private static final int physicalMemoryINT = 10;
+ private static final int processesINT = 11;
+ private static final int reservedSwapINT = 12;
+ private static final int schedulerRunCountINT = 13;
+ private static final int schedulerSwapCountINT = 14;
+ private static final int schedulerWaitCountINT = 15;
+ private static final int unreservedSwapINT = 16;
+ private static final int unallocatedSwapINT = 17;
- private final static int anonymousPagesFreedLONG = 0;
- private final static int anonymousPagesPagedInLONG = 1;
- private final static int anonymousPagesPagedOutLONG = 2;
- private final static int contextSwitchesLONG = 3;
- private final static int execPagesFreedLONG = 4;
- private final static int execPagesPagedInLONG = 5;
- private final static int execPagesPagedOutLONG = 6;
- private final static int failedMutexEntersLONG = 7;
- private final static int failedReaderLocksLONG = 8;
- private final static int failedWriterLocksLONG = 9;
- private final static int fileSystemPagesFreedLONG = 10;
- private final static int fileSystemPagesPagedInLONG = 11;
- private final static int fileSystemPagesPagedOutLONG = 12;
- private final static int hatMinorFaultsLONG = 13;
- private final static int interruptsLONG = 14;
- private final static int involContextSwitchesLONG = 15;
- private final static int majorPageFaultsLONG = 16;
- private final static int messageCountLONG = 17;
- private final static int pageDaemonCyclesLONG = 18;
- private final static int pageInsLONG = 19;
- private final static int pageOutsLONG = 20;
- private final static int pagerRunsLONG = 21;
- private final static int pagesPagedInLONG = 22;
- private final static int pagesPagedOutLONG = 23;
- private final static int pagesScannedLONG = 24;
- private final static int procsInIoWaitLONG = 25;
- private final static int protectionFaultsLONG = 26;
- private final static int semphoreOpsLONG = 27;
- private final static int softwareLockFaultsLONG = 28;
- private final static int systemCallsLONG = 29;
- private final static int systemMinorFaultsLONG = 30;
- private final static int threadCreatesLONG = 31;
- private final static int trapsLONG = 32;
- private final static int userMinorFaultsLONG = 33;
- private final static int loopbackInputPacketsLONG = 34;
- private final static int loopbackOutputPacketsLONG = 35;
- private final static int inputPacketsLONG = 36;
- private final static int inputErrorsLONG = 37;
- private final static int outputPacketsLONG = 38;
- private final static int outputErrorsLONG = 39;
- private final static int collisionsLONG = 40;
- private final static int inputBytesLONG = 41;
- private final static int outputBytesLONG = 42;
- private final static int multicastInputPacketsLONG = 43;
- private final static int multicastOutputPacketsLONG = 44;
- private final static int broadcastInputPacketsLONG = 45;
- private final static int broadcastOutputPacketsLONG = 46;
- private final static int inputPacketsDiscardedLONG = 47;
- private final static int outputPacketsDiscardedLONG = 48;
+ private static final int anonymousPagesFreedLONG = 0;
+ private static final int anonymousPagesPagedInLONG = 1;
+ private static final int anonymousPagesPagedOutLONG = 2;
+ private static final int contextSwitchesLONG = 3;
+ private static final int execPagesFreedLONG = 4;
+ private static final int execPagesPagedInLONG = 5;
+ private static final int execPagesPagedOutLONG = 6;
+ private static final int failedMutexEntersLONG = 7;
+ private static final int failedReaderLocksLONG = 8;
+ private static final int failedWriterLocksLONG = 9;
+ private static final int fileSystemPagesFreedLONG = 10;
+ private static final int fileSystemPagesPagedInLONG = 11;
+ private static final int fileSystemPagesPagedOutLONG = 12;
+ private static final int hatMinorFaultsLONG = 13;
+ private static final int interruptsLONG = 14;
+ private static final int involContextSwitchesLONG = 15;
+ private static final int majorPageFaultsLONG = 16;
+ private static final int messageCountLONG = 17;
+ private static final int pageDaemonCyclesLONG = 18;
+ private static final int pageInsLONG = 19;
+ private static final int pageOutsLONG = 20;
+ private static final int pagerRunsLONG = 21;
+ private static final int pagesPagedInLONG = 22;
+ private static final int pagesPagedOutLONG = 23;
+ private static final int pagesScannedLONG = 24;
+ private static final int procsInIoWaitLONG = 25;
+ private static final int protectionFaultsLONG = 26;
+ private static final int semphoreOpsLONG = 27;
+ private static final int softwareLockFaultsLONG = 28;
+ private static final int systemCallsLONG = 29;
+ private static final int systemMinorFaultsLONG = 30;
+ private static final int threadCreatesLONG = 31;
+ private static final int trapsLONG = 32;
+ private static final int userMinorFaultsLONG = 33;
+ private static final int loopbackInputPacketsLONG = 34;
+ private static final int loopbackOutputPacketsLONG = 35;
+ private static final int inputPacketsLONG = 36;
+ private static final int inputErrorsLONG = 37;
+ private static final int outputPacketsLONG = 38;
+ private static final int outputErrorsLONG = 39;
+ private static final int collisionsLONG = 40;
+ private static final int inputBytesLONG = 41;
+ private static final int outputBytesLONG = 42;
+ private static final int multicastInputPacketsLONG = 43;
+ private static final int multicastOutputPacketsLONG = 44;
+ private static final int broadcastInputPacketsLONG = 45;
+ private static final int broadcastOutputPacketsLONG = 46;
+ private static final int inputPacketsDiscardedLONG = 47;
+ private static final int outputPacketsDiscardedLONG = 48;
- private final static int loadAverage1DOUBLE = 0;
- private final static int loadAverage15DOUBLE = 1;
- private final static int loadAverage5DOUBLE = 2;
+ private static final int loadAverage1DOUBLE = 0;
+ private static final int loadAverage15DOUBLE = 1;
+ private static final int loadAverage5DOUBLE = 2;
- private final static StatisticsType myType;
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
@@ -117,7 +117,7 @@ public class SolarisSystemStats {
* "\n KeepAliveTimeouts KeepAliveProbes KeepAliveDrops"
* "\n ListenQueueFull HalfOpenQueueFull HalfOpenDrops" "\n) "); sprintf(buff, "%d", typeCount);
* TcpTypeCount = typeCount; typeCount++; strcat(res, buff); }
- *
+ *
*/
static {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java
index 0ad5d12..25f3423 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java
@@ -28,23 +28,23 @@ import org.apache.geode.internal.statistics.platform.ProcessStats;
* using a GemFire system.
*/
public class WindowsProcessStats {
- private final static int handlesINT = 0;
- private final static int priorityBaseINT = 1;
- private final static int threadsINT = 2;
+ private static final int handlesINT = 0;
+ private static final int priorityBaseINT = 1;
+ private static final int threadsINT = 2;
- private final static int activeTimeLONG = 0;
- private final static int pageFaultsLONG = 1;
- private final static int pageFileSizeLONG = 2;
- private final static int pageFileSizePeakLONG = 3;
- private final static int privateSizeLONG = 4;
- private final static int systemTimeLONG = 5;
- private final static int userTimeLONG = 6;
- private final static int virtualSizeLONG = 7;
- private final static int virtualSizePeakLONG = 8;
- private final static int workingSetSizeLONG = 9;
- private final static int workingSetSizePeakLONG = 10;
+ private static final int activeTimeLONG = 0;
+ private static final int pageFaultsLONG = 1;
+ private static final int pageFileSizeLONG = 2;
+ private static final int pageFileSizePeakLONG = 3;
+ private static final int privateSizeLONG = 4;
+ private static final int systemTimeLONG = 5;
+ private static final int userTimeLONG = 6;
+ private static final int virtualSizeLONG = 7;
+ private static final int virtualSizePeakLONG = 8;
+ private static final int workingSetSizeLONG = 9;
+ private static final int workingSetSizePeakLONG = 10;
- private final static StatisticsType myType;
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
@@ -129,7 +129,7 @@ public class WindowsProcessStats {
/**
* Returns a <code>ProcessStats</code> that wraps Windows process <code>Statistics</code>.
- *
+ *
* @since GemFire 3.5
*/
public static ProcessStats createProcessStats(final Statistics stats) { // TODO: was
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java
index e6b74dd..6c9992e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java
@@ -25,51 +25,51 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
* running on.
*/
public class WindowsSystemStats {
- private final static int committedMemoryInUseINT = 0;
- private final static int eventsINT = 1;
- private final static int interruptsINT = 2;
- private final static int mutexesINT = 3;
- private final static int processesINT = 4;
- private final static int processorQueueLengthINT = 5;
- private final static int registryQuotaInUseINT = 6;
- private final static int sharedMemorySectionsINT = 7;
- private final static int semaphoresINT = 8;
- private final static int threadsINT = 9;
- private final static int dgramsReceivedINT = 10;
- private final static int dgramsNoPortINT = 11;
- private final static int dgramsReceivedErrorsINT = 12;
- private final static int dgramsSentINT = 13;
- private final static int loopbackPacketsINT = 14;
- private final static int loopbackBytesINT = 15;
- private final static int netPacketsReceivedINT = 16;
- private final static int netBytesReceivedINT = 17;
- private final static int netPacketsSentINT = 18;
- private final static int netBytesSentINT = 19;
-
-
- private final static int availableMemoryLONG = 0;
- private final static int cacheFaultsLONG = 1;
- private final static int cacheSizeLONG = 2;
- private final static int cacheSizePeakLONG = 3;
- private final static int committedMemoryLONG = 4;
- private final static int committedMemoryLimitLONG = 5;
- private final static int contextSwitchesLONG = 6;
- private final static int demandZeroFaultsLONG = 7;
- private final static int pageFaultsLONG = 8;
- private final static int pageReadsLONG = 9;
- private final static int pagesLONG = 10;
- private final static int pageWritesLONG = 11;
- private final static int pagesInputLONG = 12;
- private final static int pagesOutputLONG = 13;
- private final static int systemCallsLONG = 14;
-
- private final static int cpuActiveDOUBLE = 0;
- private final static int cpuIdleDOUBLE = 1;
- private final static int cpuInterruptDOUBLE = 2;
- private final static int cpuSystemDOUBLE = 3;
- private final static int cpuUserDOUBLE = 4;
-
- private final static StatisticsType myType;
+ private static final int committedMemoryInUseINT = 0;
+ private static final int eventsINT = 1;
+ private static final int interruptsINT = 2;
+ private static final int mutexesINT = 3;
+ private static final int processesINT = 4;
+ private static final int processorQueueLengthINT = 5;
+ private static final int registryQuotaInUseINT = 6;
+ private static final int sharedMemorySectionsINT = 7;
+ private static final int semaphoresINT = 8;
+ private static final int threadsINT = 9;
+ private static final int dgramsReceivedINT = 10;
+ private static final int dgramsNoPortINT = 11;
+ private static final int dgramsReceivedErrorsINT = 12;
+ private static final int dgramsSentINT = 13;
+ private static final int loopbackPacketsINT = 14;
+ private static final int loopbackBytesINT = 15;
+ private static final int netPacketsReceivedINT = 16;
+ private static final int netBytesReceivedINT = 17;
+ private static final int netPacketsSentINT = 18;
+ private static final int netBytesSentINT = 19;
+
+
+ private static final int availableMemoryLONG = 0;
+ private static final int cacheFaultsLONG = 1;
+ private static final int cacheSizeLONG = 2;
+ private static final int cacheSizePeakLONG = 3;
+ private static final int committedMemoryLONG = 4;
+ private static final int committedMemoryLimitLONG = 5;
+ private static final int contextSwitchesLONG = 6;
+ private static final int demandZeroFaultsLONG = 7;
+ private static final int pageFaultsLONG = 8;
+ private static final int pageReadsLONG = 9;
+ private static final int pagesLONG = 10;
+ private static final int pageWritesLONG = 11;
+ private static final int pagesInputLONG = 12;
+ private static final int pagesOutputLONG = 13;
+ private static final int systemCallsLONG = 14;
+
+ private static final int cpuActiveDOUBLE = 0;
+ private static final int cpuIdleDOUBLE = 1;
+ private static final int cpuInterruptDOUBLE = 2;
+ private static final int cpuSystemDOUBLE = 3;
+ private static final int cpuUserDOUBLE = 4;
+
+ private static final StatisticsType myType;
private static void checkOffset(String name, int offset) {
int id = myType.nameToId(name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
index 17f6afe..01c2742 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.internal.stats50;
+import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicIntegerArray;
+import java.util.concurrent.atomic.AtomicLongArray;
+
import org.apache.geode.*;
import org.apache.geode.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -21,12 +27,6 @@ import org.apache.geode.internal.statistics.StatisticsImpl;
import org.apache.geode.internal.statistics.StatisticsManager;
import org.apache.geode.internal.statistics.StatisticsTypeImpl;
-import java.util.concurrent.atomic.AtomicIntegerArray; // don't use backport here!
-import java.util.concurrent.atomic.AtomicLongArray; // don't use backport here!
-import java.util.concurrent.ConcurrentLinkedQueue; // don't use backport here!
-import java.util.concurrent.CopyOnWriteArrayList; // don't use backport here!
-import java.util.*;
-
/**
* An implementation of {@link Statistics} that stores its statistics in local java memory.
*
@@ -309,7 +309,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/**
* Used to take striped thread stats and "roll them up" into a single shared stat.
- *
+ *
* @since GemFire 5.1
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/stats50/VMStats50.java b/geode-core/src/main/java/org/apache/geode/internal/stats50/VMStats50.java
index 64f7a61..b52f908 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/stats50/VMStats50.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/stats50/VMStats50.java
@@ -41,94 +41,94 @@ import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.statistics.VMStatsContract;
-import org.apache.geode.internal.logging.LogService;
/**
* Statistics related to a Java VM. This version is hardcoded to use 1.5 MXBean stats from
* java.lang.management.
*/
public class VMStats50 implements VMStatsContract {
- private final static Logger logger = LogService.getLogger(VMStats50.class.getName());
+ private static final Logger logger = LogService.getLogger(VMStats50.class.getName());
- private final static StatisticsType vmType;
+ private static final StatisticsType vmType;
- private final static ClassLoadingMXBean clBean;
- private final static MemoryMXBean memBean;
- private final static OperatingSystemMXBean osBean;
+ private static final ClassLoadingMXBean clBean;
+ private static final MemoryMXBean memBean;
+ private static final OperatingSystemMXBean osBean;
/**
* This is actually an instance of UnixOperatingSystemMXBean but this class is not available on
* Windows so needed to make this a runtime check.
*/
- private final static Object unixBean;
- private final static Method getMaxFileDescriptorCount;
- private final static Method getOpenFileDescriptorCount;
- private final static Method getProcessCpuTime;
- private final static ThreadMXBean threadBean;
-
- private final static int pendingFinalizationCountId;
- private final static int loadedClassesId;
- private final static int unloadedClassesId;
-
- private final static int daemonThreadsId;
- private final static int peakThreadsId;
- private final static int threadsId;
- private final static int threadStartsId;
-
- private final static int cpusId;
- private final static int freeMemoryId;
- private final static int totalMemoryId;
- private final static int maxMemoryId;
-
- private final static StatisticsType memoryUsageType;
- private final static int mu_initMemoryId;
- private final static int mu_maxMemoryId;
- private final static int mu_usedMemoryId;
- private final static int mu_committedMemoryId;
-
- private final static StatisticsType gcType;
- private final static int gc_collectionsId;
- private final static int gc_collectionTimeId;
+ private static final Object unixBean;
+ private static final Method getMaxFileDescriptorCount;
+ private static final Method getOpenFileDescriptorCount;
+ private static final Method getProcessCpuTime;
+ private static final ThreadMXBean threadBean;
+
+ private static final int pendingFinalizationCountId;
+ private static final int loadedClassesId;
+ private static final int unloadedClassesId;
+
+ private static final int daemonThreadsId;
+ private static final int peakThreadsId;
+ private static final int threadsId;
+ private static final int threadStartsId;
+
+ private static final int cpusId;
+ private static final int freeMemoryId;
+ private static final int totalMemoryId;
+ private static final int maxMemoryId;
+
+ private static final StatisticsType memoryUsageType;
+ private static final int mu_initMemoryId;
+ private static final int mu_maxMemoryId;
+ private static final int mu_usedMemoryId;
+ private static final int mu_committedMemoryId;
+
+ private static final StatisticsType gcType;
+ private static final int gc_collectionsId;
+ private static final int gc_collectionTimeId;
private final Map<GarbageCollectorMXBean, Statistics> gcMap =
new HashMap<GarbageCollectorMXBean, Statistics>();
- private final static StatisticsType mpType;
- private final static int mp_l_initMemoryId;
- private final static int mp_l_maxMemoryId;
- private final static int mp_l_usedMemoryId;
- private final static int mp_l_committedMemoryId;
- // private final static int mp_gc_initMemoryId;
- // private final static int mp_gc_maxMemoryId;
- private final static int mp_gc_usedMemoryId;
- // private final static int mp_gc_committedMemoryId;
- private final static int mp_usageThresholdId;
- private final static int mp_collectionUsageThresholdId;
- private final static int mp_usageExceededId;
- private final static int mp_collectionUsageExceededId;
+ private static final StatisticsType mpType;
+ private static final int mp_l_initMemoryId;
+ private static final int mp_l_maxMemoryId;
+ private static final int mp_l_usedMemoryId;
+ private static final int mp_l_committedMemoryId;
+ // private static final int mp_gc_initMemoryId;
+ // private static final int mp_gc_maxMemoryId;
+ private static final int mp_gc_usedMemoryId;
+ // private static final int mp_gc_committedMemoryId;
+ private static final int mp_usageThresholdId;
+ private static final int mp_collectionUsageThresholdId;
+ private static final int mp_usageExceededId;
+ private static final int mp_collectionUsageExceededId;
private final Map<MemoryPoolMXBean, Statistics> mpMap =
new HashMap<MemoryPoolMXBean, Statistics>();
- private final static int unix_fdLimitId;
- private final static int unix_fdsOpenId;
- private final static int processCpuTimeId;
+ private static final int unix_fdLimitId;
+ private static final int unix_fdsOpenId;
+ private static final int processCpuTimeId;
private long threadStartCount = 0;
private long[] allThreadIds = null;
- private final static boolean THREAD_STATS_ENABLED =
+ private static final boolean THREAD_STATS_ENABLED =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "enableThreadStats");
private final Map<Long, ThreadStatInfo> threadMap =
THREAD_STATS_ENABLED ? new HashMap<Long, ThreadStatInfo>() : null;
- private final static StatisticsType threadType;
- private final static int thread_blockedId;
- private final static int thread_lockOwnerId;
- private final static int thread_waitedId;
- private final static int thread_inNativeId;
- private final static int thread_suspendedId;
- private final static int thread_blockedTimeId;
- private final static int thread_waitedTimeId;
- private final static int thread_cpuTimeId;
- private final static int thread_userTimeId;
+ private static final StatisticsType threadType;
+ private static final int thread_blockedId;
+ private static final int thread_lockOwnerId;
+ private static final int thread_waitedId;
+ private static final int thread_inNativeId;
+ private static final int thread_suspendedId;
+ private static final int thread_blockedTimeId;
+ private static final int thread_waitedTimeId;
+ private static final int thread_cpuTimeId;
+ private static final int thread_userTimeId;
static {
clBean = ManagementFactory.getClassLoadingMXBean();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java
index 1345825..bd7e805 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java
@@ -23,7 +23,7 @@ import org.apache.geode.i18n.LogWriterI18n;
/**
* Base interface for {@link MsgStreamer} and {@link MsgStreamerList} to send a message over a list
* of connections to one or more peers.
- *
+ *
* @since GemFire 7.1
*/
public interface BaseMsgStreamer {
@@ -44,14 +44,14 @@ public interface BaseMsgStreamer {
/**
* Writes the message to the connected streams and returns the number of bytes written.
- *
+ *
* @throws IOException if serialization failure
*/
public int writeMessage() throws IOException;
/**
* Close this streamer.
- *
+ *
* @throws IOException on exception
*/
public void close() throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java
index 5005a83..41b9546 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java
@@ -34,7 +34,7 @@ public class Buffers {
/**
* Should only be called by threads that have currently acquired send permission.
- *
+ *
* @return a byte buffer to be used for sending on this connection.
*/
static ByteBuffer acquireSenderBuffer(int size, DMStats stats) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
index 216a9d9..16e9571 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
@@ -37,11 +37,11 @@ import org.apache.geode.internal.offheap.StoredObject;
* ByteBufferInputStream is an input stream for ByteBuffer objects. It's incredible that the jdk
* doesn't have one of these already.
* </p>
- *
+ *
* The methods in this class throw BufferUnderflowException, not EOFException, if the end of the
* buffer is reached before we read the full amount. That breaks the contract for InputStream and
* DataInput, but it works for our code.
- *
+ *
* @since GemFire 3.0
*/
@@ -50,7 +50,7 @@ public class ByteBufferInputStream extends InputStream
/**
* This interface is used to wrap either a ByteBuffer or an offheap Chunk as the source of bytes
* for a ByteBufferInputStream.
- *
+ *
*
*/
public static interface ByteSource {
@@ -884,7 +884,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readByte()
*/
public byte readByte() {
@@ -897,7 +897,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readChar()
*/
public char readChar() {
@@ -910,7 +910,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readDouble()
*/
public double readDouble() {
@@ -923,7 +923,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readFloat()
*/
public float readFloat() {
@@ -936,7 +936,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readFully(byte[])
*/
public void readFully(byte[] b) {
@@ -946,7 +946,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readFully(byte[], int, int)
*/
public void readFully(byte[] b, int off, int len) {
@@ -956,7 +956,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readInt()
*/
public int readInt() {
@@ -969,7 +969,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readLine()
*/
public String readLine() {
@@ -978,7 +978,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readLong()
*/
public long readLong() {
@@ -991,7 +991,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readShort()
*/
public short readShort() {
@@ -1004,7 +1004,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readUTF()
*/
public String readUTF() throws IOException {
@@ -1013,7 +1013,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readUnsignedByte()
*/
public int readUnsignedByte() {
@@ -1026,7 +1026,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#readUnsignedShort()
*/
public int readUnsignedShort() {
@@ -1039,7 +1039,7 @@ public class ByteBufferInputStream extends InputStream
/*
* (non-Javadoc)
- *
+ *
* @see java.io.DataInput#skipBytes(int)
*/
public int skipBytes(int n) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java
index 47c0f0a..fd8f3f1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.internal.tcp;
-// import java.io.*;
import java.util.*;
import org.apache.geode.GemFireCheckedException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 0ecb3bf..e114b98 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -16,6 +16,37 @@ package org.apache.geode.internal.tcp;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.Inet6Address;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.nio.ByteBuffer;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ClosedSelectorException;
+import java.nio.channels.SocketChannel;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheClosedException;
@@ -53,36 +84,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.tcp.MsgReader.Header;
import org.apache.geode.internal.util.concurrent.ReentrantSemaphore;
-import org.apache.logging.log4j.Logger;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.Inet6Address;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.nio.channels.CancelledKeyException;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.SocketChannel;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
/**
* Connection is a socket holder that sends and receives serialized message objects. A Connection
@@ -98,10 +99,10 @@ public class Connection implements Runnable {
private static int P2P_CONNECT_TIMEOUT;
private static boolean IS_P2P_CONNECT_TIMEOUT_INITIALIZED = false;
- public final static int NORMAL_MSG_TYPE = 0x4c;
- public final static int CHUNKED_MSG_TYPE = 0x4d; // a chunk of one logical msg
- public final static int END_CHUNKED_MSG_TYPE = 0x4e; // last in a series of chunks
- public final static int DIRECT_ACK_BIT = 0x20;
+ public static final int NORMAL_MSG_TYPE = 0x4c;
+ public static final int CHUNKED_MSG_TYPE = 0x4d; // a chunk of one logical msg
+ public static final int END_CHUNKED_MSG_TYPE = 0x4e; // last in a series of chunks
+ public static final int DIRECT_ACK_BIT = 0x20;
public static final int MSG_HEADER_SIZE_OFFSET = 0;
public static final int MSG_HEADER_TYPE_OFFSET = 4;
@@ -112,7 +113,7 @@ public class Connection implements Runnable {
* Small buffer used for send socket buffer on receiver connections and receive buffer on sender
* connections.
*/
- public final static int SMALL_BUFFER_SIZE =
+ public static final int SMALL_BUFFER_SIZE =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "SMALL_BUFFER_SIZE", 4096).intValue();
/** counter to give connections a unique id */
@@ -143,7 +144,7 @@ public class Connection implements Runnable {
/** The idle timeout timer task for this connection */
private SystemTimerTask idleTask;
- private final static ThreadLocal isReaderThread = new ThreadLocal();
+ private static final ThreadLocal isReaderThread = new ThreadLocal();
public static void makeReaderThread() {
// mark this thread as a reader thread
@@ -184,7 +185,7 @@ public class Connection implements Runnable {
private static final boolean DOMINO_THREAD_OWNED_SOCKETS =
Boolean.getBoolean("p2p.ENABLE_DOMINO_THREAD_OWNED_SOCKETS");
- private final static ThreadLocal isDominoThread = new ThreadLocal();
+ private static final ThreadLocal isDominoThread = new ThreadLocal();
// return true if this thread is a reader thread
public static boolean tipDomino() {
@@ -247,7 +248,7 @@ public class Connection implements Runnable {
/**
* How long to wait if receiver will not accept a message before we go into queue mode.
- *
+ *
* @since GemFire 4.2.2
*/
private int asyncDistributionTimeout = 0;
@@ -255,7 +256,7 @@ public class Connection implements Runnable {
/**
* How long to wait, with the receiver not accepting any messages, before kicking the receiver out
* of the distributed system. Ignored if asyncDistributionTimeout is zero.
- *
+ *
* @since GemFire 4.2.2
*/
private int asyncQueueTimeout = 0;
@@ -264,7 +265,7 @@ public class Connection implements Runnable {
* How much queued data we can have, with the receiver not accepting any messages, before kicking
* the receiver out of the distributed system. Ignored if asyncDistributionTimeout is zero.
* Canonicalized to bytes (property file has it as megabytes
- *
+ *
* @since GemFire 4.2.2
*/
private long asyncMaxQueueSize = 0;
@@ -296,7 +297,7 @@ public class Connection implements Runnable {
/**
* The maximum number of concurrent senders sending a message to a single recipient.
*/
- private final static int MAX_SENDERS = Integer
+ private static final int MAX_SENDERS = Integer
.getInteger("p2p.maxConnectionSenders", DirectChannel.DEFAULT_CONCURRENCY_LEVEL).intValue();
/**
* This semaphore is used to throttle how many threads will try to do sends on this connection
@@ -618,8 +619,8 @@ public class Connection implements Runnable {
return isIdle;
}
- static private byte[] okHandshakeBytes;
- static private ByteBuffer okHandshakeBuf;
+ private static byte[] okHandshakeBytes;
+ private static ByteBuffer okHandshakeBuf;
static {
int msglen = 1; // one byte for reply code
byte[] bytes = new byte[MSG_HEADER_BYTES + msglen];
@@ -829,7 +830,7 @@ public class Connection implements Runnable {
/**
* asynchronously close this connection
- *
+ *
* @param beingSick test hook to simulate sickness in communications & membership
*/
private void asyncClose(boolean beingSick) {
@@ -2524,7 +2525,7 @@ public class Connection implements Runnable {
/**
* sends a serialized message to the other end of this connection. This is used by the
* DirectChannel in GemFire when the message is going to be sent to multiple recipients.
- *
+ *
* @throws ConnectionException if the conduit has stopped
*/
public void sendPreserialized(ByteBuffer buffer, boolean cacheContentChanges,
@@ -2575,7 +2576,7 @@ public class Connection implements Runnable {
/**
* If <code>use</code> is true then "claim" the connection for our use. If <code>use</code> is
* false then "release" the connection. Fixes bug 37657.
- *
+ *
* @return true if connection was already in use at time of call; false if not.
*/
public boolean setInUse(boolean use, long startTime, long ackWaitThreshold, long ackSAThreshold,
@@ -2710,7 +2711,7 @@ public class Connection implements Runnable {
return false;
}
- static private byte[] getBytesToWrite(ByteBuffer buffer) {
+ private static byte[] getBytesToWrite(ByteBuffer buffer) {
byte[] bytesToWrite = new byte[buffer.limit()];
buffer.get(bytesToWrite);
return bytesToWrite;
@@ -2833,7 +2834,7 @@ public class Connection implements Runnable {
/**
* Return true if it was able to handle a block write of the given buffer. Return false if it is
* still the caller is still responsible for writing it.
- *
+ *
* @throws ConnectionException if the conduit has stopped
*/
private boolean handleBlockedWrite(ByteBuffer buffer, DistributionMessage msg)
@@ -3128,7 +3129,7 @@ public class Connection implements Runnable {
*/
public static volatile boolean FORCE_ASYNC_QUEUE = false;
- static private final int MAX_WAIT_TIME = (1 << 5); // ms (must be a power of 2)
+ private static final int MAX_WAIT_TIME = (1 << 5); // ms (must be a power of 2)
private void writeAsync(SocketChannel channel, ByteBuffer buffer, boolean forceAsync,
DistributionMessage p_msg, final DMStats stats) throws IOException {
@@ -3287,7 +3288,7 @@ public class Connection implements Runnable {
/**
* nioWriteFully implements a blocking write on a channel that is in non-blocking mode.
- *
+ *
* @param forceAsync true if we need to force a blocking async write.
* @throws ConnectionException if the conduit has stopped
*/
@@ -4030,7 +4031,7 @@ public class Connection implements Runnable {
/**
* answers whether this connection was initiated in this vm
- *
+ *
* @return true if the connection was initiated here
* @since GemFire 5.1
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionException.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionException.java
index dff284d..44483c1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionException.java
@@ -18,7 +18,7 @@ import org.apache.geode.GemFireException;
/**
* @since GemFire 3.0
- *
+ *
*/
public class ConnectionException extends GemFireException {
private static final long serialVersionUID = -1977443644277412122L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java
index 044ab42..0a6e37e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java
@@ -48,20 +48,20 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipManager;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.net.SocketCloser;
import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.net.SocketCloser;
/**
* <p>
* ConnectionTable holds all of the Connection objects in a conduit. Connections represent a pipe
* between two endpoints represented by generic DistributedMembers.
* </p>
- *
+ *
* @since GemFire 2.1
*/
public class ConnectionTable {
@@ -90,14 +90,14 @@ public class ConnectionTable {
/**
* List of thread-owned ordered connection maps, for cleanup
- *
+ *
* Accesses to the maps in this list need to be synchronized on their instance.
*/
private final List threadConnMaps;
/**
* Timer to kill idle threads
- *
+ *
* guarded.By this
*/
private SystemTimer idleConnTimer;
@@ -118,7 +118,7 @@ public class ConnectionTable {
/**
* Used for all accepted connections. These connections are read only; we never send messages,
* except for acks; only receive.
- *
+ *
* Consists of a list of Connection
*/
private final List receivers = new ArrayList();
@@ -141,14 +141,14 @@ public class ConnectionTable {
* Number of seconds to wait before timing out an unused p2p reader thread. Default is 120 (2
* minutes).
*/
- private final static long READER_POOL_KEEP_ALIVE_TIME =
+ private static final long READER_POOL_KEEP_ALIVE_TIME =
Long.getLong("p2p.READER_POOL_KEEP_ALIVE_TIME", 120).longValue();
private final SocketCloser socketCloser;
/**
* The most recent instance to be created
- *
+ *
* TODO this assumes no more than one instance is created at a time?
*/
private static final AtomicReference lastInstance = new AtomicReference();
@@ -313,7 +313,7 @@ public class ConnectionTable {
/**
* Process a newly created PendingConnection
- *
+ *
* @param id DistributedMember on which the connection is created
* @param sharedResource whether the connection is used by multiple threads
* @param preserveOrder whether to preserve order
@@ -405,7 +405,7 @@ public class ConnectionTable {
/**
* unordered or conserve-sockets=true note that unordered connections are currently always shared
- *
+ *
* @param id the DistributedMember on which we are creating a connection
* @param scheduleTimeout whether unordered connection should time out
* @param preserveOrder whether to preserve order
@@ -475,7 +475,7 @@ public class ConnectionTable {
/**
* Must be looking for an ordered connection that this thread owns
- *
+ *
* @param id stub on which to create the connection
* @param startTime the ms clock start time for the operation
* @param ackTimeout the ms ack-wait-threshold, or zero
@@ -609,7 +609,7 @@ public class ConnectionTable {
/**
* Get a new connection
- *
+ *
* @param id the DistributedMember on which to create the connection
* @param preserveOrder whether order should be preserved
* @param startTime the ms clock start time
@@ -766,7 +766,7 @@ public class ConnectionTable {
/**
* Close all receiving threads. This is used during shutdown and is also used by a test hook that
* makes us deaf to incoming messages.
- *
+ *
* @param beingSick a test hook to simulate a sick process
*/
protected void closeReceivers(boolean beingSick) {
@@ -1003,7 +1003,7 @@ public class ConnectionTable {
/**
* Just ensure that this class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
@@ -1013,7 +1013,7 @@ public class ConnectionTable {
/**
* Clears lastInstance. Does not yet close underlying sockets, but probably not strictly
* necessary.
- *
+ *
* @see SystemFailure#emergencyClose()
*/
public static void emergencyClose() {
@@ -1054,7 +1054,7 @@ public class ConnectionTable {
/**
* records the current outgoing message count on all thread-owned ordered connections. This does
* not synchronize or stop new connections from being formed or new messages from being sent
- *
+ *
* @since GemFire 5.1
*/
protected void getThreadOwnedOrderedConnectionState(DistributedMember member, Map result) {
@@ -1189,7 +1189,7 @@ public class ConnectionTable {
/**
* Synchronously set the connection and notify waiters that we are ready.
- *
+ *
* @param c the new connection
*/
public synchronized void notifyWaiters(Connection c) {
@@ -1207,7 +1207,7 @@ public class ConnectionTable {
/**
* Wait for a connection
- *
+ *
* @param mgr the membership manager that can instigate suspect processing if necessary
* @param startTime the ms clock start time for the operation
* @param ackTimeout the ms ack-wait-threshold, or zero
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ImmutableByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ImmutableByteBufferInputStream.java
index 8dc22dd..8bd0bcb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ImmutableByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ImmutableByteBufferInputStream.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.offheap.StoredObject;
* change. If you want a buffer than can be refilled with other bytes then create an instance of
* ByteBufferInputStream instead. Note that even though this class is immutable the position on its
* ByteBuffer can change.
- *
+ *
* @since GemFire 6.6
*/
public class ImmutableByteBufferInputStream extends ByteBufferInputStream {
@@ -31,7 +31,7 @@ public class ImmutableByteBufferInputStream extends ByteBufferInputStream {
/**
* Create an immutable input stream by whose contents are the first length bytes from the given
* input stream.
- *
+ *
* @param existing the input stream whose content will go into this stream. Note that this
* existing stream will be read by this class (a copy is not made) so it should not be
* changed externally.
@@ -43,7 +43,7 @@ public class ImmutableByteBufferInputStream extends ByteBufferInputStream {
/**
* Create an immutable input stream whose contents are the given bytes
- *
+ *
* @param bytes the content of this stream. Note that this byte array will be read by this class
* (a copy is not made) so it should not be changed externally.
*/
@@ -53,7 +53,7 @@ public class ImmutableByteBufferInputStream extends ByteBufferInputStream {
/**
* Create an immutable input stream whose contents are the given bytes
- *
+ *
* @param bb the content of this stream. Note that bb will be read by this class (a copy is not
* made) so it should not be changed externally.
*/
@@ -63,7 +63,7 @@ public class ImmutableByteBufferInputStream extends ByteBufferInputStream {
/**
* Create an immutable input stream by copying another. A somewhat shallow copy is made.
- *
+ *
* @param copy the input stream to copy. Note that this copy stream will be read by this class (a
* copy is not made) so it should not be changed externally.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MemberShunnedException.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MemberShunnedException.java
index b1f5cc6..11cc04a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MemberShunnedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MemberShunnedException.java
@@ -29,7 +29,7 @@ public class MemberShunnedException extends GemFireException {
/**
* constructor
- *
+ *
* @param member the member that was shunned
*/
public MemberShunnedException(DistributedMember member) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
index 6f405fc..8f32ac0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
@@ -38,9 +38,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* MsgDestreamer supports destreaming a streamed message from a tcp Connection that arrives in
* chunks. This allows us to receive a message without needing to read it completely into a buffer
* before we can start deserializing it.
- *
+ *
* @since GemFire 5.0.2
- *
+ *
*/
public class MsgDestreamer {
@@ -130,7 +130,7 @@ public class MsgDestreamer {
/**
* Adds a chunk for this guy to deserialize
- *
+ *
* @param bb contains the bytes of the chunk
* @param length the number of bytes in bb that are this chunk
*/
@@ -145,7 +145,7 @@ public class MsgDestreamer {
/**
* Adds a chunk for this guy to deserialize
- *
+ *
* @param b a byte array contains the bytes of the chunk
*/
public void addChunk(byte[] b) throws IOException {
@@ -167,7 +167,7 @@ public class MsgDestreamer {
/**
* Waits for the deserialization to complete and returns the deserialized message.
- *
+ *
* @throws IOException A problem occurred while deserializing the message.
* @throws ClassNotFoundException The class of an object read from <code>in</code> could not be
* found
@@ -310,7 +310,7 @@ public class MsgDestreamer {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.CancelCriterion#cancelInProgress()
*/
@Override
@@ -327,7 +327,7 @@ public class MsgDestreamer {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.CancelCriterion#generateCancelledException(java.lang.Throwable)
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgIdGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgIdGenerator.java
index 748afa8..eb3ae2c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgIdGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgIdGenerator.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.UniqueIdGenerator;
* Currently ids are in the range 0..32767 inclusive.
*
* @since GemFire 5.0.2
- *
+ *
*/
public class MsgIdGenerator {
/**
@@ -40,7 +40,7 @@ public class MsgIdGenerator {
/**
* Obtains a message id. Callers of this must call release when finished with the id.
- *
+ *
* @throws IllegalStateException if all ids have been obtained
*/
public static short obtain() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
index 52c70ff..abb34df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.tcp;
import java.io.*;
import java.nio.*;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -23,9 +24,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* MsgOutputStream should no longer be used except in Connection to do the handshake. Otherwise
* MsgStreamer should always be used.
- *
+ *
* @since GemFire 3.0
- *
+ *
*/
public class MsgOutputStream extends OutputStream implements ObjToByteArraySerializer {
private final ByteBuffer buffer;
@@ -114,7 +115,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* Writes two bytes to the output stream to represent the value of the argument. The byte values
* to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -137,7 +138,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* Writes a <code>char</code> value, wich is comprised of two bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -160,7 +161,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* Writes an <code>int</code> value, which is comprised of four bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 24))
@@ -184,7 +185,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* Writes a <code>long</code> value, which is comprised of eight bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 56))
@@ -302,7 +303,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* If a character <code>c</code> is in the range <code>\u0001</code> through
* <code>\u007f</code>, it is represented by one byte:
* <p>
- *
+ *
* <pre>
* (byte) c
* </pre>
@@ -311,7 +312,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* <code>\u0080</code> through <code>\u07ff</code>, then it is represented by two bytes,
* to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xc0 | (0x1f & (c >> 6)))
@@ -322,7 +323,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* If a character <code>c</code> is in the range <code>\u0800</code> through
* <code>uffff</code>, then it is represented by three bytes, to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xe0 | (0x0f & (c >> 12)))
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgReader.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgReader.java
index 1bbfd08..458ee52 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgReader.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.internal.tcp;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
/**
* This class is currently used for reading direct ack responses It should probably be used for all
* of the reading done in Connection.
@@ -60,7 +60,7 @@ public abstract class MsgReader {
/**
* Block until you can read a message. Returns null if the message was a message chunk.
- *
+ *
* @return the message, or null if we only received a chunk of the message
* @throws ClassNotFoundException
* @throws IOException
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
index 00707f5..b77e275 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
@@ -14,18 +14,6 @@
*/
package org.apache.geode.internal.tcp;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.DMStats;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionMessage;
-import org.apache.geode.internal.*;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectIterator;
-import org.apache.logging.log4j.Logger;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.UTFDataFormatException;
@@ -34,13 +22,26 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DMStats;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.internal.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+
/**
* <p>
* MsgStreamer supports streaming a message to a tcp Connection in chunks. This allows us to send a
* message without needing to perserialize it completely in memory thus saving buffer memory.
- *
+ *
* @since GemFire 5.0.2
- *
+ *
*/
public class MsgStreamer extends OutputStream
@@ -79,7 +80,7 @@ public class MsgStreamer extends OutputStream
* Set to true after last byte of message has been written to this stream.
*/
private boolean doneWritingMsg = false;
- final private DMStats stats;
+ private final DMStats stats;
private short msgId;
private long serStartTime;
@@ -113,7 +114,7 @@ public class MsgStreamer extends OutputStream
/**
* Create a msg streamer that will send the given msg to the given cons.
- *
+ *
* Note: This is no longer supposed to be called directly rather the {@link #create} method should
* now be used.
*/
@@ -202,7 +203,7 @@ public class MsgStreamer extends OutputStream
/**
* set connections to be "in use" and schedule alert tasks
- *
+ *
* @param startTime
* @param ackTimeout
* @param ackSDTimeout
@@ -478,7 +479,7 @@ public class MsgStreamer extends OutputStream
* Writes two bytes to the output stream to represent the value of the argument. The byte values
* to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -507,7 +508,7 @@ public class MsgStreamer extends OutputStream
* Writes a <code>char</code> value, wich is comprised of two bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 8))
@@ -536,7 +537,7 @@ public class MsgStreamer extends OutputStream
* Writes an <code>int</code> value, which is comprised of four bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 24))
@@ -566,7 +567,7 @@ public class MsgStreamer extends OutputStream
* Writes a <code>long</code> value, which is comprised of eight bytes, to the output stream. The
* byte values to be written, in the order shown, are:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xff & (v >> 56))
@@ -724,7 +725,7 @@ public class MsgStreamer extends OutputStream
* If a character <code>c</code> is in the range <code>\u0001</code> through
* <code>\u007f</code>, it is represented by one byte:
* <p>
- *
+ *
* <pre>
* (byte) c
* </pre>
@@ -733,7 +734,7 @@ public class MsgStreamer extends OutputStream
* <code>\u0080</code> through <code>\u07ff</code>, then it is represented by two bytes,
* to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xc0 | (0x1f & (c >> 6)))
@@ -744,7 +745,7 @@ public class MsgStreamer extends OutputStream
* If a character <code>c</code> is in the range <code>\u0800</code> through
* <code>uffff</code>, then it is represented by three bytes, to be written in the order shown:
* <p>
- *
+ *
* <pre>
* <code>
* (byte)(0xe0 | (0x0f & (c >> 12)))
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
index 6797a11..5a51af0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Encapsulates a set of {@link MsgStreamer}s and {@link VersionedMsgStreamer}s requiring possibly
* different serializations for different versions of product.
- *
+ *
* @since GemFire 7.1
*/
public class MsgStreamerList implements BaseMsgStreamer {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
index 39554cb..a70f16d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
@@ -19,7 +19,7 @@ import org.apache.geode.GemFireException;
/**
* An exception indicating that the same thread that is in the middle of trying to connect has tried
* to obtain a connection to the same member further down the call stack.
- *
+ *
* This condition has been observered when using an AlertListener, because we try to transmit
* messages logged during a connection to the very member we're trying to connect to.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java
index 37e9336..39d400e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java
@@ -26,11 +26,11 @@ import org.apache.geode.i18n.LogWriterI18n;
* {@link org.apache.geode.distributed.internal.DistributionMessage} objects received from other
* conduits.
* </p>
- *
+ *
* @see org.apache.geode.distributed.internal.direct.DirectChannel
- *
+ *
* @since GemFire 2.0
- *
+ *
*/
public interface ServerDelegate {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
index c52a676..c723083 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
@@ -34,6 +34,7 @@ import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+
import javax.net.ssl.SSLException;
import org.apache.logging.log4j.Logger;
@@ -66,7 +67,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
* TCPConduit manages a server socket and a collection of connections to other systems. Connections
* are identified by DistributedMember IDs. These types of messages are currently supported:
* </p>
- *
+ *
* <pre>
* <p>
* DistributionMessage - message is delivered to the server's
@@ -79,7 +80,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
* <p>
* If the ServerDelegate is null, DistributionMessages are ignored by the TCPConduit.
* </p>
- *
+ *
* @since GemFire 2.0
*/
@@ -102,7 +103,7 @@ public class TCPConduit implements Runnable {
*/
static boolean useSSL;
- // public final static boolean USE_SYNC_WRITES = Boolean.getBoolean("p2p.useSyncWrites");
+ // public static final boolean USE_SYNC_WRITES = Boolean.getBoolean("p2p.useSyncWrites");
/**
* Force use of Sockets rather than SocketChannels (NIO). Note from Bruce: due to a bug in the
@@ -193,7 +194,7 @@ public class TCPConduit implements Runnable {
/**
* Config from the delegate
- *
+ *
* @since GemFire 4.2.1
*/
DistributionConfig config;
@@ -236,7 +237,7 @@ public class TCPConduit implements Runnable {
* This constructor forces the conduit to ignore the following system properties and look for them
* only in the <i>props</i> argument:
* </p>
- *
+ *
* <pre>
* p2p.tcpBufferSize
* p2p.idleConnectionTimeout
@@ -350,9 +351,9 @@ public class TCPConduit implements Runnable {
*/
private volatile Exception shutdownCause;
- private final static int HANDSHAKE_POOL_SIZE =
+ private static final int HANDSHAKE_POOL_SIZE =
Integer.getInteger("p2p.HANDSHAKE_POOL_SIZE", 10).intValue();
- private final static long HANDSHAKE_POOL_KEEP_ALIVE_TIME =
+ private static final long HANDSHAKE_POOL_KEEP_ALIVE_TIME =
Long.getLong("p2p.HANDSHAKE_POOL_KEEP_ALIVE_TIME", 60).longValue();
/**
@@ -515,7 +516,7 @@ public class TCPConduit implements Runnable {
/**
* Ensure that the ConnectionTable class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
@@ -524,7 +525,7 @@ public class TCPConduit implements Runnable {
/**
* Close the ServerSocketChannel, ServerSocket, and the ConnectionTable.
- *
+ *
* @see SystemFailure#emergencyClose()
*/
public void emergencyClose() {
@@ -620,7 +621,7 @@ public class TCPConduit implements Runnable {
/**
* Returns whether or not this conduit is stopped
- *
+ *
* @since GemFire 3.0
*/
public boolean isStopped() {
@@ -836,7 +837,7 @@ public class TCPConduit implements Runnable {
/**
* records the current outgoing message count on all thread-owned ordered connections
- *
+ *
* @since GemFire 5.1
*/
public void getThreadOwnedOrderedConnectionState(DistributedMember member, Map result) {
@@ -846,7 +847,7 @@ public class TCPConduit implements Runnable {
/**
* wait for the incoming connections identified by the keys in the argument to receive and
* dispatch the number of messages associated with the key
- *
+ *
* @since GemFire 5.1
*/
public void waitForThreadOwnedOrderedConnectionState(DistributedMember member, Map channelState)
@@ -858,7 +859,7 @@ public class TCPConduit implements Runnable {
/**
* connections send messageReceived when a message object has been read.
- *
+ *
* @param bytesRead number of bytes read off of network to get this message
*/
protected void messageReceived(Connection receiver, DistributionMessage message, int bytesRead) {
@@ -904,7 +905,7 @@ public class TCPConduit implements Runnable {
* Return a connection to the given member. This method must continue to attempt to create a
* connection to the given member as long as that member is in the membership view and the system
* is not shutting down.
- *
+ *
* @param memberAddress the IDS associated with the remoteId
* @param preserveOrder whether this is an ordered or unordered connection
* @param retry false if this is the first attempt
@@ -1180,7 +1181,7 @@ public class TCPConduit implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.CancelCriterion#cancelInProgress()
*/
@Override
@@ -1197,7 +1198,7 @@ public class TCPConduit implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.CancelCriterion#generateCancelledException(java.lang.Throwable)
*/
@Override
@@ -1230,7 +1231,7 @@ public class TCPConduit implements Runnable {
/**
* if the conduit is disconnected due to an abnormal condition, this will describe the reason
- *
+ *
* @return exception that caused disconnect
*/
public Exception getShutdownCause() {
@@ -1268,4 +1269,3 @@ public class TCPConduit implements Runnable {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
index 7308a15..6a5a196 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedByteBufferInputStream.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.VersionedDataStream;
/**
* An extension to {@link ByteBufferInputStream} that implements {@link VersionedDataStream} for a
* stream coming from a different product version.
- *
+ *
* @since GemFire 7.1
*/
public class VersionedByteBufferInputStream extends ByteBufferInputStream
@@ -33,7 +33,7 @@ public class VersionedByteBufferInputStream extends ByteBufferInputStream
/**
* Create a ByteBuffer input stream whose contents are null at given product {@link Version}.
- *
+ *
* @param version the product version for which this stream was created
*/
public VersionedByteBufferInputStream(Version version) {
@@ -44,7 +44,7 @@ public class VersionedByteBufferInputStream extends ByteBufferInputStream
/**
* Create a ByteBuffer input stream whose contents are the given {@link ByteBuffer} at given
* product {@link Version}.
- *
+ *
* @param buffer the byte buffer to read
* @param version the product version for which this stream was created
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
index d39b7be..4fe7b32 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.VersionedDataStream;
/**
* An extension of {@link MsgStreamer} that implements {@link VersionedDataStream}.
- *
+ *
* @since GemFire 7.1
*/
class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/AbortableTaskService.java b/geode-core/src/main/java/org/apache/geode/internal/util/AbortableTaskService.java
index 269338b..aa20f09 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/AbortableTaskService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/AbortableTaskService.java
@@ -37,7 +37,7 @@ public class AbortableTaskService {
/**
* Invoked to execute the task. The task implementation should periodically check the aborted
* flag and take appropriate action.
- *
+ *
* @param aborted set to true when the task has been aborted
*/
void runOrAbort(AtomicBoolean aborted);
@@ -55,7 +55,7 @@ public class AbortableTaskService {
/**
* Executes the task using the embedded executor.
- *
+ *
* @param task the task to execute
*/
public void execute(AbortableTask task) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/ArgumentRedactor.java b/geode-core/src/main/java/org/apache/geode/internal/util/ArgumentRedactor.java
index 020e81d..7a078e9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/ArgumentRedactor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/ArgumentRedactor.java
@@ -33,7 +33,7 @@ public class ArgumentRedactor {
/**
* Accept a map of key/value pairs and produce a printable string, redacting any necessary values.
- *
+ *
* @param map A {@link Map} of key/value pairs such as a collection of properties
*
* @return A printable string with redacted fields. E.g., "username=jdoe password=********"
@@ -52,7 +52,7 @@ public class ArgumentRedactor {
/**
* Returns the redacted value of the {@link Entry} if the key indicates redaction is necessary.
* Otherwise, value is returned, unchanged.
- *
+ *
* @param entry A key/value pair
*
* @return The redacted string for value.
@@ -68,7 +68,7 @@ public class ArgumentRedactor {
* Example:<br>
* Single value: "password=secret" or "--password=secret" Multiple values: "-Dflag -Dkey=value
* --classpath=."
- *
+ *
* @param line The argument input to be parsed
* @return A redacted string that has sensitive information obscured.
*/
@@ -130,7 +130,7 @@ public class ArgumentRedactor {
/**
* Determine whether a key's value should be redacted.
- *
+ *
* @param key The key in question.
*
* @return true if the value should be redacted, otherwise false.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
index 6f1292a..fc8be7d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
@@ -15,13 +15,14 @@
package org.apache.geode.internal.util;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.internal.offheap.annotations.Unretained;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.internal.offheap.annotations.Unretained;
+
/**
*
* Handle some simple editing of fixed-length arrays.
@@ -35,7 +36,7 @@ public abstract class ArrayUtils {
* Gets the element at index in the array in a bound-safe manner. If index is not a valid index in
* the given array, then the default value is returned.
* <p/>
- *
+ *
* @param <T> the class type of the elements in the array.
* @param array the array from which the element at index is retrieved.
* @param index the index into the array to retrieve the element.
@@ -55,7 +56,7 @@ public abstract class ArrayUtils {
* Gets the first element from the given array or null if the array reference is null or the array
* length is 0.
* <p/>
- *
+ *
* @param <T> the Class type of the elements in the array.
* @param array the array of elements from which to retrieve the first element.
* @return the first element from the array or null if either the array reference is null or the
@@ -68,7 +69,7 @@ public abstract class ArrayUtils {
/**
* Converts the specified Object array into a String representation.
* <p/>
- *
+ *
* @param array the Object array of elements to convert to a String.
* @return a String representation of the Object array.
* @see java.lang.StringBuilder
@@ -308,7 +309,7 @@ public abstract class ArrayUtils {
/**
* Converts the primitive int array into an Integer wrapper object array.
* </p>
- *
+ *
* @param array the primitive int array to convert into an Integer wrapper object array.
* @return an Integer array containing the values from the elements in the primitive int array.
*/
@@ -326,7 +327,7 @@ public abstract class ArrayUtils {
/**
* Converts a double byte array into a double Byte array.
- *
+ *
* @param array the double byte array to convert into double Byte array
* @return a double array of Byte objects containing values from the double byte array
*/
@@ -346,7 +347,7 @@ public abstract class ArrayUtils {
/**
* Converts a double Byte array into a double byte array.
- *
+ *
* @param byteArray the double Byte array to convert into a double byte array
* @return a double byte array containing byte values from the double Byte array
*/
@@ -371,7 +372,7 @@ public abstract class ArrayUtils {
*
* <p>
* Example usage:
- *
+ *
* <pre>
* List<String> stooges = Arrays.asList("Larry", "Moe", "Curly");
* stooges.remove("Curly");
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Breadcrumbs.java b/geode-core/src/main/java/org/apache/geode/internal/util/Breadcrumbs.java
index 8242e58..e5c9b74 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Breadcrumbs.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/Breadcrumbs.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.EventID;
/**
* Breadcrumbs establishes traces in thread names that are useful in figuring out what is going on
* in a distributed system given only stack traces.
- *
+ *
* @since GemFire 20 May 2014
*
*/
@@ -34,10 +34,10 @@ public class Breadcrumbs {
/** delimiter for crumb numbers */
- final static String CrumbDelimiter = "/";
+ static final String CrumbDelimiter = "/";
/** string that starts a crumb */
- final static String CommonBreadcrumbStart = "\n\t" + CrumbDelimiter;
+ static final String CommonBreadcrumbStart = "\n\t" + CrumbDelimiter;
/** all known types of breadcrumbs */
private enum CrumbType {
@@ -144,7 +144,7 @@ public class Breadcrumbs {
/**
* This method does all of the work of setting/clearing individual breadcrumbs in thread names
- *
+ *
* @param t the thread to modify
* @param type the type of breadcrumb
* @param crumb the crumb to insert, or null to clear
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
index 32f041c..a81667c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.lang.Filter;
* The CollectionUtils class is a utility class for working with the Java Collections framework of
* classes, data structures and algorithms.
* <p/>
- *
+ *
* @see org.apache.geode.internal.lang.Filter
* @see java.util.Arrays
* @see java.util.Collection
@@ -49,7 +49,7 @@ public abstract class CollectionUtils {
/**
* Returns the specified array as a List of elements.
* <p/>
- *
+ *
* @param <T> the class type of the elements in the array.
* @param array the object array of elements to convert to a List.
* @return a List of elements contained in the specified array.
@@ -65,7 +65,7 @@ public abstract class CollectionUtils {
/**
* Returns the specified array as a Set of elements.
* <p/>
- *
+ *
* @param <T> the class type of the elements in the array.
* @param array the object array of elements to convert to a Set.
* @return a Set of elements contained in the specified array.
@@ -81,7 +81,7 @@ public abstract class CollectionUtils {
/**
* Creates an Properties object initialized with the value from the given Map.
* <p>
- *
+ *
* @param map the Map supply the keys and value for the Properties object.
* @return a Properties object initialized with the key and value from the Map.
* @see java.util.Map
@@ -103,7 +103,7 @@ public abstract class CollectionUtils {
* Null-safe implementation for method invocations that return a List Collection. If the returned
* List is null, then this method will return an empty List in it's place.
* <p/>
- *
+ *
* @param <T> the class type of the List's elements.
* @param list the target List to verify as not null.
* @return the specified List if not null otherwise return an empty List.
@@ -116,7 +116,7 @@ public abstract class CollectionUtils {
* Null-safe implementation for method invocations that return a Set Collection. If the returned
* Set is null, then this method will return an empty Set in it's place.
* <p/>
- *
+ *
* @param <T> the class type of the Set's elements.
* @param set the target Set to verify as not null.
* @return the specified Set if not null otherwise return an empty Set.
@@ -128,7 +128,7 @@ public abstract class CollectionUtils {
/**
* Iterates the Collection and finds all object elements that match the Filter criteria.
* <p/>
- *
+ *
* @param <T> the class type of the Collection elements.
* @param collection the Collection of elements to iterate and filter.
* @param filter the Filter applied to the Collection of elements in search of all matching
@@ -152,7 +152,7 @@ public abstract class CollectionUtils {
/**
* Iterates the Collection and finds all object elements that match the Filter criteria.
* <p/>
- *
+ *
* @param <T> the class type of the Collection elements.
* @param collection the Collection of elements to iterate and filter.
* @param filter the Filter applied to the Collection of elements in search of the matching
@@ -175,7 +175,7 @@ public abstract class CollectionUtils {
/**
* Removes keys from the Map based on a Filter.
* <p/>
- *
+ *
* @param <K> the Class type of the key.
* @param <V> the Class type of the value.
* @param map the Map from which to remove key-value pairs based on a Filter.
@@ -200,7 +200,7 @@ public abstract class CollectionUtils {
/**
* Removes keys with null values in the Map.
* <p/>
- *
+ *
* @param map the Map from which to remove null key-value pairs.
* @return the Map without any null keys or values.
* @see #removeKeys
@@ -217,7 +217,7 @@ public abstract class CollectionUtils {
/**
* Add all elements of an {@link Enumeration} to a {@link Collection}.
- *
+ *
* @param collection to add from enumeration.
* @param enumeration to add to collection.
* @return true if collection is modified, otherwise false.
@@ -242,7 +242,7 @@ public abstract class CollectionUtils {
*
* {@link Iterable#iterator()} will return an umodifiable {@link Iterator} on which calling
* {@link Iterator#remove()} will throw {@link UnsupportedOperationException}.
- *
+ *
* @param iterable to wrap as unmodifiable
* @return unmodifiable {@link Iterable}
* @since GemFire 8.1
@@ -254,13 +254,13 @@ public abstract class CollectionUtils {
/**
* Unmodifiable {@link Iterable} in the style of
* {@link Collections#unmodifiableCollection(Collection)}.
- *
+ *
*
* @since GemFire 8.1
*/
- static private class UnmodifiableIterable<T> implements Iterable<T> {
+ private static class UnmodifiableIterable<T> implements Iterable<T> {
- final private Iterable<T> iterable;
+ private final Iterable<T> iterable;
private UnmodifiableIterable(final Iterable<T> iterable) {
this.iterable = iterable;
@@ -269,7 +269,7 @@ public abstract class CollectionUtils {
@Override
public Iterator<T> iterator() {
return new Iterator<T>() {
- final private Iterator<T> iterator = iterable.iterator();
+ private final Iterator<T> iterator = iterable.iterator();
@Override
public boolean hasNext() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/DelayedAction.java b/geode-core/src/main/java/org/apache/geode/internal/util/DelayedAction.java
index e8aa798..9dd8121 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/DelayedAction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/DelayedAction.java
@@ -20,7 +20,7 @@ import java.util.concurrent.CountDownLatch;
* Coordinates thread scheduling to simplify multi-threaded testing. Ensures that two threads have
* both reached expected code before proceeding. Unlike a barrier pattern, the threads can be
* allowed to proceed independently.
- *
+ *
*/
public class DelayedAction implements Runnable {
private final CountDownLatch hit = new CountDownLatch(1);
@@ -47,7 +47,7 @@ public class DelayedAction implements Runnable {
/**
* Blocks until the delayed action is ready to be executed.
- *
+ *
* @throws InterruptedException interrupted while waiting
*/
public void waitForArrival() throws InterruptedException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Hex.java b/geode-core/src/main/java/org/apache/geode/internal/util/Hex.java
index 72e65c6..1894a36 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Hex.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/Hex.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.util;
/**
* Provides hexadecimal conversion and display utilities.
- *
+ *
*/
public class Hex {
/** hex chars */
@@ -25,7 +25,7 @@ public class Hex {
/**
* Converts the byte array to a hex string.
- *
+ *
* @param buf the buffer to convert
* @return the hex string
*/
@@ -35,7 +35,7 @@ public class Hex {
/**
* Converts the byte array subset to a hex string.
- *
+ *
* @param buf the buffer to convert
* @param offset the offset
* @param length the length
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
index 80b16fc..9ae2a1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.internal.util;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.internal.lang.ObjectUtils;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -28,6 +25,10 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.internal.lang.ObjectUtils;
+
/**
* Reusable Input/Output operation utility methods.
*
@@ -67,7 +68,7 @@ public abstract class IOUtils {
* InputStreams and OutputStreams. Note, this method silently ignores the possible IOException
* resulting from the close invocation.
* <p/>
- *
+ *
* @param obj an Object implementing the Closeable interface who's close method will be invoked.
*/
public static void close(final Closeable obj) {
@@ -82,7 +83,7 @@ public abstract class IOUtils {
/**
* Creates a path with the given path elements delimited with File.separator.
* </p>
- *
+ *
* @param pathElements an array of Strings constituting elements of the path.
* @return a fully constructed pathname containing the elements from the given array as path
* elements separated by File.separator.
@@ -95,7 +96,7 @@ public abstract class IOUtils {
/**
* Creates a path with the given path elements delimited with separator.
* </p>
- *
+ *
* @param pathElements an array of Strings constituting elements of the path.
* @param separator a String specifying the separator of the path. If the given String is null,
* then separator defaults to File.separator
@@ -119,7 +120,7 @@ public abstract class IOUtils {
/**
* Convenience method to de-serialize a byte array back into Object form.
* <p/>
- *
+ *
* @param objBytes an array of bytes constituting the serialized form of the Object.
* @return a Serializable Object from the array of bytes.
* @throws ClassNotFoundException if the Class type of the serialized Object cannot be resolved.
@@ -146,7 +147,7 @@ public abstract class IOUtils {
* Convenience method to de-serialize a byte array back into an Object who's Class type is
* resolved by the specific ClassLoader.
* <p/>
- *
+ *
* @param objBytes an array of bytes constituting the serialized form of the Object.
* @param loader the ClassLoader used to resolve the Class type of the serialized Object.
* @return a Serializable Object from the array of bytes.
@@ -177,7 +178,7 @@ public abstract class IOUtils {
/**
* Extracts the filename from the pathname of a file system resource (file).
* <p/>
- *
+ *
* @param pathname a String indicating the path, or location of the file system resource.
* @return a String value containing only the filename of the file system resource (file).
*/
@@ -195,7 +196,7 @@ public abstract class IOUtils {
/**
* Determines whether the path represented by name exists in the file system of the localhost.
* <p/>
- *
+ *
* @param pathname a String indicating the name of the path.
* @return a boolean indicating whether the path represented by name (pathname) actually exists in
* the file system of the localhost (system).
@@ -209,7 +210,7 @@ public abstract class IOUtils {
/**
* Convenience method to serialize a Serializable Object into a byte array.
* <p/>
- *
+ *
* @param obj the Serializable Object to serialize into an array of bytes.
* @return a byte array of the serialized Object.
* @throws IOException if an I/O error occurs during the serialization process.
@@ -237,7 +238,7 @@ public abstract class IOUtils {
/**
* Reads the contents of the specified InputStream into a byte array.
* <p/>
- *
+ *
* @param in the InputStream to read content from.
* @return a byte array containing the content of the specified InputStream.
* @throws IOException if an I/O error occurs while reading the InputStream.
@@ -268,7 +269,7 @@ public abstract class IOUtils {
* This method attempts to get the canonical form of the specified file otherwise returns it's
* absolute form.
* <p/>
- *
+ *
* @param file the java.io.File object who's canonical representation is attempted to be returned.
* @return the canonical form of the specified File or the absolute form if an IOException occurs
* during the File.getCanonicalFile call.
@@ -287,7 +288,7 @@ public abstract class IOUtils {
* This method attempts to get the canonical path of the specified file otherwise returns it's
* absolute path.
* <p/>
- *
+ *
* @param file the java.io.File object who's canonical path is attempted to be returned.
* @return the canonical path of the specified File or the absolute path if an IOException occurs
* during the File.getCanonicalPath call.
@@ -307,7 +308,7 @@ public abstract class IOUtils {
* localhost. The pathname is considered valid if it is not null, empty or blank and exists in the
* file system as a file path (which could represent a file or a directory).
* </p>
- *
+ *
* @param pathname a String indicating the file path in the file system on localhost.
* @return the pathname if valid and it exits.
* @throws FileNotFoundException if the pathname is invalid or does not exist in the file system
@@ -326,7 +327,7 @@ public abstract class IOUtils {
* The ClassLoaderObjectInputStream class is a ObjectInputStream implementation that resolves the
* Class type of the Object being de-serialized with the specified ClassLoader.
* <p/>
- *
+ *
* @see java.io.ObjectInputStream
* @see java.lang.ClassLoader
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/JavaCommandBuilder.java b/geode-core/src/main/java/org/apache/geode/internal/util/JavaCommandBuilder.java
index 3737373..08426c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/JavaCommandBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/JavaCommandBuilder.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.util;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.geode.distributed.internal.DistributionConfig;
+
/**
* A utility class for building up arguments used in spawning another VM
**/
@@ -28,7 +28,7 @@ public class JavaCommandBuilder {
/**
* Builds a command line containing all basic arguments required by java
- *
+ *
* @return cmdVec - The caller can then add additional arguments
*/
public static List<String> buildCommand(final String className, final String additionalClasspath,
@@ -88,7 +88,7 @@ public class JavaCommandBuilder {
/**
* Determine if the -server argument should be omitted for this vm
- *
+ *
* @param javaBinDir - the path to the bin directory of java
* @return true if the VM is known not to support the -server arg
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/LogFileUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/LogFileUtils.java
index 845a874..4aae88c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/LogFileUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/LogFileUtils.java
@@ -13,21 +13,21 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.util;
import java.io.File;
-import java.io.RandomAccessFile;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.RandomAccessFile;
/**
* Utility class for copying log files
- *
+ *
* @since GemFire 6.5
*/
public class LogFileUtils {
@@ -41,7 +41,7 @@ public class LogFileUtils {
/**
* Copy a file preserving the date.
- *
+ *
* @param srcFile the validated source file, must not be <code>null</code>
* @param destFile the validated destination file, must not be <code>null</code>
* @throws IOException if an error occurs
@@ -72,7 +72,7 @@ public class LogFileUtils {
/**
* Copy bytes from an <code>InputStream</code> to an <code>OutputStream</code>.
- *
+ *
* @param input the <code>InputStream</code> to read from
* @param output the <code>OutputStream</code> to write to
* @return the number of bytes copied
@@ -96,7 +96,7 @@ public class LogFileUtils {
/**
* Close an <code>InputStream</code> ignoring exceptions.
- *
+ *
* @param input the InputStream to close, may be null or already closed
*/
public static void close(InputStream input) {
@@ -111,7 +111,7 @@ public class LogFileUtils {
/**
* Close an <code>OutputStream</code> ignoring exceptions.
- *
+ *
* @param output the OutputStream to close, may be null or already closed
*/
public static void close(OutputStream output) {
@@ -127,7 +127,7 @@ public class LogFileUtils {
/**
* Delete a file ignoring exceptions.
- *
+ *
* @param file to delete, can be <code>null</code>
*/
public static boolean delete(File file) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java b/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java
index e40e363..5673961 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.util;
/**
* Similar to the Trove TObjectProcedure, this is used in iterating over some GemFire collections
- *
+ *
*
*/
public interface ObjectIntProcedure {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java b/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
index 357812a..033a57f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
@@ -35,8 +35,8 @@ import java.util.zip.GZIPInputStream;
* When run as a program it takes a list of files that may contain thread dumps. It scans those
* files, pulls out the thread dumps, removes any well-known idle threads and prints the rest to
* stdout.
- *
- *
+ *
+ *
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/SingletonCallable.java b/geode-core/src/main/java/org/apache/geode/internal/util/SingletonCallable.java
index 2497a20..92c646c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/SingletonCallable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/SingletonCallable.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Callable;
* This class serializes execution of concurrent tasks. This is useful when we want only one thread
* to perform an expensive operation such that if the operation fails, all other threads fail with
* the same exception without having to perform the expensive operation.
- *
+ *
*
* @param <T> the type of return value
*/
@@ -71,10 +71,10 @@ public class SingletonCallable<T> {
/**
* Override this method for handling exception encountered while running the Callable c.
- *
+ *
* @return false if we want the waiting threads to fail immediately<br/>
* true if we want the waiting threads to invoke the callable
- *
+ *
*/
public boolean ignoreException(Exception e) {
return false;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/SingletonValue.java b/geode-core/src/main/java/org/apache/geode/internal/util/SingletonValue.java
index af4beda..4132b2b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/SingletonValue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/SingletonValue.java
@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock;
/**
* A builder that caches the singleton value.
- *
+ *
* The result is created and cached by the first thread that invokes the underlying
* {@code Callable}. Concurrent requests will block and be notified once the originating request has
* completed. Once the result has been cached, all subsequent invocations will return the cached
@@ -35,7 +35,7 @@ import java.util.concurrent.locks.ReentrantLock;
* threads but executes blocking operations serially. Even when the call supports timeouts, the
* serial execution penalty can cause "timeout stacking" and thus unbounded delays on the invoking
* threads.
- *
+ *
*
* @param <T> the type of the singleton
*/
@@ -48,7 +48,7 @@ public class SingletonValue<T extends Closeable> {
public interface SingletonBuilder<T extends Closeable> {
/**
* Constructs the value.
- *
+ *
* @return the value
* @throws IOException unable to construct the value
*/
@@ -108,7 +108,7 @@ public class SingletonValue<T extends Closeable> {
/**
* Returns true if the value is cached.
- *
+ *
* @return true if cached
*/
public boolean hasCachedValue() {
@@ -122,7 +122,7 @@ public class SingletonValue<T extends Closeable> {
/**
* Returns true if the value is cached.
- *
+ *
* @return true if cached
*/
public boolean isCleared() {
@@ -136,7 +136,7 @@ public class SingletonValue<T extends Closeable> {
/**
* Returns the cached result, or null if the value is not cached.
- *
+ *
* @return the cached result
*/
public T getCachedValue() {
@@ -151,7 +151,7 @@ public class SingletonValue<T extends Closeable> {
/**
* Clears the cached result. Any threads waiting for the result will retry unless
* {@code allowReset} is {@code false}.
- *
+ *
* @param allowReset true if the value is allowed to be cached subsequently
* @return the old value, or null if not set.
*/
@@ -184,7 +184,7 @@ public class SingletonValue<T extends Closeable> {
/**
* Clears the cached value as long it matches the expected value.
- *
+ *
* @param expect the expected value
* @param allowReset true if the value is allowed be be cached subsequently
* @return true if the value was cleared
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/StackTraceCollector.java b/geode-core/src/main/java/org/apache/geode/internal/util/StackTraceCollector.java
index 1e836ae..4d89faa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/StackTraceCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/StackTraceCollector.java
@@ -25,14 +25,14 @@ import java.util.concurrent.ConcurrentSkipListSet;
* traces are added at the same point of origin. This will collect all unique code paths while the
* collector is turned on. This class will affect timing and performance so its use is suspect while
* diagnosing concurrency issues.
- *
+ *
* Example: <code>
* public void doSomeWork() {
* // This will collect all unique code paths to this method.
* this.traceCollector.add(new Exception())
* }
* </code>
- *
+ *
*
* @since Geode 1.0
*/
@@ -92,7 +92,7 @@ public class StackTraceCollector {
/**
* Adds a stack trace to this collector if it is unique.
- *
+ *
* @param throwable used to generate the stack trace.
* @return true if the stack trace was not already present in this collector. This will always
* return false if the collector is turned off.
@@ -103,7 +103,7 @@ public class StackTraceCollector {
/**
* Adds a stack trace to a collection Set if it is unique.
- *
+ *
* @param throwable used to generate the stack trace.
* @return true if the stack trace was not already present in this collector. This will always
* return false if the collector is turned off.
@@ -119,7 +119,7 @@ public class StackTraceCollector {
/**
* Clears this collector of all stack traces.
- *
+ *
* @return true if there were stack traces to clear.
*/
public boolean clear() {
@@ -131,7 +131,7 @@ public class StackTraceCollector {
/**
* Returns true if the throwable parameter is contained by this collector.
- *
+ *
* @param throwable a stack trace to check.
*/
public boolean contains(final Throwable throwable) {
@@ -140,7 +140,7 @@ public class StackTraceCollector {
/**
* Returns true if the stackTrace parameter is contained by this collector.
- *
+ *
* @param stackTrace a stack trace.
*/
public boolean contains(final String stackTrace) {
@@ -149,7 +149,7 @@ public class StackTraceCollector {
/**
* Returns the stack trace associated with a Throwable as a String.
- *
+ *
* @param throwable contains a stack trace to be extracted and returned.
*/
public synchronized String convert(final Throwable throwable) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
index febf98d..9fbf03c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.util;
* components could not be found, which is most likely the case when we are not running a Sun JVM
* (like HotSpot).
* </p>
- *
+ *
* @see java.lang.RuntimeException
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
index fa540fa..476a934 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
@@ -30,7 +30,7 @@ public class TransformUtils {
/**
* Transforms PersistentMemberIDs to a user friendly log entry.
*/
- public final static Transformer<Map.Entry<PersistentMemberID, Set<Integer>>, String> persistentMemberEntryToLogEntryTransformer =
+ public static final Transformer<Map.Entry<PersistentMemberID, Set<Integer>>, String> persistentMemberEntryToLogEntryTransformer =
new Transformer<Map.Entry<PersistentMemberID, Set<Integer>>, String>() {
@Override
public String transform(Map.Entry<PersistentMemberID, Set<Integer>> entry) {
@@ -53,7 +53,7 @@ public class TransformUtils {
/**
* Transforms PersistentMemberIDs to a user friendly log entry.
*/
- public final static Transformer<PersistentMemberID, String> persistentMemberIdToLogEntryTransformer =
+ public static final Transformer<PersistentMemberID, String> persistentMemberIdToLogEntryTransformer =
new Transformer<PersistentMemberID, String>() {
@Override
public String transform(PersistentMemberID memberId) {
@@ -94,7 +94,7 @@ public class TransformUtils {
/**
* This is a simple file to file name transformer.
*/
- public final static Transformer<File, String> fileNameTransformer =
+ public static final Transformer<File, String> fileNameTransformer =
new Transformer<File, String>() {
public String transform(File file) {
return file.getName();
@@ -103,7 +103,7 @@ public class TransformUtils {
/**
* Transforms a collection of one data type into another.
- *
+ *
* @param from a collection of data to be transformed.
* @param to a collection to contain the transformed data.
* @param transformer transforms the data.
@@ -118,10 +118,10 @@ public class TransformUtils {
/**
* Transforms a collection of one data type into another and returns a map using the transformed
* type as the key and the original type as the value.
- *
+ *
* @param from a collection of data to be transformed.
* @param transformer transforms the data.
- *
+ *
* @return a Map of transformed values that are keys to the original values.
*/
public static <T1, T2> Map<T2, T1> transformAndMap(Collection<T1> from,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java b/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java
index 73455da..21ee610 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java
@@ -23,7 +23,7 @@ package org.apache.geode.internal.util;
public interface Transformer<T1, T2> {
/**
* Transforms one data type into another.
- *
+ *
* @param t the data to be transferred from.
* @return the transformed data.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java b/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java
index 62ec5ec..f1fdce4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java
@@ -15,9 +15,9 @@
package org.apache.geode.internal.util;
/**
- *
+ *
* A simple interface that describes the contract of an object that has a version
- *
+ *
* @since GemFire 5.0
*/
public interface Versionable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/VersionedArrayList.java b/geode-core/src/main/java/org/apache/geode/internal/util/VersionedArrayList.java
index ff6cdb0..0cb00b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/VersionedArrayList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/VersionedArrayList.java
@@ -33,9 +33,9 @@ import org.apache.geode.internal.cache.Node;
* Versioned ArrayList which maintains the version everytime the list gets modified. This is
* thread-safe in terms of add and remove operations and also list is an unmodifiable list to avoid
* ConcurrentModificationException.
- *
+ *
* @see java.util.ConcurrentModificationException
- *
+ *
*/
public class VersionedArrayList implements DataSerializable, Versionable, Iterable<Node> {
private static final long serialVersionUID = -1455442285961593385L;
@@ -57,7 +57,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Constructor.
- *
+ *
* @param size
*/
public VersionedArrayList(int size) {
@@ -74,7 +74,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
* Adds obj to the list. Addition is done by making a copy of the existing list and then adding
* the obj to the new list and assigning the old list to the new unmodifiable list. This is to
* ensure that the iterator of the list doesn't get ConcurrentModificationException.
- *
+ *
* @see java.util.ConcurrentModificationException
* @param obj
*/
@@ -92,10 +92,10 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
* removing the obj from the new list. If the object was removed, the list is assigning to the new
* unmodifiable list. This is to ensure that the iterator of the list doesn't get
* ConcurrentModificationException.
- *
+ *
* @return true if the element was removed and the version was changed, otherwise version and list
* are left unmodified.
- *
+ *
* @see java.util.ConcurrentModificationException
* @param obj the object to remove from the list
*/
@@ -112,7 +112,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Returns the iterator.
- *
+ *
* @return a list Iterator
*/
public synchronized Iterator<Node> iterator() {
@@ -121,7 +121,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Returns the size of the list.
- *
+ *
* @return int
*/
public synchronized int size() {
@@ -130,7 +130,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Returns true if obj is present in the list otherwise false.
- *
+ *
* @param obj
* @return true if obj is present in the list
*/
@@ -146,7 +146,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Returns Object at index i.
- *
+ *
* @param i
* @return Object
*/
@@ -160,7 +160,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Returns the index of Object if present, else -1.
- *
+ *
* @param obj
* @return int
*/
@@ -174,7 +174,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Returns a copy of the arraylist contained.
- *
+ *
* @return ArrayList
*/
public Set<Node> getListCopy() {
@@ -187,7 +187,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/**
* Prints the version and elements of the list.
- *
+ *
* @return String with version and elements of the list.
*/
@Override
@@ -258,7 +258,7 @@ public class VersionedArrayList implements DataSerializable, Versionable, Iterab
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.util.Versionable#getVersion()
*/
public synchronized Comparable getVersion() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMap.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMap.java
index 9c90078..82205e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMap.java
@@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentMap;
/**
* A copy on write hash map.
- *
+ *
* Note that the entryKey and keySet of this map are unmodifable. Should be easy to make them
* modifiable at a future time.
- *
+ *
*
*/
public class CopyOnWriteHashMap<K, V> extends AbstractMap<K, V>
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteWeakHashMap.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteWeakHashMap.java
index a3e1622..66574f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteWeakHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CopyOnWriteWeakHashMap.java
@@ -22,7 +22,7 @@ import java.util.WeakHashMap;
/**
* A copy on write hash map that uses weak references for keys.
- *
+ *
*
*/
public class CopyOnWriteWeakHashMap<K, V> extends AbstractMap<K, V> {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 0f85a55..ed92f65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -16,7 +16,7 @@
* ConcurrentHashMap implementation adapted from JSR 166 backport
* (http://backport-jsr166.sourceforge.net) JDK5 version release 3.1 with modifications to use
* generics where appropriate: backport-util-concurrent-Java60-3.1-src.tar.gz
- *
+ *
* Primary change is to allow HashEntry be an interface so that custom HashEntry implementations can
* be plugged in. These HashEntry objects are now assumed to be immutable in the sense that they
* cannot and should not be cloned in a rehash, and the rehash mechanism has been recoded using
@@ -30,7 +30,7 @@
* equality with a provided object). In addition, the segments are now locked using read-write
* locks. File has been reformatted to conform to GemStone conventions. GemStone additions have been
* marked with "GemStone addition". GemStone changes have been marked with "GemStone change(s)".
- *
+ *
* Original license follows below.
*/
/*
@@ -59,9 +59,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.geode.CancelException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
-import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.size.SingleObjectSizer;
import org.apache.geode.internal.util.ArrayUtils;
@@ -74,7 +74,7 @@ import org.apache.geode.internal.util.ArrayUtils;
* there is <em>not</em> any support for locking the entire table in a way that prevents all access.
* This class is fully interoperable with <tt>Hashtable</tt> in programs that rely on its thread
* safety but not on its synchronization details.
- *
+ *
* <p>
* Retrieval operations (including <tt>get</tt>) generally do not block, so may overlap with update
* operations (including <tt>put</tt> and <tt>remove</tt>). Retrievals reflect the results of the
@@ -85,7 +85,7 @@ import org.apache.geode.internal.util.ArrayUtils;
* iterator/enumeration. They do <em>not</em> throw
* {@link java.util.ConcurrentModificationException}. However, iterators are designed to be used by
* only one thread at a time.
- *
+ *
* <p>
* The allowed concurrency among update operations is guided by the optional
* <tt>concurrencyLevel</tt> constructor argument (default <tt>16</tt>), which is used as a hint for
@@ -99,19 +99,19 @@ import org.apache.geode.internal.util.ArrayUtils;
* others will only read. Also, resizing this or any other kind of hash table is a relatively slow
* operation, so, when possible, it is a good idea to provide estimates of expected table sizes in
* constructors.
- *
+ *
* <p>
* This class and its views and iterators implement all of the <em>optional</em> methods of the
* {@link Map} and {@link Iterator} interfaces.
- *
+ *
* <p>
* Like {@link java.util.Hashtable} but unlike {@link java.util.HashMap}, this class does
* <em>not</em> allow <tt>null</tt> to be used as a key or value.
- *
+ *
* <p>
* This class is a member of the <a href="{@docRoot} /../technotes/guides/collections/index.html">
* Java Collections Framework</a>.
- *
+ *
* @since Java 1.5
* @author Doug Lea
* @param <K> the type of keys maintained by this map
@@ -230,7 +230,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the segment that should be used for key with given hash
- *
+ *
* @param hash the hash code for the key
* @return the segment
*/
@@ -250,7 +250,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* [sumedh] Interface for ConcurrentHashMap list entry. Note that this is never exported out as a
* user-visible Map.Entry.
- *
+ *
* Made this public so RegionEntries can directly implement this to reduce memory overhead of
* separate
* {@link org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry}
@@ -296,7 +296,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* ConcurrentHashMap list entry. Note that this is never exported out as a user-visible Map.Entry.
- *
+ *
* Because the value field is volatile, not final, it is legal wrt the Java Memory Model for an
* unsynchronized reader to see null instead of initial value when read via a data race. Although
* a reordering leading to this is not likely to ever actually occur, the
@@ -458,7 +458,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* The load factor for the hash table. Even though this value is same for all segments, it is
* replicated to avoid needing links to outer object.
- *
+ *
* @serial
*/
final float loadFactor;
@@ -1062,9 +1062,9 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Extension of
* {@link org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Segment} using
* reference-equality comparison for key, value equality instead of equals method.
- *
+ *
* swale
- *
+ *
* @since GemFire 7.0
*/
static class IdentitySegment<K, V> extends Segment<K, V> implements Serializable {
@@ -1102,7 +1102,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates a new, empty map with the specified initial capacity, load factor and concurrency
* level.
- *
+ *
* @param initialCapacity the initial capacity. The implementation performs internal sizing to
* accommodate this many elements.
* @param loadFactor the load factor threshold, used to control resizing. Resizing may be
@@ -1122,7 +1122,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates a new, empty map with the specified initial capacity, load factor and concurrency
* level.
- *
+ *
* @param initialCapacity the initial capacity. The implementation performs internal sizing to
* accommodate this many elements.
* @param loadFactor the load factor threshold, used to control resizing. Resizing may be
@@ -1142,7 +1142,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates a new, empty map with the specified initial capacity, load factor, concurrency level
* and custom {@link HashEntryCreator}.
- *
+ *
* @param initialCapacity the initial capacity. The implementation performs internal sizing to
* accommodate this many elements.
* @param loadFactor the load factor threshold, used to control resizing. Resizing may be
@@ -1152,7 +1152,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @param isIdentityMap if true then this will use reference-equality instead of equals like an
* {@link IdentityHashMap}
* @param entryCreator a custom {@link HashEntryCreator} for creating the map entries
- *
+ *
* @throws IllegalArgumentException if the initial capacity is negative or the load factor or
* concurrencyLevel are nonpositive.
*/
@@ -1229,14 +1229,14 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates a new, empty map with the specified initial capacity and load factor and with the
* default concurrencyLevel (16).
- *
+ *
* @param initialCapacity The implementation performs internal sizing to accommodate this many
* elements.
* @param loadFactor the load factor threshold, used to control resizing. Resizing may be
* performed when the average number of elements per bin exceeds this threshold.
* @throws IllegalArgumentException if the initial capacity of elements is negative or the load
* factor is nonpositive
- *
+ *
* @since GemFire 1.6
*/
public CustomEntryConcurrentHashMap(final int initialCapacity, final float loadFactor) {
@@ -1246,7 +1246,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates a new, empty map with the specified initial capacity, and with default load factor
* (0.75) and concurrencyLevel (16).
- *
+ *
* @param initialCapacity the initial capacity. The implementation performs internal sizing to
* accommodate this many elements.
* @throws IllegalArgumentException if the initial capacity of elements is negative.
@@ -1267,7 +1267,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Creates a new map with the same mappings as the given map. The map is created with a capacity
* of 1.5 times the number of mappings in the given map or 16 (whichever is greater), and a
* default load factor (0.75) and concurrencyLevel (16).
- *
+ *
* @param m the map
*/
public CustomEntryConcurrentHashMap(final Map<? extends K, ? extends V> m) {
@@ -1278,7 +1278,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns <tt>true</tt> if this map contains no key-value mappings.
- *
+ *
* @return <tt>true</tt> if this map contains no key-value mappings
*/
@Override
@@ -1315,7 +1315,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the number of key-value mappings in this map. If the map contains more than
* <tt>Integer.MAX_VALUE</tt> elements, returns <tt>Integer.MAX_VALUE</tt>.
- *
+ *
* @return the number of key-value mappings in this map
*/
@Override
@@ -1371,12 +1371,12 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the value to which the specified key is mapped, or {@code null} if this map contains no
* mapping for the key.
- *
+ *
* <p>
* More formally, if this map contains a mapping from a key {@code k} to a value {@code v} such
* that {@code key.equals(k)}, then this method returns {@code v}; otherwise it returns
* {@code null}. (There can be at most one such mapping.)
- *
+ *
* @throws NullPointerException if the specified key is null
*/
@Override
@@ -1388,7 +1388,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Tests if the specified object is a key in this table.
- *
+ *
* @param key possible key
* @return <tt>true</tt> if and only if the specified object is a key in this table, as determined
* by the <tt>equals</tt> method; <tt>false</tt> otherwise.
@@ -1405,7 +1405,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Returns <tt>true</tt> if this map maps one or more keys to the specified value. Note: This
* method requires a full internal traversal of the hash table, and so is much slower than method
* <tt>containsKey</tt>.
- *
+ *
* @param value value whose presence in this map is to be tested
* @return <tt>true</tt> if this map maps one or more keys to the specified value
* @throws NullPointerException if the specified value is null
@@ -1470,7 +1470,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* identical in functionality to {@link #containsValue}, and exists solely to ensure full
* compatibility with class {@link java.util.Hashtable}, which supported this method prior to
* introduction of the Java Collections framework.
- *
+ *
* @param value a value to search for
* @return <tt>true</tt> if and only if some key maps to the <tt>value</tt> argument in this table
* as determined by the <tt>equals</tt> method; <tt>false</tt> otherwise
@@ -1483,11 +1483,11 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Maps the specified key to the specified value in this table. Neither the key nor the value can
* be null.
- *
+ *
* <p>
* The value can be retrieved by calling the <tt>get</tt> method with a key that is equal to the
* original key.
- *
+ *
* @param key key with which the specified value is to be associated
* @param value value to be associated with the specified key
* @return the previous value associated with <tt>key</tt>, or <tt>null</tt> if there was no
@@ -1506,7 +1506,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* {@inheritDoc}
- *
+ *
* @return the previous value associated with the specified key, or <tt>null</tt> if there was no
* mapping for the key
* @throws NullPointerException if the specified key or value is null
@@ -1528,10 +1528,10 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* acquires a write lock on the segment which this acquires a write lock only if entry was not
* found. In other words this method is more efficient for the case when number of entries is
* small and same entries are being updated repeatedly.
- *
+ *
* @return true if the key was successfully put in the map or false if there was an existing
* mapping for the key in the map
- *
+ *
* @throws NullPointerException if the specified key is null
*/
public boolean create(final K key, final V value) {
@@ -1551,9 +1551,9 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* <p>
* Also allows invoking a method when removing from map by a call to
* {@link #removeConditionally(Object, MapCallback, Object, Object)}.
- *
+ *
* @since GemFire 7.0
- *
+ *
* @param <K> the type of key of the map
* @param <V> the type of value of the map
* @param <C> the type of context parameter passed to the creation/removal methods
@@ -1564,7 +1564,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Create a new instance of the value object given the key and provided parameters for
* construction.
- *
+ *
* @param key the key for which the value is being created
* @param context any context in which this method has been invoked
* @param createParams parameters, if any, required for construction of a new value object
@@ -1575,7 +1575,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Invoked when an existing value in map is read by the
* {@link #create(Object, MapCallback, Object, Object, boolean)} method in the segment when
* segment is locked for read, or by
- *
+ *
* @param value the value read by create that will be returned
*/
public void oldValueRead(V value);
@@ -1583,7 +1583,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Check if the existing value should be removed by the
* {@link CustomEntryConcurrentHashMap#removeConditionally} method.
- *
+ *
* @param value the value to be removed from the map
* @param context any context in which this method has been invoked
* @param removeParams parameters, if any, to be passed for cleanup of the object
@@ -1623,7 +1623,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* read lock on the segment, if required, to provide better guarantees w.r.t. remove/replace that
* checks against old value when the value may be changed structurally by reading (e.g. a list as
* value changed after a call to this method).
- *
+ *
* @param key key with which the specified value is to be associated
* @param valueCreator factory object to create the value to be associated with the specified key,
* if required
@@ -1634,11 +1634,11 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @param lockForRead if passed as true, then the read from the map prior to creation is done
* under the segment read lock; this provides better guarantees with respect to other
* threads that may be manipulating the value object in place after reading from the map
- *
+ *
* @return the previous value associated with the specified key, or the new value obtained by
* invoking {@link MapCallback#newValue} if there was no mapping for the key; this is
* paired with the segment read lock
- *
+ *
* @throws NullPointerException if the specified key or value is null
*/
public <C, P> V create(final K key, final MapCallback<K, V, C, P> valueCreator, final C context,
@@ -1651,16 +1651,16 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the value to which the specified key is mapped, or {@code null} if this map contains no
* mapping for the key.
- *
+ *
* <p>
* More formally, if this map contains a mapping from a key {@code k} to a value {@code v} such
* that {@code key.equals(k)}, then this method returns {@code v}; otherwise it returns
* {@code null}. (There can be at most one such mapping.)
- *
+ *
* <p>
* This variant locks the segment for reading and if the given {@link MapCallback} is non-null
* then its {@link MapCallback#oldValueRead(Object)} method is invoked in the lock.
- *
+ *
* @throws NullPointerException if the specified key is null
*/
public V get(final Object key, final MapCallback<K, V, ?, ?> readCallback) {
@@ -1672,7 +1672,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Removes the entry for a key only if the given condition ( {@link MapCallback#doRemoveValue}
* evaluates to true. This is equivalent to:
- *
+ *
* <pre>
* if (map.containsKey(key) && condition.doRemoveInstance(map.get(key), removeParams)) {
* map.remove(key);
@@ -1681,9 +1681,9 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* return false;
* }
* </pre>
- *
+ *
* except that the action is performed atomically.
- *
+ *
* @param key key with which the specified value is associated
* @param condition {@link MapCallback#doRemoveValue} is invoked and checked inside the segment
* lock if removal should be done
@@ -1691,10 +1691,10 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* <code>condition</code> {@link MapCallback#doRemoveValue} method to create the new
* instance
* @param removeParams parameters to be passed to the <code>onSuccess</code> parameter
- *
+ *
* @return the previous value associated with <tt>key</tt>, or <tt>null</tt> if there was no
* mapping for <tt>key</tt>
- *
+ *
* @throws UnsupportedOperationException if the <tt>remove</tt> operation is not supported by this
* map
* @throws ClassCastException if the key or value is of an inappropriate type for this map
@@ -1714,7 +1714,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Copies all of the mappings from the specified map to this one. These mappings replace any
* mappings that this map had for any of the keys currently in the specified map.
- *
+ *
* @param m mappings to be stored in this map
*/
@Override
@@ -1727,7 +1727,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Removes the key (and its corresponding value) from this map. This method does nothing if the
* key is not in the map.
- *
+ *
* @param key the key that needs to be removed
* @return the previous value associated with <tt>key</tt>, or <tt>null</tt> if there was no
* mapping for <tt>key</tt>
@@ -1742,7 +1742,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* {@inheritDoc}
- *
+ *
* @throws NullPointerException if the specified key is null
*/
public boolean remove(final Object key, final Object value) {
@@ -1756,7 +1756,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* {@inheritDoc}
- *
+ *
* @throws NullPointerException if any of the arguments are null
*/
public boolean replace(final K key, final V oldValue, final V newValue) {
@@ -1770,7 +1770,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* {@inheritDoc}
- *
+ *
* @return the previous value associated with the specified key, or <tt>null</tt> if there was no
* mapping for the key
* @throws NullPointerException if the specified key or value is null
@@ -1838,7 +1838,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* which removes the corresponding mapping from this map, via the <tt>Iterator.remove</tt>,
* <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt> operations. It
* does not support the <tt>add</tt> or <tt>addAll</tt> operations.
- *
+ *
* <p>
* The view's <tt>iterator</tt> is a "weakly consistent" iterator that will never throw
* {@link java.util.ConcurrentModificationException}, and guarantees to traverse elements as they
@@ -1858,7 +1858,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* the <tt>Iterator.remove</tt>, <tt>Collection.remove</tt>, <tt>removeAll</tt>,
* <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not support the <tt>add</tt> or
* <tt>addAll</tt> operations.
- *
+ *
* <p>
* The view's <tt>iterator</tt> is a "weakly consistent" iterator that will never throw
* {@link java.util.ConcurrentModificationException}, and guarantees to traverse elements as they
@@ -1877,7 +1877,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* removal, which removes the corresponding mapping from the map, via the
* <tt>Iterator.remove</tt>, <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
* <tt>clear</tt> operations. It does not support the <tt>add</tt> or <tt>addAll</tt> operations.
- *
+ *
* <p>
* The view's <tt>iterator</tt> is a "weakly consistent" iterator that will never throw
* {@link java.util.ConcurrentModificationException}, and guarantees to traverse elements as they
@@ -1898,13 +1898,13 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* removal, which removes the corresponding mapping from the map, via the
* <tt>Iterator.remove</tt>, <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
* <tt>clear</tt> operations. It does not support the <tt>add</tt> or <tt>addAll</tt> operations.
- *
+ *
* <p>
* The view's <tt>iterator</tt> is a "weakly consistent" iterator that will never throw
* {@link java.util.ConcurrentModificationException}, and guarantees to traverse elements as they
* existed upon construction of the iterator, and may (but is not guaranteed to) reflect any
* modifications subsequent to construction.
- *
+ *
* <p>
* This set provides entries that are reused during iteration so caller cannot store the returned
* <code>Map.Entry</code> objects.
@@ -1918,7 +1918,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns an enumeration of the keys in this table.
- *
+ *
* @return an enumeration of the keys in this table
* @see #keySet()
*/
@@ -1928,7 +1928,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns an enumeration of the values in this table.
- *
+ *
* @return an enumeration of the values in this table
* @see #values()
*/
@@ -1994,7 +1994,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/*
* (original code) if (this.nextEntry != null && (this.nextEntry =
* this.nextEntry.getNextEntry()) != null) { return; }
- *
+ *
* while (this.nextTableIndex >= 0) { if ((this.nextEntry =
* this.currentTable[this.nextTableIndex--]) != null) { return; } }
*/
@@ -2026,7 +2026,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Copy the tail of list of current matched entry ({@link #nextEntry}) to a temporary list, so
* that the read lock can be released after the copy.
- *
+ *
* Read lock on {@link #currentSegmentIndex}'s listUpdateLock should already be acquired.
*/
private void copyEntriesToList() {
@@ -2100,7 +2100,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates an entry representing a mapping from the specified key to the specified value.
- *
+ *
* @param key the key represented by this entry
* @param value the value represented by this entry
*/
@@ -2111,7 +2111,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates an entry representing the same mapping as the specified entry.
- *
+ *
* @param entry the entry to copy
*/
public SimpleReusableEntry(final Entry<? extends K, ? extends V> entry) {
@@ -2121,7 +2121,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the key corresponding to this entry.
- *
+ *
* @return the key corresponding to this entry
*/
public K getKey() {
@@ -2130,7 +2130,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the value corresponding to this entry.
- *
+ *
* @return the value corresponding to this entry
*/
public V getValue() {
@@ -2139,7 +2139,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Replaces the value corresponding to this entry with the specified value.
- *
+ *
* @param value new value to be stored in this entry
* @return the old value corresponding to the entry
*/
@@ -2153,15 +2153,15 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Compares the specified object with this entry for equality. Returns {@code true} if the given
* object is also a map entry and the two entries represent the same mapping. More formally, two
* entries {@code e1} and {@code e2} represent the same mapping if
- *
+ *
* <pre>
* (e1.getKey() == null ? e2.getKey() == null : e1.getKey().equals(e2.getKey()))
* && (e1.getValue() == null ? e2.getValue() == null : e1.getValue().equals(e2.getValue()))
* </pre>
- *
+ *
* This ensures that the {@code equals} method works properly across different implementations
* of the {@code Map.Entry} interface.
- *
+ *
* @param o object to be compared for equality with this map entry
* @return {@code true} if the specified object is equal to this map entry
* @see #hashCode
@@ -2182,16 +2182,16 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns the hash code value for this map entry. The hash code of a map entry {@code e} is
* defined to be:
- *
+ *
* <pre>
* (e.getKey() == null ? 0 : e.getKey().hashCode())
* ˆ (e.getValue() == null ? 0 : e.getValue().hashCode())
* </pre>
- *
+ *
* This ensures that {@code e1.equals(e2)} implies that {@code e1.hashCode()==e2.hashCode()} for
* any two Entries {@code e1} and {@code e2}, as required by the general contract of
* {@link Object#hashCode}.
- *
+ *
* @return the hash code value for this map entry
* @see #equals
*/
@@ -2208,7 +2208,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Returns a String representation of this map entry. This implementation returns the string
* representation of this entry's key followed by the equals character ("<tt>=</tt>") followed
* by the string representation of this entry's value.
- *
+ *
* @return a String representation of this map entry
*/
@Override
@@ -2227,7 +2227,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Creates an entry representing a mapping from the specified key to the specified value.
- *
+ *
* @param key the key represented by this entry
* @param value the value represented by this entry
*/
@@ -2383,7 +2383,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Save the state of the <tt>ConcurrentHashMap</tt> instance to a stream (i.e., serialize it).
- *
+ *
* @param s the stream
* @serialData the key (Object) and value (Object) for each key-value mapping, followed by a null
* pair. The key-value mappings are emitted in no particular order.
@@ -2413,7 +2413,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Reconstitute the <tt>ConcurrentHashMap</tt> instance from a stream (i.e., deserialize it).
- *
+ *
* @param s the stream
*/
@SuppressWarnings("unchecked")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/FutureResult.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/FutureResult.java
index 463b3fb..863943f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/FutureResult.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/FutureResult.java
@@ -19,6 +19,7 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphore.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphore.java
index e3d4efb..868b4bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphore.java
@@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit;
* acquire a real permit the first time it calls acquire. After that, the thread can call acquire
* repeatedly, and it won't affect the semaphore count until the thread calls release the same
* number of times as acquire.
- *
+ *
* This semaphore currently only supports a thread acquiring and releasing a single permit at a
* time.
- *
+ *
* If a thread does not hold the semaphore, but still decrements it, then it will increase the
* permits of the semaphore, just like a regular semaphore.
- *
+ *
* This semaphore is useful for allowing only a limited number of threads to enter a block of code,
* while allowing a single thread to try to enter that block several times in it's call stack.
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLock.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLock.java
index 46b2580..23d3a6e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLock.java
@@ -23,7 +23,7 @@ import java.util.concurrent.locks.ReadWriteLock;
/**
* This ReadWriteLock is useful when different threads need to lock and unlock the read lock. This
* is <b>NOT</b> a reentrant lock.
- *
+ *
*/
public class SemaphoreReadWriteLock implements ReadWriteLock {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCondition.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCondition.java
index 18986db..c69556e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCondition.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCondition.java
@@ -47,7 +47,7 @@ public class StoppableCondition implements java.io.Serializable {
/**
* Create a new StoppableCondition based on given condition and cancellation criterion
- *
+ *
* @param c the underlying condition
**/
StoppableCondition(Condition c, CancelCriterion stopper) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
index 4726e51..83f93ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.util.concurrent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.Assert;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* This class is a "stoppable" cover for {@link CountDownLatch}.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownOrUpLatch.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownOrUpLatch.java
index b90e47e..13b5aaa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownOrUpLatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownOrUpLatch.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* Extends the CountDownLatch with the ability to also countUp.
* <p>
* Based on the original Doug Lea backport implementation of CountDownLatch.
- *
+ *
* @see java.util.concurrent.CountDownLatch
*/
public class StoppableCountDownOrUpLatch {
@@ -209,4 +209,3 @@ public class StoppableCountDownOrUpLatch {
return getCount();
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableNonReentrantLock.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableNonReentrantLock.java
index 7f6d516..19fbc96 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableNonReentrantLock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableNonReentrantLock.java
@@ -19,12 +19,12 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* This is a type of {@link StoppableReentrantLock} that does not allow recursion
- *
+ *
*/
public class StoppableNonReentrantLock extends StoppableReentrantLock {
/**
* Creates an instance.
- *
+ *
* @param stopper the cancellation object
*/
public StoppableNonReentrantLock(CancelCriterion stopper) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReadWriteLock.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReadWriteLock.java
index 69f6561..165961f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReadWriteLock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReadWriteLock.java
@@ -19,7 +19,7 @@ import org.apache.geode.CancelCriterion;
/**
* A non-reentrant ReadWriteLock that responds to Cancellation. The underlying lock is
* {@link SemaphoreReadWriteLock}, which is a count based lock.
- *
+ *
*/
public class StoppableReadWriteLock extends StoppableReentrantReadWriteLock {
@@ -29,4 +29,3 @@ public class StoppableReadWriteLock extends StoppableReentrantReadWriteLock {
super(new SemaphoreReadWriteLock(), stopper);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantLock.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantLock.java
index 9fb340f..dcf0d64 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantLock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantLock.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.Assert;
/**
* Instances of {@link java.util.concurrent.locks.Lock} that respond to cancellations
- *
+ *
*/
public class StoppableReentrantLock {
/**
@@ -42,7 +42,7 @@ public class StoppableReentrantLock {
/**
* Create a new instance with the given cancellation criterion
- *
+ *
* @param stopper the cancellation criterion
*/
public StoppableReentrantLock(CancelCriterion stopper) {
@@ -53,7 +53,7 @@ public class StoppableReentrantLock {
/**
* Create a new instance with given fairness and cancellation criterion
- *
+ *
* @param fair whether to be fair
* @param stopper the cancellation criterion
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock.java
index 59175d4..8c3814a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock.java
@@ -38,12 +38,12 @@ public class StoppableReentrantReadWriteLock implements /* ReadWriteLock, */ jav
/**
* The underlying read lock
*/
- transient private final StoppableReadLock readLock;
+ private final transient StoppableReadLock readLock;
/**
* the underlying write lock
*/
- transient private final StoppableWriteLock writeLock;
+ private final transient StoppableWriteLock writeLock;
/**
* This is how often waiters will wake up to check for cancellation
@@ -52,7 +52,7 @@ public class StoppableReentrantReadWriteLock implements /* ReadWriteLock, */ jav
/**
* Create a new instance
- *
+ *
* @param stopper the cancellation criterion
*/
public StoppableReentrantReadWriteLock(CancelCriterion stopper) {
@@ -82,14 +82,14 @@ public class StoppableReentrantReadWriteLock implements /* ReadWriteLock, */ jav
/**
* read locks that are stoppable
*/
- static public class StoppableReadLock {
+ public static class StoppableReadLock {
private final Lock lock;
private final CancelCriterion stopper;
/**
* Create a new read lock from the given lock
- *
+ *
* @param lock the lock to be used
* @param stopper the cancellation criterion
*/
@@ -156,7 +156,7 @@ public class StoppableReentrantReadWriteLock implements /* ReadWriteLock, */ jav
// }
}
- static public class StoppableWriteLock {
+ public static class StoppableWriteLock {
/**
* The underlying write lock
@@ -170,7 +170,7 @@ public class StoppableReentrantReadWriteLock implements /* ReadWriteLock, */ jav
/**
* Create a new instance
- *
+ *
* @param lock the underlying lock
* @param stopper
*/
diff --git a/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java b/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
index 576c19e..27010fe 100644
--- a/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
@@ -19,7 +19,7 @@ package org.apache.geode.lang;
* The AttachAPINotFoundException class is a RuntimeException indicating that the JDK tools.jar has
* not been properly set on the user's classpath
* <p/>
- *
+ *
* @see java.lang.RuntimeException
* @since GemFire 7.0
*/
@@ -36,7 +36,7 @@ public class AttachAPINotFoundException extends RuntimeException {
* Constructs an instance of the AttachAPINotFoundException class with a description of the
* problem.
* <p/>
- *
+ *
* @param message a String describing the nature of the Exception and why it was thrown.
*/
public AttachAPINotFoundException(final String message) {
@@ -47,7 +47,7 @@ public class AttachAPINotFoundException extends RuntimeException {
* Constructs an instance of the AttachAPINotFoundException class with a reference to the
* underlying Exception causing this Exception to be thrown.
* <p/>
- *
+ *
* @param cause a Throwable indicating the reason this Exception was thrown.
*/
public AttachAPINotFoundException(final Throwable cause) {
@@ -59,7 +59,7 @@ public class AttachAPINotFoundException extends RuntimeException {
* underlying Exception causing this Exception to be thrown in addition to a description of the
* problem.
* <p/>
- *
+ *
* @param message a String describing the nature of the Exception and why it was thrown.
* @param cause a Throwable indicating the reason this Exception was thrown.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/lang/Identifiable.java b/geode-core/src/main/java/org/apache/geode/lang/Identifiable.java
index cedf8b8..c67b1d4 100644
--- a/geode-core/src/main/java/org/apache/geode/lang/Identifiable.java
+++ b/geode-core/src/main/java/org/apache/geode/lang/Identifiable.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
* The Identifiable interface defines a contract for classes whose Object instances can be uniquely
* identified relative to other Object instances within the same class type hierarchy.
* <p/>
- *
+ *
* @param <T> the class type of the identifier.
* @see java.lang.Comparable
* @since GemFire 7.0
@@ -31,7 +31,7 @@ public interface Identifiable<T extends Comparable<T>> extends Serializable {
/**
* Gets the identifier uniquely identifying this Object instance.
* <p/>
- *
+ *
* @return an identifier uniquely identifying this Object.
*/
public T getId();
diff --git a/geode-core/src/main/java/org/apache/geode/management/AlreadyRunningException.java b/geode-core/src/main/java/org/apache/geode/management/AlreadyRunningException.java
index 8cc6952..36bef5b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/AlreadyRunningException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/AlreadyRunningException.java
@@ -16,9 +16,9 @@ package org.apache.geode.management;
/**
* Indicates that a request to start a management service failed because it was already running.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
public class AlreadyRunningException extends ManagementException {
diff --git a/geode-core/src/main/java/org/apache/geode/management/AsyncEventQueueMXBean.java b/geode-core/src/main/java/org/apache/geode/management/AsyncEventQueueMXBean.java
index 0147da1..987303e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/AsyncEventQueueMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/AsyncEventQueueMXBean.java
@@ -21,9 +21,9 @@ import org.apache.geode.security.ResourcePermission.Resource;
/**
* MBean that provides access to an {@link AsyncEventQueue}.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface AsyncEventQueueMXBean {
@@ -55,14 +55,14 @@ public interface AsyncEventQueueMXBean {
/**
* Returns whether batch conflation for the AsyncEventQueue is enabled
- *
+ *
* @return True if batch conflation is enabled, false otherwise.
*/
public boolean isBatchConflationEnabled();
/**
* Returns whether the AsyncEventQueue is configured to be persistent or non-persistent.
- *
+ *
* @return True if the queue is persistent, false otherwise.
*/
public boolean isPersistent();
@@ -71,7 +71,7 @@ public interface AsyncEventQueueMXBean {
* Returns whether the queue is primary or secondary. Events get delivered only by the primary
* queue. If the primary queue goes down then the secondary queue first becomes primary and then
* starts delivering the events.
- *
+ *
* @return True if this is the primary queue, false otherwise.
*/
public boolean isPrimary();
@@ -90,14 +90,14 @@ public interface AsyncEventQueueMXBean {
/**
* Returns whether the isDiskSynchronous property is set for this AsyncEventQueue.
- *
+ *
* @return True if the property is set, false otherwise.
*/
public boolean isDiskSynchronous();
/**
* Returns whether the isParallel property is set for this AsyncEventQueue.
- *
+ *
* @return True if the property is set, false otherwise.
*/
public boolean isParallel();
@@ -109,7 +109,7 @@ public interface AsyncEventQueueMXBean {
/**
* Returns the Size of the event queue
- *
+ *
* @return integer
*/
public int getEventQueueSize();
diff --git a/geode-core/src/main/java/org/apache/geode/management/BackupStatus.java b/geode-core/src/main/java/org/apache/geode/management/BackupStatus.java
index 28795d1..9ac5b50 100644
--- a/geode-core/src/main/java/org/apache/geode/management/BackupStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/management/BackupStatus.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.BackupUtil;
/**
* The status of a backup operation, returned by
* {@link BackupUtil#backupAllMembers(DM, java.io.File,java.io.File)}.
- *
+ *
* @since GemFire 6.5
*/
public interface BackupStatus {
diff --git a/geode-core/src/main/java/org/apache/geode/management/CacheServerMXBean.java b/geode-core/src/main/java/org/apache/geode/management/CacheServerMXBean.java
index d0159f0..7ffc5fc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/CacheServerMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/CacheServerMXBean.java
@@ -22,10 +22,10 @@ import org.apache.geode.security.ResourcePermission.Target;
/**
* MBean that provides access to information and management functionality for a {@link CacheServer}.
- *
+ *
* <p>
* The will be one CacheServerMBean per {@link CacheServer} started in GemFire node.
- *
+ *
* <p>
* ObjectName for this MBean is GemFire:service=CacheServer,port={0},type=Member,member={1}
* <p>
@@ -51,9 +51,9 @@ import org.apache.geode.security.ResourcePermission.Target;
* <td>Client left with Id <Client ID></td>
* </tr>
* </table>
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface CacheServerMXBean {
@@ -121,7 +121,7 @@ public interface CacheServerMXBean {
/**
* Returns whether or not this CacheServer is running.
- *
+ *
* @return True of the server is running, false otherwise.
*/
boolean isRunning();
@@ -273,7 +273,7 @@ public interface CacheServerMXBean {
/**
* Remove an index.
- *
+ *
* @param indexName Name of the index to be removed.
*/
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
@@ -286,7 +286,7 @@ public interface CacheServerMXBean {
/**
* Execute an ad-hoc CQ on the server
- *
+ *
* @param queryName Name of the CQ to execute.
* @deprecated This method is dangerous because it only modifies the target cache server - other
* copies of the CQ on other servers are not affected. Using the client side CQ
@@ -298,9 +298,9 @@ public interface CacheServerMXBean {
/**
* Stop (pause) a CQ from executing
- *
+ *
* @param queryName Name of the CQ to stop.
- *
+ *
* @deprecated This method is dangerous because it only modifies the target cache server - other
* copies of the CQ on other servers are not affected. Using the client side CQ
* methods to modify a CQ.
@@ -312,7 +312,7 @@ public interface CacheServerMXBean {
/**
* Unregister all CQs from a region
- *
+ *
* @param regionName Name of the region from which to remove CQs.
* @deprecated This method is dangerous because it only modifies the target cache server - other
* copies of the CQ on other servers are not affected. Using the client side CQ
@@ -326,7 +326,7 @@ public interface CacheServerMXBean {
/**
* Unregister a CQ
- *
+ *
* @param queryName Name of the CQ to unregister.
* @deprecated This method is dangerous because it only modifies the target cache server - other
* copies of the CQ on other servers are not affected. Using the client side CQ
@@ -340,7 +340,7 @@ public interface CacheServerMXBean {
/**
* Returns a list of IDs for all connected clients.
- *
+ *
* @return A list of IDs or a length 0 array if no clients are registered.
*/
String[] getClientIds() throws Exception;
@@ -349,7 +349,7 @@ public interface CacheServerMXBean {
* Returns health and statistic information for the give client id. Some of the information (CPUs,
* NumOfCacheListenerCalls, NumOfGets,NumOfMisses, NumOfPuts,NumOfThreads, ProcessCpuTime) only
* available for clients which have set a "StatisticsInterval".
- *
+ *
* @param clientId ID of the client for which to retrieve information.
*/
ClientHealthStatus showClientStats(String clientId) throws Exception;
@@ -369,23 +369,23 @@ public interface CacheServerMXBean {
/**
* Shows a list of client with their queue statistics. Client queue statistics shown in this
* method are the following
- *
+ *
* eventsEnqueued,eventsRemoved , eventsConflated ,markerEventsConflated , eventsExpired,
* eventsRemovedByQrm , eventsTaken , numVoidRemovals
- *
+ *
* @return an array of ClientQueueDetail
* @throws Exception
*/
ClientQueueDetail[] showClientQueueDetails() throws Exception;
/**
- *
+ *
* Shows queue statistics of the given client. Client queue statistics shown in this method are
* the following
- *
+ *
* eventsEnqueued,eventsRemoved , eventsConflated ,markerEventsConflated , eventsExpired,
* eventsRemovedByQrm , eventsTaken , numVoidRemovals
- *
+ *
* @param clientId the ID of client which is returned by the attribute ClientIds
* @return ClientQueueDetail
* @throws Exception
diff --git a/geode-core/src/main/java/org/apache/geode/management/ClientHealthStatus.java b/geode-core/src/main/java/org/apache/geode/management/ClientHealthStatus.java
index bab10ea..500e084 100644
--- a/geode-core/src/main/java/org/apache/geode/management/ClientHealthStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/management/ClientHealthStatus.java
@@ -21,7 +21,7 @@ import java.util.Map;
/**
* Composite data type used to distribute statistics which can be used to determine the health of a
* cache client.
- *
+ *
* @since GemFire 7.0
*/
public class ClientHealthStatus {
diff --git a/geode-core/src/main/java/org/apache/geode/management/ClientQueueDetail.java b/geode-core/src/main/java/org/apache/geode/management/ClientQueueDetail.java
index 6b37c1d..4cbbd85 100644
--- a/geode-core/src/main/java/org/apache/geode/management/ClientQueueDetail.java
+++ b/geode-core/src/main/java/org/apache/geode/management/ClientQueueDetail.java
@@ -15,7 +15,7 @@
package org.apache.geode.management;
/**
- *
+ *
* @since GemFire 8.0
*/
public class ClientQueueDetail {
diff --git a/geode-core/src/main/java/org/apache/geode/management/DependenciesNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/DependenciesNotFoundException.java
index 793cf17..c23d4a8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DependenciesNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DependenciesNotFoundException.java
@@ -18,7 +18,7 @@ import org.apache.geode.GemFireException;
/**
* Indicates that required dependencies were not found in the ClassPath.
- *
+ *
* @since GemFire 7.0
*/
public class DependenciesNotFoundException extends GemFireException {
@@ -29,7 +29,7 @@ public class DependenciesNotFoundException extends GemFireException {
*
* Note that the detail message associated with <code>cause</code> is <i>not</i> automatically
* incorporated in this runtime exception's detail message.
- *
+ *
* @param message The detail message.
* @param cause The cause of this exception or <code>null</code> if the cause is unknown.
*/
@@ -39,7 +39,7 @@ public class DependenciesNotFoundException extends GemFireException {
/**
* Constructs a new DependenciesNotFoundException with the specified detail message.
- *
+ *
* @param message The detail message.
*/
public DependenciesNotFoundException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/DiskBackupResult.java b/geode-core/src/main/java/org/apache/geode/management/DiskBackupResult.java
index b195b1a..fb19949 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DiskBackupResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DiskBackupResult.java
@@ -18,7 +18,7 @@ import java.beans.ConstructorProperties;
/**
* Composite data type used to distribute the results of a disk backup operation.
- *
+ *
* @since GemFire 7.0
*/
public class DiskBackupResult {
@@ -54,7 +54,7 @@ public class DiskBackupResult {
/**
* Returns whether the backup was successful.
- *
+ *
* @return True if the backup was successful, false otherwise.
*/
public boolean isOffilne() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/DiskBackupStatus.java b/geode-core/src/main/java/org/apache/geode/management/DiskBackupStatus.java
index c4b824f..672527a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DiskBackupStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DiskBackupStatus.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.persistence.PersistentID;
/**
* Composite data type used to distribute the status of disk backup operations.
- *
+ *
* @since GemFire 7.0
*/
public interface DiskBackupStatus {
diff --git a/geode-core/src/main/java/org/apache/geode/management/DiskMetrics.java b/geode-core/src/main/java/org/apache/geode/management/DiskMetrics.java
index bc3778e..769aff4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DiskMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DiskMetrics.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.DiskStore;
/**
* Composite data type used to distribute metrics for a {@link DiskStore}.
- *
+ *
* @since GemFire 7.0
*/
public class DiskMetrics {
diff --git a/geode-core/src/main/java/org/apache/geode/management/DiskStoreMXBean.java b/geode-core/src/main/java/org/apache/geode/management/DiskStoreMXBean.java
index 6275df5..d6f85e2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DiskStoreMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DiskStoreMXBean.java
@@ -22,9 +22,9 @@ import org.apache.geode.security.ResourcePermission.Target;
/**
* MBean that provides access to information and management functionality for a {@link DiskStore}.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface DiskStoreMXBean {
@@ -36,7 +36,7 @@ public interface DiskStoreMXBean {
/**
* Returns whether disk files are to be automatically compacted.
- *
+ *
* @return True if disk files are automatically compacted, false otherwise
*/
boolean isAutoCompact();
@@ -49,7 +49,7 @@ public interface DiskStoreMXBean {
/**
* Returns whether manual compaction of disk files is allowed.
- *
+ *
* @return True if manual compaction is allowed, false otherwise.
*/
boolean isForceCompactionAllowed();
@@ -88,7 +88,7 @@ public interface DiskStoreMXBean {
/**
* Returns the average latency of disk reads in nanoseconds Its the average latency required to
* read a byte from disk.
- *
+ *
* Each entry in region has some overhead in terms of number of extra bytes while persisting data.
* So this rate won't match the number of bytes put in all regions.This is rate of actual bytes
* system is persisting.
@@ -98,7 +98,7 @@ public interface DiskStoreMXBean {
/**
* Returns the average latency of disk writes in nanoseconds. Its the average latency required to
* write a byte to disk.
- *
+ *
* Each entry in region has some overhead in terms of number of extra bytes while persisting data.
* So this rate won't match the number of bytes put in all regions. This is rate of actual bytes
* system is persisting.
@@ -159,7 +159,7 @@ public interface DiskStoreMXBean {
* is not configured. If the current, active op-log has had data written to it, and may be
* compacted, then an implicit call to forceRoll will be made so that the active op-log can be
* compacted. This method will block until compaction finishes.
- *
+ *
* @return True if one or more op-logs were compacted or false to indicate that no op-logs were
* ready to be compacted or that a compaction was already in progress.
*/
@@ -177,7 +177,7 @@ public interface DiskStoreMXBean {
/**
* Returns the warning threshold for disk usage as a percentage of the total disk volume.
- *
+ *
* @return the warning percent
* @since GemFire 8.0
*/
@@ -185,7 +185,7 @@ public interface DiskStoreMXBean {
/**
* Returns the critical threshold for disk usage as a percentage of the total disk volume.
- *
+ *
* @return the critical percent
* @since GemFire 8.0
*/
@@ -193,7 +193,7 @@ public interface DiskStoreMXBean {
/**
* Sets the value of the disk usage warning percentage.
- *
+ *
* @param warningPercent the warning percent
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE,
@@ -202,7 +202,7 @@ public interface DiskStoreMXBean {
/**
* Sets the value of the disk usage critical percentage.
- *
+ *
* @param criticalPercent the critical percent
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE,
diff --git a/geode-core/src/main/java/org/apache/geode/management/DistributedLockServiceMXBean.java b/geode-core/src/main/java/org/apache/geode/management/DistributedLockServiceMXBean.java
index e5306ba..81585e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DistributedLockServiceMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DistributedLockServiceMXBean.java
@@ -25,9 +25,9 @@ import org.apache.geode.security.ResourcePermission.Resource;
* MBean that provides access to information for a named instance of {@link DistributedLockService}.
* Since any number of DistributedLockService objects can be created by a member there may be 0 or
* more instances of this MBean available.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface DistributedLockServiceMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/DistributedRegionMXBean.java b/geode-core/src/main/java/org/apache/geode/management/DistributedRegionMXBean.java
index c45c5f3..5b52c5b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DistributedRegionMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DistributedRegionMXBean.java
@@ -25,9 +25,9 @@ import org.apache.geode.security.ResourcePermission.Resource;
/**
* MBean that provides access to information and management functionality for a {@link Region}.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface DistributedRegionMXBean {
@@ -64,7 +64,7 @@ public interface DistributedRegionMXBean {
/**
* Returns a list of the names of the subregions.
- *
+ *
* @param recursive <code>true</code> to recursively traverse and find sub-regions.
*/
public String[] listSubRegionPaths(boolean recursive);
@@ -91,7 +91,7 @@ public interface DistributedRegionMXBean {
/**
* Returns the membership attributes of the Region.
- *
+ *
* @deprecated this API is scheduled to be removed
*/
public MembershipAttributesData listMembershipAttributes();
@@ -129,7 +129,7 @@ public interface DistributedRegionMXBean {
/**
* Returns the number of entries in the Region.
- *
+ *
*/
public long getSystemRegionEntryCount();
@@ -203,7 +203,7 @@ public interface DistributedRegionMXBean {
/**
* Returns the current number of disk tasks (op-log compaction, asynchronous recoveries, etc) that
* are waiting for a thread to run.
- *
+ *
* @deprecated
*/
public long getDiskTaskWaiting();
@@ -276,14 +276,14 @@ public interface DistributedRegionMXBean {
/**
* Returns whether the Region sends data to a {@link GatewaySender}.
- *
+ *
* @return True if the Region sends data, false otherwise.
*/
public boolean isGatewayEnabled();
/**
* Returns whether persistence is enabled.
- *
+ *
* @return True if persistence is enabled, false otherwise.
*/
public boolean isPersistentEnabled();
diff --git a/geode-core/src/main/java/org/apache/geode/management/DistributedSystemMXBean.java b/geode-core/src/main/java/org/apache/geode/management/DistributedSystemMXBean.java
index e917895..acbf8e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/DistributedSystemMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/DistributedSystemMXBean.java
@@ -33,15 +33,15 @@ import org.apache.geode.security.ResourcePermission.Target;
*
* It also provides an API for navigating the other MBeans exposed by the GemFire distributed
* system.
- *
+ *
* There will be one DistributedSystemMBean per GemFire cluster.
- *
+ *
* <p>
* ObjectName : GemFire:service=System,type=Distributed
- *
+ *
* <p>
* List of notifications emitted by this MBean.
- *
+ *
* <p>
* <table border="1">
* <tr>
@@ -254,7 +254,7 @@ public interface DistributedSystemMXBean {
/**
* Returns a list of names for all cache servers which are able to serve requests from GemFire
* clients.
- *
+ *
*/
String[] listCacheServers();
@@ -525,26 +525,26 @@ public interface DistributedSystemMXBean {
/**
* This API is used to query data from GemFire system. This returns a JSON formatted String having
* data and it's type. Type and value of data makes an array , type preceding the value.
- *
+ *
* e.g. {"result":[["java.lang.String","v"],["java.lang.String","b"]]}
- *
+ *
* GemFire PDXInstances are also supported. The type of PDXInstance is PDXInstance and value will
* be key value pair. There is no marker to know the "IdentityField" of the PDXInstance.
- *
+ *
* If the query is executed on the cluster and no member list is given in input first key of the
* JSON string will be "result" followed by the result set in JSON format.
- *
+ *
* If the query is executed on one or more specific members then returned string will have an
* array of "member" and "result" keys.
- *
+ *
* For query on replicated region data from a random node which have the region is shown, if no
* member input is given. For PR regions data from all the nodes are collected and shown. User
* must be careful to query on a PR if the region is big and hosted on a lot of nodes
- *
+ *
* Join queries on PR mandates that user provide one member as input. If the member does not host
* the regions or the regions are not co-located error string will be returned.
- *
- *
+ *
+ *
* @param queryString GemFire supported OQL query
* @param members comma separated list of members on which the query is to be executed. It is not
* mandatory to give this input barring join queries on PR. If member list is not provided
@@ -556,19 +556,19 @@ public interface DistributedSystemMXBean {
String queryData(String queryString, String members, int limit) throws Exception;
/**
- *
+ *
* Functionality is same as queryData() method. Only difference being the resultant JSON string is
* compressed with Java GZIP with UTF-8 encoding. Any client application can de compress the
* byte[] using GZIP.
- *
+ *
* e.g.
- *
+ *
* GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(bytes));
- *
+ *
* BufferedReader bf = new BufferedReader(new InputStreamReader(gis,"UTF-8"));
- *
+ *
* String outStr = ""; String line; while ((line = bf.readLine()) != null) { outStr += line; }
- *
+ *
* @param queryString GemFire supported OQL query
* @param members comma separated list of members on which the query is to be executed. It is not
* mandatory to give this input barring join queries on PR. If member list is not provided
@@ -607,7 +607,7 @@ public interface DistributedSystemMXBean {
/**
* Number of elements in a collection to be shown in queryData operation if query results contain
* collections like Map, List etc.
- *
+ *
*/
int getQueryCollectionsDepth();
diff --git a/geode-core/src/main/java/org/apache/geode/management/EvictionAttributesData.java b/geode-core/src/main/java/org/apache/geode/management/EvictionAttributesData.java
index 0feb991..e9d5cae 100644
--- a/geode-core/src/main/java/org/apache/geode/management/EvictionAttributesData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/EvictionAttributesData.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.Region;
/**
* Composite data type used to distribute the eviction attributes for a {@link Region}.
- *
+ *
* @since GemFire 7.0
*/
@@ -45,7 +45,7 @@ public class EvictionAttributesData {
private String action;
/**
- *
+ *
* This constructor is to be used by internal JMX framework only. User should not try to create an
* instance of this class.
*/
@@ -70,7 +70,7 @@ public class EvictionAttributesData {
* one of the creation methods e.g. {@link EvictionAttributes#createLRUEntryAttributes()}
*
* For algorithm LRU HEAP null will be returned
- *
+ *
* @return maximum value used by the {@link EvictionAlgorithm} which determines when the
* {@link EvictionAction} is performed.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/FixedPartitionAttributesData.java b/geode-core/src/main/java/org/apache/geode/management/FixedPartitionAttributesData.java
index 9308c15..233a067 100644
--- a/geode-core/src/main/java/org/apache/geode/management/FixedPartitionAttributesData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/FixedPartitionAttributesData.java
@@ -20,7 +20,7 @@ import org.apache.geode.cache.Region;
/**
* Composite date type used to distribute the fixed partition attributes for a {@link Region}.
- *
+ *
* @since GemFire 7.0
*/
public class FixedPartitionAttributesData {
@@ -41,7 +41,7 @@ public class FixedPartitionAttributesData {
private int numBucket;
/**
- *
+ *
* This constructor is to be used by internal JMX framework only. User should not try to create an
* instance of this class.
*/
@@ -63,7 +63,7 @@ public class FixedPartitionAttributesData {
/**
* Returns whether this member is the primary for the partition.
- *
+ *
* @return True if this member is the primary, false otherwise.
*/
public boolean isPrimary() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/GatewayReceiverMXBean.java b/geode-core/src/main/java/org/apache/geode/management/GatewayReceiverMXBean.java
index 556bd6f..0b57465 100644
--- a/geode-core/src/main/java/org/apache/geode/management/GatewayReceiverMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/GatewayReceiverMXBean.java
@@ -23,9 +23,9 @@ import org.apache.geode.security.ResourcePermission.Target;
/**
* MBean that provides access to information and management functionality for a
* {@link GatewayReceiver}.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface GatewayReceiverMXBean {
@@ -52,7 +52,7 @@ public interface GatewayReceiverMXBean {
/**
* Returns whether the receiver is in running state.
- *
+ *
* @return True if the receiver is in a running state, false otherwise.
*/
boolean isRunning();
diff --git a/geode-core/src/main/java/org/apache/geode/management/GatewaySenderMXBean.java b/geode-core/src/main/java/org/apache/geode/management/GatewaySenderMXBean.java
index f8cad87..a6a24b3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/GatewaySenderMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/GatewaySenderMXBean.java
@@ -74,14 +74,14 @@ public interface GatewaySenderMXBean {
/**
* Returns whether batch conflation for the GatewaySender's queue is enabled
- *
+ *
* @return True if batch conflation is enabled, false otherwise.
*/
boolean isBatchConflationEnabled();
/**
* Returns whether the GatewaySender is configured to be persistent or non-persistent.
- *
+ *
* @return True if the sender is persistent, false otherwise.
*/
@@ -105,21 +105,21 @@ public interface GatewaySenderMXBean {
/**
* Returns whether the GatewaySender is configured for manual start.
- *
+ *
* @return True if the GatewaySender is configured for manual start, false otherwise.
*/
boolean isManualStart();
/**
* Returns whether or not this GatewaySender is running.
- *
+ *
* @return True if the GatewaySender is running, false otherwise.
*/
boolean isRunning();
/**
* Returns whether or not this GatewaySender is paused.
- *
+ *
* @return True of the GatewaySender is paused, false otherwise.
*/
boolean isPaused();
@@ -164,7 +164,7 @@ public interface GatewaySenderMXBean {
/**
* Starts this GatewaySender. Once the GatewaySender is running its configuration cannot be
* changed.
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE,
target = Target.GATEWAY)
@@ -200,7 +200,7 @@ public interface GatewaySenderMXBean {
/**
* Returns whether this GatewaySender is primary or secondary.
- *
+ *
* @return True if this is the primary, false otherwise.
*/
boolean isPrimary();
@@ -219,14 +219,14 @@ public interface GatewaySenderMXBean {
/**
* Returns whether the isDiskSynchronous property is set for this GatewaySender.
- *
+ *
* @return True if the property is set, false otherwise.
*/
boolean isDiskSynchronous();
/**
* Returns whether the isParallel property is set for this GatewaySender.
- *
+ *
* @return True if the property is set, false otherwise.
*/
boolean isParallel();
diff --git a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
index c892abd..5652c97 100644
--- a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
@@ -19,7 +19,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
/**
* Composite Data type to be used by member to depict gemfire properties in key value manner
- *
+ *
* @since GemFire 7.0
*
*/
@@ -77,11 +77,11 @@ public class GemFireProperties {
* of the form "hostName[portNum]" and may be of the form "host:bindAddress[port]" if a specific
* bind address is to be used on the locator machine. The square brackets around the portNum are
* literal character and must be specified.
- *
+ *
* Since IPv6 bind addresses may contain colons, you may use an at symbol instead of a colon to
* separate the host name and bind address. For example, "server1@fdf0:76cf:a0ed:9449::5[12233]"
* specifies a locator running on "server1" and bound to fdf0:76cf:a0ed:9449::5 on port 12233.
- *
+ *
* If "mcast-port" is zero and "locators" is "" then this distributed system will be isolated from
* all other GemFire processes.
**/
@@ -92,7 +92,7 @@ public class GemFireProperties {
* DistributedSystem connects, and is stopped when the DistributedSystem disconnects. To start a
* locator that is not tied to the DistributedSystem's lifecycle, see the Locator class in this
* same package.
- *
+ *
* The peer and server parameters are optional. They specify whether the locator can be used for
* peers to discover each other, or for clients to discover peers. By default both are true.
* Default: "" (doesn't start a locator)
@@ -135,7 +135,7 @@ public class GemFireProperties {
* The number of seconds the distributed system will wait after the ack-wait-threshold for a
* message to be acknowledged before it issues an alert at severe level. The default value is
* zero, which turns off this feature.
- *
+ *
* when ack-severe-alert-threshold is used, GemFire will also initiate additional checks to see if
* the process is alive. These checks will begin when the ack-wait-threshold is reached and will
* continue until GemFire has been able to communicate with the process and ascertain its status.
@@ -264,7 +264,7 @@ public class GemFireProperties {
* Specifies the application roles that this member performs in the distributed system. This is a
* comma delimited list of user-defined strings. Any number of members can be configured to
* perform the same role, and a member can be configured to perform any number of roles.
- *
+ *
* @deprecated this feature is scheduled to be removed
**/
private String roles;
@@ -272,7 +272,7 @@ public class GemFireProperties {
* Specifies the maximum number of milliseconds to wait for the distributed system to reconnect in
* case of required role loss. The system will attempt to reconnect more than once, and this
* timeout period applies to each reconnection attempt. Default: "10000"
- *
+ *
* @deprecated this feature is scheduled to be removed
**/
private int maxWaitTimeForReconnect;
@@ -288,7 +288,7 @@ public class GemFireProperties {
* cache exceeds this value when attempting to distribute to this process, it will switch to
* asynchronous messaging until this process catches up, departs, or some specified limit is
* reached, such as async-queue-timeout or async-max-queue-size. Default: "0"
- *
+ *
* @deprecated this feature is scheduled to be removed
**/
private int asyncDistributionTimeout;
diff --git a/geode-core/src/main/java/org/apache/geode/management/JMXNotificationType.java b/geode-core/src/main/java/org/apache/geode/management/JMXNotificationType.java
index ba3daeb..e0c3f1f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/JMXNotificationType.java
+++ b/geode-core/src/main/java/org/apache/geode/management/JMXNotificationType.java
@@ -19,9 +19,9 @@ import org.apache.geode.distributed.internal.DistributionConfig;
/**
* Enumerated type for JMX notification types emitted by GemFire management system. This types can
* be matched with javax.management.Notification.getType() for filtering required notifications.
- *
+ *
* For detail usage see GemFire quick start.
- *
+ *
* @since GemFire 8.0
*/
public interface JMXNotificationType {
diff --git a/geode-core/src/main/java/org/apache/geode/management/JMXNotificationUserData.java b/geode-core/src/main/java/org/apache/geode/management/JMXNotificationUserData.java
index 30d6d67..4530919 100644
--- a/geode-core/src/main/java/org/apache/geode/management/JMXNotificationUserData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/JMXNotificationUserData.java
@@ -17,7 +17,7 @@ package org.apache.geode.management;
/**
* This interface acts as UserData section of JMX notifications of type "system.alert". It contains
* some additional information apart from the Notification details.
- *
+ *
* @since GemFire 8.0
*/
public interface JMXNotificationUserData {
diff --git a/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java b/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java
index b15aff7..a8d4c40 100644
--- a/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java
@@ -22,7 +22,7 @@ import org.apache.geode.cache.Region;
/**
* Composite data type used to distribute metrics for the JVM running a GemFire member.
- *
+ *
* @since GemFire 7.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/LocatorMXBean.java b/geode-core/src/main/java/org/apache/geode/management/LocatorMXBean.java
index c5cb659..4661226 100644
--- a/geode-core/src/main/java/org/apache/geode/management/LocatorMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/LocatorMXBean.java
@@ -21,7 +21,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
/**
* MBean that provides access to information and management functionality for a {@link Locator}.
- *
+ *
* @since GemFire 7.0
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
@@ -45,14 +45,14 @@ public interface LocatorMXBean {
/**
* Returns whether the Locator provides peer location services to members.
- *
+ *
* @return True if the Locator provides peer locations services, false otherwise.
*/
public boolean isPeerLocator();
/**
* Returns whether the Locator provides server location services To clients.
- *
+ *
* @return True if the Locator provides server location services, false otherwise.
*/
public boolean isServerLocator();
diff --git a/geode-core/src/main/java/org/apache/geode/management/LockServiceMXBean.java b/geode-core/src/main/java/org/apache/geode/management/LockServiceMXBean.java
index a62ca49..d868437 100644
--- a/geode-core/src/main/java/org/apache/geode/management/LockServiceMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/LockServiceMXBean.java
@@ -27,7 +27,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
* may be 0 or more instances of this MBean available.
*
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface LockServiceMXBean {
@@ -61,7 +61,7 @@ public interface LockServiceMXBean {
/**
* Returns whether this member is the granter.
- *
+ *
* @return True if this member is the granter, false otherwise.
*/
boolean isLockGrantor();
diff --git a/geode-core/src/main/java/org/apache/geode/management/ManagementException.java b/geode-core/src/main/java/org/apache/geode/management/ManagementException.java
index 8fb34d2..8b83b08 100644
--- a/geode-core/src/main/java/org/apache/geode/management/ManagementException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/ManagementException.java
@@ -19,11 +19,11 @@ import org.apache.geode.GemFireException;
/**
* A <code>ManagementException</code> is a general exception that may be thrown when any
* administration or monitoring operation on a GemFire component fails.
- *
+ *
* Various management and monitoring exceptions are wrapped in <code>ManagementException<code>s.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
public class ManagementException extends GemFireException {
@@ -40,7 +40,7 @@ public class ManagementException extends GemFireException {
/**
* Constructs a new exception with the specified detail message. The cause is not initialized and
* may subsequently be initialized by a call to {@link Throwable#initCause}.
- *
+ *
* @param message The detail message.
*/
public ManagementException(String message) {
@@ -52,7 +52,7 @@ public class ManagementException extends GemFireException {
* <p>
* Note that the detail message associated with <code>cause</code> is <i>not</i> automatically
* incorporated in this runtime exception's detail message.
- *
+ *
* @param message The detail message.
* @param cause The cause of this exception or <code>null</code> if the cause is unknown.
*/
@@ -63,7 +63,7 @@ public class ManagementException extends GemFireException {
/**
* Constructs a new ManagementException by wrapping the specified cause. The detail for this
* exception will be null if the cause is null or cause.toString() if a cause is provided.
- *
+ *
* @param cause The cause of this exception or <code>null</code> if the cause is unknown.
*/
public ManagementException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/ManagementService.java b/geode-core/src/main/java/org/apache/geode/management/ManagementService.java
index faada65..887b04a 100755
--- a/geode-core/src/main/java/org/apache/geode/management/ManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/ManagementService.java
@@ -27,14 +27,14 @@ import org.apache.geode.management.membership.MembershipListener;
/**
* Interface to the GemFire management service for a single Cache.
- *
+ *
* @since GemFire 7.0
*/
public abstract class ManagementService {
/**
* Returns a newly created or the existing instance of the management service for a cache.
- *
+ *
* @param cache Cache for which to get the management service.
*/
public static ManagementService getManagementService(Cache cache) {
@@ -43,7 +43,7 @@ public abstract class ManagementService {
/**
* Returns the existing instance of the management service for a cache.
- *
+ *
* @param cache Cache for which to get the management service.
* @return The existing management service if one exists, null otherwise.
*/
@@ -53,7 +53,7 @@ public abstract class ManagementService {
/**
* Returns whether this member is running the management service.
- *
+ *
* @return True if this member is running the management service, false otherwise.
*/
public abstract boolean isManager();
@@ -71,7 +71,7 @@ public abstract class ManagementService {
/**
* Registers an MBean in the GemFire domain. Any other domain specified as part of the object will
* be ignored.
- *
+ *
* @param object MBean to register.
* @param objectName Object name of the MBean to register.
* @return Object name, which may have been modified to use the GemFire domain.
@@ -80,7 +80,7 @@ public abstract class ManagementService {
/**
* Unregisters an MBean.
- *
+ *
* @param objectName Object name of the MBean to unregister.
*/
public abstract void unregisterMBean(ObjectName objectName);
@@ -90,16 +90,16 @@ public abstract class ManagementService {
* pushed to managing members. It's possible to simply register MBeans in the GemFire domain
* without calling federate if the developer doesn't need their state to be shared amongst
* members. Note that Dynamic MBeans are not supported by this service.
- *
+ *
* <pre>
* Example Usage:
- *
- * <code>CustomMXBean bean = new CustomMBean();
+ *
+ * <code>CustomMXBean bean = new CustomMBean();
* ObjectName beanName = ObjectName.getInstance("DefualtDomain:type=CustomType");
- * ObjectName gemfireBeanName = service.registerMBean(customMBean, customMBeanName);
+ * ObjectName gemfireBeanName = service.registerMBean(customMBean, customMBeanName);
* service.federate(gemfireBeanName, CustomMXBean.class, true);</code>
* </pre>
- *
+ *
* @param objectName Object name of the MBean.
* @param interfaceClass Interface which this MBean exposes.
* @param notificationEmitter True if the MBean is a notification emitter.
@@ -115,7 +115,7 @@ public abstract class ManagementService {
/**
* Returns a RegionMXBbean for managing and monitoring a Region.
- *
+ *
* @param regionPath Path of the region.
* @return A RegionMXBean if the region exists, null otherwise.
*/
@@ -123,7 +123,7 @@ public abstract class ManagementService {
/**
* Returns a LockServiceMXBean for managing and monitoring a lock service.
- *
+ *
* @param lockServiceName Name of the lock service.
* @return A LockServiceMXBean if the lock service exists, null otherwise.
*/
@@ -131,7 +131,7 @@ public abstract class ManagementService {
/**
* Returns a DiskStoreMXBean for managing and monitoring a disk store.
- *
+ *
* @param diskStoreName Name of the disk store.
* @return A DiskStoreMXBean if the disk store exists, null otherwise.
*/
@@ -139,7 +139,7 @@ public abstract class ManagementService {
/**
* Returns a CacheServerMXBean for managing and monitoring a cache server.
- *
+ *
* @param serverPort Port on which the cache server is listening.
* @return A CacheServerMXBean if the cache server is found, null otherwise.
*/
@@ -148,14 +148,14 @@ public abstract class ManagementService {
/**
* Returns the DistributedSystemMXBean for managing and monitoring the distributed system as a
* whole.
- *
+ *
* @return A DistributedSystemMXBean if one is found, null otherwise.
*/
public abstract DistributedSystemMXBean getDistributedSystemMXBean();
/**
* Returns the ManagerMXBean for the management service.
- *
+ *
* @return A ManagerMXBean if one is found, null otherwise.
*/
public abstract ManagerMXBean getManagerMXBean();
@@ -163,7 +163,7 @@ public abstract class ManagementService {
/**
* Returns a DistributedRegionMXBean for managing and monitoring a region from a system wide
* perspective.
- *
+ *
* @param regionPath Path of the Region.
* @return A DistributedRegionMXBean if the region exists, null otherwise.
*/
@@ -172,7 +172,7 @@ public abstract class ManagementService {
/**
* Returns a LockServiceMXBean for managing and monitoring a lock service from a system wide
* perspective.
- *
+ *
* @param lockServiceName Name of the LockService.
* @return A DistributedLockServiceMXBean if the lock service exists, null otherwise.
*/
@@ -181,14 +181,14 @@ public abstract class ManagementService {
/**
* Returns the GatewayReceiverMXBean for managing and monitoring the gateway receiver.
- *
+ *
* @return A GatewayReceiverMXBean if one is found, null otherwise.
*/
public abstract GatewayReceiverMXBean getLocalGatewayReceiverMXBean();
/**
* Returns a GatewaySenderMXBean for managing and monitoring a gateway sender.
- *
+ *
* @param senderId ID of the gateway sender.
* @return A GatewaySenderMXBean if the gateway sender is found, null otherwise.
*/
@@ -196,7 +196,7 @@ public abstract class ManagementService {
/**
* Returns a AsyncEventQueueMXBean for managing and monitoring an asynchronous queue.
- *
+ *
* @param queueId ID of the asynchronous queue.
* @return An AsyncEventQueueMXBean if the asynchronous queue is found, null otherwise.
*/
@@ -204,14 +204,14 @@ public abstract class ManagementService {
/**
* Returns the LocatorMXBean for managing and monitoring the locator.
- *
+ *
* @return A LocatorMXBean if the locator is found, null otherwise.
*/
public abstract LocatorMXBean getLocalLocatorMXBean();
/**
* Returns the object names for all MBeans associated with a member.
- *
+ *
* @param member Member for which to find MBeans.
*/
public abstract Set<ObjectName> queryMBeanNames(DistributedMember member);
@@ -219,7 +219,7 @@ public abstract class ManagementService {
/**
* Returns an instance of an MBean. This is a reference to the MBean instance and not a
* {@link ObjectInstance}.
- *
+ *
* @param objectName Object name of the MBean.
* @param interfaceClass Interface which this MBean exposes.
* @throws ClassCastException if the MBean does not implement the given interface.
@@ -228,7 +228,7 @@ public abstract class ManagementService {
/**
* Returns the last updated time of the remote MBean as reported by Sysem.currentTimeMillis().
- *
+ *
* @param objectName Object name of the MBean.
* @return Last updated time or 0 if the MBean is local or the management service is not running
* on this member.
@@ -238,7 +238,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the MemberMBean representing a distributed member. This is a utility
* method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
*/
public abstract ObjectName getMemberMBeanName(DistributedMember member);
@@ -246,7 +246,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the RegionMBean representing a region. This is a utility method for
* generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
* @param regionPath Path of the region.
*/
@@ -255,7 +255,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the DiskStoreMBean representing a disk store. This is a utility
* method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
* @param diskName Name of the disk store.
*/
@@ -264,7 +264,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the CacheServerMBean representing a cache server. This is a utility
* method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
* @param serverPort Port on which the cache server is listening.
*/
@@ -273,7 +273,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the LockServiceMBean representing a lock service. This is a utility
* method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
* @param lockServiceName Name of the lock service.
*/
@@ -283,7 +283,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the GatewayReciverMBean representing a gateway receiver. This is a
* utility method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
*/
public abstract ObjectName getGatewayReceiverMBeanName(DistributedMember member);
@@ -291,7 +291,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the GatewaySenderMBean representing a gateway sender. This is a
* utility method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
* @param gatwaySenderId ID of the gateway sender.
*/
@@ -301,7 +301,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the AsyncEventQueueMBean representing a asynchronous queue. This is
* a utility method for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
* @param queueId ID of the asynchronous queue.
*/
@@ -310,7 +310,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the DistributedRegionMBean representing a region. This is a utility
* method for generating an object name and it does not register an MBean.
- *
+ *
* @param regionName Name of the region.
*/
public abstract ObjectName getDistributedRegionMBeanName(String regionName);
@@ -318,7 +318,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the DistributedLockServiceMBean representing a lock service. This is
* a utility method for generating an object name and it does not register an MBean.
- *
+ *
* @param lockService Name of the lock service.
*/
public abstract ObjectName getDistributedLockServiceMBeanName(String lockService);
@@ -338,7 +338,7 @@ public abstract class ManagementService {
/**
* Returns the object name of the LocatorMBean representing a locator. This is a utility method
* for generating an object name and it does not register an MBean.
- *
+ *
* @param member Distributed member used to generate the object name.
*/
public abstract ObjectName getLocatorMBeanName(DistributedMember member);
diff --git a/geode-core/src/main/java/org/apache/geode/management/ManagerMXBean.java b/geode-core/src/main/java/org/apache/geode/management/ManagerMXBean.java
index 606bac4..4cce365 100644
--- a/geode-core/src/main/java/org/apache/geode/management/ManagerMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/ManagerMXBean.java
@@ -23,23 +23,23 @@ import org.apache.geode.security.ResourcePermission.Resource;
/**
* MBean that provides access to information and management functionality for a {@link Manager}.
- *
+ *
* @since GemFire 7.0
- *
+ *
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public interface ManagerMXBean {
/**
* Returns whether the manager service is running on this member.
- *
+ *
* @return True of the manager service is running, false otherwise.
*/
public boolean isRunning();
/**
* Starts the manager service.
- *
+ *
* @return True if the manager service was successfully started, false otherwise.
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE)
@@ -47,7 +47,7 @@ public interface ManagerMXBean {
/**
* Stops the manager service.
- *
+ *
* @return True if the manager service was successfully stopped, false otherwise.
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE)
@@ -60,7 +60,7 @@ public interface ManagerMXBean {
/**
* Sets the URL for the Pulse application.
- *
+ *
* @param pulseURL The URL for the Pulse application.
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.WRITE)
@@ -75,7 +75,7 @@ public interface ManagerMXBean {
/**
* Sets the status message.
- *
+ *
* @param message The status message.
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.WRITE)
diff --git a/geode-core/src/main/java/org/apache/geode/management/MemberMXBean.java b/geode-core/src/main/java/org/apache/geode/management/MemberMXBean.java
index d0b05d1..9f89ce4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/MemberMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/MemberMXBean.java
@@ -25,16 +25,16 @@ import org.apache.geode.security.ResourcePermission.Target;
/**
* MBean that provides access to information and management functionality for a
* {@link DistributedMember} of the GemFire distributed system.
- *
+ *
* <p>
* ObjectName of the MBean :GemFire:type=Member,member=<name-or-dist-member-id>
- *
+ *
* <p>
* There will be one instance of this MBean per GemFire node.
- *
+ *
* <p>
* List of notification emitted by MemberMXBean.
- *
+ *
* <p>
* <table border="1">
* <tr>
@@ -141,7 +141,7 @@ public interface MemberMXBean {
/**
* Returns the most recent log entries for the member.
- *
+ *
* @param numberOfLines Number of lines to return, up to a maximum of 100.
*/
String showLog(int numberOfLines);
@@ -156,7 +156,7 @@ public interface MemberMXBean {
/**
* Performs compaction on all of the member's disk stores.
- *
+ *
* @return A list of names of the disk stores that were compacted.
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE,
@@ -165,7 +165,7 @@ public interface MemberMXBean {
/**
* Creates a Manager MBean on this member.
- *
+ *
* @return True if the Manager MBean was successfully created, false otherwise.
*/
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE)
@@ -190,9 +190,9 @@ public interface MemberMXBean {
/**
* Executes a command on the member.
- *
+ *
* @param commandString Command to be executed.
- *
+ *
* @return Result of the execution in JSON format.
*/
@ResourceOperation()
@@ -200,7 +200,7 @@ public interface MemberMXBean {
/**
* Executes a command on the member.
- *
+ *
* @param commandString Command to be execute.
* @param env Environmental properties to use during command execution.
* @return Result of the execution in JSON format.
@@ -211,7 +211,7 @@ public interface MemberMXBean {
/**
* Executes a command on the member. this is the method that's used by the HttpOperationInvoker
* and JmxOperationInvoker
- *
+ *
* @param commandString Command to be execute.
* @param env Environmental properties to use during command execution.
* @param binaryData Binary data specific to the command being executed.
@@ -222,7 +222,7 @@ public interface MemberMXBean {
/**
* Returns the name of all disk stores in use by this member.
- *
+ *
* @param includeRegionOwned Whether to include disk stores owned by a region.
*/
String[] listDiskStores(boolean includeRegionOwned);
@@ -274,7 +274,7 @@ public interface MemberMXBean {
/**
* Returns whether this member is attached to at least one Locator.
- *
+ *
* @return True if this member is attached to a Locator, false otherwise.
*/
boolean isLocator();
@@ -297,14 +297,14 @@ public interface MemberMXBean {
/**
* Returns whether this member has at least one GatewaySender.
- *
+ *
* @return True if this member has at least one GatewaySender, false otherwise.
*/
boolean hasGatewaySender();
/**
* Returns whether this member is running the Manager service.
- *
+ *
* @return True if this member is running the Manager service, false otherwise.
*/
boolean isManager();
@@ -312,14 +312,14 @@ public interface MemberMXBean {
/**
* Returns whether this member has created the Manager service (it may be created, but not
* running).
- *
+ *
* @return True if this member has created the Manager service, false otherwise.
*/
boolean isManagerCreated();
/**
* Returns whether this member has at least one GatewayReceiver.
- *
+ *
* @return True if this member has at least one GatewayReceiver, false otherwise.
*/
boolean hasGatewayReceiver();
@@ -343,37 +343,37 @@ public interface MemberMXBean {
* Returns the time (as a percentage) that this member's process time with respect to Statistics
* sample time interval. If process time between two sample time t1 & t2 is p1 and p2 cpuUsage =
* ((p2-p1) * 100) / ((t2-t1))
- *
+ *
* ProcessCpuTime is obtained from OperatingSystemMXBean. If process CPU time is not available in
* the platform it will be shown as -1
- *
+ *
*/
float getCpuUsage();
/**
* Returns the current size of the heap in megabytes.
- *
+ *
* @deprecated Please use {@link #getUsedMemory()} instead.
*/
long getCurrentHeapSize();
/**
* Returns the maximum size of the heap in megabytes.
- *
+ *
* @deprecated Please use {@link #getMaxMemory()} instead.
*/
long getMaximumHeapSize();
/**
* Returns the free heap size in megabytes.
- *
+ *
* @deprecated Please use {@link #getFreeMemory()} instead.
*/
long getFreeHeapSize();
/**
* Returns the maximum size of the heap in megabytes.
- *
+ *
*/
long getMaxMemory();
@@ -665,7 +665,7 @@ public interface MemberMXBean {
/**
* Returns the number of initial images in progress.
- *
+ *
* @deprecated as typo in name has been corrected: use
* {@link MemberMXBean#getInitialImagesInProgress} instead.
*/
@@ -749,9 +749,9 @@ public interface MemberMXBean {
* Returns the system load average for the last minute. The system load average is the sum of the
* number of runnable entities queued to the available processors and the number of runnable
* entities running on the available processors averaged over a period of time.
- *
+ *
* Pulse Attribute
- *
+ *
* @return The load average or a negative value if one is not available.
*/
double getLoadAverage();
@@ -789,7 +789,7 @@ public interface MemberMXBean {
int getHostCpuUsage();
/**
- *
+ *
* Returns true if a cache server is running on this member and able server requests from GemFire
* clients
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/MembershipAttributesData.java b/geode-core/src/main/java/org/apache/geode/management/MembershipAttributesData.java
index 9a9c590..dae2c83 100644
--- a/geode-core/src/main/java/org/apache/geode/management/MembershipAttributesData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/MembershipAttributesData.java
@@ -22,7 +22,7 @@ import org.apache.geode.distributed.Role;
/**
* Composite data type used to distribute the membership attributes for a {@link Region}.
- *
+ *
* @deprecated this API is scheduled to be removed
*/
public class MembershipAttributesData {
@@ -45,7 +45,7 @@ public class MembershipAttributesData {
/**
* This constructor is to be used by internal JMX framework only. User should not try to create an
* instance of this class.
- *
+ *
* @param requiredRoles Array of required role names by this process for reliable access to the
* region
* @param lossAction The configuration defining how this process behaves when there are missing
diff --git a/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java b/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java
index 20806f4..e3da7a7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.DiskStore;
/**
* Composite data type used to distribute network related metrics for a member.
- *
+ *
* @since GemFire 7.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/OSMetrics.java b/geode-core/src/main/java/org/apache/geode/management/OSMetrics.java
index c9de92f..98db3e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/OSMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/management/OSMetrics.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
/**
* Composite data type used to distribute metrics for the operating system hosting a member of the
* distributed system.
- *
+ *
* @since GemFire 7.0
*
*/
@@ -79,7 +79,7 @@ public class OSMetrics implements Serializable {
private double systemLoadAverage;
/**
- *
+ *
* This constructor is to be used by internal JMX framework only. User should not try to create an
* instance of this class.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/PartitionAttributesData.java b/geode-core/src/main/java/org/apache/geode/management/PartitionAttributesData.java
index 9edc419..7c4ef12 100644
--- a/geode-core/src/main/java/org/apache/geode/management/PartitionAttributesData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/PartitionAttributesData.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
/**
* Composite date type used to distribute attributes for a {@link PartitionedRegion}.
- *
+ *
* @since GemFire 7.0
*/
public class PartitionAttributesData {
diff --git a/geode-core/src/main/java/org/apache/geode/management/PersistentMemberDetails.java b/geode-core/src/main/java/org/apache/geode/management/PersistentMemberDetails.java
index d28db1a..015ddbf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/PersistentMemberDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/PersistentMemberDetails.java
@@ -30,7 +30,7 @@ public class PersistentMemberDetails {
private final String diskStoreId;
/**
- *
+ *
* This constructor is to be used by internal JMX framework only. User should not try to create an
* instance of this class.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java b/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java
index 508492f..205546b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Region;
/**
* Composite data type used to distribute attributes for a {@link Region}.
- *
+ *
* @since GemFire 7.0
*/
public class RegionAttributesData {
@@ -58,7 +58,7 @@ public class RegionAttributesData {
private boolean offHeap;
/**
- *
+ *
* This constructor is to be used by internal JMX framework only. User should not try to create an
* instance of this class.
*/
@@ -189,7 +189,7 @@ public class RegionAttributesData {
/**
* Returns whether JTA transactions are being ignored.
- *
+ *
* @return True if JTA transactions are being ignored, false otherwise.
*/
public boolean isIgnoreJTA() {
@@ -227,7 +227,7 @@ public class RegionAttributesData {
/**
* Returns whether this member is configured to become the lock granter when the Region is
* created. It does not indicate whether this member is currently the lock granter for the Region.
- *
+ *
* @return True if this member is configured to start the Region as the lock granter, false
* otherwise. Always returns false if the scope of the Region is not
* <code>Scope.GLOBAL</code>
@@ -238,7 +238,7 @@ public class RegionAttributesData {
/**
* Returns whether multicast communication is enabled for the Region.
- *
+ *
* @return True if multicast communication is enabled, false otherwise.
*/
public boolean isMulticastEnabled() {
@@ -254,7 +254,7 @@ public class RegionAttributesData {
/**
* Returns whether query service index maintenance will be done synchronously.
- *
+ *
* @return True if query service index maintenance will be done synchronously or false if it will
* be done asynchronously.
*/
@@ -264,7 +264,7 @@ public class RegionAttributesData {
/**
* Returns whether statistic collection is enabled for the Region and its entries.
- *
+ *
* @return True if statistic collection is enabled, false otherwise.
*/
public boolean isStatisticsEnabled() {
@@ -293,7 +293,7 @@ public class RegionAttributesData {
/**
* Returns the name of the Pool that this Region will use to communicate with servers, if any.
- *
+ *
* @return The name of the Pool used to communicate with servers or null if the host member
* communicates with peers.
*/
@@ -326,7 +326,7 @@ public class RegionAttributesData {
/**
* Returns whether disk writes are synchronous.
- *
+ *
* @return True if disk writes are synchronous, false otherwise.
*/
public boolean isDiskSynchronous() {
@@ -342,7 +342,7 @@ public class RegionAttributesData {
/**
* Returns the compressor class name used by the region.
- *
+ *
* @return null if no compression is used.
*/
public String getCompressorClassName() {
@@ -351,7 +351,7 @@ public class RegionAttributesData {
/**
* Returns true if the region uses off-heap memory.
- *
+ *
* @return false if the region does not use off-heap memory.
*/
public boolean getOffHeap() {
@@ -385,4 +385,3 @@ public class RegionAttributesData {
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/RegionMXBean.java b/geode-core/src/main/java/org/apache/geode/management/RegionMXBean.java
index a2c8eb1..d432952 100644
--- a/geode-core/src/main/java/org/apache/geode/management/RegionMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/RegionMXBean.java
@@ -25,10 +25,10 @@ import org.apache.geode.security.ResourcePermission.Resource;
/**
* MBean that provides access to information and management functionality for a local
* {@link Region}.
- *
+ *
* For all the latency related attributes e.g. PutRemoteLatency ,DiskWritesAverageLatency etc..
* "enable-time-statistics" should be set to true.
- *
+ *
* @since GemFire 7.0
*
*/
@@ -58,7 +58,7 @@ public interface RegionMXBean {
/**
* Returns a list of the names of the sub regions.
- *
+ *
* @param recursive <code>True</code> to recursively traverse and find sub-regions.
*/
public String[] listSubregionPaths(boolean recursive);
@@ -87,7 +87,7 @@ public interface RegionMXBean {
/**
* Returns the membership attributes of the Region.
- *
+ *
* @deprecated this API is scheduled to be removed
*/
public MembershipAttributesData listMembershipAttributes();
@@ -197,14 +197,14 @@ public interface RegionMXBean {
/**
* Returns the average latency of disk reads in nanoseconds
- *
+ *
* @deprecated See corresponding DiskStores latency to get the latency.
*/
public long getDiskReadsAverageLatency();
/**
* Returns the average latency of disk writes in nanoseconds.
- *
+ *
* @deprecated See corresponding DiskStores latency to get the latency.
*/
public long getDiskWritesAverageLatency();
@@ -222,7 +222,7 @@ public interface RegionMXBean {
/**
* Returns the current number of disk tasks (op-log compaction, asynchronous recoveries, etc) that
* are waiting for a thread to run.
- *
+ *
* @deprecated
*/
public long getDiskTaskWaiting();
@@ -285,7 +285,7 @@ public interface RegionMXBean {
/**
* Returns the average number of entries in bucket. Only applicable for partitioned regions.
- *
+ *
* @deprecated This attribute is removed from 8.0 for being incorrect and impacting performance.
*/
public int getAvgBucketSize();
@@ -299,7 +299,7 @@ public interface RegionMXBean {
/**
* Returns the aggregate entry size (in bytes) of all entries. This will provide a correct value
* only if the eviction algorithm has been set to {@link EvictionAlgorithm#LRU_MEMORY}.
- *
+ *
* For all partition regions it will show entry size in bytes. It will also include size of all
* the secondary entries in the data store. So while referring to size one should take redundancy
* into account
diff --git a/geode-core/src/main/java/org/apache/geode/management/ServerLoadData.java b/geode-core/src/main/java/org/apache/geode/management/ServerLoadData.java
index 4cbf4f0..d483055 100644
--- a/geode-core/src/main/java/org/apache/geode/management/ServerLoadData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/ServerLoadData.java
@@ -18,7 +18,7 @@ import java.beans.ConstructorProperties;
/**
* Composite data type used to distribute server load information.
- *
+ *
* @since GemFire 7.0
*/
public class ServerLoadData {
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CliMetaData.java b/geode-core/src/main/java/org/apache/geode/management/cli/CliMetaData.java
index 0e838e6..bcb5936 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CliMetaData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CliMetaData.java
@@ -74,7 +74,7 @@ public @interface CliMetaData {
/**
* String used as a separator when multiple values for a command are specified
- *
+ *
* @deprecated since 1.2, Command methods may override both the delimiter and the escape through
* spring shell's {@code splittingRegex} option context
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
index 1511da0..446d84b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
@@ -21,7 +21,7 @@ package org.apache.geode.management.cli;
* <li>parsing errors from unknown parameters
* <li>errors from invalid values for parameters
* </ul>
- *
+ *
* @since GemFire 7.0
*/
public class CommandProcessingException extends RuntimeException {
@@ -77,7 +77,7 @@ public class CommandProcessingException extends RuntimeException {
/**
* Constructs a new <code>CommandProcessingException</code>
- *
+ *
* @param message The error detail message.
* @param errorType One of the error types defined in <code>CommandProcessingException</code>
* @param errorData Additional information about the error.
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandServiceException.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandServiceException.java
index 452aa6a..1d1e476 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandServiceException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandServiceException.java
@@ -17,8 +17,8 @@ package org.apache.geode.management.cli;
/**
* Indicates that an exception occurred while accessing/creating a Command Service for processing
* GemFire Command Line Interface (CLI) commands.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class CommandServiceException extends Exception {
@@ -28,7 +28,7 @@ public class CommandServiceException extends Exception {
/**
* Constructs a new <code>CommandServiceException</code> with the specified detail message and
* cause.
- *
+ *
* @param message The detail message.
* @param cause The cause of this exception or <code>null</code> if the cause is unknown.
*/
@@ -38,7 +38,7 @@ public class CommandServiceException extends Exception {
/**
* Constructs a new <code>CommandServiceException</code> with the specified detail message.
- *
+ *
* @param message The detail message.
*/
public CommandServiceException(String message) {
@@ -49,7 +49,7 @@ public class CommandServiceException extends Exception {
* Constructs a new <code>CommandServiceException</code> by wrapping the specified cause. The
* detail for this exception will be null if the cause is null or cause.toString() if a cause is
* provided.
- *
+ *
* @param cause The cause of this exception or <code>null</code> if the cause is unknown.
*/
public CommandServiceException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandStatement.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandStatement.java
index 5d8c830..a0c8c4a 100755
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandStatement.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandStatement.java
@@ -19,8 +19,8 @@ import java.util.Map;
/**
* Represents GemFire Command Line Interface (CLI) command strings. A <code>CommandStatement</code>
* instance can be used multiple times to process the same command string repeatedly.
- *
- *
+ *
+ *
* @since GemFire 7.0
*
* @deprecated since Geode 1.3. simply use commandProcessor to process the command
@@ -39,7 +39,7 @@ public interface CommandStatement {
/**
* Processes this command statement with the user specified command string and environment
- *
+ *
* @return The {@link Result} of the execution of this command statement.
*/
public Result process();
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/Result.java b/geode-core/src/main/java/org/apache/geode/management/cli/Result.java
index 57f7c43..7b8e270 100755
--- a/geode-core/src/main/java/org/apache/geode/management/cli/Result.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/Result.java
@@ -18,22 +18,22 @@ import java.io.IOException;
/**
* The result of processing a GemFire Command Line Interface (CLI) command string.
- *
+ *
* A string representation of this Result can be iterated over using the methods
* {@link #hasNextLine()}, {@link #nextLine()} and {@link #resetToFirstLine()}.
- *
+ *
* A Result may have one or more files as part of the command output and if so they can be saved to
* the file system using {@link #saveIncomingFiles(String)}. To check whether the result has a file
* in it use {@link #hasIncomingFiles()}.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface Result {
/**
* Indicates a Results status.
- *
+ *
* @since GemFire 7.0
*/
public enum Status {
@@ -73,14 +73,14 @@ public interface Result {
/**
* Returns whether the result has any more lines of information.
- *
+ *
* @return True if there are more lines, false otherwise.
*/
public boolean hasNextLine();
/**
* Returns the next line of information from the Result.
- *
+ *
* @throws IndexOutOfBoundsException if this method is called more times than there are lines of
* information.
*/
@@ -88,7 +88,7 @@ public interface Result {
/**
* Returns whether this Result has a file as a part of the command output.
- *
+ *
* @return True if there is a file, false otherwise.
*/
public boolean hasIncomingFiles();
@@ -96,7 +96,7 @@ public interface Result {
/**
* Save the file(s) from this Result. {@link #hasIncomingFiles()} should be used before calling
* this method to verify that the Result contains a file.
- *
+ *
* @param directory Directory to which the file(s) should be saved.
* @throws IOException If an error occurs while saving the file.
* @throws RuntimeException If there is no file in the Result to save.
@@ -106,17 +106,16 @@ public interface Result {
/****
* Return whether the configuration changes due to command have been persisted to cluster
* configuration or not.
- *
+ *
* @return True if the command has failed to persist configuration changes , false otherwise.
*/
public boolean failedToPersist();
/*****
* Sets whether the command changes have not been persisted to the cluster configuration
- *
+ *
* @param commandPersisted true if the command changes are persisted to the cluster configuration,
* false otherwise.
*/
public void setCommandPersisted(boolean commandPersisted);
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
index 3bd442a..95e40dc 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
@@ -15,17 +15,18 @@
package org.apache.geode.management.internal;
+import java.io.File;
+import java.net.URL;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
-import java.io.File;
-import java.net.URL;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LogService;
/**
* Hosts common utility methods needed by the management package
- *
+ *
* @since Geode 1.0.0.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
index ecf8da2..bd9c293 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
@@ -138,7 +138,7 @@ public class AlertDetails {
/**
* Converts the int alert level to a string representation.
- *
+ *
* @param intLevel int alert level to convert
* @return A string representation of the alert level
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
index 624d6fc..f638dd3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
@@ -24,8 +24,8 @@ import javax.management.openmbean.OpenDataException;
/**
* Converting an Array of Composite types
- *
- *
+ *
+ *
*/
public class ArrayConverter extends OpenTypeConverter {
ArrayConverter(Type targetType, ArrayType openArrayType, Class openArrayClass,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/BackupStatusImpl.java b/geode-core/src/main/java/org/apache/geode/management/internal/BackupStatusImpl.java
index 3cc29b6..42a45d5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/BackupStatusImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/BackupStatusImpl.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.BackupStatus;
/**
* Holds the result of a backup operation.
- *
+ *
*
*/
public class BackupStatusImpl implements BackupStatus, Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
index bc317bc..bd9e584 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
@@ -29,7 +29,7 @@ import org.apache.geode.management.ManagementService;
/**
* Super class to all Management Service
- *
+ *
* @since GemFire 7.0
*/
public abstract class BaseManagementService extends ManagementService {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
index a3f6ad7..df6602e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
@@ -32,8 +32,8 @@ import javax.management.openmbean.OpenDataException;
/**
* Open type converter for Collections
- *
- *
+ *
+ *
*/
public class CollectionConverter extends OpenTypeConverter {
CollectionConverter(Type targetType, ArrayType openArrayType, Class openArrayClass,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
index 0ab3dfe..8890685 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
@@ -26,8 +26,8 @@ import javax.management.openmbean.OpenDataException;
/**
* Open type converter for Composite type
- *
- *
+ *
+ *
*/
public class CompositeConverter extends OpenTypeConverter {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/DiskBackupStatusImpl.java b/geode-core/src/main/java/org/apache/geode/management/internal/DiskBackupStatusImpl.java
index 9650ca3..883fb5a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/DiskBackupStatusImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/DiskBackupStatusImpl.java
@@ -90,4 +90,3 @@ public class DiskBackupStatusImpl implements DiskBackupStatus {
setOfflineDiskStores(diskStores);
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
index f9e7547..5df5288 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
@@ -20,8 +20,8 @@ import javax.management.openmbean.SimpleType;
/**
* Open type converter for Enums.
- *
- *
+ *
+ *
*/
public class EnumConverter<T extends Enum<T>> extends OpenTypeConverter {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
index 4300482..8ebe444 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
@@ -54,9 +54,9 @@ import org.apache.geode.management.ManagementException;
/**
* Manager implementation which manages federated MBeans for the entire DistributedSystem and
* controls the JMX server endpoints for JMX clients to connect, such as an RMI server.
- *
+ *
* The FederatingManager is only appropriate for a peer or server in a GemFire distributed system.
- *
+ *
* @since GemFire 7.0
*/
public class FederatingManager extends Manager {
@@ -158,7 +158,7 @@ public class FederatingManager extends Manager {
/**
* This method will be invoked from MembershipListener which is registered when the member becomes
* a Management node.
- *
+ *
* This method will delegate task to another thread and exit, so that it wont block the membership
* listener
*/
@@ -175,7 +175,7 @@ public class FederatingManager extends Manager {
/**
* This method will be invoked from MembershipListener which is registered when the member becomes
* a Management node.
- *
+ *
* This method will delegate task to another thread and exit, so that it wont block the membership
* listener
*/
@@ -233,7 +233,7 @@ public class FederatingManager extends Manager {
/**
* This method will be invoked from MembershipListener which is registered when the member becomes
* a Management node.
- *
+ *
* this method will delegate task to another thread and exit, so that it wont block the membership
* listener
*/
@@ -323,18 +323,18 @@ public class FederatingManager extends Manager {
/**
* Actual task of doing the GII
- *
+ *
* It will perform the GII request which might originate from TransitionListener or Membership
* Listener.
*
* Managing Node side resources are created per member which is visible to this node
- *
+ *
* 1)Management Region : its a Replicated NO_ACK region 2)Notification Region : its a Replicated
* Proxy NO_ACK region
- *
+ *
* Listeners are added to the above two regions 1) ManagementCacheListener() 2)
* NotificationCacheListener
- *
+ *
* This task can be cancelled from the calling thread if a timeout happens. In that case we have
* to handle the thread interrupt
*/
@@ -490,7 +490,7 @@ public class FederatingManager extends Manager {
/**
* This will return the last updated time of the proxyMBean
- *
+ *
* @param objectName {@link javax.management.ObjectName} of the MBean
* @return last updated time of the proxy
*/
@@ -503,7 +503,7 @@ public class FederatingManager extends Manager {
* {@link org.apache.geode.distributed.DistributedMember} and interface class If the proxy
* interface does not implement the given interface class a {@link java.lang.ClassCastException}.
* will be thrown
- *
+ *
* @param objectName {@link javax.management.ObjectName} of the MBean
* @param interfaceClass interface class implemented by proxy
* @return an instance of proxy exposing the given interface
@@ -514,7 +514,7 @@ public class FederatingManager extends Manager {
/**
* Find a set of proxies given a {@link org.apache.geode.distributed.DistributedMember}
- *
+ *
* @param member {@link org.apache.geode.distributed.DistributedMember}
* @return a set of {@link javax.management.ObjectName}
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java b/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java
index fd78a65..3675b47 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/FederationComponent.java
@@ -35,8 +35,8 @@ import org.apache.geode.management.ManagementException;
/**
* Central component for federation It consists of an Object State as well as some meta data for the
* Object being federated.
- *
- *
+ *
+ *
*/
public class FederationComponent
@@ -45,7 +45,7 @@ public class FederationComponent
private static final String THIS_COMPONENT = FederationComponent.class.getName();
/**
- *
+ *
*/
private static final long serialVersionUID = 3123549507449088591L;
@@ -78,12 +78,12 @@ public class FederationComponent
private transient Map<String, Object> oldObjectState = new HashMap<String, Object>();
- private transient final Map<Method, OpenMethod> methodHandlerMap = OpenTypeUtil.newMap();
+ private final transient Map<Method, OpenMethod> methodHandlerMap = OpenTypeUtil.newMap();
private transient boolean prevRefreshChangeDetected = false;
/**
- *
+ *
* @param objectName ObjectName of the MBean
* @param interfaceClass interface class of the MBean
* @param notificationEmitter specifies whether this MBean is going to emit notifications
@@ -128,7 +128,7 @@ public class FederationComponent
/**
* gets the Canonical name of the MBean interface
- *
+ *
* @return mbean interface class name
*/
@@ -138,7 +138,7 @@ public class FederationComponent
/**
* True if this MBean is a notification emitter.
- *
+ *
* @return whether its a notification emitter or not
*/
@@ -149,9 +149,9 @@ public class FederationComponent
/**
* This method will get called from Management Thread. This will dynamically invoke the MBeans
* getter methods and set them in ObjectState Map.
- *
+ *
* In Future releases we can implement the delta propagation here
- *
+ *
* @return true if the refresh detects that the state changed. It will return false if two
* consecutive refresh calls results in no state change. This indicates to the
* LocalManager whether to send the MBean state to Manager or not.
@@ -228,7 +228,7 @@ public class FederationComponent
/**
* Managing node will get Object state by calling this method
- *
+ *
* @param propertyName
* @return value of the given property
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
index 92987cb..9281154 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.management.internal;
+import java.io.File;
+import java.util.concurrent.CountDownLatch;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.internal.admin.SSLConfig;
-import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.Connector;
@@ -31,8 +31,9 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
-import java.io.File;
-import java.util.concurrent.CountDownLatch;
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.internal.logging.LogService;
/**
* @since GemFire 8.1
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
index f7f2a82..3f9b631 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
@@ -158,7 +158,7 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
/**
* Constructor used to send
- *
+ *
* @param recips
* @param p
*/
@@ -233,7 +233,7 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
/**
* Send profile to the provided members
- *
+ *
* @param recips The recipients of the message
* @throws ReplyException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
index dcf9b22..af0063d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
/**
* Sent to a locator to request it to find (and possibly start) a jmx manager for us. It returns a
* JmxManagerLocatorResponse.
- *
+ *
* @since GemFire 7.0
*
*/
@@ -57,7 +57,7 @@ public class JmxManagerLocatorRequest implements DataSerializableFixedID {
/**
* Send a request to the specified locator asking it to find (and start if needed) a jmx manager.
* A jmx manager will only be started
- *
+ *
* @param locatorHost the name of the host the locator is on
* @param locatorPort the port the locator is listening on
* @param msTimeout how long in milliseconds to wait for a response from the locator
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java
index 1912730..0da8116 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorResponse.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.Version;
/**
* Sent to a locator to request it to find (and possibly start) a jmx manager for us. It returns a
* JmxManagerLocatorResponse.
- *
+ *
* @since GemFire 7.0
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
index b5b97ca..8028dd7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
@@ -51,7 +51,7 @@ import org.apache.geode.management.ManagementException;
/**
* DistributionHelper solves the following problems
- *
+ *
* a) Handles proxy creation when Management node comes up b) Handles proxy creation when a member
* joins c) Remove proxies when a member leaves or node stops being management node. d) Takes care
* to create resources like hidden regions for MBean and notification federation.
@@ -93,7 +93,7 @@ public class LocalManager extends Manager {
/**
* Managed Node side resources are created
- *
+ *
* Management Region : its a Replicated NO_ACK region Notification Region : its a Replicated Proxy
* NO_ACK region
*/
@@ -304,7 +304,7 @@ public class LocalManager extends Manager {
* This task is responsible for pushing data to the hidden region. It is executed in a single
* thread from Executors.newSingleThreadScheduledExecutor(); Only one thread will be responsible
* for pushing the data to the hidden region.
- *
+ *
* (Note however that if this single thread terminates due to a failure during execution prior to
* shutdown, a new one will take its place if needed to execute subsequent tasks.) Tasks are
* guaranteed to execute sequentially, and no more than one task will be active at any given time.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
index 8d6b2e8..467e3d1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
@@ -56,8 +56,8 @@ import org.apache.geode.management.RegionMXBean;
/**
* Utility class to interact with the JMX server
- *
- *
+ *
+ *
*/
public class MBeanJMXAdapter implements ManagementConstants {
@@ -65,7 +65,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
public static MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
/**
- *
+ *
*/
private Map<ObjectName, Object> localGemFireMBean;
@@ -83,11 +83,11 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* This method will register an MBean in GemFire domain. Even if the client provides a domain name
* it will be ignored and GemFire domain name will be used.
- *
+ *
* This method checks the local Filter for registering the MBean. If filtered the MBean wont be
* registered. Although the filter will remember the filtered MBean and register it once the
* filter is removed.
- *
+ *
* @param object
* @param objectName
* @return modified ObjectName
@@ -114,7 +114,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* Checks whether an MBean implements notification support classes or not
- *
+ *
* @param objectName
* @return if this MBean can be a notification broadcaster
*/
@@ -146,11 +146,11 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* This method will register an MBean in GemFire domain. Even if the client provides a domain name
* it will be ignored and GemFire domain name will be used.
- *
+ *
* This method checks the local Filter for registering the MBean. If filtered the MBean wont be
* registered. Although the filter will remember the filtered MBean and register it once the
* filter is removed.
- *
+ *
* @param object
* @param objectName
*/
@@ -168,9 +168,9 @@ public class MBeanJMXAdapter implements ManagementConstants {
}
/**
- *
+ *
* This method will unregister the MBean from GemFire Domain
- *
+ *
* @param objectName
*/
public void unregisterMBean(ObjectName objectName) {
@@ -198,7 +198,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* Finds the MBean instance by {@link javax.management.ObjectName}
- *
+ *
* @param objectName
* @param interfaceClass
* @return instance of MBean
@@ -219,7 +219,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* Method to unregister all the local GemFire MBeans
- *
+ *
*/
public void unregisterAll() {
@@ -249,7 +249,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* This method returns the name that will be used for a DistributedMember when it is registered as
* a JMX bean.
- *
+ *
* @param member Member to find the name for
* @return The name used to register this member as a JMX bean.
*/
@@ -271,7 +271,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
* If value is empty, this method will return the string "nothing".
* <p>
* Note: this is <code>public</code> because certain tests call this from outside of the package.
- *
+ *
* @param value the potentially non-compliant ObjectName property
* @return the value modified to be compliant as an ObjectName property
*/
@@ -309,7 +309,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
}
/**
- *
+ *
*/
public static String makeCompliantRegionNameAppender(String value) {
@@ -320,7 +320,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* returns Member MBean if any
- *
+ *
*/
public MemberMXBean getMemberMXBean() {
ObjectName objName = getMemberMBeanName(distMember);
@@ -495,7 +495,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
/**
* Without special character transformation
- *
+ *
* @param regionPath region path
* @return ObjectName MBean name
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyFactory.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyFactory.java
index 4f8366a..da8ce09 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyFactory.java
@@ -69,7 +69,7 @@ public class MBeanProxyFactory {
/**
* Creates a single proxy and adds a {@link ProxyInfo} to proxy repository
* {@link MBeanProxyInfoRepository}
- *
+ *
* @param member {@link org.apache.geode.distributed.DistributedMember}
* @param objectName {@link javax.management.ObjectName} of the Bean
* @param monitoringRegion monitoring region containing the proxies
@@ -113,7 +113,7 @@ public class MBeanProxyFactory {
* exception to its caller. It handles the error and logs error messages
*
* It will be called from GII or when a member joins the system
- *
+ *
* @param member {@link org.apache.geode.distributed.DistributedMember}
* @param monitoringRegion monitoring region containing the proxies
*/
@@ -145,7 +145,7 @@ public class MBeanProxyFactory {
/**
* Removes all proxies for a given member
- *
+ *
* @param member {@link org.apache.geode.distributed.DistributedMember}
* @param monitoringRegion monitoring region containing the proxies
*/
@@ -177,7 +177,7 @@ public class MBeanProxyFactory {
/**
* Removes the proxy
- *
+ *
* @param member {@link org.apache.geode.distributed.DistributedMember}
* @param objectName {@link javax.management.ObjectName} of the Bean
*/
@@ -226,7 +226,7 @@ public class MBeanProxyFactory {
* {@link org.apache.geode.distributed.DistributedMember} and interface class If the proxy
* interface does not implement the given interface class a {@link java.lang.ClassCastException}.
* will be thrown
- *
+ *
* @param objectName {@link javax.management.ObjectName} of the MBean
* @param interfaceClass interface class implemented by proxy
* @return an instance of proxy exposing the given interface
@@ -244,7 +244,7 @@ public class MBeanProxyFactory {
/**
* Find a set of proxies given a {@link org.apache.geode.distributed.DistributedMember}
- *
+ *
* @param member {@link org.apache.geode.distributed.DistributedMember}
* @return a set of {@link javax.management.ObjectName}
*/
@@ -256,7 +256,7 @@ public class MBeanProxyFactory {
/**
* This will return the last updated time of the proxyMBean
- *
+ *
* @param objectName {@link javax.management.ObjectName} of the MBean
* @return last updated time of the proxy
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java
index 3b19587..9f981dd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java
@@ -33,8 +33,8 @@ import org.apache.geode.internal.logging.LogService;
* This class is a repository of all proxy related information multiple indices are provided for
* searching This searching capability will ease while various proxy ops. It will also be used while
* filter addition/ removal if dynamic filters are going to be supported.
- *
- *
+ *
+ *
*/
public class MBeanProxyInfoRepository {
@@ -59,7 +59,7 @@ public class MBeanProxyInfoRepository {
/**
* Add the {@link ProxyInfo} into repository for future quick access
- *
+ *
* @param member Distributed Member
* @param proxyInfo Proxy Info instance
*/
@@ -82,7 +82,7 @@ public class MBeanProxyInfoRepository {
/**
* Finds the proxy instance by {@link javax.management.ObjectName}
- *
+ *
* @param objectName
* @param interfaceClass
* @return instance of proxy
@@ -105,7 +105,7 @@ public class MBeanProxyInfoRepository {
/**
* Finds the proxy instance by {@link javax.management.ObjectName}
- *
+ *
* @param objectName
* @return instance of proxy
*/
@@ -120,7 +120,7 @@ public class MBeanProxyInfoRepository {
/**
* Finds the set of proxy instances by {@link org.apache.geode.distributed.DistributedMember}
- *
+ *
* @param member DistributedMember
* @return A set of proxy instance on which user can invoke operations as defined by the proxy
* interface
@@ -141,7 +141,7 @@ public class MBeanProxyInfoRepository {
/**
* Removes a proxy of a given {@link org.apache.geode.distributed.DistributedMember} and given
* {@link javax.management.ObjectName}
- *
+ *
* @param member DistributedMember
* @param objectName MBean name
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
index e8f2521..7478d9e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java
@@ -48,8 +48,8 @@ import org.apache.geode.internal.logging.LogService;
* This class is the proxy handler for all the proxies created for federated MBeans. Its designed
* with Java proxy mechanism. All data calls are delegated to the federation components. All method
* calls are routed to specified members via Function service
- *
- *
+ *
+ *
*/
public class MBeanProxyInvocationHandler implements InvocationHandler {
@@ -87,7 +87,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
- *
+ *
* @param member member to which this MBean belongs
* @param monitoringRegion corresponding MonitoringRegion
* @param objectName ObjectName of the MBean
@@ -122,7 +122,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
}
/**
- *
+ *
* @param member member to which this MBean belongs
* @param objectName ObjectName of the MBean
* @param monitoringRegion corresponding MonitoringRegion
@@ -144,9 +144,9 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
* Inherited method from Invocation handler All object state requests are delegated to the
* federated component.
- *
+ *
* All setters and operations() are delegated to the function service.
- *
+ *
* Notification emmitter methods are also delegated to the function service
*/
@Override
@@ -224,7 +224,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
* As this proxy may behave as an notification emitter it delegates to the member
* NotificationBroadcasterSupport object
- *
+ *
* @param notification
*/
private void sendNotification(Object notification) {
@@ -234,7 +234,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
* This will get the data from Object state which is replicated across the hidden region
* FederataionComponent being the carrier.
- *
+ *
* @param attributeName
* @return Object
*/
@@ -262,7 +262,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
* It will call the Generic function to execute the method on the remote VM
- *
+ *
* @param objectName ObjectName of the MBean
* @param methodName method name
* @param args arguments to the methods
@@ -328,9 +328,9 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
* The call will delegate to Managed Node for NotificationHub to register a local listener to
* listen for notification from the MBean
- *
+ *
* Moreover it will also add the client to local listener list by adding to the contained emitter.
- *
+ *
* @param proxy the proxy object
* @param method method to be invoked
* @param args method arguments
@@ -430,8 +430,8 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
/**
* Internal implementation of all the generic proxy methods
- *
- *
+ *
+ *
*/
private class ProxyInterfaceImpl implements ProxyInterface {
/**
@@ -511,4 +511,3 @@ public class MBeanProxyInvocationHandler implements InvocationHandler {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MXBeanProxyInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/MXBeanProxyInvocationHandler.java
index eb85287..6759f7f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MXBeanProxyInvocationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MXBeanProxyInvocationHandler.java
@@ -30,8 +30,8 @@ import org.apache.geode.i18n.LogWriterI18n;
* This proxy handler handles all the method call invoked on an MXBean It follows same route as
* MBeanProxyInvocationHandler Only difference is after obtaining the result it transforms the open
* type to the actual java type
- *
- *
+ *
+ *
*/
public class MXBeanProxyInvocationHandler {
@@ -90,7 +90,7 @@ public class MXBeanProxyInvocationHandler {
/**
* Eliminate methods that are overridden with a covariant return type. Reflection will return both
* the original and the overriding method but we need only the overriding one is of interest
- *
+ *
* @param methodArray
* @return the method after eliminating covariant menthods
*/
@@ -147,13 +147,13 @@ public class MXBeanProxyInvocationHandler {
return +1;
}
- public final static MethodOrder instance = new MethodOrder();
+ public static final MethodOrder instance = new MethodOrder();
}
/**
* Hanlder for MXBean Proxy
- *
- *
+ *
+ *
*/
private abstract class MethodHandler {
MethodHandler(String name, OpenMethod cm) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementCacheListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementCacheListener.java
index d904518..297d3c3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementCacheListener.java
@@ -24,10 +24,10 @@ import org.apache.geode.internal.logging.LogService;
/**
* This listener is attached to the Monitoring Region to receive any addition or deletion of MBEans
- *
+ *
* It updates the last refreshed time of proxy once it gets the update request from the Managed Node
- *
- *
+ *
+ *
*/
public class ManagementCacheListener extends CacheListenerAdapter<String, Object> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementConstants.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementConstants.java
index 151aa9d..7baa784 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementConstants.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementConstants.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.management.internal;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.management.internal.beans.QueryDataFunction;
+import java.util.concurrent.TimeUnit;
import javax.management.ObjectName;
-import java.util.concurrent.TimeUnit;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.management.internal.beans.QueryDataFunction;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
index 097b161..98161b7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
@@ -34,11 +34,11 @@ import org.apache.geode.internal.logging.LogService;
/**
* A generic function to act as a conduit between Managing Node and Managed nodes.
- *
+ *
* The direction of request flow is from Managing Node to Managing Node.
- *
+ *
* The following methods are executed at Managed node on behalf of the proxy.
- *
+ *
* 1) All setter methods 2) All operations 3) addNotificationListener 4) removeNotificationListener
* 5) getNotificationInfo
*/
@@ -60,7 +60,7 @@ public class ManagementFunction extends FunctionAdapter implements InternalEntit
/**
* Public constructor
- *
+ *
* @param notifHub
*/
public ManagementFunction(NotificationHub notifHub) {
@@ -69,7 +69,7 @@ public class ManagementFunction extends FunctionAdapter implements InternalEntit
/**
* Actual function execution. It delegates task at managed node according to the request received.
- *
+ *
* If any exception is encountered it will set the result to UNDEFINED
*/
public void execute(FunctionContext fc) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementMembershipListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementMembershipListener.java
index 622badc..4e2c2d2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementMembershipListener.java
@@ -26,8 +26,8 @@ import org.apache.geode.internal.logging.LogService;
/**
* This listener is added to the cache when a node becomes Managing node. It then starts to listen
* on various membership events to take steps accordingly
- *
- *
+ *
+ *
*/
public class ManagementMembershipListener implements MembershipListener {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementResourceRepo.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementResourceRepo.java
index b0f72c5..5437af9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementResourceRepo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementResourceRepo.java
@@ -26,11 +26,11 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Instance of this object behaves as a cache wide repository in the context of management and
* monitoring. Various management infrastructures are initialized by this class
- *
+ *
* Various repository related methods are declared here These methods provide a consistent view to
* read and update the repository.
- *
- *
+ *
+ *
*/
public class ManagementResourceRepo {
@@ -62,7 +62,7 @@ public class ManagementResourceRepo {
}
/**
- *
+ *
* @return local monitoring region
*/
public Region<String, Object> getLocalMonitoringRegion() {
@@ -81,7 +81,7 @@ public class ManagementResourceRepo {
/**
* Sets the repository local monitoring region to the given Region
- *
+ *
* @param localMonitoringRegion local monitoring region
*/
public void setLocalMonitoringRegion(Region<String, Object> localMonitoringRegion) {
@@ -90,7 +90,7 @@ public class ManagementResourceRepo {
/**
* put an entry in local monitoring region
- *
+ *
* @param name MBean name
* @param data The value part of the Map
*/
@@ -103,7 +103,7 @@ public class ManagementResourceRepo {
/**
* uses putAll operation of region
- *
+ *
* @param objectMap Object Map containing key-value operations
*/
public void putAllInLocalMonitoringRegion(Map<String, FederationComponent> objectMap) {
@@ -126,7 +126,7 @@ public class ManagementResourceRepo {
/**
* get a entry from local monitoring region
- *
+ *
* @param name MBean name
* @return the value
*/
@@ -136,7 +136,7 @@ public class ManagementResourceRepo {
}
/**
- *
+ *
* @return local notification region
*/
public Region<NotificationKey, Notification> getLocalNotificationRegion() {
@@ -145,7 +145,7 @@ public class ManagementResourceRepo {
/**
* sets the local notification region
- *
+ *
* @param localNotificationRegion local notification region
*/
public void setLocalNotificationRegion(
@@ -155,7 +155,7 @@ public class ManagementResourceRepo {
/**
* put an entry in local notification region
- *
+ *
* @param key Notiofication key
* @param notif Notification Object
*/
@@ -165,7 +165,7 @@ public class ManagementResourceRepo {
/**
* put an entry in Monitoring Region Map
- *
+ *
* @param member Distributed member
* @param region Corresponding region
*/
@@ -175,7 +175,7 @@ public class ManagementResourceRepo {
}
/**
- *
+ *
* @param member Distributed Member
* @return the corresponding Monitoring region at Managing Node side
*/
@@ -186,7 +186,7 @@ public class ManagementResourceRepo {
/**
* remove the entry corresponding to the distributed member
- *
+ *
* @param member Distributed Member
*/
public void romoveEntryFromMonitoringRegionMap(DistributedMember member) {
@@ -195,7 +195,7 @@ public class ManagementResourceRepo {
}
/**
- *
+ *
* @return the map containing all the member and region map
*/
public Map<DistributedMember, Region<String, Object>> getMonitoringRegionMap() {
@@ -204,7 +204,7 @@ public class ManagementResourceRepo {
/**
* put an entry into notification region map
- *
+ *
* @param member Distributed Member
* @param region Corresponding notification region
*/
@@ -215,7 +215,7 @@ public class ManagementResourceRepo {
/**
* get the notification region for a corresponding member
- *
+ *
* @param member Distributed Member
* @return notification Region for the member
*/
@@ -227,7 +227,7 @@ public class ManagementResourceRepo {
/**
* removes an entry from notification region
- *
+ *
* @param member Distributed Member
*/
public void removeEntryFromNotifRegionMap(DistributedMember member) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java b/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java
index 38ffb21..8d5a38a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java
@@ -15,6 +15,8 @@
package org.apache.geode.management.internal;
+import java.util.Set;
+
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -24,15 +26,13 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.admin.remote.AlertLevelChangeMessage;
import org.apache.geode.internal.logging.log4j.LogLevel;
-import java.util.Set;
-
/**
* This class will act as a messenger from manager to members for various operations.
- *
+ *
* To start with its is designed to Manager start stop details, change alert level.
- *
- *
- *
+ *
+ *
+ *
*/
public class MemberMessenger {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java
index a141f51..74845cb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java
@@ -29,8 +29,8 @@ import org.apache.geode.internal.logging.LogService;
/**
* Cache listener on local monitoring region to get Manager's local MBean updates. This acts as an
* aggregator interface for Manager. Its used only on Manager's side.
- *
- *
+ *
+ *
*/
public class MonitoringRegionCacheListener extends CacheListenerAdapter<String, Object> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationBroadCasterProxy.java b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationBroadCasterProxy.java
index 16215ac8..fc377af 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationBroadCasterProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationBroadCasterProxy.java
@@ -21,15 +21,15 @@ import javax.management.NotificationBroadcaster;
* This interface is to extend the functionality of NotificationBroadcaster. It enables proxies to
* send notifications on their own as proxy implementations have to implement the sendNotification
* method.
- *
- *
+ *
+ *
*
*/
public interface NotificationBroadCasterProxy extends NotificationBroadcaster {
/**
* send the notification to registered clients
- *
+ *
* @param notification
*/
public void sendNotification(Notification notification);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHub.java b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHub.java
index 3ba21f6..4ea0326 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHub.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHub.java
@@ -31,8 +31,8 @@ import org.apache.geode.management.ManagementException;
/**
* This class acts as a central point hub for collecting all notifications originated from VM and
* sending across to Managing Node
- *
- *
+ *
+ *
*/
public class NotificationHub {
@@ -59,7 +59,7 @@ public class NotificationHub {
/**
* public constructor
- *
+ *
* @param repo Resource repo for this member
*/
public NotificationHub(ManagementResourceRepo repo) {
@@ -74,7 +74,7 @@ public class NotificationHub {
/**
* Adds a NotificationHubListener
- *
+ *
* @param objectName
*/
public void addHubNotificationListener(String memberName, ObjectName objectName) {
@@ -99,7 +99,7 @@ public class NotificationHub {
/**
* Removes a NotificationHubListener
- *
+ *
* @param objectName
*/
public void removeHubNotificationListener(String memberName, ObjectName objectName) {
@@ -157,8 +157,8 @@ public class NotificationHub {
/**
* This class is the managed node counterpart to listen to notifications from MBeans for which it
* is resistered
- *
- *
+ *
+ *
*/
public class NotificationHubListener implements NotificationListener {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHubClient.java b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHubClient.java
index 604fa27..ea6e2d9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHubClient.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationHubClient.java
@@ -24,8 +24,8 @@ import org.apache.geode.internal.logging.LogService;
/**
* This class actually distribute the notification with the help of the actual broadcaster proxy.
- *
- *
+ *
+ *
*/
public class NotificationHubClient {
@@ -43,9 +43,9 @@ public class NotificationHubClient {
/**
* send the notification to actual client on the Managing node VM
- *
+ *
* it does not throw any exception. it will capture all exception and log a warning
- *
+ *
* @param event
*/
public void sendNotification(EntryEvent<NotificationKey, Notification> event) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationKey.java b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationKey.java
index 6e58082..377005a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationKey.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationKey.java
@@ -19,8 +19,8 @@ import javax.management.ObjectName;
/**
* This class is used as a key for Notification region Only using ObjectName as key will overwrite
* entries if put rate for notification is high.
- *
- *
+ *
+ *
*/
public class NotificationKey implements java.io.Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
index e144717..ede8d7d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
@@ -25,8 +25,8 @@ import javax.management.openmbean.OpenType;
/**
* Each data type in corresponding to an Open type will have a
- *
- *
+ *
+ *
*/
public class OpenMethod {
@@ -40,7 +40,7 @@ public class OpenMethod {
/**
* Static method to get the OpenMethod
- *
+ *
* @param m
* @return an open method
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
index 0fb2b39..8e75322 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
@@ -65,15 +65,15 @@ import org.apache.geode.management.ManagementException;
/**
* It takes care of converting a Java type to an open types
- *
+ *
* A Java type is an instance of java.lang.reflect.Type representing all types in Java.
- *
+ *
* Each Type is associated with an OpenTypeConverter. The OpenTypeConverter defines an OpenType
* corresponding to the Type, plus a Java class corresponding to the OpenType. For example:
- *
- *
+ *
+ *
* Java Type : Integer Open Class :Integer Open Type :SimpleType.INTEGER
- *
+ *
* Apart from simple types, arrays, and collections, Java types are converted through introspection
* into CompositeType
*/
@@ -95,7 +95,7 @@ public abstract class OpenTypeConverter {
private static final ConverterMap converterMap = new ConverterMap();
- private final static Map<Type, Type> inProgress = OpenTypeUtil.newIdentityHashMap();
+ private static final Map<Type, Type> inProgress = OpenTypeUtil.newIdentityHashMap();
/**
* Following List simply serves to keep a reference to predefined OpenConverters so they don't get
@@ -111,7 +111,7 @@ public abstract class OpenTypeConverter {
/**
* Convert an instance of openClass into an instance of targetType.
- *
+ *
* @return the java type object
*/
public Object fromOpenValue(Object value) throws InvalidObjectException {
@@ -133,7 +133,7 @@ public abstract class OpenTypeConverter {
/**
* Convert an instance of targetType into an instance of openClass.
- *
+ *
* @return open class object
*/
Object toOpenValue(Object value) throws OpenDataException {
@@ -346,12 +346,12 @@ public abstract class OpenTypeConverter {
/**
* Supported types are List<E>, Set<E>, SortedSet<E>, Map<K,V>, SortedMap<K,V>.
- *
+ *
* Subclasses of the above types wont be supported as deserialize info wont be there.
- *
+ *
* Queue<E> won't be supported as Queue is more of a functional data structure rather than a data
* holder
- *
+ *
* @return the open type converter for a given type
*/
private static OpenTypeConverter makeParameterizedConverter(ParameterizedType objType)
@@ -434,7 +434,7 @@ public abstract class OpenTypeConverter {
* Converts from a CompositeData to an instance of the targetClass Various subclasses override its
* functionality.
*/
- protected static abstract class CompositeBuilder {
+ protected abstract static class CompositeBuilder {
CompositeBuilder(Class targetClass, String[] itemNames) {
this.targetClass = targetClass;
this.itemNames = itemNames;
@@ -451,14 +451,14 @@ public abstract class OpenTypeConverter {
/**
* If the subclass should be appropriate but there is a problem, then the method throws
* InvalidObjectException.
- *
+ *
* @return If the subclass is appropriate for targetClass, then the method returns null. If the
* subclass is not appropriate, then the method returns an explanation of why not.
*/
abstract String applicable(Method[] getters) throws InvalidObjectException;
/**
- *
+ *
* @return possible cause if target class is not applicable
*/
Throwable possibleCause() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeUtil.java
index 105ee18..ba6ce3e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeUtil.java
@@ -30,8 +30,8 @@ import java.util.TreeMap;
/**
* Various uitlity methods for open type conversion
- *
- *
+ *
+ *
*/
public class OpenTypeUtil {
@@ -88,7 +88,7 @@ public class OpenTypeUtil {
/**
* Utility method to take a string and convert it to normal Java variable name capitalization.
- *
+ *
* @param name The string to be made in camel case.
* @return The camel case version of the string.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInfo.java
index a8d9bae..77bb723 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInfo.java
@@ -40,7 +40,7 @@ public class ProxyInfo {
/**
* public constructor
- *
+ *
* @param proxyInstance
* @param objectName
*/
@@ -53,7 +53,7 @@ public class ProxyInfo {
/**
* get the proxy instance
- *
+ *
* @return proxyInstance
*/
public Object getProxyInstance() {
@@ -63,7 +63,7 @@ public class ProxyInfo {
/**
* get MBean name
- *
+ *
* @return ObjectName
*/
public ObjectName getObjectName() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInterface.java b/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInterface.java
index ac3408e..2dfc3cb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInterface.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ProxyInterface.java
@@ -23,14 +23,14 @@ public interface ProxyInterface {
/**
* Last refreshed time for proxy
- *
+ *
* @return last refreshed time
*/
public long getLastRefreshedTime();
/**
* Sets the last refreshed time for the proxy
- *
+ *
* @param lastRefreshedTime
*/
public void setLastRefreshedTime(long lastRefreshedTime);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ProxyListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/ProxyListener.java
index f96bbec..692fd43 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ProxyListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ProxyListener.java
@@ -20,51 +20,51 @@ import javax.management.ObjectName;
import org.apache.geode.distributed.internal.MembershipListener;
/**
- *
+ *
* A listener to handle MBean proxy related events.
- *
+ *
* Any custom ProxyListener should implement this interface. For the time being its not exposed to
* the user. But is being kept as an extension point for future releases if we decide to support
* custom ProxyListener.
- *
+ *
* TODO Along side we need to make FederationCompoent public as well.
- *
+ *
* A simple usage of a ProxyListener could be custom aggregator of Statistics exposed by MBeans.
- *
- *
+ *
+ *
* ManagementService service = ManagementService .getManagementService(cache);
- *
+ *
* ProxyListener listener = new MyListener(); //implements ProxyListener.
* service.addProxyListener(listener)
- *
- *
+ *
+ *
* Adding an ProxyListener in a non Manager node wont be useful as it wont get any proxy related
* callbacks
- *
- *
+ *
+ *
*/
public interface ProxyListener extends MembershipListener {
/**
- *
+ *
* When a new proxy is added to the Manager this call back is invoked. User can decide what to do
* with the event. It can take some action or ignore the event.
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy. This proxy object can be cast to the input
* interface class type.
* @param newVal new value for the proxy
- *
+ *
*/
void afterCreateProxy(ObjectName objectName, Class interfaceClass, Object proxyObject,
FederationComponent newVal);
/**
- *
+ *
* When a proxy is removed from the Manager this call back is invoked. User can decide what to do
* with the event. It can take some action or ignore the event.
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy.
@@ -76,7 +76,7 @@ public interface ProxyListener extends MembershipListener {
/**
* When a proxy is updated in Manager this call back is invoked. User can decide what to do with
* the event. It can take some action or ignore the event.
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy.
@@ -88,7 +88,7 @@ public interface ProxyListener extends MembershipListener {
/**
* User can implement this method to handle all notifications generated by the System.
- *
+ *
* @param notification
*/
public void handleNotification(Notification notification);
@@ -97,11 +97,11 @@ public interface ProxyListener extends MembershipListener {
* This is a very special method, Only to be invoked from MonitoringRegionCacheListener. The need
* for this interface arises as some time a create op is not meant to create proxies or aggregate.
* But only to feed data to existing proxies.
- *
+ *
* e.g. When manager starts and not a single ManagementTask cycle has been run. This will result
* in lost updates. To capture all updates we can feed the newly created data to existing
* aggregate.
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy. This proxy object can be cast to the input
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
index 7c9256d..3cf4915 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
@@ -14,7 +14,13 @@
*/
package org.apache.geode.management.internal;
+import java.net.UnknownHostException;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -29,11 +35,6 @@ import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.management.ManagementService;
-import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-
-import java.net.UnknownHostException;
/**
* Agent implementation that controls the HTTP server end points used for REST clients to connect
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
index 820e8a5..b35f9c7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.management.internal;
-import org.apache.commons.lang.StringUtils;
-
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
+
import javax.net.ssl.SSLContext;
+import org.apache.commons.lang.StringUtils;
+
/**
- *
+ *
* @since GemFire 8.1
*/
public class SSLUtil {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/StringBasedFilter.java b/geode-core/src/main/java/org/apache/geode/management/internal/StringBasedFilter.java
index 3e0dee6..86db80e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/StringBasedFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/StringBasedFilter.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.ManagementException;
/**
* This is a string pattern based Filter with some limitations.
- *
+ *
*
*/
@@ -36,7 +36,7 @@ public class StringBasedFilter {
private List<Pattern> inclusionPatternList;
/**
- *
+ *
*/
public StringBasedFilter(FilterParam params) {
this.params = params;
@@ -49,7 +49,7 @@ public class StringBasedFilter {
}
/**
- *
+ *
*/
public boolean isExcluded(String tokenToMatch) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
index 9a92eaa..60615db 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
@@ -56,7 +56,7 @@ import org.apache.geode.management.membership.MembershipListener;
/**
* This is the concrete implementation of ManagementService which is the gateway to various JMX
* operations over a GemFire System
- *
+ *
* @since GemFire 7.0
*/
public class SystemManagementService extends BaseManagementService {
@@ -149,7 +149,7 @@ public class SystemManagementService extends BaseManagementService {
/**
* This method will initialize all the internal components for Management and Monitoring
- *
+ *
* It will a)start an JMX connectorServer b) create a notification hub c)register the
* ManagementFunction
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
index 8d41c5a..b486f42 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
@@ -31,8 +31,8 @@ import javax.management.openmbean.TabularType;
/**
* Table type converter
- *
- *
+ *
+ *
*/
public class TableConverter extends OpenTypeConverter {
TableConverter(Type targetType, boolean sortedMap, TabularType tabularType,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AggregateHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AggregateHandler.java
index 61c8f09..07badcf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AggregateHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AggregateHandler.java
@@ -21,14 +21,14 @@ import org.apache.geode.management.internal.FederationComponent;
/**
* Internal aggregate handlers could(they can be independent of this interface also as long as they
* adhere to ProxyAggregator contract) implement this interface.
- *
- *
+ *
+ *
*/
public interface AggregateHandler {
/**
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy.
@@ -38,7 +38,7 @@ public interface AggregateHandler {
FederationComponent newVal);
/**
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy.
@@ -48,7 +48,7 @@ public interface AggregateHandler {
FederationComponent oldVal);
/**
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy.
@@ -59,7 +59,7 @@ public interface AggregateHandler {
FederationComponent newVal, FederationComponent oldVal);
/**
- *
+ *
* @param objectName name of the proxy object
* @param interfaceClass interface class of the proxy object.
* @param proxyObject actual reference of the proxy.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java
index 7cea8e9..4af9882 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java
@@ -21,8 +21,8 @@ import org.apache.geode.management.internal.beans.stats.StatsKey;
/**
* Concrete implementation of AsyncEventQueueMXBean
- *
- *
+ *
+ *
*/
public class AsyncEventQueueMBean extends NotificationBroadcasterSupport
implements AsyncEventQueueMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBeanBridge.java
index 83cfb88..cc32375 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBeanBridge.java
@@ -22,8 +22,8 @@ import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
import org.apache.geode.management.internal.beans.stats.StatsKey;
/**
- *
- *
+ *
+ *
*/
public class AsyncEventQueueMBeanBridge {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
index 31a198b..fab0bbd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
@@ -40,7 +40,7 @@ public class BeanUtilFuncs {
/**
* returns the tail of the log file
- *
+ *
* @return tail of the log file
*/
public static String tailSystemLog(File logFile, final int numLines) throws IOException {
@@ -327,7 +327,7 @@ public class BeanUtilFuncs {
/**
* Compresses a given String. It is encoded using ISO-8859-1, So any decompression of the
* compressed string should also use ISO-8859-1
- *
+ *
* @param str String to be compressed.
* @return compressed bytes
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
index 3b49f65..efb9425 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
@@ -535,7 +535,7 @@ public class CacheServerBridge extends ServerBridge {
/**
* closes a continuous query and releases all the resources associated with it.
- *
+ *
* @param queryName
*/
public void closeContinuousQuery(String queryName) throws Exception {
@@ -559,7 +559,7 @@ public class CacheServerBridge extends ServerBridge {
/**
* Execute a continuous query
- *
+ *
* @param queryName
*/
public void executeContinuousQuery(String queryName) throws Exception {
@@ -581,7 +581,7 @@ public class CacheServerBridge extends ServerBridge {
/**
* Stops a given query witout releasing any of the resources associated with it.
- *
+ *
* @param queryName
*/
public void stopContinuousQuery(String queryName) throws Exception {
@@ -606,7 +606,7 @@ public class CacheServerBridge extends ServerBridge {
/**
* remove a given index
- *
+ *
* @param indexName
*/
public void removeIndex(String indexName) throws Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerMBean.java
index 377f4db..705f885 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerMBean.java
@@ -24,8 +24,8 @@ import org.apache.geode.management.ServerLoadData;
/**
* Represents the GemFire CacheServer . Provides data and notifications about server,
* subscriptions,durable queues and indices
- *
- *
+ *
+ *
*/
public class CacheServerMBean extends NotificationBroadcasterSupport implements CacheServerMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskRegionBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskRegionBridge.java
index 2d023fc..19177ea 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskRegionBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskRegionBridge.java
@@ -25,8 +25,8 @@ import org.apache.geode.management.internal.beans.stats.StatsKey;
import org.apache.geode.management.internal.beans.stats.StatsRate;
/**
- *
- *
+ *
+ *
*/
public class DiskRegionBridge {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBean.java
index 926ea30..2ce499d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBean.java
@@ -22,8 +22,8 @@ import org.apache.geode.management.DiskStoreMXBean;
* DiskStore MBean represent a DiskStore which provides disk storage for one or more regions. The
* regions in the same disk store will share the same disk persistence attributes. A region without
* a disk store name belongs to the default disk store.
- *
- *
+ *
+ *
*/
public class DiskStoreMBean extends NotificationBroadcasterSupport implements DiskStoreMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBeanBridge.java
index 068a390..a9df830 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DiskStoreMBeanBridge.java
@@ -29,8 +29,8 @@ import org.apache.geode.management.internal.beans.stats.StatsRate;
/**
* Bridge class to act as an interface between JMX layer and GemFire DiskStores
- *
- *
+ *
+ *
*/
public class DiskStoreMBeanBridge {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceBridge.java
index 4d2ea48..b739e7b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceBridge.java
@@ -30,14 +30,14 @@ import org.apache.geode.management.internal.ManagementConstants;
/**
* Bridge for the Distributed lock service. It provides an aggregated view of a lock service which
* might be present in multiple members.
- *
+ *
* Proxies are added as and when proxies are received by Federation framework.
- *
+ *
* Each method which access all the proxies to gather data from them creates an Iterator. Iterates
* over them and gather data. Creating multiple iterator on each method call is a concern and a
* better way needs to be introduced.
- *
- *
+ *
+ *
*/
public class DistributedLockServiceBridge {
@@ -63,7 +63,7 @@ public class DistributedLockServiceBridge {
/**
* Public constructor
- *
+ *
* @param objectName name of the MBean
* @param proxy reference to the proxy
*/
@@ -78,7 +78,7 @@ public class DistributedLockServiceBridge {
/**
* Add a proxy to the proxy map
- *
+ *
* @param objectName name of the MBean
* @param proxy reference to the proxy
*/
@@ -90,7 +90,7 @@ public class DistributedLockServiceBridge {
}
/**
- *
+ *
* @param objectName name of the MBean
* @param proxy reference to the proxy
* @return true if no proxies left for this aggregator to work on
@@ -111,7 +111,7 @@ public class DistributedLockServiceBridge {
/**
- *
+ *
* @return member name of the grantor
*/
public String fetchGrantorMember() {
@@ -126,7 +126,7 @@ public class DistributedLockServiceBridge {
}
/**
- *
+ *
* @return number of members using this lock service
*/
public int getMemberCount() {
@@ -135,7 +135,7 @@ public class DistributedLockServiceBridge {
}
/**
- *
+ *
* @return list of members using this lock service
*/
public String[] getMemberNames() {
@@ -151,7 +151,7 @@ public class DistributedLockServiceBridge {
}
/**
- *
+ *
* @return name of the lock service
*/
public String getName() {
@@ -167,7 +167,7 @@ public class DistributedLockServiceBridge {
}
/**
- *
+ *
* @return lists the name of locks held by this member's threads
*/
public String[] listHeldLocks() {
@@ -191,7 +191,7 @@ public class DistributedLockServiceBridge {
}
/**
- *
+ *
* @return a map of object name and thread name if this member holds lock or null/none
*/
public Map<String, String> listThreadsHoldingLock() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceMBean.java
index 968a95b..f87c1ad 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedLockServiceMBean.java
@@ -20,8 +20,8 @@ import org.apache.geode.management.DistributedLockServiceMXBean;
/**
* It represents a distributed view of a LockService
- *
- *
+ *
+ *
*/
public class DistributedLockServiceMBean implements DistributedLockServiceMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionBridge.java
index a9d6e23..6ff8f76 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionBridge.java
@@ -42,8 +42,8 @@ import org.apache.geode.management.internal.beans.stats.RegionClusterStatsMonito
/**
* Bridge to collect data from all the proxies from a named region. MBeanAggregator will create this
* bridge and inject it into a DistributedRegionMBean
- *
- *
+ *
+ *
*/
public class DistributedRegionBridge {
@@ -89,7 +89,7 @@ public class DistributedRegionBridge {
/**
* Public constructor.
- *
+ *
* @param objectName Name of the MBean
* @param proxy reference to the actual proxy
*/
@@ -103,7 +103,7 @@ public class DistributedRegionBridge {
/**
* Adds a proxy to the Proxy set
- *
+ *
* @param objectName name of the MBean
* @param proxy reference to the actual proxy
*/
@@ -116,7 +116,7 @@ public class DistributedRegionBridge {
/**
* Removes proxy from the proxy set
- *
+ *
* @param objectName name of the MBean
* @param proxy reference to the actual proxy
* @return true if this DistributedRegion's proxy set is empty
@@ -137,7 +137,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Eviction Attributes of the Region
*/
public EvictionAttributesData getEvictionAttributes() {
@@ -162,7 +162,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return fixed partition attributes of a partition region if its fixed partitioned
*/
public FixedPartitionAttributesData[] getFixedPartitionAttributesData() {
@@ -186,7 +186,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return number of members where this region is present
*/
public int getMemberCount() {
@@ -212,7 +212,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return membership attributes
*/
public MembershipAttributesData getMembershipAttributes() {
@@ -236,7 +236,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return name of the Region
*/
public String getName() {
@@ -244,7 +244,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return parent region name
*/
public String getParentRegion() {
@@ -255,7 +255,7 @@ public class DistributedRegionBridge {
* Lists the sub regions of the GemFire {@link Region} represented by this
* {@link DistributedRegionMXBean}. If <code>recursive</code> is <code>true</code>, will return
* sub-regions by traversing recursively.
- *
+ *
* @param recursive if <code>true</code>, recursively traverses to find sub regions.
* @return String array of sub region paths
*/
@@ -279,7 +279,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return partitioned attributes
*/
public PartitionAttributesData getPartitionAttributes() {
@@ -305,7 +305,7 @@ public class DistributedRegionBridge {
/**
* Region attributes
- *
+ *
* @return region attributes
*/
public RegionAttributesData getRegionAttributes() {
@@ -329,7 +329,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return type of the region
*/
public String getRegionType() {
@@ -337,7 +337,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return full path of the region
*/
public String getFullPath() {
@@ -345,7 +345,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Avg Latency of cache listener call
*/
public long getCacheListenerCallsAvgLatency() {
@@ -354,7 +354,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Avg Latency of cache writer call
*/
public long getCacheWriterCallsAvgLatency() {
@@ -362,7 +362,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return creates per second for the Regions
*/
public float getCreatesRate() {
@@ -371,7 +371,7 @@ public class DistributedRegionBridge {
/**
- *
+ *
* @return destroy per second for the Regions
*/
public float getDestroyRate() {
@@ -379,7 +379,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return disk reads rate across disks belonging to Region
*/
public float getDiskReadsRate() {
@@ -387,7 +387,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return disk writes rate across region
*/
public float getDiskWritesRate() {
@@ -396,7 +396,7 @@ public class DistributedRegionBridge {
/**
- *
+ *
* @return gets per second for the Regions
*/
public float getGetsRate() {
@@ -404,7 +404,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return total hit count
*/
public long getHitCount() {
@@ -415,7 +415,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return hit to miss ratio
*/
public float getHitRatio() {
@@ -426,7 +426,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return returns the last time the region was accessed
*/
public long getLastAccessedTime() {
@@ -438,7 +438,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return last update time of the region
*/
public long getLastModifiedTime() {
@@ -449,7 +449,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return entries destroyed rate in the region through both destroy cache operations and
* eviction.
*/
@@ -458,7 +458,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return entry evictions rate triggered by LRU.
*/
public float getLruEvictionRate() {
@@ -466,7 +466,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return number of times cache missed on the local region
*/
public long getMissCount() {
@@ -477,7 +477,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return putAll per second for the Regions
*/
public float getPutAllRate() {
@@ -485,7 +485,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Partition Region local put rate
*/
public float getPutLocalRate() {
@@ -493,7 +493,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Average Latency for remote put
*/
public long getPutRemoteAvgLatency() {
@@ -501,7 +501,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Latency for last remote put
*/
public long getPutRemoteLatency() {
@@ -509,7 +509,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return Partition Region remote put rate
*/
public float getPutRemoteRate() {
@@ -517,7 +517,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return puts per second for the Regions
*/
public float getPutsRate() {
@@ -526,7 +526,7 @@ public class DistributedRegionBridge {
/**
- *
+ *
* @return number of entries
*/
public long getSystemRegionEntryCount() {
@@ -539,7 +539,7 @@ public class DistributedRegionBridge {
/**
- *
+ *
* @return The current number of backups in progress on this disk store
*/
public long getTotalDiskWritesProgress() {
@@ -547,7 +547,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return consolidated count of bytes on each disk of the region
*/
public long getTotalBytesOnDisk() {
@@ -555,7 +555,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return The current number of entries whose value resides in the VM. The value may also have
* been written to disk.
*/
@@ -564,7 +564,7 @@ public class DistributedRegionBridge {
}
/**
- *
+ *
* @return The current number of entries whose value is on disk and is not in memory. This is true
* of overflowed entries. It is also true of recovered entries that have not yet been
* faulted in.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionMBean.java
index c5acda5..5cf1cf8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedRegionMBean.java
@@ -24,8 +24,8 @@ import org.apache.geode.management.RegionAttributesData;
/**
* System-wide aggregate of a named Region. Provides high-level view of a Region for all members
* hosting and/or using it.
- *
- *
+ *
+ *
*/
public class DistributedRegionMBean implements DistributedRegionMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
index 681b2b5..1bf5215 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
@@ -14,7 +14,36 @@
*/
package org.apache.geode.management.internal.beans;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.Notification;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.admin.internal.BackupDataStoreHelper;
import org.apache.geode.admin.internal.BackupDataStoreResult;
import org.apache.geode.cache.persistence.PersistentID;
@@ -63,34 +92,6 @@ import org.apache.geode.management.internal.beans.stats.GatewaySenderClusterStat
import org.apache.geode.management.internal.beans.stats.MemberClusterStatsMonitor;
import org.apache.geode.management.internal.beans.stats.ServerClusterStatsMonitor;
import org.apache.geode.management.internal.cli.json.TypedJson;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
/**
* This is the gateway to distributed system as a whole. Aggregated metrics and stats are shown
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBean.java
index b64ad8c..4c0d787 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBean.java
@@ -19,8 +19,8 @@ import javax.management.NotificationBroadcasterSupport;
import org.apache.geode.management.GatewayReceiverMXBean;
/**
- *
- *
+ *
+ *
*/
public class GatewayReceiverMBean extends NotificationBroadcasterSupport
implements GatewayReceiverMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBeanBridge.java
index 0c9e7ff..3dc9f80 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewayReceiverMBeanBridge.java
@@ -31,7 +31,7 @@ import org.apache.geode.management.internal.beans.stats.StatsKey;
import org.apache.geode.management.internal.beans.stats.StatsRate;
/**
- *
+ *
*
*/
public class GatewayReceiverMBeanBridge extends ServerBridge {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBean.java
index b1da203..0342b10 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBean.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.management.internal.beans;
-import org.apache.geode.management.GatewaySenderMXBean;
import javax.management.NotificationBroadcasterSupport;
+import org.apache.geode.management.GatewaySenderMXBean;
+
public class GatewaySenderMBean extends NotificationBroadcasterSupport
implements GatewaySenderMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBeanBridge.java
index 37d1f66..5ed525c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/GatewaySenderMBeanBridge.java
@@ -31,8 +31,8 @@ import org.apache.geode.management.internal.beans.stats.StatsKey;
import org.apache.geode.management.internal.beans.stats.StatsRate;
/**
- *
- *
+ *
+ *
*/
public class GatewaySenderMBeanBridge {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBean.java
index 703ef63..8170005 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBean.java
@@ -19,8 +19,8 @@ import javax.management.NotificationBroadcasterSupport;
import org.apache.geode.management.LocatorMXBean;
/**
- *
- *
+ *
+ *
*/
public class LocatorMBean extends NotificationBroadcasterSupport implements LocatorMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBean.java
index bc4050f..c4770c7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBean.java
@@ -22,8 +22,8 @@ import org.apache.geode.management.LockServiceMXBean;
/**
* Management API to manage a Lock Service MBean
- *
- *
+ *
+ *
*/
public class LockServiceMBean extends NotificationBroadcasterSupport implements LockServiceMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBeanBridge.java
index 9ea8c61..34baa37 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LockServiceMBeanBridge.java
@@ -26,8 +26,8 @@ import org.apache.geode.management.internal.ManagementConstants;
/**
* This class acts as a Bridge between JMX layer and GemFire layer
- *
- *
+ *
+ *
*/
public class LockServiceMBeanBridge {
@@ -45,7 +45,7 @@ public class LockServiceMBeanBridge {
}
/**
- *
+ *
* @return currently held lock by this lock Service
*/
@@ -101,7 +101,7 @@ public class LockServiceMBeanBridge {
/**
* Returns a list of thread which are blocked on some Object
- *
+ *
* @return map of object Name and thread holding lock on that object
*/
public Map<String, String> listThreadsHoldingLock() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
index 98d1810..5c6dac1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
@@ -37,8 +37,8 @@ import org.apache.geode.management.internal.SystemManagementService;
/**
* This class is responsible for creating Aggregate MBeans at GemFire layer. It acts as a
* ProxyListener and add/remove/update the corresponding MBean aggregates accordingly.
- *
- *
+ *
+ *
*/
public class MBeanAggregator implements ProxyListener {
@@ -107,7 +107,7 @@ public class MBeanAggregator implements ProxyListener {
/**
* Public constructor.
- *
+ *
* @param distributedSystemBridge
*/
public MBeanAggregator(DistributedSystemBridge distributedSystemBridge) {
@@ -125,7 +125,7 @@ public class MBeanAggregator implements ProxyListener {
}
/**
- *
+ *
* @param interfaceClass class of the proxy interface
* @return appropriate handler instance to handle the proxy addition or removal
*/
@@ -189,8 +189,8 @@ public class MBeanAggregator implements ProxyListener {
/**
* Handler class for CacheServer MBeans only to provide data to Distributed System MBean As of
* today there wont be any Distributed counterpart of Cache Server MBean
- *
- *
+ *
+ *
*/
private class CacheServerHandler implements AggregateHandler {
@@ -225,8 +225,8 @@ public class MBeanAggregator implements ProxyListener {
/**
* Handler class for GatewayReceiverHandler MBeans only to provide data to Distributed System
* MBean As of today there wont be any Distributed counterpart of GatewayReceiverHandler MBean
- *
- *
+ *
+ *
*/
private class GatewayReceiverHandler implements AggregateHandler {
@@ -263,8 +263,8 @@ public class MBeanAggregator implements ProxyListener {
/**
* Handler class for GatewayReceiverHandler MBeans only to provide data to Distributed System
* MBean As of today there wont be any Distributed counterpart of GatewayReceiverHandler MBean
- *
- *
+ *
+ *
*/
private class GatewaySenderHandler implements AggregateHandler {
@@ -296,8 +296,8 @@ public class MBeanAggregator implements ProxyListener {
/**
* Handler class for DistributedRegion
- *
- *
+ *
+ *
*/
private class RegionHandler implements AggregateHandler {
@@ -329,8 +329,8 @@ public class MBeanAggregator implements ProxyListener {
/**
* Handler class for Distributed System
- *
- *
+ *
+ *
*/
private class MemberHandler implements AggregateHandler {
@@ -363,8 +363,8 @@ public class MBeanAggregator implements ProxyListener {
/**
* Handler class for Distributed Lock Service
- *
- *
+ *
+ *
*/
private class LockServiceHandler implements AggregateHandler {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
index e35e97b..5d0e07a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
@@ -79,7 +79,7 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
/**
* Acts as an intermediate between MBean layer and Federation Layer. Handles all Call backs from
* GemFire to instantiate or remove MBeans from GemFire Domain.
- *
+ *
* Even though this class have a lot of utility functions it interacts with the state of the system
* and contains some state itself.
*/
@@ -329,7 +329,7 @@ public class ManagementAdapter {
/**
* Handles Region Creation. This is the call back which will create the specified RegionMXBean and
* will send a notification on behalf of Member Mbean
- *
+ *
* @param region the region for which the call back is invoked
*/
public <K, V> void handleRegionCreation(Region<K, V> region) throws ManagementException {
@@ -364,7 +364,7 @@ public class ManagementAdapter {
/**
* Handles Disk Creation. Will create DiskStoreMXBean and will send a notification
- *
+ *
* @param disk the disk store for which the call back is invoked
*/
public void handleDiskCreation(DiskStore disk) throws ManagementException {
@@ -388,7 +388,7 @@ public class ManagementAdapter {
/**
* Handles LockService Creation
- *
+ *
* @param lockService
*/
public void handleLockServiceCreation(DLockService lockService) throws ManagementException {
@@ -420,7 +420,7 @@ public class ManagementAdapter {
/**
* Handles GatewaySender creation
- *
+ *
* @param sender the specific gateway sender
* @throws ManagementException
*/
@@ -446,7 +446,7 @@ public class ManagementAdapter {
/**
* Handles Gateway receiver creation
- *
+ *
* @param recv specific gateway receiver
* @throws ManagementException
*/
@@ -480,7 +480,7 @@ public class ManagementAdapter {
/**
* Handles Gateway receiver creation
- *
+ *
* @param recv specific gateway receiver
* @throws ManagementException
*/
@@ -506,7 +506,7 @@ public class ManagementAdapter {
/**
* Handles Gateway receiver creation
- *
+ *
* @param recv specific gateway receiver
* @throws ManagementException
*/
@@ -583,7 +583,7 @@ public class ManagementAdapter {
/**
* Sends the alert with the Object source as member. This notification will get filtered out for
* particular alert level
- *
+ *
* @param details
*/
public void handleSystemNotification(AlertDetails details) {
@@ -626,7 +626,7 @@ public class ManagementAdapter {
/**
* Assumption is its a cache server instance. For Gateway receiver there will be a separate method
- *
+ *
* @param cacheServer cache server instance
*/
public void handleCacheServerStart(CacheServer cacheServer) {
@@ -664,7 +664,7 @@ public class ManagementAdapter {
/**
* Assumption is its a cache server instance. For Gateway receiver there will be a separate method
- *
+ *
* @param server cache server instance
*/
public void handleCacheServerStop(CacheServer server) {
@@ -697,7 +697,7 @@ public class ManagementAdapter {
/**
* Handles Cache removal. It will automatically remove all MBeans from GemFire Domain
- *
+ *
* @param cache GemFire Cache instance. For now client cache is not supported
*/
public void handleCacheRemoval(Cache cache) throws ManagementException {
@@ -773,7 +773,7 @@ public class ManagementAdapter {
/**
* Handles particular region destroy or close operation it will remove the corresponding MBean
- *
+ *
* @param region
*/
public void handleRegionRemoval(Region region) throws ManagementException {
@@ -816,7 +816,7 @@ public class ManagementAdapter {
/**
* Handles DiskStore Removal
- *
+ *
* @param disk
*/
public void handleDiskRemoval(DiskStore disk) throws ManagementException {
@@ -854,7 +854,7 @@ public class ManagementAdapter {
/**
* Handles Lock Service Removal
- *
+ *
* @param lockService lock service instance
*/
public void handleLockServiceRemoval(DLockService lockService) throws ManagementException {
@@ -878,10 +878,10 @@ public class ManagementAdapter {
/**
* Handles management side call backs for a locator creation and start. Assumption is a cache will
* be created before hand.
- *
+ *
* There is no corresponding handleStopLocator() method. Locator will close the cache whenever its
* stopped and it should also shutdown all the management services by closing the cache.
- *
+ *
* @param locator instance of locator which is getting started
* @throws ManagementException
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
index fa93f6c..0e6821c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
@@ -57,12 +57,12 @@ public class ManagementListener implements ResourceEventsListener {
* Checks various conditions which might arise due to race condition for lock of
* GemFireCacheImpl.class which is obtained while GemFireCacheImpl constructor, cache.close(),
* DistributedSystem.disconnect().
- *
+ *
* As ManagementService creation logic is called in cache.init() method it leaves a small window
* of loosing the lock of GemFireCacheImpl.class
- *
+ *
* These checks ensures that something unwanted has not happened during that small window
- *
+ *
* @return true or false depending on the status of Cache and System
*/
private boolean shouldProceed(ResourceEvent event) {
@@ -90,7 +90,7 @@ public class ManagementListener implements ResourceEventsListener {
/**
* Handles various GFE resource life-cycle methods vis-a-vis Management and Monitoring
- *
+ *
* It checks for race conditions cases by calling shouldProceed();
*
* @param event Management event for which invocation has happened
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagerMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagerMBean.java
index 28917c6..0096f28 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagerMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagerMBean.java
@@ -19,7 +19,7 @@ import javax.management.JMException;
import org.apache.geode.management.ManagerMXBean;
/**
- *
+ *
*
*/
public class ManagerMBean implements ManagerMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java
index f3febc1..19a76aa 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java
@@ -27,8 +27,8 @@ import org.apache.geode.management.OSMetrics;
/**
* This MBean is a gateway to cache and a member
- *
- *
+ *
+ *
*/
public class MemberMBean extends NotificationBroadcasterSupport implements MemberMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
index 5b911d5..0afdfd1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
@@ -759,7 +759,7 @@ public class MemberMBeanBridge {
* All OS metrics are not present in java.lang.management.OperatingSystemMXBean It has to be cast
* to com.sun.management.OperatingSystemMXBean. To avoid the cast using dynamic call so that Java
* platform will take care of the details in a native manner;
- *
+ *
* @return Some basic OS metrics at the particular instance
*/
public OSMetrics fetchOSMetrics() {
@@ -851,7 +851,7 @@ public class MemberMBeanBridge {
/**
* Creates a Manager
- *
+ *
* @return successful or not
*/
public boolean createManager() {
@@ -863,7 +863,7 @@ public class MemberMBeanBridge {
/**
* An instruction to members with cache that they should compact their disk stores.
- *
+ *
* @return a list of compacted Disk stores
*/
public String[] compactAllDiskStores() {
@@ -882,7 +882,7 @@ public class MemberMBeanBridge {
/**
* List all the disk Stores at member level
- *
+ *
* @param includeRegionOwned indicates whether to show the disk belonging to any particular region
* @return list all the disk Stores name at cache level
*/
@@ -994,7 +994,7 @@ public class MemberMBeanBridge {
/**
* backs up all the disk to the targeted directory
- *
+ *
* @param targetDirPath path of the directory where back up is to be taken
* @return array of DiskBackup results which might get aggregated at Managing node Check the
* validity of this mbean call. When does it make sense to backup a single member of a
@@ -1297,7 +1297,7 @@ public class MemberMBeanBridge {
/**
* Returns true if the manager has been created. Note it does not need to be running so this
* method can return true when isManager returns false.
- *
+ *
* @return true if the manager has been created.
*/
public boolean isManagerCreated() {
@@ -1562,7 +1562,7 @@ public class MemberMBeanBridge {
/**
* Processes the given command string using the given environment information if it's non-empty.
* Result returned is in a JSON format.
- *
+ *
* @param commandString command string to be processed
* @param env environment information to be used for processing the command
* @return result of the processing the given command string.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java
index bc7ee89..8d71b9f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java
@@ -21,8 +21,8 @@ import org.apache.geode.management.internal.ManagementConstants;
/**
* This is a utility class to calculate various type of Metrics out of raw stats
- *
- *
+ *
+ *
*/
public class MetricsCalculator {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/PartitionedRegionBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/PartitionedRegionBridge.java
index 33c16e8..b24a48d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/PartitionedRegionBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/PartitionedRegionBridge.java
@@ -32,7 +32,7 @@ import org.apache.geode.management.internal.beans.stats.StatsLatency;
import org.apache.geode.management.internal.beans.stats.StatsRate;
/**
- *
+ *
*/
public class PartitionedRegionBridge<K, V> extends RegionMBeanBridge<K, V> {
@@ -280,7 +280,7 @@ public class PartitionedRegionBridge<K, V> extends RegionMBeanBridge<K, V> {
/**
* partition region entry count is taken from all primary bucket entry count. Ideally it should
* come from stats. to be done in 8.0
- *
+ *
* @return long
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBean.java
index 10ad5ea..af39424 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBean.java
@@ -26,10 +26,10 @@ import org.apache.geode.management.RegionMXBean;
/**
* Concrete implementation of RegionMXBean which exposes various configuration and runtime
* statistics about the region instance.
- *
+ *
* It extends NotificationBroadcasterSupport for any future implementation of notification.
- *
- *
+ *
+ *
*/
public class RegionMBean<K, V> extends NotificationBroadcasterSupport implements RegionMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
index 8cfd4f2..480c5c0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
@@ -380,7 +380,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return float
*/
public float getPutLocalRate() {
@@ -389,7 +389,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return float
*/
public float getPutRemoteRate() {
@@ -398,7 +398,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return long
*/
public long getPutRemoteAvgLatency() {
@@ -407,7 +407,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return long
*/
public long getPutRemoteLatency() {
@@ -416,7 +416,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return int
*/
public int getActualRedundancy() {
@@ -425,7 +425,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return int
*/
public int getAvgBucketSize() {
@@ -434,7 +434,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return int
*/
public int getBucketCount() {
@@ -447,7 +447,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return int
*/
public int getNumBucketsWithoutRedundancy() {
@@ -456,7 +456,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return int
*/
public int getPrimaryBucketCount() {
@@ -465,7 +465,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return int
*/
public int getTotalBucketSize() {
@@ -474,7 +474,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return list of fixed PR attributes
*/
public FixedPartitionAttributesData[] listFixedPartitionAttributes() {
@@ -483,7 +483,7 @@ public class RegionMBeanBridge<K, V> {
/**
* Only applicable for PRs
- *
+ *
* @return list of PR attributes
*/
public PartitionAttributesData listPartitionAttributes() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanCompositeDataFactory.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanCompositeDataFactory.java
index 7779931..99c9ff1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanCompositeDataFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanCompositeDataFactory.java
@@ -34,7 +34,7 @@ import org.apache.geode.management.internal.ManagementConstants;
/**
* Utility class to create CompositeDataTypes for RegionMXBean
- *
+ *
*
*/
public class RegionMBeanCompositeDataFactory {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/SequenceNumber.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/SequenceNumber.java
index 3664f8b..6733adf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/SequenceNumber.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/SequenceNumber.java
@@ -18,8 +18,8 @@ import java.util.concurrent.atomic.AtomicLong;
/**
* Class to give a consistent sequence number to notifications
- *
- *
+ *
+ *
*/
public class SequenceNumber {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/AggregateRegionStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/AggregateRegionStatsMonitor.java
index 6e49a60..3890f36 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/AggregateRegionStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/AggregateRegionStatsMonitor.java
@@ -28,7 +28,7 @@ import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor.Defaul
/**
- *
+ *
*
*/
public class AggregateRegionStatsMonitor extends MBeanStatsMonitor {
@@ -165,10 +165,10 @@ public class AggregateRegionStatsMonitor extends MBeanStatsMonitor {
/**
* Only decrease those values which can both increase and decrease and not values which can only
* increase like read/writes
- *
+ *
* Remove last sample value from the aggregate. Last Sampled value can be obtained from the
* DefaultHashMap for the disk
- *
+ *
* @param stats
*/
public void decreaseParStats(Statistics stats) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java
index 02d9b3d..4109fe7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.statistics.StatisticNotFoundException;
import org.apache.geode.internal.statistics.StatisticsNotification;
/**
- *
+ *
*
*/
public class GCStatsMonitor extends MBeanStatsMonitor {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java
index 558a050..05f3d68 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.statistics.ValueMonitor;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor.DefaultHashMap;
/**
- *
+ *
*
*/
public class MemberLevelDiskMonitor extends MBeanStatsMonitor {
@@ -159,10 +159,10 @@ public class MemberLevelDiskMonitor extends MBeanStatsMonitor {
/**
* Only decrease those values which can both increase and decrease and not values which can only
* increase like read/writes
- *
+ *
* Remove last sample value from the aggregate. Last Sampled value can be obtained from the
* DefaultHashMap for the disk
- *
+ *
* @param stats
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatType.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatType.java
index a407e49..5e7fbef 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatType.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatType.java
@@ -15,7 +15,7 @@
package org.apache.geode.management.internal.beans.stats;
/**
- *
+ *
*
*/
public enum StatType {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsAverageLatency.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsAverageLatency.java
index 0540571..7de9e5f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsAverageLatency.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsAverageLatency.java
@@ -17,7 +17,7 @@ package org.apache.geode.management.internal.beans.stats;
import org.apache.geode.management.internal.beans.MetricsCalculator;
/**
- *
+ *
*
*/
public class StatsAverageLatency {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsKey.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsKey.java
index aaedc71..968c954 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsKey.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsKey.java
@@ -349,6 +349,6 @@ public class StatsKey {
public static final String LINUX_SYSTEM_LOAD_AVERAGE5 = "loadAverage5";
// Sampler Stats
- public final static String JVM_PAUSES = "jvmPauses"; // int
+ public static final String JVM_PAUSES = "jvmPauses"; // int
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsLatency.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsLatency.java
index 96d1c45..5a2ada2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsLatency.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsLatency.java
@@ -17,7 +17,7 @@ package org.apache.geode.management.internal.beans.stats;
import org.apache.geode.management.internal.beans.MetricsCalculator;
/**
- *
+ *
*
*/
public class StatsLatency {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java
index bc2e400..20e1e3e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java
@@ -17,7 +17,7 @@ package org.apache.geode.management.internal.beans.stats;
import org.apache.geode.management.internal.beans.MetricsCalculator;
/**
- *
+ *
*
*/
public class StatsRate {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
index a62f926..a21eb81 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
@@ -24,8 +24,8 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
/**
* This class acts as a monitor and listen for VM stats update on behalf of MemberMBean.
- *
- *
+ *
+ *
*/
public class VMStatsMonitor extends MBeanStatsMonitor {
@@ -74,11 +74,11 @@ public class VMStatsMonitor extends MBeanStatsMonitor {
/**
* Right now it only refreshes CPU usage in terms of percentage. This method can be used for any
* other computation based on Stats in future.
- *
+ *
* Returns the time (as a percentage) that this member's process time with respect to Statistics
* sample time interval. If process time between two sample time t1 & t2 is p1 and p2 cpuUsage =
* ((p2-p1) * 100) / ((t2-t1)
- *
+ *
*/
private void refreshStats() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptor.java
index 1b84649..d1cbdcc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptor.java
@@ -18,8 +18,8 @@ import org.apache.geode.management.internal.cli.shell.Gfsh;
/**
* Semi-complete implementation of {@link CliAroundInterceptor} for convenience for implementors.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public abstract class AbstractCliAroundInterceptor implements CliAroundInterceptor {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java
index 7a95306..880ba6a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java
@@ -14,17 +14,17 @@
*/
package org.apache.geode.management.internal.cli;
+import java.nio.file.Path;
+
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.GfshExecutionStrategy;
-import java.nio.file.Path;
-
/**
* Interceptor interface which {@link GfshExecutionStrategy} can use to intercept before & after
* actual command execution.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface CliAroundInterceptor {
@@ -38,7 +38,7 @@ public interface CliAroundInterceptor {
/**
* called by the OperationInvoker after the command is executed
- *
+ *
* @param tempFile if the command's isFileDownloadOverHttp is true, the is the File downloaded
* after the http response is processed.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
index c6ab852..2358cb7 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
@@ -498,7 +498,7 @@ public class CliUtil {
/**
* Returns a set of all the members of the distributed system excluding locators.
- *
+ *
* @param cache
*/
@SuppressWarnings("unchecked")
@@ -509,7 +509,7 @@ public class CliUtil {
/**
* Returns a set of all the members of the distributed system including locators.
- *
+ *
* @param cache
*/
@SuppressWarnings("unchecked")
@@ -525,7 +525,7 @@ public class CliUtil {
/***
* Executes a function with arguments on a set of members , ignores the departed members.
- *
+ *
* @param function Function to be executed.
* @param args Arguments passed to the function, pass null if you wish to pass no arguments to the
* function.
@@ -596,7 +596,7 @@ public class CliUtil {
/**
* this finds the member that hosts all the regions passed in.
- *
+ *
* @param regions
* @param cache
* @param returnAll: if true, returns all matching members, otherwise, returns only one.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
index 0160598..44617d3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
@@ -46,7 +46,7 @@ import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
/**
*
* this only takes care of loading all available command markers and converters from the application
- *
+ *
* @since GemFire 7.0
*/
public class CommandManager {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandRequest.java
index cd991f7..a9772e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandRequest.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.cli.CliMetaData;
* The CommandRequest class encapsulates information pertaining to the command the user entered in
* Gfsh.
* <p/>
- *
+ *
* @see org.apache.geode.management.internal.cli.GfshParseResult
* @since GemFire 8.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponse.java
index 10bdbe8..a6db280 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponse.java
@@ -200,41 +200,41 @@ public class CommandResponse {
/*
** TABLE
- *
+ *
* { "sender": "member1", "version": "gemfire70", "contentType": "table", "page": "1/1",
* "tokenAccessor": "__NULL__", "status": "OK", "when": "January 12 2012", "debugData": [ "val1",
* "val2" ], "data": { "header": [ "Header1", "Header2", "Header3", "Header4" ], "content": [ [
* "val00", "val01", "val02", "val03" ], [ "val10", "val11", "val12", "val13" ], [ "val20", "val21",
* "val22", "val23" ] ] } }
- **
+ **
* TABLE SCROLLABLE
- *
+ *
* { "sender": "member1", "version": "gemfire70", "contentType": "table", "page": "1/5",
* "tokenHolder": "TOKEN12345", "status": "OK", "when": "January 12 2012", "debugData": [ "val1",
* "val2" ], "data": { "header": [ "Header1", "Header2", "Header3", "Header4" ], "content": [ [
* "val00", "val01", "val02", "val03" ], [ "val10", "val11", "val12", "val13" ], [ "val20", "val21",
* "val22", "val23" ] ] } }
- **
- *
+ **
+ *
* CATALOG
- *
+ *
* { "sender": "member1", "version": "gemfire70", "contentType": "catalog", "page": "1/1",
* "tokenHolder": "__NULL__", "status": "OK", "when": "January 12 2012", "debugData": [ "val1",
* "val2" ], "data": { "content": [ { "key1": "val1", "key2": "val2", "key3": "val3", "key4":
* "val4", "key5": "val5", "key6": "val6", "key7": "val7" } ] } }
- **
- *
+ **
+ *
* CATALOG SCROLLABLE
- *
+ *
* { "sender": "member1", "version": "gemfire70", "contentType": "catalog", "page": "1/10",
* "tokenHolder": "TOKEN1265765", "status": "OK", "when": "January 12 2012", "debugData": [ "val1",
* "val2" ], "data": { "content": [ { "key1": "val1", "key2": "val2", "key3": "val3", "key4":
* "val4", "key5": "val5", "key6": "val6", "key7": "val7" } ] } }
- **
- *
+ **
+ *
* Object as argument
- *
+ *
* { "com.foo.bar.Employee": { "id": 1234, "name": "Foo BAR", "department": { "id": 456, "name":
* "support" } } }
- *
+ *
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
index c41d2d6..e7152a5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
@@ -21,7 +21,7 @@ import org.apache.geode.management.internal.cli.remote.CommandExecutionContext;
import org.apache.geode.management.internal.cli.result.CommandResult;
/**
- *
+ *
* @since GemFire 7.0
*/
public class CommandResponseBuilder {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseWriter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseWriter.java
index 1f6b466..830c7d0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseWriter.java
@@ -24,8 +24,8 @@ import java.io.StringWriter;
* ThreadLocal copy of this writer which will be accessible through
* {@link org.apache.geode.management.internal.cli.remote.CommandExecutionContext#WRITER_WRAPPER}.
* NOTE: Not thread safe
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class CommandResponseWriter {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParseResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParseResult.java
index 8e3a58d..b3fd0fa 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParseResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParseResult.java
@@ -31,14 +31,14 @@ import org.apache.geode.management.internal.cli.shell.OperationInvoker;
/**
* Immutable representation of the outcome of parsing a given shell line. * Extends
* {@link ParseResult} to add a field to specify the command string that was input by the user.
- *
+ *
* <p>
* Some commands are required to be executed on a remote GemFire managing member. These should be
* marked with the annotation {@link CliMetaData#shellOnly()} set to <code>false</code>.
* {@link GfshExecutionStrategy} will detect whether the command is a remote command and send it to
* ManagementMBean via {@link OperationInvoker}.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class GfshParseResult extends ParseResult {
@@ -48,7 +48,7 @@ public class GfshParseResult extends ParseResult {
/**
* Creates a GfshParseResult instance to represent parsing outcome.
- *
+ *
* @param method Method associated with the command
* @param instance Instance on which this method has to be executed
* @param arguments arguments of the method
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
index 59d7206..accfbe3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
@@ -15,11 +15,12 @@
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
public class CommandAvailabilityIndicator implements CommandMarker {
@CliAvailabilityIndicator({CliStrings.LIST_CLIENTS, CliStrings.DESCRIBE_CLIENT,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
index 9014b43..789acf3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
@@ -42,6 +42,9 @@ import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
import org.apache.commons.lang.StringUtils;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.net.SSLConfigurationFactory;
@@ -65,8 +68,6 @@ import org.apache.geode.management.internal.cli.util.ConnectionEndpoint;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.management.internal.web.shell.HttpOperationInvoker;
import org.apache.geode.security.AuthenticationFailedException;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
public class ConnectCommand implements GfshCommand {
// millis that connect --locator will wait for a response from the locator.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
index dd56bc9..20cbeac 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
@@ -57,7 +57,7 @@ public class ExportLogsCommand implements GfshCommand {
public static final String FORMAT = "yyyy/MM/dd/HH/mm/ss/SSS/z";
public static final String ONLY_DATE_FORMAT = "yyyy/MM/dd";
- public final static String DEFAULT_EXPORT_LOG_LEVEL = "ALL";
+ public static final String DEFAULT_EXPORT_LOG_LEVEL = "ALL";
private static final Pattern DISK_SPACE_LIMIT_PATTERN = Pattern.compile("(\\d+)([kmgtKMGT]?)");
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
index 44d32a4..bfb8219 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
@@ -41,7 +41,7 @@ import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
/**
* Encapsulates methods used by StartServerCommand and StartLocatorCommand and their associated
* tests.
- *
+ *
* @see StartLocatorCommand
* @see StartServerCommand
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
index 0006815..1bcbbae 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
@@ -16,6 +16,16 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.apache.geode.internal.process.ProcessStreamReader.waitAndCaptureProcessStandardErrorStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.internal.lang.ObjectUtils;
@@ -31,15 +41,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.JmxOperationInvoker;
import org.apache.geode.management.internal.cli.util.ConnectionEndpoint;
import org.apache.geode.management.internal.cli.util.JdkTool;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
public class StartJConsoleCommand implements GfshCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
index 86ed2e6..699a482 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
@@ -16,6 +16,13 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.apache.geode.internal.process.ProcessStreamReader.waitAndCaptureProcessStandardErrorStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.internal.lang.StringUtils;
@@ -27,12 +34,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.InfoResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.util.JdkTool;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
public class StartJVisualVMCommand implements GfshCommand {
@CliCommand(value = CliStrings.START_JVISUALVM, help = CliStrings.START_JVISUALVM__HELP)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java
index d29eaa4..7719611 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java
@@ -17,6 +17,18 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.apache.geode.internal.Assert.assertState;
import static org.apache.geode.internal.process.ProcessStreamReader.waitAndCaptureProcessStandardErrorStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.internal.lang.StringUtils;
@@ -28,17 +40,6 @@ import org.apache.geode.management.internal.cli.commands.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.InfoResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
public class StartVsdCommand implements GfshCommand {
@CliCommand(value = CliStrings.START_VSD, help = CliStrings.START_VSD__HELP)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java
index 5dfb54e..ec3583c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java
@@ -17,6 +17,11 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.LOCATOR_TERM_NAME;
import static org.apache.geode.management.internal.cli.shell.MXBeanProvider.getMemberMXBean;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.AbstractLauncher;
import org.apache.geode.distributed.LocatorLauncher;
@@ -30,10 +35,6 @@ import org.apache.geode.management.internal.cli.commands.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.util.concurrent.TimeUnit;
public class StopLocatorCommand implements GfshCommand {
private static final long WAITING_FOR_STOP_TO_MAKE_PID_GO_AWAY_TIMEOUT_MILLIS = 30 * 1000;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java
index d5bd85a..526dcd8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java
@@ -16,6 +16,11 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.apache.geode.management.internal.cli.shell.MXBeanProvider.getMemberMXBean;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.AbstractLauncher;
import org.apache.geode.distributed.ServerLauncher;
@@ -29,10 +34,6 @@ import org.apache.geode.management.internal.cli.commands.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.util.concurrent.TimeUnit;
public class StopServerCommand implements GfshCommand {
private static final long WAITING_FOR_STOP_TO_MAKE_PID_GO_AWAY_TIMEOUT_MILLIS = 30 * 1000;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ClusterMemberIdNameConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ClusterMemberIdNameConverter.java
index 580debc..f6c3782 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ClusterMemberIdNameConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ClusterMemberIdNameConverter.java
@@ -19,13 +19,13 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
*
*
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConnectionEndpointConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConnectionEndpointConverter.java
index ed16fae..ce2965c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConnectionEndpointConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConnectionEndpointConverter.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.management.internal.cli.converters;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java
index 04c5fd4..f2750a8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java
@@ -14,12 +14,6 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.springframework.shell.core.Completion;
-import org.springframework.shell.core.Converter;
-import org.springframework.shell.core.MethodTarget;
-
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -28,9 +22,16 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import org.springframework.shell.core.Completion;
+import org.springframework.shell.core.Converter;
+import org.springframework.shell.core.MethodTarget;
+
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class DiskStoreNameConverter implements Converter<String> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathConverter.java
index 7232795..de2b702 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathConverter.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import org.apache.geode.management.cli.ConverterHint;
+import java.io.File;
+import java.util.List;
+
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
-import java.io.File;
-import java.util.List;
+import org.apache.geode.management.cli.ConverterHint;
/**
- *
+ *
* @since GemFire 7.0
*/
public class FilePathConverter implements Converter<File> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
index d1e3f9e..de777f3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.management.internal.cli.converters;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.management.cli.ConverterHint;
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
+import org.apache.geode.management.cli.ConverterHint;
/**
- *
+ *
* @since GemFire 7.0
*/
public class FilePathStringConverter implements Converter<String> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewayReceiverIdsConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewayReceiverIdsConverter.java
index 63e24aa..226a836 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewayReceiverIdsConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewayReceiverIdsConverter.java
@@ -20,14 +20,14 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.ManagementConstants;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
public class GatewayReceiverIdsConverter implements Converter<String> {
@Override
public boolean supports(Class<?> type, String optionContext) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
index 20b37b3..b154039 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
@@ -14,21 +14,22 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.springframework.shell.core.Completion;
-import org.springframework.shell.core.Converter;
-import org.springframework.shell.core.MethodTarget;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import org.springframework.shell.core.Completion;
+import org.springframework.shell.core.Converter;
+import org.springframework.shell.core.MethodTarget;
+
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.ManagementConstants;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
- *
+ *
* @since GemFire 7.0
*/
public class GatewaySenderIdConverter implements Converter<String> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HelpConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HelpConverter.java
index 502eddd..bca586d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HelpConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HelpConverter.java
@@ -28,7 +28,7 @@ import org.apache.geode.management.internal.cli.commands.GfshHelpCommand;
/**
* {@link Converter} for {@link GfshHelpCommand#obtainHelp(String)}
- *
+ *
*
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HintTopicConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HintTopicConverter.java
index 17667ca..5b9597a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HintTopicConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/HintTopicConverter.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.CommandManager;
-import org.apache.geode.management.internal.cli.CommandManagerAware;
-import org.apache.geode.management.internal.cli.help.Helper;
+import java.util.List;
+import java.util.Set;
+
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
-import java.util.List;
-import java.util.Set;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.CommandManager;
+import org.apache.geode.management.internal.cli.CommandManagerAware;
+import org.apache.geode.management.internal.cli.help.Helper;
/**
- *
+ *
* @since GemFire 7.0
*/
public class HintTopicConverter implements Converter<String>, CommandManagerAware {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
index 4c76523..a4b94cb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
@@ -19,13 +19,13 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
*
*
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java
index 7d188cf..57904ae 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java
@@ -19,13 +19,13 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
*
*
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LogLevelConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LogLevelConverter.java
index b303e77..4da62bd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LogLevelConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LogLevelConverter.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import org.apache.geode.management.cli.ConverterHint;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.logging.log4j.Level;
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+import org.apache.geode.management.cli.ConverterHint;
/**
- *
+ *
* @since GemFire 7.0
*/
public class LogLevelConverter implements Converter<String> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
index e961911..e91d407 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
@@ -27,7 +27,7 @@ import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.cli.shell.Gfsh;
/**
- *
+ *
* @since GemFire 7.0
*/
public class MemberGroupConverter implements Converter<String> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberIdNameConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberIdNameConverter.java
index 243b4c5..5d2aee7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberIdNameConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberIdNameConverter.java
@@ -19,13 +19,13 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
*
*
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/RegionPathConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/RegionPathConverter.java
index d7d70f9..e76bdd6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/RegionPathConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/RegionPathConverter.java
@@ -29,7 +29,7 @@ import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.cli.shell.Gfsh;
/**
- *
+ *
* @since GemFire 7.0
*/
public class RegionPathConverter implements Converter<String> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/AsyncEventQueueDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/AsyncEventQueueDetails.java
index f7f7e2c..720fe6f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/AsyncEventQueueDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/AsyncEventQueueDetails.java
@@ -17,7 +17,7 @@ package org.apache.geode.management.internal.cli.domain;
/**
* Used to transfer information about an AsyncEventQueue from a function being executed on a server
* back to the manager that invoked the function.
- *
+ *
* @since GemFire 8.0
*/
import java.io.Serializable;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/ConnectToLocatorResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/ConnectToLocatorResult.java
index ba00af8..49a74b5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/ConnectToLocatorResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/ConnectToLocatorResult.java
@@ -17,14 +17,14 @@ package org.apache.geode.management.internal.cli.domain;
import org.apache.geode.management.internal.cli.util.ConnectionEndpoint;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class ConnectToLocatorResult {
private ConnectionEndpoint memberEndpoint = null;
private String resultMessage;
- final private boolean isJmxManagerSslEnabled;
+ private final boolean isJmxManagerSslEnabled;
public ConnectToLocatorResult(ConnectionEndpoint memberEndpoint, String resultMessage,
boolean isJmxManagerSslEnabled) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java
index b2c3352..5acee2e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
/**
* Domain object used for Data Commands Functions
- *
+ *
*/
public class DataCommandRequest implements Serializable {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
index d1a1107..112a304 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
@@ -15,11 +15,6 @@
package org.apache.geode.management.internal.cli.domain;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.cache.DiskStoreFactory;
-import org.apache.geode.internal.lang.MutableIdentifiable;
-import org.apache.geode.internal.lang.ObjectUtils;
-
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -28,12 +23,18 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.internal.lang.MutableIdentifiable;
+import org.apache.geode.internal.lang.ObjectUtils;
+
/**
* The DiskStoreDetails class captures information about a particular disk store for a GemFire
* distributed system member. Each disk store for a member should be captured in separate instance
* of this class.
* </p>
- *
+ *
* @see org.apache.geode.cache.DiskStore
* @see org.apache.geode.cache.DiskStoreFactory
* @see org.apache.geode.lang.Identifiable
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java
index 6c1257d..ca56305 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java
@@ -28,7 +28,7 @@ import org.apache.geode.management.internal.cli.util.RegionAttributesNames;
public class EvictionAttributesInfo implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private String evictionAction = "";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java
index eb0435a..292565e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.FixedPartitionAttributes;
public class FixedPartitionAttributesInfo implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private boolean isPrimary;
@@ -67,5 +67,3 @@ public class FixedPartitionAttributesInfo implements Serializable {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
index d588cd8..7792fb8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.lang.ObjectUtils;
/**
* The IndexDetails class encapsulates information for an Index on a Region in the GemFire Cache.
* </p>
- *
+ *
* @see org.apache.geode.cache.query.Index
* @see org.apache.geode.cache.query.IndexStatistics
* @see org.apache.geode.cache.query.IndexType
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexInfo.java
index 26c9b4e..24559c8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexInfo.java
@@ -37,7 +37,7 @@ public class IndexInfo implements Serializable {
/***
* Used for passing index information for destroying index.
- *
+ *
* @param indexName
* @param regionPath
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/MemberInformation.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/MemberInformation.java
index ca16076..e00e780 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/MemberInformation.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/MemberInformation.java
@@ -27,7 +27,7 @@ import java.util.Set;
*/
public class MemberInformation implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private String name;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java
index 893a7fa..72eaef3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java
@@ -38,7 +38,7 @@ import org.apache.geode.management.internal.cli.util.RegionAttributesNames;
public class PartitionAttributesInfo implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private int totalNumBuckets = 0;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java
index 4571b90..18ad530 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java
@@ -41,7 +41,7 @@ import org.apache.geode.management.internal.cli.util.RegionAttributesNames;
public class RegionAttributesInfo implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescription.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescription.java
index f6766cc..d0d5640 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescription.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescription.java
@@ -30,8 +30,8 @@ import org.apache.geode.cache.Scope;
/***
* Data class which contains description of a region and provides the aggregated view of the region
* Used by describe region command
- *
- *
+ *
+ *
*/
public class RegionDescription implements Serializable {
@@ -69,9 +69,9 @@ public class RegionDescription implements Serializable {
/**
* Adds the RegionDescription per member to the aggregated view
- *
+ *
* @param regionDescPerMember
- *
+ *
*/
public boolean add(RegionDescriptionPerMember regionDescPerMember) {
boolean isAdded = false;
@@ -209,7 +209,7 @@ public class RegionDescription implements Serializable {
/***
* Get
- *
+ *
* @return Map containing attribute name and its associated value
*/
public Map<String, String> getCndRegionAttributes() {
@@ -218,7 +218,7 @@ public class RegionDescription implements Serializable {
/***
* Gets the common non-default Eviction Attributes
- *
+ *
* @return Map containing attribute name and its associated value
*/
public Map<String, String> getCndEvictionAttributes() {
@@ -227,7 +227,7 @@ public class RegionDescription implements Serializable {
/***
* Gets the common non-default PartitionAttributes
- *
+ *
* @return Map containing attribute name and its associated value
*/
public Map<String, String> getCndPartitionAttributes() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionPerMember.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionPerMember.java
index ef03c45..b181b80 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionPerMember.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionPerMember.java
@@ -26,7 +26,7 @@ import org.apache.geode.cache.Scope;
public class RegionDescriptionPerMember implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
index 1f19786..57e4912 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.management.internal.cli.domain;
+import java.io.Serializable;
+import java.util.*;
+
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
-import java.io.Serializable;
-import java.util.*;
-
/***
* Gives the most basic common information of a region Used by the GetRegionsFunction for 'list
* region' command since 7.0
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
index ae0b756..46d89ef 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
@@ -24,11 +30,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
public class AlterRuntimeConfigFunction extends FunctionAdapter implements InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java
index 87c806b..7220413 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java
@@ -16,28 +16,29 @@ package org.apache.geode.management.internal.cli.functions;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.logging.log4j.LogWriterLogger;
-import org.apache.geode.internal.logging.log4j.LogLevel;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
/**
- *
+ *
* Class for change log level function
- *
+ *
* since 8.0
- *
+ *
*/
public class ChangeLogLevelFunction implements Function, InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
index 401c1a8..57589ef 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
@@ -14,11 +14,6 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -28,6 +23,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+
public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSerializableFixedID {
private String memberIdOrName;
private Serializable[] serializables = new String[0];
@@ -223,7 +223,7 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer
/**
* Remove elements from the list that are not instances of CliFunctionResult and then sort the
* results.
- *
+ *
* @param results The results to clean.
* @return The cleaned results.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java
index f6ced99..f4e931f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java
@@ -17,6 +17,7 @@ package org.apache.geode.management.internal.cli.functions;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.internal.InternalEntity;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
index bbf4bf1..41fd042 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
@@ -16,7 +16,7 @@ package org.apache.geode.management.internal.cli.functions;
/**
* Function used by the 'create disk-store' gfsh command to create a disk store on each member.
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
index c8392e4..ba791f6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
@@ -766,7 +766,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
/**
* Returns a sorted list of all region full paths found in the specified cache.
- *
+ *
* @param cache The cache to search.
* @param recursive recursive search for sub-regions
* @return Returns a sorted list of all region paths defined in the distributed system.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
index 6a9d5b4..1bbc3b5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
@@ -15,7 +15,14 @@
package org.apache.geode.management.internal.cli.functions;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.DiskStore;
@@ -34,12 +41,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
/**
* The DescribeDiskStoreFunction class is an implementation of a GemFire Function used to collect
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
index ad98ed1..f617d48 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function used by the 'destroy disk-store' gfsh command to destroy a disk store on each member.
- *
+ *
* @since GemFire 8.0
*/
public class DestroyDiskStoreFunction extends FunctionAdapter implements InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java
index d76c2fb..6e45c56 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java
@@ -94,7 +94,7 @@ public class DestroyIndexFunction extends FunctionAdapter implements InternalEnt
}
/***
- *
+ *
* @param name
* @param queryService
* @return true if the index was found and removed/false if the index was not found.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java
index 6a60c91..9d4cf9f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java
@@ -30,13 +30,13 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
/***
* Function which carries out the export of a region to a file on a member. Uses the
* RegionSnapshotService to export the data
- *
+ *
*
*/
public class ExportDataFunction extends FunctionAdapter implements InternalEntity {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java
index 21c395d..06956fc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -22,10 +24,9 @@ import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.logging.log4j.Logger;
/**
- *
+ *
* @since GemFire 7.0
*/
public class FetchRegionAttributesFunction extends FunctionAdapter {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
index c688d7a..09814c1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.cli.functions;
import org.apache.commons.lang.StringUtils;
+
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java
index 0ba0f01..b7b1bc5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java
@@ -16,6 +16,7 @@ package org.apache.geode.management.internal.cli.functions;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
@@ -25,11 +26,11 @@ import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.util.BytesToString;
/**
- *
+ *
* Class for Garbage collection function
- *
- *
- *
+ *
+ *
+ *
*/
public class GarbageCollectionFunction implements Function, InternalEntity {
public static final String ID = GarbageCollectionFunction.class.getName();
@@ -76,5 +77,3 @@ public class GarbageCollectionFunction implements Function, InternalEntity {
return false;
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java
index ff37ae2..3a1a9c9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java
@@ -106,7 +106,7 @@ public class GatewayReceiverCreateFunction extends FunctionAdapter implements In
/**
* GatewayReceiver creation happens here.
- *
+ *
* @param cache
* @param gatewayReceiverCreateArgs
* @return GatewayReceiver
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java
index 4ebeb8d..d3964f5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java
@@ -88,7 +88,7 @@ public class GatewaySenderCreateFunction extends FunctionAdapter implements Inte
/**
* Creates the GatewaySender with given configuration.
- *
+ *
* @param cache
* @param gatewaySenderCreateArgs
* @return GatewaySender
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java
index d1c5116..fc3ec6b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
@@ -24,7 +26,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderException;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.logging.log4j.Logger;
public class GatewaySenderDestroyFunction extends FunctionAdapter implements InternalEntity {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionArgs.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionArgs.java
index cf3fa24..361cf63 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionArgs.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionArgs.java
@@ -30,4 +30,3 @@ public class GatewaySenderDestroyFunctionArgs implements Serializable {
return id;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index 9e01c93..1c898b4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.*;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
@@ -28,20 +34,14 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.ha.HARegionQueue;
import org.apache.geode.management.internal.cli.domain.MemberConfigurationInfo;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/****
- *
+ *
*
*/
public class GetMemberConfigInformationFunction extends FunctionAdapter implements InternalEntity {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -135,7 +135,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
/****
* Gets the default values for the cache attributes
- *
+ *
* @return a map containing the cache attributes - default values
*/
private Map<String, String> getCacheAttributesDefaultValues() {
@@ -164,7 +164,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
/***
* Gets the default values for the cache attributes
- *
+ *
* @return a map containing the cache server attributes - default values
*/
private Map<String, String> getCacheServerAttributesDefaultValues() {
@@ -193,7 +193,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
/****
* Removes the default values from the attributesMap based on defaultAttributesMap
- *
+ *
* @param attributesMap
* @param defaultAttributesMap
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberInformationFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberInformationFunction.java
index 51b3ec4..c1a95d4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberInformationFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberInformationFunction.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.FunctionAdapter;
@@ -29,21 +36,14 @@ import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.domain.CacheServerInfo;
import org.apache.geode.management.internal.cli.domain.MemberInformation;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryUsage;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/***
- *
+ *
* since 7.0
*/
public class GetMemberInformationFunction extends FunctionAdapter implements InternalEntity {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
index 25b81ee..d7277ee 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
@@ -36,7 +36,7 @@ import org.apache.geode.management.internal.cli.domain.AsyncEventQueueDetails;
* An implementation of GemFire Function interface used to determine all the async event queues that
* exist for the entire cache, distributed across the GemFire distributed system.
* </p>
- *
+ *
* @since GemFire 8.0
*/
public class ListAsyncEventQueuesFunction extends FunctionAdapter implements InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
index 9ab5978..7ed83db 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
@@ -16,8 +16,6 @@ package org.apache.geode.management.internal.cli.functions;
import java.util.List;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.DeployedJar;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
@@ -25,6 +23,8 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.DeployedJar;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.cache.InternalCache;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction.java
index c98f585..11072ff 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
* determine all the disk stores that exist for the entire cache, distributed across the GemFire
* distributed system.
* </p>
- *
+ *
* @see org.apache.geode.cache.DiskStore
* @see org.apache.geode.cache.execute.Function
* @see org.apache.geode.cache.execute.FunctionAdapter
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
index 22b8021..e5d1c63 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
@@ -34,7 +34,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
* The ListDurableCqs class is a GemFire function used to collect all the durable client names on
* the server
* </p>
- *
+ *
* @see org.apache.geode.cache.Cache
* @see org.apache.geode.cache.execute.Function
* @see org.apache.geode.cache.execute.FunctionAdapter
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListIndexFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListIndexFunction.java
index 0a44c76..da7bc69 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListIndexFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListIndexFunction.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.internal.cli.domain.IndexDetails;
* The ListIndexFunction class is a GemFire function used to collect all the index information on
* all Regions across the entire GemFire Cache (distributed system).
* </p>
- *
+ *
* @see org.apache.geode.cache.Cache
* @see org.apache.geode.cache.execute.Function
* @see org.apache.geode.cache.execute.FunctionAdapter
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
index de176a7..6ed1e17 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.logging.LogService;
/**
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java
index 5c1cb29..c934427 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/NetstatFunction.java
@@ -39,7 +39,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
/**
* Executes 'netstat' OS command & returns the result as compressed bytes.
- *
+ *
* @since GemFire 7.0
*/
@SuppressWarnings({"serial"})
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
index 8933f6a..8876035 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
@@ -42,7 +42,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function used by the 'alter region' gfsh command to alter a region on each member.
- *
+ *
* @since GemFire 8.0
*/
public class RegionAlterFunction extends FunctionAdapter implements InternalEntity {
@@ -288,10 +288,10 @@ public class RegionAlterFunction extends FunctionAdapter implements InternalEnti
/**
* Converts the expiration attributes passed as arguments from the command to the function into a
* type suitable for applying to a Region.
- *
+ *
* @param newExpirationAttrs Attributes supplied by the command
* @param oldExpirationAttributes Attributes currently applied to the Region.
- *
+ *
* @return A new pair of expiration attributes taken from the command if it was given or the
* current value from the Region if it was not.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
index b658e61..d7cf091 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
- *
+ *
* @since GemFire 7.0
*/
public class RegionDestroyFunction implements Function, InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShutDownFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShutDownFunction.java
index 83d694f..27c317c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShutDownFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShutDownFunction.java
@@ -14,25 +14,26 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.tcp.ConnectionTable;
-import org.apache.logging.log4j.Logger;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
/**
- *
+ *
* Class for Shutdown function
- *
- *
- *
+ *
+ *
+ *
*/
public class ShutDownFunction implements Function, InternalEntity {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
index fbb60a0..ba6ab15 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
@@ -17,9 +17,6 @@ package org.apache.geode.management.internal.cli.functions;
import java.io.File;
import java.io.IOException;
-import org.apache.geode.management.ManagementException;
-import org.apache.geode.management.internal.cli.util.BytesToString;
-import org.apache.geode.management.internal.cli.util.LogExporter;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.execute.Function;
@@ -30,6 +27,9 @@ import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.management.ManagementException;
+import org.apache.geode.management.internal.cli.util.BytesToString;
+import org.apache.geode.management.internal.cli.util.LogExporter;
import org.apache.geode.management.internal.cli.util.LogFilter;
public class SizeExportLogsFunction extends ExportLogsFunction implements Function, InternalEntity {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
index 6ab7cf1..98b3cd5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.geode.internal.ClassPathLoader;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
@@ -26,8 +25,9 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.InternalEntity;
+import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.DeployedJar;
+import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
index 4d7adf0..506d7a8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
@@ -20,11 +20,11 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.internal.InternalEntity;
/**
- *
+ *
* Class for Unregister function
- *
- *
- *
+ *
+ *
+ *
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
index 449b979..c33edb7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java
@@ -173,4 +173,3 @@ public class UserFunctionExecution implements Function, InternalEntity {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
index 78879d3..b69e7e0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
@@ -14,13 +14,14 @@
*/
package org.apache.geode.management.internal.cli.help;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.lang.StringUtils;
+
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
index 3525013..917f3e4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
@@ -14,15 +14,6 @@
*/
package org.apache.geode.management.internal.cli.help;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.management.cli.CliMetaData;
-import org.apache.geode.management.internal.cli.GfshParser;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.springframework.shell.core.MethodTarget;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -35,9 +26,19 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.shell.core.MethodTarget;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.internal.cli.GfshParser;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class Helper {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Topic.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Topic.java
index 3ea896c..9ed248f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Topic.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Topic.java
@@ -54,5 +54,3 @@ public class Topic implements Comparable<Topic> {
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
index c5299bf..ed956e3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
@@ -17,14 +17,15 @@ package org.apache.geode.management.internal.cli.json;
import java.util.Collection;
import java.util.Map;
-import org.apache.geode.management.internal.cli.LogWrapper;
import org.json.JSONArray;
import org.json.JSONException;
+import org.apache.geode.management.internal.cli.LogWrapper;
+
/**
* Wrapper over JSONArray.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class GfJsonArray {
@@ -35,7 +36,7 @@ public class GfJsonArray {
}
/**
- *
+ *
* @param array
* @throws GfJsonException If not an array.
*/
@@ -52,7 +53,7 @@ public class GfJsonArray {
}
/**
- *
+ *
* @param source
* @throws GfJsonException If there is a syntax error.
*/
@@ -66,7 +67,7 @@ public class GfJsonArray {
/**
* Get the object value associated with an index.
- *
+ *
* @param index
* @return An object value.
* @throws GfJsonException If there is no value for the index.
@@ -94,7 +95,7 @@ public class GfJsonArray {
}
/**
- *
+ *
* @param index
* @param value
* @return this GfJsonArray
@@ -115,7 +116,7 @@ public class GfJsonArray {
}
/**
- *
+ *
* @param index
* @param value
* @return this GfJsonArray
@@ -136,7 +137,7 @@ public class GfJsonArray {
}
/**
- *
+ *
* @param index
* @param value
* @return this GfJsonArray
@@ -161,7 +162,7 @@ public class GfJsonArray {
}
/**
- *
+ *
* @param indentFactor
* @return this GfJsonArray
* @throws GfJsonException If the object contains an invalid number.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonException.java
index 9c710d5..16bece2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonException.java
@@ -16,9 +16,9 @@ package org.apache.geode.management.internal.cli.json;
/**
* Wraps GemFire JSON Exceptions
- *
- *
- *
+ *
+ *
+ *
* @since GemFire 7.0
*/
public class GfJsonException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
index 66e9f79..ceda1b2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
@@ -26,8 +26,8 @@ import org.json.JSONObject;
/**
* Wrapper over JSONObject.
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class GfJsonObject {
@@ -73,7 +73,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param source A string beginning with { (left brace) and ending with } (right brace).
* @throws GfJsonException - If there is a syntax error in the source string or a duplicated key.
*/
@@ -86,7 +86,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param key
* @param value
* @return this GfJsonObject
@@ -122,7 +122,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param key
* @param value
* @return this GfJsonObject
@@ -175,7 +175,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param key
* @return this GfJsonObject
* @throws GfJsonException If there is a syntax error while preparing GfJsonArray.
@@ -189,7 +189,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @return A GfJsonArray containing the key strings, or null if the internal JSONObject is empty.
* @throws GfJsonException If there is a syntax error while preparing GfJsonArray.
*/
@@ -204,7 +204,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param key
* @param value
* @return this GfJsonObject object
@@ -234,7 +234,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param key
* @param value
* @return this GfJsonObject
@@ -250,7 +250,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param key
* @param value
* @return this GfJsonObject
@@ -313,7 +313,7 @@ public class GfJsonObject {
}
/**
- *
+ *
* @param indentFactor
* @return this GfJsonObject
* @throws GfJsonException If the object contains an invalid number.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
index 107ac0b..d0248b4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
@@ -39,7 +39,7 @@ import org.apache.geode.pdx.PdxInstance;
* A limited functionality JSON parser. Its a DSF based JSON parser. It does not create Object maps
* and serialize them like JSONObject. It just traverses an Object graph in depth first search
* manner and appends key values to a String writer. Hence we prevent creating a lot of garbage.
- *
+ *
* Although it has limited functionality,still a simple use of add() method should suffice for most
* of the simple JSON use cases.
*/
@@ -149,13 +149,13 @@ public class TypedJson {
/**
* User can build on this object by adding Objects against a key.
- *
+ *
* TypedJson result = new TypedJson(); result.add(KEY,object); If users add more objects against
* the same key the newly added object will be appended to the existing key forming an array of
* objects.
- *
+ *
* If the KEY is a new one then it will be a key map value.
- *
+ *
* @param key Key against which an object will be added
* @param value Object to be added
* @return TypedJson object
@@ -716,7 +716,7 @@ public class TypedJson {
/**
* Produce a string from a Number.
- *
+ *
* @param number A Number
* @return A String.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/modes/CommandModes.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/modes/CommandModes.java
index df78f73..c50fbf3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/modes/CommandModes.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/modes/CommandModes.java
@@ -21,13 +21,14 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.geode.LogWriter;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+
public class CommandModes {
public static final String DEFAULT_MODE = "default";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
index fd4ebb7..41456f4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
@@ -22,7 +22,7 @@ import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.shell.Gfsh;
/**
- *
+ *
* @since GemFire 7.0
*/
public class CommandExecutionContext {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandStatementImpl.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandStatementImpl.java
index c9a717e..c93dce8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandStatementImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandStatementImpl.java
@@ -20,8 +20,8 @@ import org.apache.geode.management.cli.CommandStatement;
import org.apache.geode.management.cli.Result;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*
* @deprecated since Geode 1.3. simply use commandProcessor to process the command
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/WrapperThreadLocal.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/WrapperThreadLocal.java
index 49ef9fb..f3a1f07 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/WrapperThreadLocal.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/WrapperThreadLocal.java
@@ -15,10 +15,10 @@
package org.apache.geode.management.internal.cli.remote;
/**
- *
- *
+ *
+ *
* @param <T> Type of ThreadLocal variable
- *
+ *
* @since GemFire 7.0
*/
public abstract class WrapperThreadLocal<T> extends ThreadLocal<T> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
index 847273a..9357896 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
@@ -34,8 +34,8 @@ import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.management.internal.cli.shell.Gfsh;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public abstract class AbstractResultData implements ResultData {
@@ -89,7 +89,7 @@ public abstract class AbstractResultData implements ResultData {
}
/**
- *
+ *
* @param headerText
* @return this ResultData
* @throws ResultDataException If the value is non-finite number or if the key is null.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializable.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializable.java
index 8fba64b..7807f0e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializable.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializable.java
@@ -19,8 +19,8 @@ import java.util.Map;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface CliJsonSerializable extends CliJsonSerializableIds {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializableIds.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializableIds.java
index e1ece36..e5ffef3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializableIds.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CliJsonSerializableIds.java
@@ -15,8 +15,8 @@
package org.apache.geode.management.internal.cli.result;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface CliJsonSerializableIds {
@@ -27,5 +27,3 @@ public interface CliJsonSerializableIds {
/* CLI Data Transfer Objects 100 onwards - add below */
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
index 32685d5..1802b9b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
@@ -36,7 +36,7 @@ import org.apache.geode.management.internal.cli.result.TableBuilder.Table;
/**
* Wraps the Result of a command execution.
- *
+ *
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResultException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResultException.java
index dde184a..396a944 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResultException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResultException.java
@@ -18,7 +18,7 @@ import org.apache.geode.management.cli.Result;
/**
* Exception wrapper around a command result.
- *
+ *
* @since GemFire 7.0
*/
public class CommandResultException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
index 9d93d3a..a35cfb1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
@@ -21,8 +21,8 @@ import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class CompositeResultData extends AbstractResultData {
@@ -44,7 +44,7 @@ public class CompositeResultData extends AbstractResultData {
}
/**
- *
+ *
* @param headerText
* @return this CompositeResultData
* @throws ResultDataException If the value is non-finite number or if the key is null.
@@ -54,7 +54,7 @@ public class CompositeResultData extends AbstractResultData {
}
/**
- *
+ *
* @param footerText
* @return this CompositeResultData
* @throws ResultDataException If the value is non-finite number or if the key is null.
@@ -128,7 +128,7 @@ public class CompositeResultData extends AbstractResultData {
}
/**
- *
+ *
* @since GemFire 7.0
*/
public static class SectionResultData {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ErrorResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ErrorResultData.java
index 9734bf2..07a9a8f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ErrorResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ErrorResultData.java
@@ -19,8 +19,8 @@ import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class ErrorResultData extends InfoResultData {
@@ -48,7 +48,7 @@ public class ErrorResultData extends InfoResultData {
}
/**
- *
+ *
* @param errorCode
* @return this ErrorResultData
* @throws ResultDataException If the errorCode value is a non-finite number or invalid.
@@ -64,7 +64,7 @@ public class ErrorResultData extends InfoResultData {
}
/**
- *
+ *
* @param headerText
* @return this ErrorResultData
* @throws ResultDataException
@@ -74,7 +74,7 @@ public class ErrorResultData extends InfoResultData {
}
/**
- *
+ *
* @param line message to add
* @return this ErrorResultData
*/
@@ -83,7 +83,7 @@ public class ErrorResultData extends InfoResultData {
}
/**
- *
+ *
* @param footerText
* @return this InfoResultData
* @throws ResultDataException
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/FileResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/FileResult.java
index 308afc5..8d3ffac 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/FileResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/FileResult.java
@@ -21,8 +21,8 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CliUtil;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class FileResult implements Result {
@@ -62,7 +62,7 @@ public class FileResult implements Result {
/**
* Calculates the total file size of all files associated with this result.
- *
+ *
* @return Total file size.
*/
public long computeFileSizeTotal() {
@@ -75,7 +75,7 @@ public class FileResult implements Result {
/**
* Get a comma separated list of all files associated with this result.
- *
+ *
* @return Comma separated list of files.
*/
public String getFormattedFileList() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ObjectResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ObjectResultData.java
index cc32408..ab30a7c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ObjectResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ObjectResultData.java
@@ -23,8 +23,8 @@ import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class ObjectResultData<T extends CliJsonSerializable> extends AbstractResultData {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
index 22db17c..07dfd05 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
@@ -48,7 +48,7 @@ public class ResultBuilder {
* <p/>
* Note: To build your own error result, use {@link #createErrorResultData()} to build
* {@link ErrorResultData} & then use {@link #buildResult(ResultData)}
- *
+ *
* @param message Message to be shown to the user
*/
public static CommandResult createConnectionErrorResult(String message) {
@@ -70,7 +70,7 @@ public class ResultBuilder {
* <p/>
* Note: To build your own error result, use {@link #createErrorResultData()} to build
* {@link ErrorResultData} & then use {@link #buildResult(ResultData)}
- *
+ *
* @param message Message to be shown to the user
*/
public static CommandResult createParsingErrorResult(String message) {
@@ -86,7 +86,7 @@ public class ResultBuilder {
* <p/>
* Note: To build your own error result, use {@link #createErrorResultData()} to build
* {@link ErrorResultData} & then use {@link #buildResult(ResultData)}
- *
+ *
* @param message Message to be shown to the user
*/
public static CommandResult createGemFireErrorResult(String message) {
@@ -107,7 +107,7 @@ public class ResultBuilder {
* <p/>
* Note: To build your own error result, use {@link #createErrorResultData()} to build
* {@link ErrorResultData} & then use {@link #buildResult(ResultData)}
- *
+ *
* @param message Message to be shown to the user
*/
public static CommandResult createBadResponseErrorResult(String message) {
@@ -120,7 +120,7 @@ public class ResultBuilder {
* <p/>
* Note: To build your own error result, use {@link #createErrorResultData()} to build
* {@link ErrorResultData} & then use {@link #buildResult(ResultData)}
- *
+ *
* @param errorCode error code should be one of ResultBuilder.ERRORCODE_**
* @param message message for the error
*/
@@ -133,7 +133,7 @@ public class ResultBuilder {
/**
* Convenience method to create a simple Info Result that takes a message.
- *
+ *
* @param message Message for the OK Result
*/
public static Result createInfoResult(String message) {
@@ -145,7 +145,7 @@ public class ResultBuilder {
/**
* Creates a {@link TabularResultData} object to start building result that should be shown in a
* Tabular Format.
- *
+ *
* @return TabularResultData instance
*/
public static TabularResultData createTabularResultData() {
@@ -163,7 +163,7 @@ public class ResultBuilder {
/**
* Creates a {@link InfoResultData} object to start building result that is required to be shown
* as an information without any specific format.
- *
+ *
* @return InfoResultData instance
*/
public static InfoResultData createInfoResultData() {
@@ -172,7 +172,7 @@ public class ResultBuilder {
/**
* Creates a {@link ErrorResultData} object to start building result for an error.
- *
+ *
* @return ErrorResultData instance
*/
public static ErrorResultData createErrorResultData() {
@@ -181,7 +181,7 @@ public class ResultBuilder {
/**
* Build a Result object from the given ResultData
- *
+ *
* @param resultData data to use to build Result
*/
public static CommandResult buildResult(ResultData resultData) {
@@ -192,7 +192,7 @@ public class ResultBuilder {
* Prepare Result from JSON. Type of result is expected to there in the JSON as 'contentType'
* which should be one of {@link ResultData#TYPE_TABULAR}, {@link ResultData#TYPE_COMPOSITE},
* {@link ResultData#TYPE_INFO}, {@link ResultData#TYPE_ERROR}, {@link ResultData#TYPE_OBJECT}.
- *
+ *
* @param gfJsonObject GemFire JSON Object to use to prepare Result
*/
public static CommandResult fromJson(GfJsonObject gfJsonObject) {
@@ -203,7 +203,7 @@ public class ResultBuilder {
/**
* Prepare a Result object from a JSON String. This is useful on gfsh/client to read the response
* & prepare a Result object from the JSON response
- *
+ *
* @param json JSON string for Result
*/
public static CommandResult fromJson(String json) {
@@ -266,7 +266,7 @@ public class ResultBuilder {
/**
* Wraps a given ResultData and wraps it into appropriate ResultData of the same type but the
* returned object is immutable & throws UnsupportedOperationException on invoking those methods.
- *
+ *
* @param resultData to be wrapped
* @return Read only ResultData of the same type
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
index cacbef8..7c36709 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
@@ -18,8 +18,8 @@ import org.apache.geode.management.cli.Result.Status;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public interface ResultData {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultDataException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultDataException.java
index 36c09ca..5f1e1af 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultDataException.java
@@ -15,7 +15,7 @@
package org.apache.geode.management.internal.cli.result;
/**
- *
+ *
* @since GemFire 7.0
*/
public class ResultDataException extends RuntimeException {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
index 55081ed..82c2ac1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
@@ -16,41 +16,41 @@ package org.apache.geode.management.internal.cli.result;
/**
* Helper class to build rows of columnized strings & build a table from those rows.
- *
+ *
* Sample usage:
- *
+ *
* <code>
* public final Table createTable() {
* Table resultTable = TableBuilder.newTable();
* resultTable.setColumnSeparator(" | ");
- *
+ *
* resultTable.newBlankRow();
* resultTable.newRow().newLeftCol("Displaying all fields for member: " + memberName);
* resultTable.newBlankRow();
* RowGroup rowGroup = resultTable.newRowGroup();
* rowGroup.newRow().newCenterCol("FIELD1").newCenterCol("FIELD2");
- * rowGroup.newRowSeparator('-');
+ * rowGroup.newRowSeparator('-');
* for (int i = 0; i < counter; i++) {
* rowGroup.newRow().newLeftCol(myFirstField[i]).newLeftCol(mySecondField[i]);
- * }
+ * }
* resultTable.newBlankRow();
- *
+ *
* return resultTable;
* }
* </code>
- *
+ *
* Will result in this:
- *
+ *
* <literal>
- *
+ *
* Displaying all fields for member: Member1
- *
+ *
* FIELD1 | FIELD2 -------------- | --------------- My First Field | My Second Field Another Fld1 |
* Another Fld2 Last Fld1 | Last Fld2
- *
+ *
* </literal>
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
@@ -166,7 +166,7 @@ public class TableBuilder {
/**
* A group of rows. Widths for all columns within a group will be the same and when built will
* automatically be set to the length of the longest value in the column.
- *
+ *
* @since GemFire 7.0
*/
public static class RowGroup {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
index fa1e4a5..c694a8b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.management.internal.cli.result;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.geode.management.internal.cli.json.GfJsonArray;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
index 3c368c5..02d47c5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.management.internal.cli.shell;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.internal.util.IOUtils;
-
import java.io.File;
import java.util.logging.Level;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.internal.util.IOUtils;
+
/**
*
* @since GemFire 7.0
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
index 42faac0..592c389 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
@@ -42,7 +42,7 @@ import org.apache.geode.security.NotAuthorizedException;
/**
* Defines the {@link ExecutionStrategy} for commands that are executed in GemFire Shell (gfsh).
- *
+ *
* @since GemFire 7.0
*/
public class GfshExecutionStrategy implements ExecutionStrategy {
@@ -60,7 +60,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
* {@link GfshParseResult} for GemFire defined commands. If the command Method is decorated with
* {@link CliMetaData#shellOnly()} set to <code>false</code>, {@link OperationInvoker} is used to
* send the command for processing on a remote GemFire node.
- *
+ *
* @param parseResult that should be executed (never presented as null)
* @return an object which will be rendered by the {@link Shell} implementation (may return null)
* @throws RuntimeException which is handled by the {@link Shell} implementation
@@ -91,7 +91,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
/**
* Whether the command is available only at the shell or on GemFire member too.
- *
+ *
* @param method the method to check the associated annotation
* @return true if CliMetaData is added to the method & CliMetaData.shellOnly is set to true,
* false otherwise
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXConnectionException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXConnectionException.java
index bb70e8c..042fd04 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXConnectionException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXConnectionException.java
@@ -16,7 +16,7 @@ package org.apache.geode.management.internal.cli.shell;
/**
* RuntimeException to wrap JMX Connection Error/Exception.
- *
+ *
* @since GemFire 7.0
*/
public class JMXConnectionException extends RuntimeException {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXInvocationException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXInvocationException.java
index 2346b43..ed63dbc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXInvocationException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JMXInvocationException.java
@@ -16,7 +16,7 @@ package org.apache.geode.management.internal.cli.shell;
/**
* RuntimeException to wrap all the exception that could occur for JMX operations/attributes.
- *
+ *
* @since GemFire 7.0
*/
public class JMXInvocationException extends RuntimeException {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
index 1fc96a7..6c0b304 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
@@ -54,7 +54,7 @@ import org.apache.geode.management.internal.cli.LogWrapper;
/**
* OperationInvoker JMX Implementation
- *
+ *
* @since GemFire 7.0
*/
public class JmxOperationInvoker implements OperationInvoker {
@@ -207,7 +207,7 @@ public class JmxOperationInvoker implements OperationInvoker {
/**
* JMX Specific operation invoke caller.
- *
+ *
* @param resource
* @param operationName
* @param params
@@ -325,7 +325,7 @@ public class JmxOperationInvoker implements OperationInvoker {
* If the given host address contains a ":", considers it as an IPv6 address & returns the host
* based on RFC2732 requirements i.e. surrounds the given host address string with square
* brackets. If ":" is not found in the given string, simply returns the same string.
- *
+ *
* @param hostAddress host address to check if it's an IPv6 address
*
* @return for an IPv6 address returns compatible host address otherwise returns the same string
@@ -350,7 +350,7 @@ public class JmxOperationInvoker implements OperationInvoker {
/**
* A Connection Notification Listener. Notifies Gfsh when a connection gets terminated abruptly.
- *
+ *
* @since GemFire 7.0
*/
class JMXConnectionListener implements NotificationListener {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MXBeanProvider.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MXBeanProvider.java
index efe2734..d010360 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MXBeanProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MXBeanProvider.java
@@ -16,17 +16,18 @@ package org.apache.geode.management.internal.cli.shell;
import static org.apache.geode.internal.Assert.assertState;
-import org.apache.geode.management.DistributedSystemMXBean;
-import org.apache.geode.management.MemberMXBean;
-import org.apache.geode.management.internal.ManagementConstants;
-
import java.io.IOException;
import java.util.Set;
+
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.management.Query;
import javax.management.QueryExp;
+import org.apache.geode.management.DistributedSystemMXBean;
+import org.apache.geode.management.MemberMXBean;
+import org.apache.geode.management.internal.ManagementConstants;
+
public class MXBeanProvider {
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MultiCommandHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MultiCommandHelper.java
index 9eafff5..ce3df6d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MultiCommandHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/MultiCommandHelper.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.management.internal.cli.shell;
-import org.apache.geode.management.internal.cli.GfshParser;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.geode.management.internal.cli.GfshParser;
+
public class MultiCommandHelper {
public static List<String> getMultipleCommands(String input) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/OperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/OperationInvoker.java
index 19b5081..cf235e9 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/OperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/OperationInvoker.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.cli.shell;
import java.util.Set;
+
import javax.management.ObjectName;
import javax.management.QueryExp;
@@ -29,7 +30,7 @@ import org.apache.geode.management.internal.cli.CommandRequest;
* There could be many different implementations of OperationInvoker based on different protocols
* like JMX, HTTP and so on.
* <p/>
- *
+ *
* @since GemFire 7.0
*/
public interface OperationInvoker {
@@ -39,7 +40,7 @@ public interface OperationInvoker {
/**
* Determines whether there is an active, current connection.
* <p/>
- *
+ *
* @return true if there is an active connection, false otherwise.
* @see #isReady()
*/
@@ -48,7 +49,7 @@ public interface OperationInvoker {
/**
* Determines whether there is an active, current active connection ready for use.
* <p/>
- *
+ *
* @return true if this {@linkplain OperationInvoker} is ready for operation, false otherwise.
* @see #isConnected()
*/
@@ -57,7 +58,7 @@ public interface OperationInvoker {
/**
* Read the attribute identified by name from a remote resource identified by name.
* <p/>
- *
+ *
* @param resourceName name/url of the remote resource from which to fetch the attribute.
* @param attributeName name of the attribute to be fetched.
* @return value of the named attribute on the remote resource.
@@ -67,7 +68,7 @@ public interface OperationInvoker {
/**
* Gets the identifier of the GemFire cluster.
* <p/>
- *
+ *
* @return an integer value indicating the identifier of the GemFire cluster.
*/
public int getClusterId();
@@ -78,7 +79,7 @@ public interface OperationInvoker {
* Gets a proxy to the remote DistributedSystem MXBean to access attributes and invoke operations
* on the distributed system, or the GemFire cluster.
* <p/>
- *
+ *
* @return a proxy instance of the GemFire Manager's DistributedSystem MXBean.
* @see org.apache.geode.management.DistributedSystemMXBean
*/
@@ -87,7 +88,7 @@ public interface OperationInvoker {
/**
* Gets a proxy to an MXBean on a remote MBeanServer.
* <p/>
- *
+ *
* @param <T> the class type of the remote MXBean.
* @param objectName the JMX ObjectName uniquely identifying the remote MXBean.
* @param mbeanInterface the interface of the remote MXBean to proxy for attribute/operation
@@ -101,7 +102,7 @@ public interface OperationInvoker {
* Invoke an operation identified by name on a remote resource identified by name with the given
* arguments.
* <p/>
- *
+ *
* @param resourceName name/url (object name) of the remote resource (MBea) on which operation is
* to be invoked.
* @param operationName name of the operation to be invoked.
@@ -132,7 +133,7 @@ public interface OperationInvoker {
* Processes the requested command. Sends the command to the GemFire Manager for remote processing
* (execution). NOTE refactoring return type in favor of covariant return types.
* <p/>
- *
+ *
* @param command the Command entered and invoked by the user to be processed.
* @return the result of the command execution.
* @see org.apache.geode.management.internal.cli.CommandRequest
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIBuffer.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIBuffer.java
index cc914c2..b81598c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIBuffer.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIBuffer.java
@@ -6,11 +6,11 @@
*/
package org.apache.geode.management.internal.cli.shell.jline;
-import org.springframework.shell.support.util.OsUtils;
-
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import org.springframework.shell.support.util.OsUtils;
+
/**
* A buffer that can contain ANSI text.
*
@@ -133,7 +133,7 @@ public class ANSIBuffer {
/**
* Sets the screen mode. The mode will be one of the following values:
- *
+ *
* <pre>
* mode description
* ----------------------------------------
@@ -279,7 +279,7 @@ public class ANSIBuffer {
* quotes) and numeric values. For example, to set F1 to the String "Hello F1", followed by a
* CRLF sequence, one can use: ANSI.setkey ("0;59", "\"Hello F1\";13;10"). Heres's the table of
* key values:
- *
+ *
* <pre>
* Key Code SHIFT+code CTRL+code ALT+code
* --------------------------------------------------------------- F1 0;59 0;84 0;94 0;104 F2
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java
index 9af05e4..12b0cc3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java
@@ -18,7 +18,7 @@ import org.springframework.shell.core.JLineLogHandler;
/**
* Overrides jline.History to add History without newline characters.
- *
+ *
* @since GemFire 7.0
*/
public class ANSIHandler {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java
index 2d03d06..e709a1e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java
@@ -25,9 +25,9 @@ import jline.UnixTerminal;
* This is re-write of UnixTerminal with stty process spawn removed. There is no process named stty
* in windows (non-cygwin process) so that part is commented, also since erase is already applied
* within gfsh script when running under cygwin backspaceDeleteSwitched is hard-coded as true
- *
+ *
* To know exact changed please see UnixTerminal code.
- *
+ *
*
*/
public class CygwinMinttyTerminal extends UnixTerminal {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshHistory.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshHistory.java
index d0113af..1725757 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshHistory.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshHistory.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.management.internal.cli.shell.jline;
-import jline.console.history.MemoryHistory;
-
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import jline.console.history.MemoryHistory;
+
/**
* Overrides jline.History to add History without newline characters.
- *
+ *
* @since GemFire 7.0
*/
public class GfshHistory extends MemoryHistory {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
index 292eae6..b6f3303 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
@@ -18,7 +18,7 @@ import jline.UnsupportedTerminal;
/**
* Used when gfsh is run in Head Less mode. Doesn't support ANSI.
- *
+ *
* @since GemFire 7.0
*/
public class GfshUnsupportedTerminal extends UnsupportedTerminal {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
index 641c4d9..314e5c4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.process.signal.SignalEvent;
* This class externalizes signal handling in order to make the GemFire build process a bit cleaner
* - for example we have to have exceptions for sun.misc classes when building javadocs.
* </p>
- *
+ *
* @see org.apache.geode.internal.process.signal.AbstractSignalNotificationHandler
* @see org.apache.geode.internal.process.signal.Signal
* @see sun.misc.Signal
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CLIConsoleBufferUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CLIConsoleBufferUtil.java
index 5ed3d79..d6c3502 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CLIConsoleBufferUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CLIConsoleBufferUtil.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.cli.util;
import jline.console.ConsoleReader;
+
import org.apache.geode.management.internal.cli.shell.Gfsh;
public class CLIConsoleBufferUtil {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CauseFinder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CauseFinder.java
index 726306b..f6b3b1b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CauseFinder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CauseFinder.java
@@ -22,7 +22,7 @@ package org.apache.geode.management.internal.cli.util;
* <li>retrieve a nested cause at a specific index/depth
* <li>find a cause by specific type
* </ul>
- *
+ *
* @since GemFire 7.0
*/
public class CauseFinder {
@@ -35,9 +35,9 @@ public class CauseFinder {
* NOTE: It looks for the "nested" causes & doesn't try to match the <code>causeClass</code> of
* the <code>parent</code>.
* <p />
- *
+ *
* Returns -1 if a cause with the given Throwable type is not found.
- *
+ *
* @param parent parent Throwable instance
* @param causeClass type of the nested Throwable cause
* @param isSubtypeOk whether any matching sub-type is required or exact match is required
@@ -56,9 +56,9 @@ public class CauseFinder {
* NOTE: It looks for the "nested" causes & doesn't try to match the <code>causeClass</code> of
* the <code>parent</code>.
* <p />
- *
+ *
* Returns -1 if a cause with the given Throwable type is not found.
- *
+ *
* @param parent parent Throwable instance
* @param causeClass type of the nested Throwable cause
* @param cindex variable to store current index/depth of the cause
@@ -87,7 +87,7 @@ public class CauseFinder {
/**
* Returns whether the given <code>cause</code> is assignable or has same type as that of
* <code>causeClass</code> depending on <code>isSubtypeOk</code> value.
- *
+ *
* @param cause parent Throwable instance
* @param causeClass type of the nested Throwable cause
* @param isSubtypeOk whether any matching sub-type is required or exact match is required
@@ -103,7 +103,7 @@ public class CauseFinder {
/**
* Returns nested 'root' cause of the given parent Throwable. Will return the same Throwable if it
* has no 'cause'.
- *
+ *
* @param parent Throwable whose root cause is to be found
* @return nested root cause.
* @throws IllegalArgumentException when parent is <code>null</code>
@@ -117,7 +117,7 @@ public class CauseFinder {
* has no 'cause'. If <code>depth</code> is 0, does a <code>null</code> check on the given
* <code>parent Throwable</code> & if <code>parent</code> is <code>null</code>, throws
* {@link IllegalArgumentException}.
- *
+ *
* @param parent Throwable whose root cause is to be found
* @param depth recurse depth indicator
* @return nested root cause.
@@ -142,7 +142,7 @@ public class CauseFinder {
/**
* Returns cause at the specified depth/index starting from the 'top most' Throwable
* <code>parent</code> in the stack. Returns <code>null</code> if it can't find it.
- *
+ *
* @param parent Throwable to use to find the cause at given index/depth
* @param requiredIndex index/depth of nesting the cause
* @return cause at the specified index starting from the 'top most' Throwable in the stack.
@@ -169,7 +169,7 @@ public class CauseFinder {
/**
* Returns the first occurrence of nested cause of <code>parent</code> which matches the specified
* <code>causeType</code> or its sub-type depending on <code>isSubtypeOk</code> value.
- *
+ *
* @param parent Throwable to use to find the cause of given type
* @param causeType type of the nested Throwable cause
* @param isSubtypeOk whether any matching sub-type is required or exact match is required
@@ -186,4 +186,3 @@ public class CauseFinder {
return cause;
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ClasspathScanLoadHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ClasspathScanLoadHelper.java
index d3bc7d3..046d890 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ClasspathScanLoadHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ClasspathScanLoadHelper.java
@@ -16,15 +16,15 @@ package org.apache.geode.management.internal.cli.util;
import static java.util.stream.Collectors.toSet;
-import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
-
import java.lang.reflect.Modifier;
import java.util.HashSet;
import java.util.Set;
+import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
+
/**
* Utility class to scan class-path & load classes.
- *
+ *
* @since GemFire 7.0
*/
public class ClasspathScanLoadHelper {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
index 73bd436..fce577f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.internal.cli.GfshParser;
/**
* - Helper class to build command strings, used in the Dunits for testing gfsh commands
- *
+ *
* @since GemFire 7.0
*/
public class CommandStringBuilder {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommentSkipHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommentSkipHelper.java
index 42a83bb..0747f09 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommentSkipHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommentSkipHelper.java
@@ -19,7 +19,7 @@ import org.springframework.util.Assert;
/**
* Utility based on code extracted from
* {@link org.springframework.shell.core.AbstractShell#executeCommand(String)}
- *
+ *
* @since GemFire 7.0
*/
// @original-author Ben Alex
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ConnectionEndpoint.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ConnectionEndpoint.java
index c5bd3e6..0690383 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ConnectionEndpoint.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ConnectionEndpoint.java
@@ -13,12 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.management.internal.cli.util;
/**
- *
+ *
*
*/
public class ConnectionEndpoint {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java
index 684fdf1..0b0c12b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java
@@ -29,8 +29,8 @@ import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class DiskStoreCompacter {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
index e0000b6..1887f88 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
@@ -21,7 +21,7 @@ import org.apache.geode.GemFireException;
* The DiskStoreNotFoundException is a GemFireException class indicating that a disk store by name
* could not be found on a member specified by name!
* </p>
- *
+ *
* @see org.apache.geode.GemFireException
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreValidater.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreValidater.java
index a93112b..abb80eb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreValidater.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreValidater.java
@@ -16,6 +16,7 @@ package org.apache.geode.management.internal.cli.util;
import java.io.File;
+
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java
index 90f6de5..38be36a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java
@@ -25,7 +25,7 @@ import org.apache.geode.cache.EvictionAttributes;
public class EvictionAttributesInfo implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private String evictionAction = "";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriter.java
index f6e42ab..e752ced 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriter.java
@@ -16,11 +16,6 @@
package org.apache.geode.management.internal.cli.util;
-import org.apache.commons.io.IOUtils;
-import org.apache.geode.cache.CacheWriterException;
-import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.cache.util.CacheWriterAdapter;
-
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -28,6 +23,12 @@ import java.io.Serializable;
import java.nio.file.Files;
import java.nio.file.Path;
+import org.apache.commons.io.IOUtils;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+
public class ExportLogsCacheWriter extends CacheWriterAdapter implements Serializable {
private Path currentFile;
private boolean isEmpty = true;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/FixedPartitionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/FixedPartitionAttributesInfo.java
index 3263b88..8b3977c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/FixedPartitionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/FixedPartitionAttributesInfo.java
@@ -59,5 +59,3 @@ public class FixedPartitionAttributesInfo implements Serializable {
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/GfshConsoleReader.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/GfshConsoleReader.java
index a635c50..eb5dc29 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/GfshConsoleReader.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/GfshConsoleReader.java
@@ -20,12 +20,12 @@ import org.apache.geode.management.internal.cli.shell.Gfsh;
/**
* {@link GfeConsoleReader} implementation which uses JLine's Console Reader.
- *
+ *
* Using the default {@link GfeConsoleReader} which uses {@link java.io.Console} makes the shell
* repeat the characters twice.
- *
+ *
* TODO - Abhishek: Investigate if stty settings can avoid this?
- *
+ *
* @since GemFire 7.0.1
*/
public class GfshConsoleReader extends GfeConsoleReader {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HostUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HostUtils.java
index 468ca79..748a84f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HostUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HostUtils.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.management.internal.cli.util;
+import java.net.UnknownHostException;
+
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.DistributionLocator;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.net.SocketCreator;
-import java.net.UnknownHostException;
-
public class HostUtils {
private static final String LOCALHOST = "localhost";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
index bf0bb5e..432bcb5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
@@ -21,7 +21,7 @@ import org.apache.geode.GemFireException;
* The JConsoleNotFoundException class is a RuntimeException class that indicates that the JDK
* JConsole tool could not be located in the file system.
* </p>
- *
+ *
* @see org.apache.geode.GemFireException
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java
index d5da8ee..8a16d19 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JdkTool.java
@@ -16,16 +16,16 @@ package org.apache.geode.management.internal.cli.util;
import static org.apache.geode.internal.Assert.assertNotNull;
+import java.io.FileNotFoundException;
+import java.util.EmptyStackException;
+import java.util.Stack;
+
import org.apache.geode.GemFireException;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.lang.SystemUtils;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import java.io.FileNotFoundException;
-import java.util.EmptyStackException;
-import java.util.Stack;
-
public class JdkTool {
protected static final String JAVA_HOME = System.getProperty("java.home");
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java
index 9376fbb..f40e782 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java
@@ -28,6 +28,10 @@ import java.util.Set;
import java.util.TreeMap;
import org.apache.commons.beanutils.ConvertUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.management.internal.cli.json.GfJsonArray;
import org.apache.geode.management.internal.cli.json.GfJsonException;
@@ -35,25 +39,22 @@ import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.management.internal.cli.result.CliJsonSerializable;
import org.apache.geode.management.internal.cli.result.CliJsonSerializableFactory;
import org.apache.geode.management.internal.cli.result.ResultDataException;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
/**
* This class contains utility methods for JSON (http://www.json.org/) which is used by classes used
* for the Command Line Interface (CLI).
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class JsonUtil {
/**
* Converts given JSON String in to a Map. Refer http://www.json.org/ to construct a JSON format.
- *
+ *
* @param jsonString jsonString to be converted in to a Map.
* @return a Map created from
- *
+ *
* @throws IllegalArgumentException if the specified JSON string can not be converted in to a Map
*/
public static Map<String, String> jsonToMap(String jsonString) {
@@ -76,7 +77,7 @@ public class JsonUtil {
/**
* Converts given Map in to a JSON string representing a Map. Refer http://www.json.org/ for more.
- *
+ *
* @param properties a Map of Strings to be converted in to JSON String
* @return a JSON string representing the specified Map.
*/
@@ -87,7 +88,7 @@ public class JsonUtil {
/**
* Converts given Object in to a JSON string representing an Object. Refer http://www.json.org/
* for more.
- *
+ *
* @param object an Object to be converted in to JSON String
* @return a JSON string representing the specified object.
*/
@@ -99,7 +100,7 @@ public class JsonUtil {
* Converts given Object in to a JSON string representing an Object. If object contains an
* attribute which itself is another object it will be displayed as className if its json
* representation exceeds the length
- *
+ *
* @param object an Object to be converted in to JSON String
* @return a JSON string representing the specified object.
*/
@@ -138,10 +139,10 @@ public class JsonUtil {
/**
* Converts given JSON String in to a Object. Refer http://www.json.org/ to construct a JSON
* format.
- *
+ *
* @param jsonString jsonString to be converted in to a Map.
* @return an object constructed from given JSON String
- *
+ *
* @throws IllegalArgumentException if the specified JSON string can not be converted in to an
* Object
*/
@@ -241,7 +242,7 @@ public class JsonUtil {
/**
* This is used in Put command this method uses HashSet as default implementation
- *
+ *
* @param value
* @param parameterType
* @return setValue
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogExporter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogExporter.java
index 5802f79..d60b3c8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogExporter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogExporter.java
@@ -18,11 +18,6 @@ package org.apache.geode.management.internal.cli.util;
import static java.util.stream.Collectors.toList;
-import org.apache.commons.io.FileUtils;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.management.internal.configuration.utils.ZipUtils;
-import org.apache.logging.log4j.Logger;
-
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -36,6 +31,12 @@ import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.management.internal.configuration.utils.ZipUtils;
+
/**
* this LogExporter only finds the .log and .gfs files under in the same directory of the base files
* it doesn't use the base file's filename patterns to find the related logs/stats yet.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java
index d896243..40db2df 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java
@@ -16,10 +16,6 @@
package org.apache.geode.management.internal.cli.util;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
@@ -27,6 +23,11 @@ import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.internal.logging.LogService;
+
public class LogFilter {
public enum LineFilterResult {
LINE_ACCEPTED, LINE_REJECTED, REMAINDER_OF_FILE_REJECTED
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogLevelExtractor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogLevelExtractor.java
index b496249..3e36ef4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogLevelExtractor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogLevelExtractor.java
@@ -16,14 +16,15 @@
package org.apache.geode.management.internal.cli.util;
-import org.apache.geode.internal.logging.log4j.LogLevel;
-import org.apache.logging.log4j.Level;
-
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.logging.log4j.Level;
+
+import org.apache.geode.internal.logging.log4j.LogLevel;
+
/**
* this will extract convert the deprecated InternalLogWriter's level into log4j level as well.
*/
@@ -68,4 +69,3 @@ public class LogLevelExtractor {
}
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberInformation.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberInformation.java
index 6f746e7..d1023a1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberInformation.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberInformation.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
*/
public class MemberInformation implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private String name;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
index 78f68ae..47837a9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
@@ -21,7 +21,7 @@ import org.apache.geode.GemFireException;
* The MemberNotFoundException is a GemFirException indicating that a member by name could not be
* found in the GemFire distributed system.
* </p>
- *
+ *
* @see org.apache.geode.GemFireException
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
index 04a649b..cd9f72f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
@@ -18,7 +18,6 @@ import static java.util.stream.Collectors.toList;
import java.io.BufferedReader;
import java.io.File;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
@@ -32,6 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
+
import org.apache.geode.internal.logging.MergeLogFiles;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.GfshParser;
@@ -40,7 +40,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
/**
- *
+ *
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
index c9d05b0..3d246a7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
@@ -32,8 +32,8 @@ import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.cli.GfshParser;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
public class ReadWriteFile {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionPath.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionPath.java
index 518626f..aac49bf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionPath.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionPath.java
@@ -23,7 +23,7 @@ import org.apache.geode.management.ManagementService;
/**
* Class to handle Region path.
- *
+ *
* @since GemFire 7.0
*/
public class RegionPath {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
index 7f4ef96..b1d9e16 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
@@ -21,7 +21,7 @@ import org.apache.geode.GemFireException;
* The VisualVmNotFoundException class is a GemFireException (RuntimeException) indicating that the
* JDK jvisualvm tool could not be found on the system.
* </p>
- *
+ *
* @see org.apache.geode.GemFireException
* @since GemFire 7.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/callbacks/ConfigurationChangeListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/callbacks/ConfigurationChangeListener.java
index ae8b9b3..c68664e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/callbacks/ConfigurationChangeListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/callbacks/ConfigurationChangeListener.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.management.internal.configuration.callbacks;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.commons.io.FileUtils;
-import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
/****
* CacheListener on ConfigRegion on Locators to write the configuration changes to file-system.
*
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
index 63f64d1..912d2d2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathCo
/**
* Domain class to determine the order of an element Currently being used to store order information
* of child elements of "cache"
- *
+ *
*
*/
// UnitTest CacheElementJUnitTest
@@ -96,7 +96,7 @@ public class CacheElement {
/**
* Build <code>cache</code> element map for given <cod>doc</code>'s schemaLocation for
* {@link CacheXml#GEODE_NAMESPACE}.
- *
+ *
* @param doc {@link Document} to parse schema for.
* @return Element map
* @throws IOException
@@ -128,7 +128,7 @@ public class CacheElement {
/**
* Resolve schema from <code>schemaLocationsNape</code> or <code>namespaceUri</code> for given
* <code>namespaceUri</code>.
- *
+ *
* @param schemaLocationMap {@link Map} of namespaceUri to URLs.
* @param namespaceUri Namespace URI for schema.
* @return {@link InputSource} for schema if found.
@@ -160,7 +160,7 @@ public class CacheElement {
/**
* Build element map adding to existing <code>elementMap</code>.
- *
+ *
* @param elementMap to add elements to.
* @param inputSource to parse elements from.
* @throws SAXException
@@ -187,7 +187,7 @@ public class CacheElement {
/**
* Build element map for elements matching <code>xPath</code> relative to <code>parent</code> into
* <code>elementMap</code> .
- *
+ *
* @param elementMap to add elements to
* @param schema {@link Document} for schema.
* @param parent {@link Element} to query XPath.
@@ -228,7 +228,7 @@ public class CacheElement {
/**
* Tests if element allows multiple.
- *
+ *
* @param element to test for multiple.
* @return true if multiple allowed, otherwise false.
* @since GemFire 8.1
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
index 3c718ab..f0ff79c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
@@ -26,15 +26,16 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
/**
* Domain object for all the configuration related data.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 6789416..fbb30cc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -52,8 +52,8 @@ import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathCo
/****
* Domain class for defining a GemFire entity in XML.
- *
- *
+ *
+ *
*/
public class XmlEntity implements VersionedDataSerializable {
private static final long serialVersionUID = 1L;
@@ -76,7 +76,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Default constructor for serialization only.
- *
+ *
* @deprecated Use {@link XmlEntity#builder()}.
*/
@Deprecated
@@ -85,7 +85,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Construct a new XmlEntity while creating XML from the cache using the element which has a type
* and attribute matching those given.
- *
+ *
* @param type Type of the XML element to search for. Should be one of the constants from the
* {@link CacheXml} class. For example, CacheXml.REGION.
* @param key Key of the attribute to match, for example, "name" or "id".
@@ -101,10 +101,10 @@ public class XmlEntity implements VersionedDataSerializable {
/****
* Construct a new XmlEntity while creating Xml from the cache using the element which has
* attributes matching those given
- *
+ *
* @param parentType Parent type of the XML element to search for. Should be one of the constants
* from the {@link CacheXml} class. For example, CacheXml.REGION.
- *
+ *
* @param parentKey Identifier for the parent elements such "name/id"
* @param parentValue Value of the identifier
* @param childType Child type of the XML element to search for within the parent . Should be one
@@ -168,7 +168,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Initialize new instances. Called from {@link #XmlEntity(String, String, String)} and
* {@link XmlEntityBuilder#build()}.
- *
+ *
* @since GemFire 8.1
*/
private void init() {
@@ -184,7 +184,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Use the CacheXmlGenerator to create XML from the entity associated with the current cache.
- *
+ *
* @return XML string representation of the entity.
*/
private String loadXmlDefinition() {
@@ -200,7 +200,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Used supplied xmlDocument to extract the XML for the defined {@link XmlEntity}.
- *
+ *
* @param xmlDocument to extract XML from.
* @return XML for {@link XmlEntity} if found, otherwise <code>null</code>.
* @since GemFire 8.1
@@ -218,7 +218,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Used supplied XML {@link Document} to extract the XML for the defined {@link XmlEntity}.
- *
+ *
* @param document to extract XML from.
* @return XML for {@link XmlEntity} if found, otherwise <code>null</code>.
* @throws XPathExpressionException
@@ -251,11 +251,11 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Create an XmlPath query string from the given element name and attributes.
- *
+ *
* @param element Name of the XML element to search for.
* @param attributes Attributes of the element that should match, for example "name" or "id" and
* the value they should equal. This list may be empty.
- *
+ *
* @return An XmlPath query string.
*/
private String createQueryString(final String prefix, final String element,
@@ -295,9 +295,9 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Return the value of a single attribute.
- *
+ *
* @param key Key of the attribute whose while will be returned.
- *
+ *
* @return The value of the attribute.
*/
public String getAttribute(String key) {
@@ -307,7 +307,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* A convenience method to get a name or id attributes from the list of attributes if one of them
* has been set. Name takes precedence.
- *
+ *
* @return The name or id attribute or null if neither is found.
*/
public String getNameOrId() {
@@ -324,7 +324,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Gets the namespace for the element. Defaults to {@link CacheXml#GEODE_NAMESPACE} if not set.
- *
+ *
* @return XML element namespace
* @since GemFire 8.1
*/
@@ -334,7 +334,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Gets the prefix for the element. Defaults to {@link CacheXml#PREFIX} if not set.
- *
+ *
* @return XML element prefix
* @since GemFire 8.1
*/
@@ -353,7 +353,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Gets the namespace for the child element.
- *
+ *
* @return XML element namespace for the child element
*/
public String getChildNamespace() {
@@ -436,7 +436,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Produce a new {@link XmlEntityBuilder}.
- *
+ *
* @return new {@link XmlEntityBuilder}.
* @since GemFire 8.1
*/
@@ -451,7 +451,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Builder for {@link XmlEntity}. Default values are as described in {@link XmlEntity}.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -460,7 +460,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Private constructor.
- *
+ *
* @since GemFire 8.1
*/
private XmlEntityBuilder() {
@@ -470,9 +470,9 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Produce an {@link XmlEntity} with the supplied values. Builder is reset after
* {@link #build()} is called. Subsequent calls will produce a new {@link XmlEntity}.
- *
+ *
* You are required to at least call {@link #withType(String)}.
- *
+ *
* @return {@link XmlEntity}
* @since GemFire 8.1
*/
@@ -487,7 +487,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Sets the type or element name value as returned by {@link XmlEntity#getType()}
- *
+ *
* @param type Name of element type.
* @return this {@link XmlEntityBuilder}
* @since GemFire 8.1
@@ -502,7 +502,7 @@ public class XmlEntity implements VersionedDataSerializable {
* Sets the element prefix and namespace as returned by {@link XmlEntity#getPrefix()} and
* {@link XmlEntity#getNamespace()} respectively. Defaults are {@link CacheXml#PREFIX} and
* {@link CacheXml#GEODE_NAMESPACE} respectively.
- *
+ *
* @param prefix Prefix of element
* @param namespace Namespace of element
* @return this {@link XmlEntityBuilder}
@@ -518,7 +518,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Adds an attribute for the given <code>name</code> and <code>value</code> to the attributes
* map returned by {@link XmlEntity#getAttributes()} or {@link XmlEntity#getAttribute(String)}.
- *
+ *
* @param name Name of attribute to set.
* @param value Value of attribute to set.
* @return this {@link XmlEntityBuilder}
@@ -532,7 +532,7 @@ public class XmlEntity implements VersionedDataSerializable {
/**
* Replaces all attributes with the supplied attributes {@link Map}.
- *
+ *
* @param attributes {@link Map} to use.
* @return this {@link XmlEntityBuilder}
* @since GemFire 8.1
@@ -547,9 +547,9 @@ public class XmlEntity implements VersionedDataSerializable {
* Sets a config xml document source to get the entity XML Definition from as returned by
* {@link XmlEntity#getXmlDefinition()}. Defaults to current active configuration for
* {@link Cache}.
- *
+ *
* <b>Should only be used for testing.</b>
- *
+ *
* @param xmlDocument Config XML document.
* @return this {@link XmlEntityBuilder}
* @since GemFire 8.1
@@ -564,9 +564,9 @@ public class XmlEntity implements VersionedDataSerializable {
* Sets a config xml document source to get the entity XML Definition from as returned by
* {@link XmlEntity#getXmlDefinition()}. Defaults to current active configuration for
* {@link Cache}.
- *
+ *
* <b>Should only be used for testing.</b>
- *
+ *
* @param document Config XML {@link Document}.
* @return this {@link XmlEntityBuilder}
* @throws TransformerException
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
index bd942c7..9cde755 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
@@ -16,6 +16,8 @@ package org.apache.geode.management.internal.configuration.functions;
import static java.util.stream.Collectors.toSet;
+import java.util.Set;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.internal.InternalEntity;
@@ -23,8 +25,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
-import java.util.Set;
-
public class GetRegionNamesFunction implements Function, InternalEntity {
@Override
public void execute(FunctionContext context) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/UploadJarFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/UploadJarFunction.java
index c3b5035..f4fbbb3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/UploadJarFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/UploadJarFunction.java
@@ -15,6 +15,8 @@
*/
package org.apache.geode.management.internal.configuration.functions;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.Locator;
@@ -22,7 +24,6 @@ import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
public class UploadJarFunction implements Function, InternalEntity {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/handlers/ConfigurationRequestHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/handlers/ConfigurationRequestHandler.java
index 201bcd6..590494e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/handlers/ConfigurationRequestHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/handlers/ConfigurationRequestHandler.java
@@ -16,11 +16,11 @@ package org.apache.geode.management.internal.configuration.handlers;
import java.io.IOException;
-import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
index cb9951f..ac52595 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
@@ -14,15 +14,6 @@
*/
package org.apache.geode.management.internal.configuration.messages;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-import org.xml.sax.SAXException;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -31,10 +22,21 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactoryConfigurationError;
+import org.apache.commons.lang.StringUtils;
+import org.xml.sax.SAXException;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.management.internal.configuration.domain.Configuration;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils;
+
/***
* Response containing the configuration requested by the {@link ConfigurationRequest}
*/
@@ -166,5 +168,3 @@ public class ConfigurationResponse implements DataSerializableFixedID {
this.failedToGetSharedConfig = failedToGetSharedConfig;
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusRequest.java
index 2163bce..47f12c3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusRequest.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.geode.DataSerializable;
/****
- *
+ *
*
*/
public class SharedConfigurationStatusRequest implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java
index 89b769b..fdde06a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.management.internal.configuration.domain.SharedConfigurationStatus;
/*****
- *
+ *
*
*/
public class SharedConfigurationStatusResponse implements DataSerializable {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
index b00e287..c506034 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
@@ -26,7 +26,7 @@ public class XmlConstants {
/**
* Standard prefix for {@link XMLConstants#W3C_XML_SCHEMA_INSTANCE_NS_URI}
* (http://www.w3.org/2001/XMLSchema-instance) namespace.
- *
+ *
* @since GemFire 8.1
*/
public static final String W3C_XML_SCHEMA_INSTANCE_PREFIX = "xsi";
@@ -35,14 +35,14 @@ public class XmlConstants {
* Schema location attribute local name, "schemaLocation", in
* {@link XMLConstants#W3C_XML_SCHEMA_INSTANCE_NS_URI} (http://www.w3.org/2001/XMLSchema-instance)
* namespace.
- *
+ *
* @since GemFire 8.1
*/
public static final String W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION = "schemaLocation";
/**
* Default prefix. Effectively no prefix.
- *
+ *
* @since GemFire 8.1
*/
public static final String DEFAULT_PREFIX = "";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
index 8d9f445..91e790b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
@@ -64,7 +64,7 @@ public class XmlUtils {
/**
* Create an XML {@link Document} from the given {@link Reader}.
- *
+ *
* @param reader to create document from.
* @return {@link Document} if successful, otherwise false.
* @throws ParserConfigurationException
@@ -117,7 +117,7 @@ public class XmlUtils {
/*****
* Adds a new node or replaces an existing node in the Document
- *
+ *
* @param doc Target document where the node will added
* @param xmlEntity contains definition of the xml entity
* @throws IOException
@@ -229,7 +229,7 @@ public class XmlUtils {
/****
* Creates a node from the String xml definition
- *
+ *
* @param owner
* @param xmlDefinition
* @return Node representing the xml definition
@@ -268,10 +268,10 @@ public class XmlUtils {
/**
* Build schema location map of schemas used in given <code>schemaLocationAttribute</code>.
- *
+ *
* @see <a href="http://www.w3.org/TR/xmlschema-0/#schemaLocation">XML Schema Part 0: Primer
* Second Edition | 5.6 schemaLocation</a>
- *
+ *
* @param schemaLocation attribute value to build schema location map from.
* @return {@link Map} of schema namespace URIs to location URLs.
* @since GemFire 8.1
@@ -294,7 +294,7 @@ public class XmlUtils {
/*****
* Deletes all the node from the document which match the definition provided by xmlEntity
- *
+ *
* @param doc
* @param xmlEntity
* @throws Exception
@@ -313,7 +313,7 @@ public class XmlUtils {
/****
* Gets all the nodes matching the definition given by the xml entity
- *
+ *
* @param doc
* @param xmlEntity
* @return Nodes
@@ -331,7 +331,7 @@ public class XmlUtils {
/**
* An object used by an XPath query that maps namespaces to uris.
- *
+ *
* @see NamespaceContext
*
*/
@@ -370,7 +370,7 @@ public class XmlUtils {
/****
* Converts the document to a well formatted Xml string
- *
+ *
* @param doc
* @return pretty xml string
* @throws IOException
@@ -403,7 +403,7 @@ public class XmlUtils {
/****
* Convert the xmlString to pretty well formatted xmlString
- *
+ *
* @param xmlContent
* @return pretty xml string
* @throws IOException
@@ -421,7 +421,7 @@ public class XmlUtils {
/***
* Create a document from the xml
- *
+ *
* @param xmlContent
* @return Document
* @throws IOException
@@ -456,7 +456,7 @@ public class XmlUtils {
/**
* Upgrade the schema of a given Config XMl <code>document</code> to the given
* <code>namespace</code>, <code>schemaLocation</code> and <code>version</code>.
- *
+ *
* @param document Config XML {@link Document} to upgrade.
* @param namespaceUri Namespace URI to upgrade to.
* @param schemaLocation Schema location to upgrade to.
@@ -524,10 +524,10 @@ public class XmlUtils {
/**
* Set the <code>schemaLocationAttribute</code> to the values of the
* <code>schemaLocationMap</code>.
- *
+ *
* @see <a href="http://www.w3.org/TR/xmlschema-0/#schemaLocation">XML Schema Part 0: Primer
* Second Edition | 5.6 schemaLocation</a>
- *
+ *
* @param schemaLocationMap {@link Map} to get schema locations from.
* @since GemFire 8.1
*/
@@ -565,8 +565,8 @@ public class XmlUtils {
* Change the namespace URI of a <code>node</code> and its children to
* <code>newNamespaceUri</code> if that node is in the given <code>oldNamespaceUri</code>
* namespace URI.
- *
- *
+ *
+ *
* @param node {@link Node} to change namespace URI on.
* @param oldNamespaceUri old namespace URI to change from.
* @param newNamespaceUri new Namespace URI to change to.
@@ -593,7 +593,7 @@ public class XmlUtils {
/****
* Method to modify the root attribute (cache) of the XML
- *
+ *
* @param doc Target document whose root attributes must be modified
* @param xmlEntity xml entity for the root , it also contains the attributes
* @throws IOException
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java
index e32803a..d5cc146 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java
@@ -106,5 +106,3 @@ public class ZipUtils {
}
}
}
-
-
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactResponse.java
index cd67352..26475ee 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactResponse.java
@@ -24,8 +24,8 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.admin.remote.AdminResponse;
/**
- *
- *
+ *
+ *
* @since GemFire 7.0
*/
// NOTE: This is copied from org/apache/geode/internal/admin/remote/CompactResponse.java
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
index 7f088ce..042249c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
@@ -17,8 +17,8 @@ package org.apache.geode.management.internal.security;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.ResourcePermission;
-import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.security.ResourcePermission.Operation;
+import org.apache.geode.security.ResourcePermission.Resource;
/**
* AccessControlMBean Implementation. This retrieves JMXPrincipal from AccessController and performs
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMXBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMXBean.java
index b6c42ed..8dee3f1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMXBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMXBean.java
@@ -16,7 +16,7 @@ package org.apache.geode.management.internal.security;
/**
* Interface for AccessControlMBean
- *
+ *
* @since Geode 1.0
*/
public interface AccessControlMXBean {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java b/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
index 7c3ecb8..549e89f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
@@ -56,7 +56,7 @@ import org.apache.geode.security.ResourcePermission.Target;
/**
* This class intercepts all MBean requests for GemFire MBeans and passed it to
* ManagementInterceptor for authorization
- *
+ *
* @since Geode 1.0
*/
public class MBeanServerWrapper implements MBeanServerForwarder {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/security/ResourceOperation.java b/geode-core/src/main/java/org/apache/geode/management/internal/security/ResourceOperation.java
index 1eb684f..fcc8a17 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/security/ResourceOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/security/ResourceOperation.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.management.internal.security;
-import org.apache.geode.security.ResourcePermission.Target;
-import org.apache.geode.security.ResourcePermission.Operation;
-import org.apache.geode.security.ResourcePermission.Resource;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+
import javax.management.DescriptorKey;
+import org.apache.geode.security.ResourcePermission.Operation;
+import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.security.ResourcePermission.Target;
+
@java.lang.annotation.Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessController.java b/geode-core/src/main/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessController.java
index 6f8dae8..c236dcd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessController.java
@@ -29,7 +29,7 @@ import com.sun.jmx.remote.security.MBeanServerFileAccessController;
* read-write access. But in GemFire some of the attributes are implemented as operations in order
* to reduce federation cost due to large payloads of those attribute. These attributes are exposed
* as operations but require readOnly access. This class filter those methods for read access.
- *
+ *
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
index fc11fc9..735c584 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
@@ -59,7 +59,7 @@ import org.apache.geode.security.NotAuthorizedException;
* The AbstractCommandsController class is the abstract base class encapsulating common
* functionality across all Management Controller classes that expose REST API web service endpoints
* (URLs/URIs) for GemFire shell (Gfsh) commands.
- *
+ *
* @see org.apache.geode.management.MemberMXBean
* @see org.apache.geode.management.internal.cli.shell.Gfsh
* @see org.springframework.http.ResponseEntity
@@ -142,7 +142,7 @@ public abstract class AbstractCommandsController {
* Gets a reference to the platform MBeanServer running in this JVM process. The MBeanServer
* instance constitutes a connection to the MBeanServer. This method returns a security-wrapped
* MBean if integrated security is active.
- *
+ *
* @return a reference to the platform MBeanServer for this JVM process.
* @see java.lang.management.ManagementFactory#getPlatformMBeanServer()
* @see javax.management.MBeanServer
@@ -160,7 +160,7 @@ public abstract class AbstractCommandsController {
* method gets an instance of the Platform MBeanServer for this JVM process and uses it to lookup
* the MemberMXBean for the GemFire Manager based on the ObjectName declared in the
* DistributedSystemMXBean.getManagerObjectName() operation.
- *
+ *
* @return a proxy instance to the MemberMXBean of the GemFire Manager.
* @see #getMBeanServer()
* @see #createMemberMXBeanForManagerUsingProxy(javax.management.MBeanServer,
@@ -190,7 +190,7 @@ public abstract class AbstractCommandsController {
/**
* Creates a Proxy using the Platform MBeanServer and ObjectName in order to access attributes and
* invoke operations on the GemFire Manager's MemberMXBean.
- *
+ *
* @param server a reference to this JVM's Platform MBeanServer.
* @param managingMemberObjectName the ObjectName of the GemFire Manager's MemberMXBean registered
* in the Platform MBeanServer.
@@ -207,7 +207,7 @@ public abstract class AbstractCommandsController {
/**
* Gets the environment setup during this HTTP/command request for the current command process
* execution.
- *
+ *
* @return a mapping of environment variables to values.
* @see LoginHandlerInterceptor#getEnvironment()
*/
@@ -224,7 +224,7 @@ public abstract class AbstractCommandsController {
* Executes the specified command as entered by the user using the GemFire Shell (Gfsh). Note,
* Gfsh performs validation of the command during parsing before sending the command to the
* Manager for processing.
- *
+ *
* @param command a String value containing a valid command String as would be entered by the user
* in Gfsh.
* @param environment a Map containing any environment configuration settings to be used by the
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
index 2ccb264..d609105 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
@@ -37,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceConstants;
* The GetEnvironmentHandlerInterceptor class handles extracting Gfsh environment variables encoded
* in the HTTP request message as request parameters.
* <p/>
- *
+ *
* @see javax.servlet.http.HttpServletRequest
* @see javax.servlet.http.HttpServletResponse
* @see org.springframework.web.servlet.handler.HandlerInterceptorAdapter
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/QueryParameterSource.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/QueryParameterSource.java
index 32153f4..bf94829 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/QueryParameterSource.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/QueryParameterSource.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.web.domain;
import java.io.Serializable;
+
import javax.management.ObjectName;
import javax.management.QueryExp;
@@ -22,7 +23,7 @@ import javax.management.QueryExp;
* The QueryParameterSource class encapsulates details in order to perform a query on an JMX MBean
* server.
* <p/>
- *
+ *
* @see java.io.Serializable
* @see javax.management.ObjectName
* @see javax.management.QueryExp
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
index 033411f..13ae90e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
@@ -17,9 +17,6 @@ package org.apache.geode.management.internal.web.http.converter;
import java.io.IOException;
import java.io.Serializable;
-import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.util.IOUtils;
-
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpMessage;
import org.springframework.http.HttpOutputMessage;
@@ -29,11 +26,14 @@ import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.http.converter.HttpMessageNotWritableException;
import org.springframework.util.StreamUtils;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.internal.util.IOUtils;
+
/**
* The SerializableObjectHttpMessageConverter class is a Spring HttpMessageConverter for converting
* bytes streams to/from Serializable Objects.
* <p/>
- *
+ *
* @see java.io.Serializable
* @see org.springframework.http.HttpInputMessage
* @see org.springframework.http.HttpMessage
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/support/HttpRequester.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/support/HttpRequester.java
index 55d15aa..d7ac175 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/support/HttpRequester.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/support/HttpRequester.java
@@ -50,7 +50,7 @@ import org.apache.geode.security.NotAuthorizedException;
* The HttpRequester class is a Adapter/facade for the Spring RestTemplate class for abstracting
* HTTP requests and operations.
* <p/>
- *
+ *
* @see org.springframework.http.client.SimpleClientHttpRequestFactory
* @see org.springframework.web.client.RestTemplate
* @since GemFire 8.0
@@ -118,7 +118,7 @@ public class HttpRequester {
/**
* Gets an instance of the Spring RestTemplate to perform the HTTP operations.
* <p/>
- *
+ *
* @return an instance of the Spring RestTemplate for performing HTTP operations.
* @see org.springframework.web.client.RestTemplate
*/
@@ -181,7 +181,7 @@ public class HttpRequester {
/**
* build the url using the path and query params
- *
+ *
* @param path : the part after the baseUrl
* @param queryParams this needs to be an even number of strings in the form of paramName,
* paramValue....
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileAdapter.java
index 718f5f2..67c47fb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileAdapter.java
@@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
* The MultipartFileAdapter class is an Adapter built for extension in order to implement the
* MultipartFile interface overriding behavior applicable to the implementation.
* <p/>
- *
+ *
* @see org.springframework.web.multipart.MultipartFile
* @since GemFire 8.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
index d4aa268..d3ba42c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
@@ -25,7 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
* into an instance of the Resource interface in the context where a Resource object is required
* instead.
* <p/>
- *
+ *
* @see org.springframework.core.io.AbstractResource
* @see org.springframework.core.io.Resource
* @see org.springframework.web.multipart.MultipartFile
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/HttpOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/HttpOperationInvoker.java
index 859dd8f..ce4aaec 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/HttpOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/HttpOperationInvoker.java
@@ -47,7 +47,7 @@ import org.apache.geode.management.internal.web.util.ConvertUtils;
/**
* The HttpOperationInvoker class is an abstract base class encapsulating common functionality for
* all HTTP-based OperationInvoker implementations.
- *
+ *
* @see org.apache.geode.management.internal.cli.shell.Gfsh
* @see org.apache.geode.management.internal.cli.shell.OperationInvoker
* @see org.apache.geode.management.internal.web.shell.HttpOperationInvoker
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
index 35fa8cb..c0f4731 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
@@ -18,7 +18,7 @@ package org.apache.geode.management.internal.web.shell;
* The MBeanAccessException class is a RuntimeException indicating that an attempt to access an
* MBean attribute or invocation of an MBean operation failed.
* <p/>
- *
+ *
* @see java.lang.RuntimeException
* @since GemFire 8.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
index a87948e..6500bfc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
@@ -18,6 +18,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+
import javax.management.ObjectName;
import org.apache.geode.management.internal.web.shell.HttpOperationInvoker;
@@ -26,7 +27,7 @@ import org.apache.geode.management.internal.web.shell.HttpOperationInvoker;
* The HttpInvocationHandler class is an implementation of InvocationHandler serving as a proxy that
* uses HTTP remoting for the actual method invocation on the target resource.
* <p/>
- *
+ *
* @see java.lang.reflect.InvocationHandler
* @see javax.management.ObjectName
* @see org.apache.geode.management.internal.web.shell.HttpOperationInvoker
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpMBeanProxyFactory.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpMBeanProxyFactory.java
index 462e8c4..23cda97 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpMBeanProxyFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpMBeanProxyFactory.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.web.shell.support;
import java.lang.reflect.Proxy;
+
import javax.management.ObjectName;
import org.apache.geode.management.internal.web.shell.HttpOperationInvoker;
@@ -22,7 +23,7 @@ import org.apache.geode.management.internal.web.shell.HttpOperationInvoker;
/**
* The HttpMBeanProxyFactory class is an abstract factory for creating
* <p/>
- *
+ *
* @see java.lang.reflect.Proxy
* @see org.apache.geode.management.internal.web.shell.HttpOperationInvoker
* @since GemFire 8.0
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
index ffb56f2..b8f5c0c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
@@ -31,7 +31,7 @@ import org.apache.geode.management.internal.web.io.MultipartFileResourceAdapter;
* The ConvertUtils class is a support class for performing conversions used by the GemFire web
* application and REST interface.
* <p/>
- *
+ *
* @see org.apache.geode.management.internal.cli.CliUtil
* @since GemFire 8.0
*/
@@ -43,7 +43,7 @@ public abstract class ConvertUtils {
* bytes followed by the byte content of the file, for all files being transmitted by Gfsh to the
* GemFire Manager.
* <p/>
- *
+ *
* @param fileData a 2 dimensional byte array of files names and file content.
* @return an array of Spring Resource objects encapsulating the details (name and content) of
* each file being transmitted by Gfsh to the GemFire Manager.
@@ -81,7 +81,7 @@ public abstract class ConvertUtils {
* each MultipartFile. The 2-dimensional byte array format is used by Gfsh and the GemFire Manager
* to transmit file data.
* <p/>
- *
+ *
* @param files an array of Spring MultipartFile objects to convert into the 2-dimensional byte
* array format.
* @return a 2-dimensional byte array containing the content of each MultipartFile.
@@ -106,7 +106,7 @@ public abstract class ConvertUtils {
* Resource. The 2-dimensional byte array format is used by Gfsh and the GemFire Manager to
* transmit file data.
* <p/>
- *
+ *
* @param resources an array of Spring Resource objects to convert into the 2-dimensional byte
* array format.
* @return a 2-dimensional byte array containing the content of each Resource.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
index a22ee13..0eb3b6e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
@@ -22,7 +22,7 @@ import java.util.Map;
/**
* The UriUtils is a utility class for processing URIs and URLs.
* <p/>
- *
+ *
* @see java.net.URLDecoder
* @see java.net.URLEncoder
* @since GemFire 8.0
@@ -39,7 +39,7 @@ public abstract class UriUtils {
* String value to have been encoded multiple times, the String value is decoded until the value
* stops changing (in other words, until the value is completely decoded).
* <p/>
- *
+ *
* @param encodedValue the encoded String value encoded to decode.
* @return the decoded value of the String. If UTF-8 is unsupported, then the encodedValue is
* returned.
@@ -57,7 +57,7 @@ public abstract class UriUtils {
* for a String value to have been encoded multiple times, the String value is decoded until the
* value stops changing (in other words, until the value is completely decoded).
* <p/>
- *
+ *
* @param encodedValue the encoded String value to decode.
* @param encoding a String value specifying the encoding.
* @return the decoded value of the String. If the encoding is unsupported, then the encodedValue
@@ -87,7 +87,7 @@ public abstract class UriUtils {
* value is decoded until the value stops changing (in other words, until the value is completely
* decoded).
* <p/>
- *
+ *
* @param encodedValues the array of encoded String values to decode.
* @return the same String array with each String value decoded using the default encoding of
* UTF-8.
@@ -104,7 +104,7 @@ public abstract class UriUtils {
* String value is decoded until the value stops changing (in other words, until the value is
* completely decoded).
* <p/>
- *
+ *
* @param encodedValues the array of encoded String values to decode.
* @return the same String array with each String value decoded using the specified encoding (e.g.
* UTF-8).
@@ -128,7 +128,7 @@ public abstract class UriUtils {
* String value is decoded until the value stops changing (in other words, until the value is
* completely decoded).
* <p/>
- *
+ *
* @param form a mapping of key/value pairs containing possible encoded String values.
* @return the original Map (form) with keys re-paired with decoded String values.
* @see #decode(java.util.Map, String)
@@ -145,7 +145,7 @@ public abstract class UriUtils {
* String value is decoded until the value stops changing (in other words, until the value is
* completely decoded).
* <p/>
- *
+ *
* @param form a mapping of key/value pairs containing possible encoded String values.
* @return the original Map (form) with keys re-paired with decoded String values.
* @see #decode(String, String)
@@ -167,7 +167,7 @@ public abstract class UriUtils {
/**
* Encode the specified String value using the default encoding, UTF-8.
* <p/>
- *
+ *
* @param value the String value to encode.
* @return an encoded value of the String using the default encoding, UTF-8. If UTF-8 is
* unsupported, then value is returned.
@@ -181,7 +181,7 @@ public abstract class UriUtils {
/**
* Encode the String value using the specified encoding.
* <p/>
- *
+ *
* @param value the String value to encode.
* @param encoding a String value indicating the encoding.
* @return an encoded value of the String using the specified encoding. If the encoding is
@@ -200,7 +200,7 @@ public abstract class UriUtils {
* Encodes the array of String values using the default encoding, UTF-8. Each String value in the
* array is encoded individually and placed back in the array at the exact same index.
* <p/>
- *
+ *
* @param values the array of encoded String values to encode.
* @return the same String array with each String value encoded using the default encoding of
* UTF-8.
@@ -215,7 +215,7 @@ public abstract class UriUtils {
* Encodes the array of String values using the specified encoding (e.g. UTF-8). Each String value
* in the array is encoded individually and placed back in the array at the exact same index.
* <p/>
- *
+ *
* @param values the array of encoded String values to encode.
* @return the same String array with each String value encoded using the default encoding of
* UTF-8.
@@ -237,7 +237,7 @@ public abstract class UriUtils {
* similar to a key/value data store but with the contents from an HTML form. Keys with String
* values are searched and encoded, which then get repaired with the same Key.
* <p/>
- *
+ *
* @param form a mapping of key/value pairs containing String values to encode.
* @return the original Map (form) with keys re-paired with encoded String values.
* @see #encode(java.util.Map, String)
@@ -252,7 +252,7 @@ public abstract class UriUtils {
* structurally similar to a key/value data store but with the contents from an HTML form. Keys
* with String values are searched and encoded, which then get repaired with the same Key.
* <p/>
- *
+ *
* @param form a mapping of key/value pairs containing String values to encode.
* @return the original Map (form) with keys re-paired with encoded String values.
* @see #encode(String, String)
diff --git a/geode-core/src/main/java/org/apache/geode/management/membership/ClientMembership.java b/geode-core/src/main/java/org/apache/geode/management/membership/ClientMembership.java
index c1ea796..1cd92f3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/membership/ClientMembership.java
+++ b/geode-core/src/main/java/org/apache/geode/management/membership/ClientMembership.java
@@ -29,7 +29,7 @@ public final class ClientMembership {
/**
* Registers a {@link ClientMembershipListener} for notification of connection changes for
* CacheServer and clients.
- *
+ *
* @param listener a ClientMembershipListener to be registered
*/
public static void registerClientMembershipListener(ClientMembershipListener listener) {
@@ -38,7 +38,7 @@ public final class ClientMembership {
/**
* Removes registration of a previously registered {@link ClientMembershipListener}.
- *
+ *
* @param listener a ClientMembershipListener to be unregistered
*/
public static void unregisterClientMembershipListener(ClientMembershipListener listener) {
@@ -48,7 +48,7 @@ public final class ClientMembership {
/**
* Returns an array of all the currently registered <code>ClientMembershipListener</code>s.
* Modifications to the returned array will not affect the registration of these listeners.
- *
+ *
* @return the registered <code>ClientMembershipListener</code>s; an empty array if no listeners
*/
public static ClientMembershipListener[] getClientMembershipListeners() {
diff --git a/geode-core/src/main/java/org/apache/geode/management/membership/MembershipEvent.java b/geode-core/src/main/java/org/apache/geode/management/membership/MembershipEvent.java
index 12256eb..6815869 100644
--- a/geode-core/src/main/java/org/apache/geode/management/membership/MembershipEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/membership/MembershipEvent.java
@@ -30,7 +30,7 @@ public interface MembershipEvent {
/**
* Returns the {@link DistributedMember} that this event originated in.
- *
+ *
* @return the member that performed the operation that originated this event.
* @since GemFire 8.0
*/
diff --git a/geode-core/src/main/java/org/apache/geode/management/membership/UniversalMembershipListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/management/membership/UniversalMembershipListenerAdapter.java
index 7cc90b2..74d11d1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/membership/UniversalMembershipListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/membership/UniversalMembershipListenerAdapter.java
@@ -79,7 +79,7 @@ import org.apache.geode.management.ManagementService;
* The following code illustrates how a CacheServer application would use
* <code>UniversalMembershipListenerAdapter</code>. The code in this example assumes that the class
* MyMembershipListenerImpl extends <code>UniversalMembershipListenerAdapter</code>:
- *
+ *
* <pre>
* <code>
* public class MyMembershipListenerImpl extends UniversalMembershipListenerAdapter {
@@ -93,15 +93,15 @@ import org.apache.geode.management.ManagementService;
* // customer code
* }
* }
- *
+ *
* Cache cache = //Get hold of GemFire Cache instance
* ManagementService service = ManagementService.getExistingManagementService(cache);
- *
+ *
* MyMembershipListenerImpl myListener = new MyMembershipListenerImpl();
* myListener.registerMembershipListener(service);
* </code>
* </pre>
- *
+ *
* The callback on MyMembershipListenerImpl would then be invoked for all
* <code>MembershipEvent</code>s and <code>ClientMembershipEvent</code>s. The latter will appear to
* be <code>MembershipEvent</code>s.
@@ -112,13 +112,13 @@ import org.apache.geode.management.ManagementService;
* <code>UniversalMembershipListenerAdapter</code>, where MyMembershipListenerImpl is a
* subclass.Simply by constructing this subclass of <code>UniversalMembershipListenerAdapter</code>
* it is registering itself as a <code>ClientMembershipListener</code>:
- *
+ *
* <pre>
* <code>
* new MyMembershipListenerImpl();
* </code>
* </pre>
- *
+ *
* A client that also connects to the <code>DistributedSystem</code> could register with
* the<code>ManagementService</code> as shown above.
* </p>
@@ -131,7 +131,7 @@ import org.apache.geode.management.ManagementService;
* ManagementService#addMembershipListener}.
* </p>
*
- *
+ *
* @since GemFire 8.0
*/
public abstract class UniversalMembershipListenerAdapter implements MembershipListener {
@@ -154,7 +154,7 @@ public abstract class UniversalMembershipListenerAdapter implements MembershipLi
/**
* Constructs an instance of UniversalMembershipListenerAdapter.
- *
+ *
* @param historySize number of historical events to track in order to avoid duplicate events for
* members that are both client and peer members; must a number between 10 and
* <code>Integer.MAX_INT</code>
@@ -208,7 +208,7 @@ public abstract class UniversalMembershipListenerAdapter implements MembershipLi
/**
* Unregisters this adapter as a <code>ClientMembershipListener</code>.
- *
+ *
* @see #registerClientMembershipListener
*/
public void unregisterClientMembershipListener() {
@@ -360,4 +360,3 @@ public abstract class UniversalMembershipListenerAdapter implements MembershipLi
};
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/memcached/GemFireMemcachedServer.java b/geode-core/src/main/java/org/apache/geode/memcached/GemFireMemcachedServer.java
index 4da7e0a..a58f4fa 100644
--- a/geode-core/src/main/java/org/apache/geode/memcached/GemFireMemcachedServer.java
+++ b/geode-core/src/main/java/org/apache/geode/memcached/GemFireMemcachedServer.java
@@ -34,9 +34,9 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.memcached.ConnectionHandler;
+import org.apache.geode.internal.net.SocketCreator;
/**
* This is the Server that listens for incoming memcached client connections. This server
@@ -47,9 +47,9 @@ import org.apache.geode.internal.memcached.ConnectionHandler;
* <p>
* "gemcached" region is {@link RegionShortcut#PARTITION} by default, though a cache.xml can be
* provided to override region attributes.
- *
+ *
* This class has a Main method that can be used to start the server.
- *
+ *
*
*/
public class GemFireMemcachedServer {
@@ -117,7 +117,7 @@ public class GemFireMemcachedServer {
/**
* Create an instance of the server. to start the server {@link #start()} must be called.
- *
+ *
* @param port the port on which the server listens for new memcached client connections.
*/
public GemFireMemcachedServer(int port) {
@@ -132,7 +132,7 @@ public class GemFireMemcachedServer {
/**
* Create an instance of the server. to start the server {@link #start()} must be called.
- *
+ *
* @param bindAddress the address on which the server listens for new memcached client
* connections.
* @param port the port on which the server listens for new memcached client connections.
@@ -239,7 +239,7 @@ public class GemFireMemcachedServer {
}
/**
- *
+ *
* @param args
*/
public static void main(String[] args) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java b/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java
index 35472c8..521fdbe 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/FieldType.java
@@ -27,7 +27,7 @@ import org.apache.geode.pdx.internal.DataSize;
* Some field types are always serialized with a certain number of bytes; these are called
* "fixed-width". Others are serialized with a variable number of bytes; these are called
* "variable-width".
- *
+ *
* @since GemFire 6.6.2
*/
public enum FieldType {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java b/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
index 6d32c0a..8dde931 100755
--- a/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
@@ -14,12 +14,17 @@
*/
package org.apache.geode.pdx;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonParser.Feature;
import com.fasterxml.jackson.core.JsonParser.NumberType;
import com.fasterxml.jackson.core.JsonToken;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.internal.json.JSONToPdxMapper;
import org.apache.geode.pdx.internal.json.PdxInstanceHelper;
@@ -27,10 +32,6 @@ import org.apache.geode.pdx.internal.json.PdxInstanceSortedHelper;
import org.apache.geode.pdx.internal.json.PdxListHelper;
import org.apache.geode.pdx.internal.json.PdxToJSON;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
/**
* <p>
@@ -111,7 +112,7 @@ public class JSONFormatter {
/**
* Converts a JSON document into a PdxInstance
- *
+ *
* @return the PdxInstance.
* @throws JSONFormatterException if unable to parse the JSON document
*/
@@ -121,7 +122,7 @@ public class JSONFormatter {
/**
* Converts a JSON document into a PdxInstance
- *
+ *
* @return the PdxInstance.
* @throws JSONFormatterException if unable to parse the JSON document
*/
@@ -160,7 +161,7 @@ public class JSONFormatter {
/**
* Converts a PdxInstance into a JSON document
- *
+ *
* @return the JSON string.
* @throws JSONFormatterException if unable to create the JSON document
*/
@@ -175,7 +176,7 @@ public class JSONFormatter {
/**
* Converts a PdxInstance into a JSON document in byte-array form
- *
+ *
* @return the JSON byte array.
* @throws JSONFormatterException if unable to create the JSON document
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatterException.java b/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatterException.java
index 0765139..dc8e4c7 100755
--- a/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatterException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatterException.java
@@ -27,7 +27,7 @@ public class JSONFormatterException extends GemFireException {
/**
* Create the exception with the given message.
- *
+ *
* @param message the message of the new exception
*/
public JSONFormatterException(String message) {
@@ -36,7 +36,7 @@ public class JSONFormatterException extends GemFireException {
/**
* Create the exception with the given message and cause.
- *
+ *
* @param message the message of the new exception
* @param cause the cause of the new exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/NonPortableClassException.java b/geode-core/src/main/java/org/apache/geode/pdx/NonPortableClassException.java
index eb9f1d4..ddc8847 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/NonPortableClassException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/NonPortableClassException.java
@@ -17,7 +17,7 @@ package org.apache.geode.pdx;
/**
* Thrown if "check-portability" is enabled and an attempt is made to pdx serialize a class that is
* not portable to non-java platforms.
- *
+ *
* @since GemFire 6.6.2
*/
public class NonPortableClassException extends PdxSerializationException {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxConfigurationException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxConfigurationException.java
index 7ba1d9e..983d6bf 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxConfigurationException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -21,7 +21,7 @@ import org.apache.geode.GemFireException;
/**
* Thrown when a configuration that is now allowed by PDX is detected.
- *
+ *
* @since GemFire 6.6
*
*/
@@ -31,7 +31,7 @@ public class PdxConfigurationException extends GemFireException {
/**
* Constructs a new exception with the given message
- *
+ *
* @param message the message of the new exception
*/
public PdxConfigurationException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldAlreadyExistsException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldAlreadyExistsException.java
index 538a829..0430fc8 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldAlreadyExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldAlreadyExistsException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -29,7 +29,7 @@ import org.apache.geode.GemFireException;
* <p>
* It can also be caused by {@link PdxWriter#writeUnreadFields(PdxUnreadFields) writeUnreadFields}
* being called after a field is written.
- *
+ *
* @since GemFire 6.6
*
*/
@@ -38,7 +38,7 @@ public class PdxFieldAlreadyExistsException extends GemFireException {
/**
* Constructs a new exception with the given message.
- *
+ *
* @param message the message of the new exception
*/
public PdxFieldAlreadyExistsException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldDoesNotExistException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldDoesNotExistException.java
index 3ee4162..7f83e27 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldDoesNotExistException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldDoesNotExistException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -22,7 +22,7 @@ import org.apache.geode.GemFireException;
/**
* Thrown when a PDX field does not exist and the current operation requires its existence. PDX
* fields exist after they are written by one of the writeXXX methods on {@link PdxWriter}.
- *
+ *
* @since GemFire 6.6
*
*/
@@ -32,7 +32,7 @@ public class PdxFieldDoesNotExistException extends GemFireException {
/**
* Constructs a new exception with the given message
- *
+ *
* @param message the message of the new exception
*/
public PdxFieldDoesNotExistException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldTypeMismatchException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldTypeMismatchException.java
index 8af475d..b20221d 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldTypeMismatchException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxFieldTypeMismatchException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -26,7 +26,7 @@ import org.apache.geode.GemFireException;
* <p>
* This exception can also be caused by {@link WritablePdxInstance#setField(String, Object)
* setField} trying to set a value whose type is not compatible with the field.
- *
+ *
* @since GemFire 6.6
*
*/
@@ -35,7 +35,7 @@ public class PdxFieldTypeMismatchException extends GemFireException {
/**
* Constructs a new exception with the given message
- *
+ *
* @param message the message of the new exception
*/
public PdxFieldTypeMismatchException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxInitializationException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxInitializationException.java
index 106f28e..960a383 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxInitializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxInitializationException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -22,7 +22,7 @@ import org.apache.geode.GemFireException;
/**
* Thrown if the PDX system could not be successfully initialized. The cause will give the detailed
* reason why initialization failed.
- *
+ *
* @since GemFire 6.6
*
*/
@@ -32,7 +32,7 @@ public class PdxInitializationException extends GemFireException {
/**
* Construct a new exception with the given message
- *
+ *
* @param message the message of the new exception
*/
public PdxInitializationException(String message) {
@@ -41,7 +41,7 @@ public class PdxInitializationException extends GemFireException {
/**
* Construct a new exception with the given message and cause
- *
+ *
* @param message the message of the new exception
* @param cause the cause of the new exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxInstance.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxInstance.java
index a463a86..c9d398b 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxInstance.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxInstance.java
@@ -40,14 +40,14 @@ import org.apache.geode.cache.client.ClientCacheFactory;
* field and the PdxInstance for version 2 will have the field. This differs from deserialization of
* a pdx back to a domain class. In that case if version 2 is deserializing version 1 PdxReader will
* return a default value for the added field even though version 1 has no knowledge of it.
- *
+ *
* @since GemFire 6.6
*/
public interface PdxInstance extends java.io.Serializable {
/**
* Return the full name of the class that this pdx instance represents.
- *
+ *
* @return the name of the class that this pdx instance represents.
* @since GemFire 6.6.2
*/
@@ -57,14 +57,14 @@ public interface PdxInstance extends java.io.Serializable {
* Returns true if this instance represents an enum. Enum's have a String field named "name" and
* an int field named "ordinal". It is ok to cast a PdxInstance that represents an enum to
* {@link java.lang.Comparable}. PdxInstances representing enums are not writable.
- *
+ *
* @return true if this instance represents an enum.
*/
public boolean isEnum();
/**
* Deserializes and returns the domain object that this instance represents.
- *
+ *
* @return the deserialized domain object.
* @throws PdxSerializationException if the instance could not be deserialized
*/
@@ -74,7 +74,7 @@ public interface PdxInstance extends java.io.Serializable {
* Checks if the named field exists and returns the result.
* <p>
* This can be useful when writing code that handles more than one version of a PDX class.
- *
+ *
* @param fieldName the name of the field to check
* @return <code>true</code> if the named field exists; otherwise <code>false</code>
*/
@@ -82,7 +82,7 @@ public interface PdxInstance extends java.io.Serializable {
/**
* Return an unmodifiable list of the field names on this PdxInstance.
- *
+ *
* @return an unmodifiable list of the field names on this PdxInstance
*/
public List<String> getFieldNames();
@@ -93,7 +93,7 @@ public interface PdxInstance extends java.io.Serializable {
* <p>
* Note that if no fields have been marked then all the fields are used as identity fields even
* though this method will return <code>false</code> since none of them have been <em>marked</em>.
- *
+ *
* @param fieldName the name of the field to check
* @return <code>true</code> if the named field exists and was marked as an identify field;
* otherwise <code>false</code>
@@ -111,9 +111,9 @@ public interface PdxInstance extends java.io.Serializable {
* If an Object[] is deserialized by this call then that array's component type will be
* <code>Object.class</code> instead of the original class that the array had when it was
* serialized. This is done so that PdxInstance objects can be added to the array.
- *
+ *
* @param fieldName name of the field to read
- *
+ *
* @return If this instance has the named field then the field's value is returned, otherwise
* <code>null</code> is returned.
* @throws PdxSerializationException if the field could not be deserialized
@@ -162,7 +162,7 @@ public interface PdxInstance extends java.io.Serializable {
* {@link java.util.Arrays#deepEquals(Object[], Object[]) deepEquals} as noted above. You should
* either override equals and hashCode in these cases or mark other fields as your identity
* fields.
- *
+ *
* @param other the other instance to compare to this.
* @return <code>true</code> if this instance is equal to <code>other</code>.
*/
@@ -205,7 +205,7 @@ public interface PdxInstance extends java.io.Serializable {
* Creates and returns a {@link WritablePdxInstance} whose initial values are those of this
* PdxInstance. This call returns a copy of the current field values so modifications made to the
* returned value will not modify this PdxInstance.
- *
+ *
* @return a {@link WritablePdxInstance}
* @throws IllegalStateException if the PdxInstance is an enum.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxInstanceFactory.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxInstanceFactory.java
index 2214456..5575417 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxInstanceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxInstanceFactory.java
@@ -25,14 +25,14 @@ import org.apache.geode.cache.RegionService;
* only create a single instance. To create multiple instances create multiple factories or use
* {@link PdxInstance#createWriter()} to create subsequent instances. Using
* {@link PdxInstance#createWriter()} is usually faster.
- *
+ *
* @since GemFire 6.6.2
*/
public interface PdxInstanceFactory {
/**
* Create a {@link PdxInstance}. The instance will contain any data written to this factory using
* the write methods.
- *
+ *
* @return the created instance
* @throws IllegalStateException if called more than once
*/
@@ -43,7 +43,7 @@ public interface PdxInstanceFactory {
* {@code char}.
* <p>
* Java char is mapped to .NET System.Char.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -57,7 +57,7 @@ public interface PdxInstanceFactory {
* {@code boolean}.
* <p>
* Java boolean is mapped to .NET System.Boolean.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -71,7 +71,7 @@ public interface PdxInstanceFactory {
* {@code byte}.
* <p>
* Java byte is mapped to .NET System.SByte.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -85,7 +85,7 @@ public interface PdxInstanceFactory {
* {@code short}.
* <p>
* Java short is mapped to .NET System.Int16.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -99,7 +99,7 @@ public interface PdxInstanceFactory {
* {@code int}.
* <p>
* Java int is mapped to .NET System.Int32.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -113,7 +113,7 @@ public interface PdxInstanceFactory {
* {@code long}.
* <p>
* Java long is mapped to .NET System.Int64.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -127,7 +127,7 @@ public interface PdxInstanceFactory {
* {@code float}.
* <p>
* Java float is mapped to .NET System.Float.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -141,7 +141,7 @@ public interface PdxInstanceFactory {
* {@code double}.
* <p>
* Java double is mapped to .NET System.Double.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -155,7 +155,7 @@ public interface PdxInstanceFactory {
* {@code Date}.
* <p>
* Java Date is mapped to .NET System.DateTime.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -169,7 +169,7 @@ public interface PdxInstanceFactory {
* {@code String}.
* <p>
* Java String is mapped to .NET System.String.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -189,7 +189,7 @@ public interface PdxInstanceFactory {
* Note that some Java objects serialized with this method may not be compatible with non-java
* languages. To ensure that only portable objects are serialized use
* {@link #writeObject(String, Object, boolean)}.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -242,7 +242,7 @@ public interface PdxInstanceFactory {
* <li>java.util.HashSet: CacheableHashSet
* <li>java.util.LinkedHashSet: CacheableLinkedHashSet
* </ul>
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @param checkPortability if true then an exception is thrown if a non-portable object is
@@ -261,7 +261,7 @@ public interface PdxInstanceFactory {
* {@code boolean[]}.
* <p>
* Java boolean[] is mapped to .NET System.Boolean[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -275,7 +275,7 @@ public interface PdxInstanceFactory {
* {@code char[]}.
* <p>
* Java char[] is mapped to .NET System.Char[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -289,7 +289,7 @@ public interface PdxInstanceFactory {
* {@code byte[]}.
* <p>
* Java byte[] is mapped to .NET System.Byte[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -303,7 +303,7 @@ public interface PdxInstanceFactory {
* {@code short[]}.
* <p>
* Java short[] is mapped to .NET System.Int16[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -317,7 +317,7 @@ public interface PdxInstanceFactory {
* {@code int[]}.
* <p>
* Java int[] is mapped to .NET System.Int32[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -331,7 +331,7 @@ public interface PdxInstanceFactory {
* {@code long[]}.
* <p>
* Java long[] is mapped to .NET System.Int64[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -345,7 +345,7 @@ public interface PdxInstanceFactory {
* {@code float[]}.
* <p>
* Java float[] is mapped to .NET System.Float[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -359,7 +359,7 @@ public interface PdxInstanceFactory {
* {@code double[]}.
* <p>
* Java double[] is mapped to .NET System.Double[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -373,7 +373,7 @@ public interface PdxInstanceFactory {
* {@code String[]}.
* <p>
* Java String[] is mapped to .NET System.String[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -391,7 +391,7 @@ public interface PdxInstanceFactory {
* writeObject}. Note that this call may serialize elements that are not compatible with non-java
* languages. To ensure that only portable objects are serialized use
* {@link #writeObjectArray(String, Object[], boolean)}.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -409,7 +409,7 @@ public interface PdxInstanceFactory {
* writeObject}. Note that this call may serialize elements that are not compatible with non-java
* languages. To ensure that only portable objects are serialized use
* {@code writeObjectArray(String, Object[], boolean)}.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @param checkPortability if true then an exception is thrown if a non-portable object is
@@ -429,7 +429,7 @@ public interface PdxInstanceFactory {
* {@code byte[][]}.
* <p>
* Java byte[][] is mapped to .NET System.Byte[][].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxInstanceFactory
@@ -472,7 +472,7 @@ public interface PdxInstanceFactory {
* </ul>
* Note that the object form of primitives, for example Integer.class and Long.class, map to
* {@link #writeObject(String, Object) writeObject}.
- *
+ *
* @param fieldName the name of the field to write
* @param fieldValue the value of the field to write; this parameter's class must extend the
* {@code fieldType}
@@ -517,7 +517,7 @@ public interface PdxInstanceFactory {
* </ul>
* Note that the object form of primitives, for example Integer.class and Long.class, map to
* {@link #writeObject(String, Object, boolean) writeObject}.
- *
+ *
* @param fieldName the name of the field to write
* @param fieldValue the value of the field to write; this parameter's class must extend the
* {@code fieldType}
@@ -538,16 +538,16 @@ public interface PdxInstanceFactory {
* Indicate that the named field should be included in hashCode and equals checks of this object
* on a server that is accessing {@link PdxInstance} or when a client executes a query on a
* server.
- *
+ *
* The fields that are marked as identity fields are used to generate the hashCode and equals
* methods of {@link PdxInstance}. Because of this, the identity fields should themselves either
* be primitives, or implement hashCode and equals.
- *
+ *
* If no fields are set as identity fields, then all fields will be used in hashCode and equals
* checks.
- *
+ *
* The identity fields should make marked after they are written using a write* method.
- *
+ *
* @param fieldName the name of the field to mark as an identity field.
* @return this PdxInstanceFactory
* @throws PdxFieldDoesNotExistException if the named field has not already been written.
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxReader.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxReader.java
index c426165..5733a2e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxReader.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxReader.java
@@ -29,14 +29,14 @@ import java.util.Date;
* <P>
* The methods on this interface are not thread safe so do not call them concurrently, on the same
* instance, from more than one thread.
- *
+ *
* @since GemFire 6.6
*/
public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a <code>char</code>
@@ -47,7 +47,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a
@@ -58,7 +58,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a <code>byte</code>
@@ -69,7 +69,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a <code>short</code>
@@ -80,7 +80,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a <code>int</code>
@@ -91,7 +91,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a <code>long</code>
@@ -102,7 +102,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a <code>float</code>
@@ -113,7 +113,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a
@@ -124,7 +124,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxFieldTypeMismatchException if the named field exists and is not a
@@ -135,7 +135,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -146,7 +146,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -157,7 +157,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -168,7 +168,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -179,7 +179,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -190,7 +190,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -201,7 +201,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -212,7 +212,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -223,7 +223,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -234,7 +234,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -245,7 +245,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -256,7 +256,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -267,7 +267,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
@@ -280,7 +280,7 @@ public interface PdxReader {
* Checks if the named field exists and returns the result.
* <p>
* This can be useful when writing code that handles more than one version of a PDX class.
- *
+ *
* @param fieldName the name of the field to check
* @return <code>true</code> if the named field exists; otherwise <code>false</code>
*/
@@ -292,7 +292,7 @@ public interface PdxReader {
* <p>
* Note that if no fields have been marked then all the fields are used as identity fields even
* though this method will return <code>false</code> since none of them have been <em>marked</em>.
- *
+ *
* @param fieldName the name of the field to check
* @return <code>true</code> if the named field exists and was marked as an identify field;
* otherwise <code>false</code>
@@ -301,7 +301,7 @@ public interface PdxReader {
/**
* Reads the named field and returns its value.
- *
+ *
* @param fieldName the name of the field to read
* @return the value of the field if the field exists; otherwise a default value
* @throws PdxSerializationException if deserialization of the field fails.
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxRegistryMismatchException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxRegistryMismatchException.java
index 451472c..1317a32 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxRegistryMismatchException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxRegistryMismatchException.java
@@ -26,7 +26,7 @@ public class PdxRegistryMismatchException extends GemFireException {
/**
* Constructs a new exception with the given message
- *
+ *
* @param message the message of the new exception
*/
public PdxRegistryMismatchException(String message) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializable.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializable.java
index 4098ff7..16f5962 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializable.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializable.java
@@ -22,30 +22,30 @@ package org.apache.geode.pdx;
* and fromData method. Also fromData and toData must read and write the same fields each time they
* are called. A domain class that implements this interface must also have a public zero-arg
* constructor which is used during deserialization.
- *
+ *
*
* <p>
* Simple example:
- *
+ *
* <PRE>
* public class User implements PdxSerializable {
* private String name;
* private int userId;
- *
+ *
* public User() {}
- *
+ *
* public void toData(PdxWriter out) {
* out.writeString("name", this.name);
* out.writeInt("userId", this.userId);
* }
- *
+ *
* public void fromData(PdxReader in) {
* this.name = in.readString("name");
* this.userId = in.readInt("userId");
* }
* }
* </PRE>
- *
+ *
* @since GemFire 6.6
*/
@@ -53,14 +53,14 @@ public interface PdxSerializable {
/**
* Serializes the PDX fields using the given writer.
- *
+ *
* @param writer the {@link PdxWriter} to use to write the PDX fields.
*/
public void toData(PdxWriter writer);
/**
* Deserializes the PDX fields using the given reader.
- *
+ *
* @param reader the {@link PdxReader} to use to read the PDX fields.
*/
public void fromData(PdxReader reader);
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializationException.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializationException.java
index 43ae0a4..6adde27 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializationException.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -22,7 +22,7 @@ import org.apache.geode.SerializationException;
/**
* Thrown if a problem occurred during serialization or deserialization of a PDX. In most cases
* consult the cause for a description of the problem.
- *
+ *
* @since GemFire 6.6
*/
public class PdxSerializationException extends SerializationException {
@@ -31,7 +31,7 @@ public class PdxSerializationException extends SerializationException {
/**
* Create the exception with the given message.
- *
+ *
* @param message the message of the new exception
*/
public PdxSerializationException(String message) {
@@ -40,7 +40,7 @@ public class PdxSerializationException extends SerializationException {
/**
* Create the exception with the given message and cause.
- *
+ *
* @param message the message of the new exception
* @param cause the cause of the new exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializer.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializer.java
index 624aa1c..5119282 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxSerializer.java
@@ -32,22 +32,22 @@ package org.apache.geode.pdx;
* each time they are called.
* <p>
* If you can modify your domain class then use {@link PdxSerializable} instead.
- *
+ *
* <p>
* Simple example:
- *
+ *
* <PRE>
* public class User {
- * final public String name;
- * final public int userId;
- *
+ * public final String name;
+ * public final int userId;
+ *
* public User(String name, int userId) {
* this.name = name;
* this.userId = userId;
* }
* }
- *
- *
+ *
+ *
* public class MyPdxSerializer implements PdxSerializer {
* public boolean toData(Object o, PdxWriter out) {
* if (o instanceof User) {
@@ -59,7 +59,7 @@ package org.apache.geode.pdx;
* return false;
* }
* }
- *
+ *
* public Object fromData(Class<?> clazz, PdxReader in) {
* if (User.class.isAssignableFrom(clazz)) {
* return new User(in.readString("name"), in.readInt("userId"));
@@ -69,7 +69,7 @@ package org.apache.geode.pdx;
* }
* }
* </PRE>
- *
+ *
* @since GemFire 6.6
*/
public interface PdxSerializer {
@@ -77,7 +77,7 @@ public interface PdxSerializer {
* This method is given an object to serialize as a PDX using the given writer. If it chooses to
* do the serialization then it must return <code>true</code>; otherwise it must return
* <code>false</code> in which case it will be serialized using standard serialization.
- *
+ *
* @param o the object to consider serializing as a PDX
* @param out the {@link PdxWriter} to use to serialize the object
* @return <code>true</code> if the method serialized the object; otherwise <code>false</code>
@@ -87,7 +87,7 @@ public interface PdxSerializer {
/**
* This method is given an class that should be instantiated and deserialized using the given
* reader.
- *
+ *
* @param clazz the Class of the object that should be deserialized
* @param in the reader to use to obtain the field data
* @return the deserialized object. <code>null</code> indicates that this PdxSerializer does not
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxUnreadFields.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxUnreadFields.java
index c7da5ad..458253b 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxUnreadFields.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxUnreadFields.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx;
@@ -34,7 +34,7 @@ package org.apache.geode.pdx;
* setPdxIgnoreUnreadFields}) but to reduce the performance and memory overhead of automatic
* preservation it is recommended that use {@link PdxReader#readUnreadFields() readUnreadFields} if
* possible.
- *
+ *
* @since GemFire 6.6
*
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java
index 47f0e6f..a6564a2 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java
@@ -30,7 +30,7 @@ import org.apache.geode.cache.CacheFactory;
* Field names are case sensitive.
* <p>
* All methods on this interface return itself to allow method calls to be chained together.
- *
+ *
* @since GemFire 6.6
*/
public interface PdxWriter {
@@ -40,7 +40,7 @@ public interface PdxWriter {
* <code>char</code>.
* <p>
* Java char is mapped to .NET System.Char.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -54,7 +54,7 @@ public interface PdxWriter {
* <code>boolean</code>.
* <p>
* Java boolean is mapped to .NET System.Boolean.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -68,7 +68,7 @@ public interface PdxWriter {
* <code>byte</code>.
* <p>
* Java byte is mapped to .NET System.SByte.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -82,7 +82,7 @@ public interface PdxWriter {
* <code>short</code>.
* <p>
* Java short is mapped to .NET System.Int16.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -96,7 +96,7 @@ public interface PdxWriter {
* <code>int</code>.
* <p>
* Java int is mapped to .NET System.Int32.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -110,7 +110,7 @@ public interface PdxWriter {
* <code>long</code>.
* <p>
* Java long is mapped to .NET System.Int64.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -124,7 +124,7 @@ public interface PdxWriter {
* <code>float</code>.
* <p>
* Java float is mapped to .NET System.Float.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -138,7 +138,7 @@ public interface PdxWriter {
* <code>double</code>.
* <p>
* Java double is mapped to .NET System.Double.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -152,7 +152,7 @@ public interface PdxWriter {
* <code>Date</code>.
* <p>
* Java Date is mapped to .NET System.DateTime.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -166,7 +166,7 @@ public interface PdxWriter {
* <code>String</code>.
* <p>
* Java String is mapped to .NET System.String.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -186,7 +186,7 @@ public interface PdxWriter {
* Note that some Java objects serialized with this method may not be compatible with non-java
* languages. To ensure that only portable objects are serialized use
* {@link #writeObject(String, Object, boolean)}.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -239,7 +239,7 @@ public interface PdxWriter {
* <li>java.util.HashSet: CacheableHashSet
* <li>java.util.LinkedHashSet: CacheableLinkedHashSet
* </ul>
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @param checkPortability if true then an exception is thrown if a non-portable object is
@@ -258,7 +258,7 @@ public interface PdxWriter {
* <code>boolean[]</code>.
* <p>
* Java boolean[] is mapped to .NET System.Boolean[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -272,7 +272,7 @@ public interface PdxWriter {
* <code>char[]</code>.
* <p>
* Java char[] is mapped to .NET System.Char[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -286,7 +286,7 @@ public interface PdxWriter {
* <code>byte[]</code>.
* <p>
* Java byte[] is mapped to .NET System.Byte[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -300,7 +300,7 @@ public interface PdxWriter {
* <code>short[]</code>.
* <p>
* Java short[] is mapped to .NET System.Int16[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -314,7 +314,7 @@ public interface PdxWriter {
* <code>int[]</code>.
* <p>
* Java int[] is mapped to .NET System.Int32[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -328,7 +328,7 @@ public interface PdxWriter {
* <code>long[]</code>.
* <p>
* Java long[] is mapped to .NET System.Int64[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -342,7 +342,7 @@ public interface PdxWriter {
* <code>float[]</code>.
* <p>
* Java float[] is mapped to .NET System.Float[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -356,7 +356,7 @@ public interface PdxWriter {
* <code>double[]</code>.
* <p>
* Java double[] is mapped to .NET System.Double[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -370,7 +370,7 @@ public interface PdxWriter {
* <code>String[]</code>.
* <p>
* Java String[] is mapped to .NET System.String[].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -388,7 +388,7 @@ public interface PdxWriter {
* Note that this call may serialize elements that are not compatible with non-java languages. To
* ensure that only portable objects are serialized use
* {@link #writeObjectArray(String, Object[], boolean)}.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -406,7 +406,7 @@ public interface PdxWriter {
* Note that this call may serialize elements that are not compatible with non-java languages. To
* ensure that only portable objects are serialized use
* {@link #writeObjectArray(String, Object[], boolean)}.
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @param checkPortability if true then an exception is thrown if a non-portable object is
@@ -425,7 +425,7 @@ public interface PdxWriter {
* <code>byte[][]</code>.
* <p>
* Java byte[][] is mapped to .NET System.Byte[][].
- *
+ *
* @param fieldName the name of the field to write
* @param value the value of the field to write
* @return this PdxWriter
@@ -468,7 +468,7 @@ public interface PdxWriter {
* </ul>
* Note that the object form of primitives, for example Integer.class and Long.class, map to
* {@link #writeObject(String, Object) writeObject}.
- *
+ *
* @param fieldName the name of the field to write
* @param fieldValue the value of the field to write; this parameter's class must extend the
* <code>fieldType</code>
@@ -514,7 +514,7 @@ public interface PdxWriter {
* </ul>
* Note that the object form of primitives, for example Integer.class and Long.class, map to
* {@link #writeObject(String, Object, boolean) writeObject}.
- *
+ *
* @param fieldName the name of the field to write
* @param fieldValue the value of the field to write; this parameter's class must extend the
* <code>fieldType</code>
@@ -536,7 +536,7 @@ public interface PdxWriter {
* calling {@link PdxReader#readUnreadFields() readUnreadFields}.
* <p>
* This method must be called first before any of the writeXXX methods is called.
- *
+ *
* @param unread the object that was returned from {@link PdxReader#readUnreadFields()
* readUnreadFields}.
* @return this PdxWriter
@@ -548,16 +548,16 @@ public interface PdxWriter {
* Indicate that the named field should be included in hashCode and equals checks of this object
* on a server that is accessing {@link PdxInstance} or when a client executes a query on a
* server.
- *
+ *
* The fields that are marked as identity fields are used to generate the hashCode and equals
* methods of {@link PdxInstance}. Because of this, the identity fields should themselves either
* be primitives, or implement hashCode and equals.
- *
+ *
* If no fields are set as identity fields, then all fields will be used in hashCode and equals
* checks.
- *
+ *
* The identity fields should be marked after they are written using a write* method.
- *
+ *
* @param fieldName the name of the field to mark as an identity field.
* @return this PdxWriter
* @throws PdxFieldDoesNotExistException if the named field has not already been written.
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java b/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
index e5de960..8c8f93c 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.pdx;
-import org.apache.geode.cache.Declarable;
-import org.apache.geode.cache.RegionService;
-import org.apache.geode.pdx.internal.AutoSerializableManager;
-
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.RegionService;
+import org.apache.geode.pdx.internal.AutoSerializableManager;
+
/**
* This class uses Java reflection in conjunction with {@link org.apache.geode.pdx.PdxSerializer
* PdxSerialzer} to perform automatic serialization of domain objects. The implication is that the
@@ -31,7 +31,7 @@ import java.util.Properties;
* This implementation will serialize all relevant fields
* <p>
* For example:
- *
+ *
* <pre>
* Cache c = new CacheFactory().set("cache-xml-file", cacheXmlFileName)
* .setPdxSerializer(new ReflectionBasedAutoSerializer("com.foo.DomainObject")).create();
@@ -41,7 +41,7 @@ import java.util.Properties;
* <code>PdxSerializable</code> to be serialized.
* <p>
* The equivalent <code>cache.xml</code> entries might be as follows:
- *
+ *
* <pre>
* <pdx>
* <pdx-serializer>
@@ -54,10 +54,10 @@ import java.util.Properties;
* </pdx-serializer>
* </pdx>
* </pre>
- *
+ *
* See {@link ReflectionBasedAutoSerializer#reconfigure(String...) reconfigure} for additional
* details on the format of the parameter string.
- *
+ *
* @since GemFire 6.6
*/
public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable {
@@ -78,18 +78,18 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* Portability of serialization will not be checked.
* <p>
* Each string in the list represents a definition in the following form:
- *
+ *
* <pre>
* <class pattern>#identity=<identity field pattern>#exclude=<exclude field pattern>
* </pre>
- *
+ *
* The hash (#) characters are separators and are not part of the parameter name. An example would
* be:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*#exclude=creationDate
* </pre>
- *
+ *
* This would select all classes with a class name beginning with
* <code>com.company.DomainObject</code> and would select as PDX identity fields any fields
* beginning with <code>id</code> and would not serialize the field called
@@ -97,16 +97,16 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* There is no association between the the <i>identity</i> and <i>exclude</i> options, so the
* above example could also be expressed as:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*
* com.company.DomainObject.*#exclude=creationDate
* </pre>
- *
+ *
* Note that <u>all</u> defined patterns are used when determining whether a field should be
* considered as an identity field or should be excluded. Thus the order of the patterns is not
* relevant.
- *
+ *
* @param classes the patterns which are matched against domain class names to determine whether
* they should be serialized
* @deprecated as of 6.6.2 use ReflectionBasedAutoSerializer(String...) instead.
@@ -127,18 +127,18 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* Portability of serialization will not be checked.
* <p>
* Each string in the list represents a definition in the following form:
- *
+ *
* <pre>
* <class pattern>#identity=<identity field pattern>#exclude=<exclude field pattern>
* </pre>
- *
+ *
* The hash (#) characters are separators and are not part of the parameter name. An example would
* be:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*#exclude=creationDate
* </pre>
- *
+ *
* This would select all classes with a class name beginning with
* <code>com.company.DomainObject</code> and would select as PDX identity fields any fields
* beginning with <code>id</code> and would not serialize the field called
@@ -146,16 +146,16 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* There is no association between the the <i>identity</i> and <i>exclude</i> options, so the
* above example could also be expressed as:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*
* com.company.DomainObject.*#exclude=creationDate
* </pre>
- *
+ *
* Note that <u>all</u> defined patterns are used when determining whether a field should be
* considered as an identity field or should be excluded. Thus the order of the patterns is not
* relevant.
- *
+ *
* @param patterns the patterns which are matched against domain class names to determine whether
* they should be serialized
* @since GemFire 6.6.2
@@ -168,18 +168,18 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* Constructor which takes a list of class name patterns which are to be auto-serialized.
* <p>
* Each string in the list represents a definition in the following form:
- *
+ *
* <pre>
* <class pattern>#identity=<identity field pattern>#exclude=<exclude field pattern>
* </pre>
- *
+ *
* The hash (#) characters are separators and are not part of the parameter name. An example would
* be:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*#exclude=creationDate
* </pre>
- *
+ *
* This would select all classes with a class name beginning with
* <code>com.company.DomainObject</code> and would select as PDX identity fields any fields
* beginning with <code>id</code> and would not serialize the field called
@@ -187,16 +187,16 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* There is no association between the the <i>identity</i> and <i>exclude</i> options, so the
* above example could also be expressed as:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*
* com.company.DomainObject.*#exclude=creationDate
* </pre>
- *
+ *
* Note that <u>all</u> defined patterns are used when determining whether a field should be
* considered as an identity field or should be excluded. Thus the order of the patterns is not
* relevant.
- *
+ *
* @param checkPortability if <code>true</code> then an serialization done by this serializer will
* throw an exception if the object it not portable to non-java languages.
* @param patterns the patterns which are matched against domain class names to determine whether
@@ -215,18 +215,18 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* define any fields to exclude from serialization.
* <p>
* Each string in the list represents a definition in the following form:
- *
+ *
* <pre>
* <class pattern>#identity=<identity field pattern>#exclude=<exclude field pattern>
* </pre>
- *
+ *
* The hash (#) characters are separators and are not part of the parameter name. An example would
* be:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*#exclude=creationDate
* </pre>
- *
+ *
* This would select all classes with a class name beginning with
* <code>com.company.DomainObject</code> and would select as PDX identity fields any fields
* beginning with <code>id</code> and would not serialize the field called
@@ -234,16 +234,16 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* There is no association between the the <i>identity</i> and <i>exclude</i> options, so the
* above example could also be expressed as:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*
* com.company.DomainObject.*#exclude=creationDate
* </pre>
- *
+ *
* Note that <u>all</u> defined patterns are used when determining whether a field should be
* considered as an identity field or should be excluded. Thus the order of the patterns is not
* relevant.
- *
+ *
* @param patterns the list of definitions to apply
* @deprecated as of 6.6.2 use {@link #reconfigure(String...)} instead.
*/
@@ -256,18 +256,18 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* will not check for portable serialization.
* <p>
* Each string in the list represents a definition in the following form:
- *
+ *
* <pre>
* <class pattern>#identity=<identity field pattern>#exclude=<exclude field pattern>
* </pre>
- *
+ *
* The hash (#) characters are separators and are not part of the parameter name. An example would
* be:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*#exclude=creationDate
* </pre>
- *
+ *
* This would select all classes with a class name beginning with
* <code>com.company.DomainObject</code> and would select as PDX identity fields any fields
* beginning with <code>id</code> and would not serialize the field called
@@ -275,16 +275,16 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* There is no association between the the <i>identity</i> and <i>exclude</i> options, so the
* above example could also be expressed as:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*
* com.company.DomainObject.*#exclude=creationDate
* </pre>
- *
+ *
* Note that <u>all</u> defined patterns are used when determining whether a field should be
* considered as an identity field or should be excluded. Thus the order of the patterns is not
* relevant.
- *
+ *
* @param patterns the definitions to apply
* @since GemFire 6.6.2
*/
@@ -296,18 +296,18 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* Method to reconfigure this serializer. Any previous configuration is cleared.
* <p>
* Each string in the list represents a definition in the following form:
- *
+ *
* <pre>
* <class pattern>#identity=<identity field pattern>#exclude=<exclude field pattern>
* </pre>
- *
+ *
* The hash (#) characters are separators and are not part of the parameter name. An example would
* be:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*#exclude=creationDate
* </pre>
- *
+ *
* This would select all classes with a class name beginning with
* <code>com.company.DomainObject</code> and would select as PDX identity fields any fields
* beginning with <code>id</code> and would not serialize the field called
@@ -315,16 +315,16 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* There is no association between the the <i>identity</i> and <i>exclude</i> options, so the
* above example could also be expressed as:
- *
+ *
* <pre>
* com.company.DomainObject.*#identity=id.*
* com.company.DomainObject.*#exclude=creationDate
* </pre>
- *
+ *
* Note that <u>all</u> defined patterns are used when determining whether a field should be
* considered as an identity field or should be excluded. Thus the order of the patterns is not
* relevant.
- *
+ *
* @param patterns the definitions to apply
* @param checkPortability if <code>true</code> then an serialization done by this serializer will
* throw an exception if the object it not portable to non-java languages.
@@ -336,7 +336,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
/**
* Method implemented from <code>PdxSerializer</code> which performs object serialization.
- *
+ *
* @param obj the object to serialize
* @param writer the <code>PdxWriter</code> to use when serializing this object
* @return <code>true</code> if the object was serialized, <code>false</code> otherwise
@@ -347,7 +347,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
/**
* Method implemented from <code>PdxSerializer</code> which performs object de-serialization.
- *
+ *
* @param clazz the class of the object to re-create
* @param reader the <code>PdxReader</code> to use when creating this object
* @return the deserialized object if this serializer handles the given class, null otherwise.
@@ -367,7 +367,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* specifics.</li>
* <li><b>check-portability</b> - if true then an exception will be thrown if an attempt to
* serialize data that is not portable to .NET is made.
- *
+ *
* @param props properties used to configure the auto serializer
*/
public void init(Properties props) {
@@ -379,7 +379,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* on how this <code>ReflectionBasedAutoSerializer</code> was configured, the returned property
* value will have the correct semantics but may differ from the the original configuration
* string.
- *
+ *
* @return a <code>Properties</code> object
*/
public Properties getConfig() {
@@ -405,7 +405,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* This method is only called the first time it sees a new class. The result will be remembered
* and used the next time the same class is seen.
- *
+ *
* @param clazz the class that is being considered for auto serialization.
* @return true if instances of the class should be auto serialized; false if not.
* @since GemFire 6.6.2
@@ -428,7 +428,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* This method is only called the first time it sees a new class. The result will be remembered
* and used the next time the same class is seen.
- *
+ *
* @param f the field being considered for serialization
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -451,7 +451,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* This method is only called the first time it sees a new class. The result will be remembered
* and used the next time the same class is seen.
- *
+ *
* @param f the field whose name is returned.
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -474,7 +474,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* This method is only called the first time it sees a new class. The result will be remembered
* and used the next time the same class is seen.
- *
+ *
* @param f the field to test to see if it is an identity field.
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -495,7 +495,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* This method is only called the first time it sees a new class. The result will be remembered
* and used the next time the same class is seen.
- *
+ *
* @param f the field whose pdx field type needs to be determined
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -516,7 +516,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* <p>
* This method is only called the first time it sees a new class. The result will be remembered
* and used the next time the same class is seen.
- *
+ *
* @param f the field in question
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -533,7 +533,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* Controls what field value is written during auto serialization. Override this method to
* customize the data that will be written during auto serialization. This method will only be
* called if {@link #transformFieldValue} returned true.
- *
+ *
* @param f the field in question
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -551,7 +551,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* Controls what field value is read during auto deserialization. Override this method to
* customize the data that will be read during auto deserialization. This method will only be
* called if {@link #transformFieldValue} returned true.
- *
+ *
* @param f the field in question
* @param clazz the original class being serialized that owns this field. Note that this field may
* have been inherited from a super class by this class. If you want to find the class that
@@ -567,7 +567,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
/**
* Returns the cache that this serializer is installed on. Returns null if it is not installed.
- *
+ *
* @since GemFire 6.6.2
*/
public RegionService getRegionService() {
@@ -576,7 +576,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
/**
* For internal use only.
- *
+ *
* @since GemFire 8.2
*/
public Object getManager() {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/WritablePdxInstance.java b/geode-core/src/main/java/org/apache/geode/pdx/WritablePdxInstance.java
index 0105ecc..45ddc52 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/WritablePdxInstance.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/WritablePdxInstance.java
@@ -19,7 +19,7 @@ package org.apache.geode.pdx;
* WritablePdxInstance is a {@link PdxInstance} that also supports field modification using the
* {@link #setField setField} method. To get a WritablePdxInstance call
* {@link PdxInstance#createWriter createWriter}.
- *
+ *
* @since GemFire 6.6
*/
@@ -28,7 +28,7 @@ public interface WritablePdxInstance extends PdxInstance {
* Set the existing named field to the given value. The setField method has copy-on-write
* semantics. So for the modifications to be stored in the cache the WritablePdxInstance must be
* put into a region after setField has been called one or more times.
- *
+ *
* @param fieldName name of the field whose value will be set
* @param value value that will be assigned to the field
* @throws PdxFieldDoesNotExistException if the named field does not exist
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
index 354a9f7..67a2151 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
@@ -14,17 +14,6 @@
*/
package org.apache.geode.pdx.internal;
-import org.apache.geode.CancelException;
-import org.apache.geode.cache.RegionService;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.CopyOnWriteHashSet;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.util.concurrent.CopyOnWriteWeakHashMap;
-import org.apache.geode.pdx.*;
-import org.apache.geode.pdx.internal.unsafe.UnsafeWrapper;
-import org.apache.logging.log4j.Logger;
-
import java.io.Externalizable;
import java.io.ObjectOutputStream;
import java.io.Serializable;
@@ -37,6 +26,18 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.regex.Pattern;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.RegionService;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.CopyOnWriteHashSet;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.util.concurrent.CopyOnWriteWeakHashMap;
+import org.apache.geode.pdx.*;
+import org.apache.geode.pdx.internal.unsafe.UnsafeWrapper;
+
/**
* The core of auto serialization which is used in both aspect and reflection-based
* auto-serialization. This simple manager class is a singleton which tracks the relevant fields for
@@ -44,7 +45,7 @@ import java.util.regex.Pattern;
* instance of ReflectionBasedAutoSerializer will have its own instance of this class. We allow
* instances of this class to be found so that tests can access internal apis that are not exposed
* on the public ReflectionBasedAutoSerializer.
- *
+ *
* @since GemFire 6.6
*/
@@ -173,9 +174,9 @@ public class AutoSerializableManager {
/*
* Helper method to determine whether the class of a given object is a class which we are
* interested in (de)serializing.
- *
+ *
* @param obj
- *
+ *
* @return true if the object should be considered for serialization or false otherwise
*/
private boolean isRelevant(Class<?> clazz) {
@@ -225,7 +226,7 @@ public class AutoSerializableManager {
/*
* Helper method to determine whether a class has a default constructor. That's needed so that it
* can be re-instantiated by PDX on de-serialization.
- *
+ *
*/
private boolean hasValidConstructor(Class<?> clazz, Pattern matchedPattern) {
if (unsafe != null && !USE_CONSTRUCTOR) {
@@ -285,7 +286,7 @@ public class AutoSerializableManager {
}
/**
- * Returns true if a non-static private method with given signature defined by given class, or
+ * Returns true if a non-private static method with given signature defined by given class, or
* false if none found.
*/
private static boolean getPrivateMethod(Class cl, String name, Class[] argTypes,
@@ -356,7 +357,7 @@ public class AutoSerializableManager {
/**
* Given a class, figure out which fields we're interested in serializing. The class' entire
* hierarchy will be traversed and used. Transients and statics will be ignored.
- *
+ *
* @param clazz the <code>Class</code> we're interested in
* @return a list of fields to be used when this class is (de)serialized
*/
@@ -645,7 +646,7 @@ public class AutoSerializableManager {
unsafe = tmp;
}
- public static abstract class PdxFieldWrapper {
+ public abstract static class PdxFieldWrapper {
private final FieldWrapper field;
private final String fieldName;
private final boolean transformValue;
@@ -1939,7 +1940,7 @@ public class AutoSerializableManager {
/**
* Given an object, use its class to determine which fields are to be used when (de)serializing.
- *
+ *
* @param obj the object whose class we're interested in
* @return a list of fields to be used when this object's class is (de)serialized
*/
@@ -1949,7 +1950,7 @@ public class AutoSerializableManager {
/**
* Using the given PdxWriter, write out the relevant fields for the object instance passed in.
- *
+ *
* @param writer the <code>PdxWriter</code> to use when writing the object
* @param obj the object to serialize
* @return <code>true</code> if the object was serialized, <code>false</code> otherwise
@@ -1977,7 +1978,7 @@ public class AutoSerializableManager {
/**
* Using the given PdxWriter, write out the fields which have been passed in.
- *
+ *
* @param writer the <code>PdxWriter</code> to use when writing the object
* @param obj the object to serialize
* @param autoClassInfo a <code>List</code> of <code>Field</code>s which are to be written out
@@ -2025,7 +2026,7 @@ public class AutoSerializableManager {
/**
* Using the given PdxReader, recreate the given object.
- *
+ *
* @param reader the <code>PdxReader</code> to use when reading the object
* @param clazz the class of the object to re-create
*/
@@ -2050,7 +2051,7 @@ public class AutoSerializableManager {
/**
* Add a new class pattern / identity-field pattern tuple
- *
+ *
* @param classPattern the class pattern
* @param fieldPattern the pattern to identify a field as an identity field within the given class
* pattern
@@ -2062,11 +2063,11 @@ public class AutoSerializableManager {
/**
* Return the identity patterns. The patterns are returned as a <code>List</code> of
* <code>String</code> arrays of size 2 - essentially a tuple of the form
- *
+ *
* <pre>
* (classPattern, identityPattern)
* </pre>
- *
+ *
* @return the identity patterns
*/
public List<String[]> getIdentityPatterns() {
@@ -2075,7 +2076,7 @@ public class AutoSerializableManager {
/**
* Add a new class pattern / exclude-field pattern tuple
- *
+ *
* @param classPattern the class pattern
* @param fieldPattern the pattern to exclude a field from serialization within the given class
* pattern
@@ -2087,11 +2088,11 @@ public class AutoSerializableManager {
/**
* Return the exclude patterns. The patterns are returned as a <code>List</code> of
* <code>String</code> arrays of size 2 - essentially a tuple of the form
- *
+ *
* <pre>
* (classPattern, excludePattern)
* </pre>
- *
+ *
* @return the exclude patterns
*/
public List<String[]> getExcludePatterns() {
@@ -2100,13 +2101,13 @@ public class AutoSerializableManager {
/*
* Helper method which determines whether a given field matches a set of class/field patterns.
- *
+ *
* @param field the <code>Field</code> to consider
- *
+ *
* @param field the className which references this field
- *
+ *
* @param matches a map containing the
- *
+ *
* @param
*/
private boolean fieldMatches(Field field, String className, List<String[]> matches) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/DataSize.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/DataSize.java
index 0c792f3..bb69363 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/DataSize.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/DataSize.java
@@ -16,7 +16,7 @@ package org.apache.geode.pdx.internal;
/**
* This is a helper class that defines the size of the primitive java types.
- *
+ *
* @since GemFire 6.6
*/
public class DataSize {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java
index b592f27..1114cfb 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/EnumInfo.java
@@ -235,7 +235,7 @@ public class EnumInfo implements DataSerializableFixedID {
return getFieldNames().contains(fieldName);
}
- static private final List<String> fieldNames;
+ private static final List<String> fieldNames;
static {
ArrayList<String> tmp = new ArrayList<String>(2);
tmp.add("name");
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/InternalPdxReader.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/InternalPdxReader.java
index 7b4ec7e..f6cab14 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/InternalPdxReader.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/InternalPdxReader.java
@@ -23,7 +23,7 @@ import org.apache.geode.pdx.internal.AutoSerializableManager.AutoClassInfo;
/**
* Adds additional methods for reading pdx fields for internal use.
- *
+ *
* @since GemFire 6.6.2
*/
public interface InternalPdxReader extends PdxReader {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
index 0609dd4..b6d8a04 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
@@ -100,7 +100,7 @@ public class LonerTypeRegistration implements TypeRegistration {
/**
* Check to see if the current member is a loner and we can't tell if the user wants a peer or a
* client type registry.
- *
+ *
* @return true if this member is a loner and we can't determine what type of registry they want.
*/
public static boolean isIndeterminateLoner(InternalCache cache) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java
index e3202c8..e454364 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java
@@ -50,7 +50,7 @@ public class PdxField implements DataSerializable, Comparable<PdxField> {
/**
* Set to true by the pdx delete-field gfsh command
- *
+ *
* @since GemFire 8.1
*/
private boolean deleted;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInputStream.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInputStream.java
index c5dfb9e..8d4ea30 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInputStream.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx.internal;
@@ -23,14 +23,14 @@ import java.util.Date;
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireException;
-import org.apache.geode.pdx.PdxSerializationException;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.tcp.ByteBufferInputStream;
import org.apache.geode.internal.tcp.ImmutableByteBufferInputStream;
+import org.apache.geode.pdx.PdxSerializationException;
/**
* Used by PdxReaderImpl to manage the raw bytes of a PDX.
- *
+ *
* @since GemFire 6.6
*/
public class PdxInputStream extends ImmutableByteBufferInputStream {
@@ -38,7 +38,7 @@ public class PdxInputStream extends ImmutableByteBufferInputStream {
/**
* Create a pdx input stream by whose contents are the first length bytes from the given input
* stream.
- *
+ *
* @param existing the input stream whose content will go into this stream. Note that this
* existing stream will be read by this class (a copy is not made) so it should not be
* changed externally.
@@ -50,7 +50,7 @@ public class PdxInputStream extends ImmutableByteBufferInputStream {
/**
* Create a pdx input stream whose contents are the given bytes
- *
+ *
* @param bytes the content of this stream. Note that this byte array will be read by this class
* (a copy is not made) so it should not be changed externally.
*/
@@ -60,7 +60,7 @@ public class PdxInputStream extends ImmutableByteBufferInputStream {
/**
* Create a pdx input stream whose contents are the given bytes
- *
+ *
* @param bb the content of this stream. Note that bb will be read by this class (a copy is not
* made) so it should not be changed externally.
*/
@@ -70,7 +70,7 @@ public class PdxInputStream extends ImmutableByteBufferInputStream {
/**
* Create a pdx input stream by copying another. A somewhat shallow copy is made.
- *
+ *
* @param copy the input stream to copy. Note that this copy stream will be read by this class (a
* copy is not made) so it should not be changed externally.
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
index 86aa67e..e596eb0 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
@@ -35,7 +35,7 @@ import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
/**
* Used to represent an enum value as a PdxInstance
- *
+ *
* @since GemFire 6.6.2
*/
public class PdxInstanceEnum implements PdxInstance, Sendable, ConvertableToBytes, ComparableEnum {
@@ -96,7 +96,7 @@ public class PdxInstanceEnum implements PdxInstance, Sendable, ConvertableToByte
return getFieldNames().contains(fieldName);
}
- static private final List<String> fieldNames;
+ private static final List<String> fieldNames;
static {
ArrayList<String> tmp = new ArrayList<String>(2);
tmp.add("name");
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxOutputStream.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxOutputStream.java
index da4b878..f205e91 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxOutputStream.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.pdx.internal;
@@ -23,12 +23,12 @@ import java.nio.ByteBuffer;
import java.util.Date;
import org.apache.geode.DataSerializer;
-import org.apache.geode.pdx.PdxSerializationException;
import org.apache.geode.internal.ByteBufferWriter;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
+import org.apache.geode.pdx.PdxSerializationException;
/**
* Used by PdxWriterImpl to manage the raw data of a PDX.
@@ -39,7 +39,7 @@ public class PdxOutputStream implements ByteBufferWriter {
private final HeapDataOutputStream hdos;
/**
- *
+ *
*/
public PdxOutputStream() {
this.hdos = new HeapDataOutputStream(Version.CURRENT);
@@ -54,7 +54,7 @@ public class PdxOutputStream implements ByteBufferWriter {
/**
* Wrapper constructor
- *
+ *
* @param hdos
*/
public PdxOutputStream(HeapDataOutputStream hdos) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
index 801157e..8c1e122 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
@@ -42,7 +42,7 @@ import org.apache.geode.pdx.internal.AutoSerializableManager.PdxFieldWrapper;
/**
* A new instance of this class is created each time we deserialize a pdx. It is also used as the
* base class of our {@link PdxInstance} implementation. It is serializable because PdxInstance is.
- *
+ *
* @since GemFire 6.6
* @see InternalDataSerializer#readPdxSerializable(java.io.DataInput)
*/
@@ -836,7 +836,7 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
/**
* Provides optimized deserialization when a blob exactly matches the fields of the target class
* when using {@link AutoSerializableManager}.
- *
+ *
* @param obj the target object we are deserializing into
* @param ci the meta information generated by the auto serializer
*/
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java
index d7d781e..6d7046b 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxString.java
@@ -19,6 +19,7 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.Sendable;
@@ -27,7 +28,7 @@ import org.apache.geode.internal.tcp.ByteBufferInputStream;
/**
* A class that references the String offset in PdxInstance Used as Index keys for PdxInstances and
* query evaluation for PdxInstances
- *
+ *
* @since GemFire 7.0
*/
public class PdxString implements Comparable<PdxString>, Sendable {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
index cd3d9d9..0e6b09a 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
@@ -52,7 +52,7 @@ public class PdxType implements DataSerializable {
private boolean noDomainClass;
/**
* Will be set to true if any fields on this type have been deleted.
- *
+ *
* @since GemFire 8.1
*/
private boolean hasDeletedField;
@@ -205,7 +205,7 @@ public class PdxType implements DataSerializable {
* Return true if two pdx types have same class name and the same fields but, unlike equals, field
* order does not matter. Note a type that expects a domain class can be compatible with one that
* does not expect a domain class.
- *
+ *
* @param other the other pdx type
* @return true if two pdx types are compatible.
*/
@@ -387,7 +387,7 @@ public class PdxType implements DataSerializable {
}
/**
- *
+ *
* @param readFields the fields that have been read
* @return a List of fields that have not been read (may be empty).
*/
@@ -403,7 +403,7 @@ public class PdxType implements DataSerializable {
/**
* Return true if the this type has a field that the other type does not have.
- *
+ *
* @param other the type we are comparing to
* @return true if the this type has a field that the other type does not have.
*/
@@ -463,7 +463,7 @@ public class PdxType implements DataSerializable {
/**
* Used to optimize auto deserialization
*/
- private transient final AtomicReference<AutoClassInfo> autoClassInfo =
+ private final transient AtomicReference<AutoClassInfo> autoClassInfo =
new AtomicReference<AutoClassInfo>();
public void setAutoInfo(AutoClassInfo autoClassInfo) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
index d2621b5..3dc48a6 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
@@ -64,7 +64,7 @@ public class PdxUnreadData implements PdxUnreadFields {
/**
* Returns the PdxType to use when serializing this unread data. Returns null if we don't know
* what this type is yet.
- *
+ *
* @return the PdxType to use when serializing this unread data.
*/
public PdxType getSerializedType() {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
index 61be1ad..4061cae 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
@@ -40,7 +40,7 @@ import org.apache.geode.pdx.internal.AutoSerializableManager.AutoClassInfo;
* A new instance of this class is created for each (nested) instance of {@link PdxSerializable}.
* But it may share the underlying instance of {@link HeapDataOutputStream} with other instances of
* this class.
- *
+ *
* @since GemFire 6.6
* @see InternalDataSerializer#basicWriteObject(Object, java.io.DataOutput, boolean)
*/
@@ -491,7 +491,7 @@ public class PdxWriterImpl implements PdxWriter {
/**
* Must be invoked only after {@link PdxSerializable#toData(PdxWriter)}
- *
+ *
* @return total number of bytes serialized for this pdx
*/
public int completeByteStreamGeneration() {
@@ -592,7 +592,7 @@ public class PdxWriterImpl implements PdxWriter {
/**
* This is required while writing the byte stream.
- *
+ *
* @param offsetCount Number of offsets to appended in this byte stream.
* @param size Size of the byte stream (excluding DSCODE, length int and the offsets.)
* @return size of each offset
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
index 13c97fa..0752066 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
@@ -351,7 +351,7 @@ public class PeerTypeRegistration implements TypeRegistration {
/**
* Test hook that returns the most recently allocated type id
- *
+ *
* @return the most recently allocated type id
*/
public int getLastAllocatedTypeId() {
@@ -361,7 +361,7 @@ public class PeerTypeRegistration implements TypeRegistration {
/**
* Test hook that returns the most recently allocated enum id
- *
+ *
* @return the most recently allocated enum id
*/
public int getLastAllocatedEnumId() {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java
index fbefc9f..310f158 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java
@@ -26,7 +26,7 @@ import org.apache.geode.pdx.internal.AutoSerializableManager.PdxFieldWrapper;
/**
* Used to track what fields are actually read by the user's code. We want to know what fields are
* not read so that we can preserve them.
- *
+ *
* @since GemFire 6.6
*/
public class TrackingPdxReaderImpl implements InternalPdxReader {
@@ -170,7 +170,7 @@ public class TrackingPdxReaderImpl implements InternalPdxReader {
/**
* Returns the indexes of the fields not read during deserialization.
- *
+ *
* @return the indexes of the unread fields
*/
private int[] generateUnreadDataFieldIndexes() {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistration.java
index cb8f948..8b2fbb6 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistration.java
@@ -66,21 +66,21 @@ public interface TypeRegistration {
/**
* Returns the currently defined types.
- *
+ *
* @return the types
*/
Map<Integer, PdxType> types();
/**
* Returns the currently defined enums.
- *
+ *
* @return the enums
*/
Map<Integer, EnumInfo> enums();
/**
* Returns PdxType having the field
- *
+ *
* @param fieldName
* @param className
* @return PdxType or null if field not present
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
index e245b34..ab02806 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
@@ -250,9 +250,9 @@ public class TypeRegistry {
/**
* Test hook that returns the most recently allocated type id
- *
+ *
* Note that this method will not work on clients.
- *
+ *
* @return the most recently allocated type id
*/
public int getLastAllocatedTypeId() {
@@ -467,7 +467,7 @@ public class TypeRegistry {
/**
* Returns the currently defined types.
- *
+ *
* @return the types
*/
public Map<Integer, PdxType> typeMap() {
@@ -476,7 +476,7 @@ public class TypeRegistry {
/**
* Returns the currently defined enums.
- *
+ *
* @return the enums
*/
public Map<Integer, EnumInfo> enumMap() {
@@ -485,11 +485,11 @@ public class TypeRegistry {
/**
* searches a field in different versions (PdxTypes) of a class in the distributed type registry
- *
+ *
* @param fieldName the field to look for in the PdxTypes
* @param className the PdxTypes for this class would be searched
* @return PdxType having the field or null if not found
- *
+ *
*/
PdxType getPdxTypeForField(String fieldName, String className) {
return this.distributedTypeRegistry.getPdxTypeForField(fieldName, className);
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/UnreadPdxType.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/UnreadPdxType.java
index a237865..8a205d3 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/UnreadPdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/UnreadPdxType.java
@@ -19,7 +19,7 @@ package org.apache.geode.pdx.internal;
* pdx and the blob we are deserializing contains fields that our local version does not read. Note
* that instances of the class are only kept locally so I didn't add code to serialize
* unreadFieldIndexes.
- *
+ *
* @since GemFire 6.6
*/
public class UnreadPdxType extends PdxType {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java
index d0a174f..316114b 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java
@@ -41,11 +41,11 @@ import java.util.concurrent.ConcurrentHashMap;
* The approach is to wrap each key in a WeakReference and use the wrapped value as a key in an
* ordinary HashMap. The WeakReference has to be a subclass IdentityWeakReference (IWR) where two
* IWRs are equal if they refer to the same object. This enables us to find the entry again.
- *
+ *
* <p>
* Note: this code came from the jdk from the package: com.sun.jmx.mbeanserver. I modified it to use
* a ConcurrentMap.
- *
+ *
* @since GemFire 6.6
*/
class WeakConcurrentIdentityHashMap<K, V> {
@@ -130,4 +130,3 @@ class WeakConcurrentIdentityHashMap<K, V> {
private final Map<WeakReference<K>, V> map = new ConcurrentHashMap<WeakReference<K>, V>();
private final ReferenceQueue<K> refQueue = new ReferenceQueue<K>();
}
-
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java
index 428fa40..d3c041d 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxToJSON.java
@@ -28,6 +28,7 @@ import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonGenerator.Feature;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/unsafe/UnsafeWrapper.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/unsafe/UnsafeWrapper.java
index 5ef5a9a..b548938 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/unsafe/UnsafeWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/unsafe/UnsafeWrapper.java
@@ -21,7 +21,7 @@ import sun.misc.Unsafe;
/**
* This class wraps the sun.misc.Unsafe class which is only available on Sun JVMs. It is also
* available on other JVMs (like IBM).
- *
+ *
*
*/
public class UnsafeWrapper {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
index 4dc4db7..4087418 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
@@ -211,7 +211,7 @@ public class GeodeRedisServer {
private EventLoopGroup bossGroup;
private EventLoopGroup workerGroup;
- private final static int numExpirationThreads = 1;
+ private static final int numExpirationThreads = 1;
private final ScheduledExecutorService expirationExecutor;
/**
@@ -263,7 +263,7 @@ public class GeodeRedisServer {
/**
* Determine the {@link RegionShortcut} type from a String value. If the String value doesn't map
* to a RegionShortcut type then {@link RegionShortcut#PARTITION} will be used by default.
- *
+ *
* @return {@link RegionShortcut}
*/
private static RegionShortcut setRegionType() {
@@ -279,7 +279,7 @@ public class GeodeRedisServer {
/**
* Helper method to set the number of worker threads
- *
+ *
* @return If the System property {@value #NUM_THREADS_SYS_PROP_NAME} is set then that number is
* used, otherwise 4 * # of cores
*/
@@ -301,7 +301,7 @@ public class GeodeRedisServer {
/**
* Constructor for {@code GeodeRedisServer} that will start the server on the given port and bind
* to the first non-loopback address
- *
+ *
* @param port The port the server will bind to, will use {@value #DEFAULT_REDIS_SERVER_PORT} by
* default
*/
@@ -312,7 +312,7 @@ public class GeodeRedisServer {
/**
* Constructor for {@code GeodeRedisServer} that will start the server and bind to the given
* address and port
- *
+ *
* @param bindAddress The address to which the server will attempt to bind to
* @param port The port the server will bind to, will use {@value #DEFAULT_REDIS_SERVER_PORT} by
* default if argument is less than or equal to 0
@@ -326,7 +326,7 @@ public class GeodeRedisServer {
* address and port. Keep in mind that the log level configuration will only be set if a
* {@link Cache} does not already exist, if one already exists then setting that property will
* have no effect.
- *
+ *
* @param bindAddress The address to which the server will attempt to bind to
* @param port The port the server will bind to, will use {@value #DEFAULT_REDIS_SERVER_PORT} by
* default if argument is less than or equal to 0
@@ -365,7 +365,7 @@ public class GeodeRedisServer {
/**
* Helper method to get the host name to bind to
- *
+ *
* @return The InetAddress to bind to
* @throws UnknownHostException
*/
@@ -478,7 +478,7 @@ public class GeodeRedisServer {
/**
* Helper method to start the server listening for connections. The server is bound to the port
* specified by {@link GeodeRedisServer#serverPort}
- *
+ *
* @throws IOException
* @throws InterruptedException
*/
@@ -558,7 +558,7 @@ public class GeodeRedisServer {
* Takes an entry event and processes it. If the entry denotes that a
* {@link RedisDataType#REDIS_LIST} or {@link RedisDataType#REDIS_SORTEDSET} was created then this
* function will call the necessary calls to create the parameterized queries for those keys.
- *
+ *
* @param event EntryEvent from meta data region
*/
private void afterKeyCreate(EntryEvent<String, RedisDataType> event) {
@@ -610,7 +610,7 @@ public class GeodeRedisServer {
/**
* Helper method to get GemFire set socket buffer size, possibly a default of 32k
- *
+ *
* @return Buffer size to use for server
*/
private int getBufferSize() {
@@ -651,7 +651,7 @@ public class GeodeRedisServer {
* -port= <br>
* -bind-address= <br>
* -log-level=
- *
+ *
* @param args Command line args
*/
public static void main(String[] args) {
@@ -681,7 +681,7 @@ public class GeodeRedisServer {
/**
* Helper method to parse the port to a number
- *
+ *
* @param arg String where the argument is
* @return The port number when the correct syntax was used, otherwise will return
* {@link #DEFAULT_REDIS_SERVER_PORT}
@@ -704,7 +704,7 @@ public class GeodeRedisServer {
/**
* Helper method to parse bind address
- *
+ *
* @param arg String holding bind address
* @return Bind address
*/
@@ -721,7 +721,7 @@ public class GeodeRedisServer {
/**
* Helper method to parse log level
- *
+ *
* @param arg String holding log level
* @return Log level
*/
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/ByteArrayWrapper.java b/geode-core/src/main/java/org/apache/geode/redis/internal/ByteArrayWrapper.java
index 4a0ef59..23170ca 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/ByteArrayWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/ByteArrayWrapper.java
@@ -26,7 +26,7 @@ import org.apache.geode.DataSerializer;
* This class is a wrapper for the any Regions that need to store a byte[]. The only data this an
* instance will store is a byte[] for the data but it is also serializable and comparable so it is
* able to be used in querying
- *
+ *
*
*/
public class ByteArrayWrapper implements DataSerializable, Comparable<ByteArrayWrapper> {
@@ -54,7 +54,7 @@ public class ByteArrayWrapper implements DataSerializable, Comparable<ByteArrayW
/**
* Default constructor constructs a ValueWrapper and initialize the {@link #value}
- *
+ *
* @param value
*/
public ByteArrayWrapper(byte[] value) {
@@ -92,7 +92,7 @@ public class ByteArrayWrapper implements DataSerializable, Comparable<ByteArrayW
/**
* Getter for the length of the {@link #value} array
- *
+ *
* @return The length of the value array
*/
public int length() {
@@ -137,7 +137,7 @@ public class ByteArrayWrapper implements DataSerializable, Comparable<ByteArrayW
/**
* Private helper method to compare two byte arrays, A.compareTo(B). The comparison is basically
* numerical, for each byte index, the byte representing the greater value will be the greater
- *
+ *
* @param A byte[]
* @param B byte[]
* @return 1 if A > B, -1 if B > A, 0 if A == B
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/ByteToCommandDecoder.java b/geode-core/src/main/java/org/apache/geode/redis/internal/ByteToCommandDecoder.java
index 124bf75..d8a2b6f 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/ByteToCommandDecoder.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/ByteToCommandDecoder.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.redis.internal;
+import java.util.ArrayList;
+import java.util.List;
+
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* This is the first part of the channel pipeline for Netty. Here incoming bytes are read and a
* created {@link Command} is sent down the pipeline. It is unfortunate that this class is not
@@ -34,14 +34,14 @@ import java.util.List;
* amount of cpu time. The simplicity of the Redis protocol allows us to just back out and wait for
* more data, while exceptions are left to malformed requests which should never happen if using a
* proper Redis client.
- *
+ *
*
*/
public class ByteToCommandDecoder extends ByteToMessageDecoder {
/**
* Important note
- *
+ *
* Do not use '' <-- java primitive chars. Redis uses {@link Coder#CHARSET} encoding so we should
* not risk java handling char to byte conversions, rather just hard code {@link Coder#CHARSET}
* chars as bytes
@@ -114,7 +114,7 @@ public class ByteToCommandDecoder extends ByteToMessageDecoder {
/**
* Helper method to parse a bulk string when one is seen
- *
+ *
* @param buffer Buffer to read from
* @return byte[] representation of the Bulk String read
* @throws RedisCommandParserException Thrown when there is illegal syntax
@@ -142,7 +142,7 @@ public class ByteToCommandDecoder extends ByteToMessageDecoder {
/**
* Helper method to parse the number at the beginning of the buffer
- *
+ *
* @param buffer Buffer to read
* @return The number found at the beginning of the buffer
*/
@@ -167,7 +167,7 @@ public class ByteToCommandDecoder extends ByteToMessageDecoder {
/**
* Helper method that is called when the next characters are supposed to be "\r\n"
- *
+ *
* @param buffer Buffer to read from
* @throws RedisCommandParserException Thrown when the next two characters are not "\r\n"
*/
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java b/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
index f032316..44e8447 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.redis.internal;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-
import java.io.UnsupportedEncodingException;
import java.text.DecimalFormat;
import java.util.Collection;
@@ -25,12 +22,15 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.query.Struct;
/**
* This is a safe encoder and decoder for all redis matching needs
- *
+ *
*
*/
public class Coder {
@@ -488,7 +488,7 @@ public class Coder {
/**
* A conversion where the byte array actually represents a string, so it is converted as a string
* not as a literal double
- *
+ *
* @param bytes Array holding double
* @return Parsed value
* @throws NumberFormatException if bytes to string does not yield a convertible double
@@ -499,7 +499,7 @@ public class Coder {
/**
* Redis specific manner to parse floats
- *
+ *
* @param d String holding double
* @return Value of string
* @throws NumberFormatException if the double cannot be parsed
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/Command.java b/geode-core/src/main/java/org/apache/geode/redis/internal/Command.java
index 2f91218..f8967ae 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/Command.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/Command.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.redis.internal;
-import io.netty.buffer.ByteBuf;
-
import java.nio.channels.SocketChannel;
import java.util.List;
+import io.netty.buffer.ByteBuf;
+
/**
* The command class is used in holding a received Redis command. Each sent command resides in an
* instance of this class. This class is designed to be used strictly by getter and setter methods.
- *
+ *
*
*/
public class Command {
@@ -36,7 +36,7 @@ public class Command {
/**
* Constructor for {@link Command}. Must initialize Command with a {@link SocketChannel} and a
* {@link List} of command elements
- *
+ *
* @param commandElems List of elements in command
*/
public Command(List<byte[]> commandElems) {
@@ -61,7 +61,7 @@ public class Command {
/**
* Used to get the command element list
- *
+ *
* @return List of command elements in form of {@link List}
*/
public List<byte[]> getProcessedCommand() {
@@ -70,7 +70,7 @@ public class Command {
/**
* Getter method for the command type
- *
+ *
* @return The command type
*/
public RedisCommandType getCommandType() {
@@ -79,7 +79,7 @@ public class Command {
/**
* Getter method to get the response to be sent
- *
+ *
* @return The response
*/
public ByteBuf getResponse() {
@@ -88,7 +88,7 @@ public class Command {
/**
* Setter method to set the response to be sent
- *
+ *
* @param response The response to be sent
*/
public void setResponse(ByteBuf response) {
@@ -108,7 +108,7 @@ public class Command {
/**
* Convenience method to get a String representation of the key in a Redis command, always at the
* second position in the sent command array
- *
+ *
* @return Returns the second element in the parsed command list, which is always the key for
* commands indicating a key
*/
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java b/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java
index 60cd130..d7253fc 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java
@@ -23,7 +23,7 @@ import org.apache.geode.DataSerializer;
/**
* This is a wrapper class for doubles, similar to {@link ByteArrayWrapper}
- *
+ *
*
*/
public class DoubleWrapper implements DataSerializable, Comparable<Object> {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/ExecutionHandlerContext.java b/geode-core/src/main/java/org/apache/geode/redis/internal/ExecutionHandlerContext.java
index e2b49be..0af5d56 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/ExecutionHandlerContext.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/ExecutionHandlerContext.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.redis.internal;
+import java.io.IOException;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.Channel;
@@ -22,11 +27,6 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.DecoderException;
import io.netty.util.concurrent.EventExecutor;
-import java.io.IOException;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
@@ -37,8 +37,8 @@ import org.apache.geode.cache.TransactionId;
import org.apache.geode.cache.UnsupportedOperationInTransactionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.RegionNotFoundException;
-import org.apache.geode.redis.internal.executor.transactions.TransactionExecutor;
import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.redis.internal.executor.transactions.TransactionExecutor;
/**
* This class extends {@link ChannelInboundHandlerAdapter} from Netty and it is the last part of the
@@ -49,7 +49,7 @@ import org.apache.geode.redis.GeodeRedisServer;
* Besides being part of Netty's pipeline, this class also serves as a context to the execution of a
* command. It abstracts transactions, provides access to the {@link RegionProvider} and anything
* else an executing {@link Command} may need.
- *
+ *
*
*/
public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
@@ -83,7 +83,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Default constructor for execution contexts.
- *
+ *
* @param ch Channel used by this context, should be one to one
* @param cache The Geode cache instance of this vm
* @param regionProvider The region provider of this context
@@ -223,7 +223,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Private helper method to execute a command without a transaction, done for special exception
* handling neatness
- *
+ *
* @param exec Executor to use
* @param command Command to execute
* @throws Exception Throws exception if exception is from within execution and not to be handled
@@ -268,7 +268,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Get the current transacationId
- *
+ *
* @return The current transactionId, null if one doesn't exist
*/
public TransactionId getTransactionID() {
@@ -277,7 +277,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Check if client has transaction
- *
+ *
* @return True if client has transaction, false otherwise
*/
public boolean hasTransaction() {
@@ -286,7 +286,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Setter method for transaction
- *
+ *
* @param id TransactionId of current transaction for client
*/
public void setTransactionID(TransactionId id) {
@@ -310,7 +310,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Getter for transaction command queue
- *
+ *
* @return Command queue
*/
public Queue<Command> getTransactionQueue() {
@@ -322,7 +322,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* {@link ByteBuf} allocator for this context. All executors must use this pooled allocator as
* opposed to having unpooled buffers for maximum performance
- *
+ *
* @return allocator instance
*/
public ByteBufAllocator getByteBufAllocator() {
@@ -331,7 +331,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Gets the provider of Regions
- *
+ *
* @return Provider
*/
public RegionProvider getRegionProvider() {
@@ -340,7 +340,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Getter for manager to allow pausing and resuming transactions
- *
+ *
* @return Instance
*/
public CacheTransactionManager getCacheTransactionManager() {
@@ -349,7 +349,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Getter for logger
- *
+ *
* @return instance
*/
public LogWriter getLogger() {
@@ -358,7 +358,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Get the channel for this context
- *
+ *
* @return instance
*
* public Channel getChannel() { return this.channel; }
@@ -367,7 +367,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Get the authentication password, this will be same server wide. It is exposed here as opposed
* to {@link GeodeRedisServer}.
- *
+ *
* @return password
*/
public byte[] getAuthPwd() {
@@ -376,7 +376,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter {
/**
* Checker if user has authenticated themselves
- *
+ *
* @return True if no authentication required or authentication complete, false otherwise
*/
public boolean isAuthenticated() {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/Executor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/Executor.java
index 7698535..50484f1 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/Executor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/Executor.java
@@ -17,7 +17,7 @@ package org.apache.geode.redis.internal;
/**
* Interface for executors of a {@link Command}
- *
+ *
*
*/
public interface Executor {
@@ -25,7 +25,7 @@ public interface Executor {
/**
* This method executes the command and sets the response. Any runtime errors from this execution
* should be handled by caller to ensure the client gets a response
- *
+ *
* @param command The command to be executed
* @param context The execution context by which this command is to be executed
*/
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/Extendable.java b/geode-core/src/main/java/org/apache/geode/redis/internal/Extendable.java
index ed36030..af78031 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/Extendable.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/Extendable.java
@@ -16,14 +16,14 @@ package org.apache.geode.redis.internal;
/**
* This defines a command that can be extended, and there may need some level of abstraction
- *
+ *
*
*/
public interface Extendable {
/**
* Getter for error message in case of argument arity mismatch
- *
+ *
* @return Error string
*/
public String getArgsError();
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandParserException.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandParserException.java
index 4ec154a..cae7c83 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandParserException.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandParserException.java
@@ -16,7 +16,7 @@ package org.apache.geode.redis.internal;
/**
* Exception thrown by CommandParser (non-existent class) when a command has illegal syntax
- *
+ *
*
*/
public class RedisCommandParserException extends Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
index acacd12..a4a42ad 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
@@ -131,7 +131,7 @@ import org.apache.geode.redis.internal.executor.transactions.WatchExecutor;
/**
* The redis command type used by the server. Each command is directly from the redis protocol and
* calling {@link #getExecutor()} on a type returns the executor class for that command.
- *
+ *
*
*/
public enum RedisCommandType {
@@ -2884,7 +2884,7 @@ public enum RedisCommandType {
/**
* Abstract method overridden by each value in enum to get the executor associated with that
* command type
- *
+ *
* @return {@link Executor} for command type
*/
public abstract Executor getExecutor();
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RedisDataTypeMismatchException.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RedisDataTypeMismatchException.java
index 727412b..e60482b 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RedisDataTypeMismatchException.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RedisDataTypeMismatchException.java
@@ -17,7 +17,7 @@ package org.apache.geode.redis.internal;
/**
* This exception is for the case that a client attempts to operate on a data structure of one
* {@link RedisDataType} with a command that is of another type
- *
+ *
*
*/
public class RedisDataTypeMismatchException extends RuntimeException {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionCreationException.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionCreationException.java
index afc009e..34d5a22 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionCreationException.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionCreationException.java
@@ -17,7 +17,7 @@ package org.apache.geode.redis.internal;
/**
* This exception is used when an error happens while creating a
* {@link org.apache.geode.cache.Region} globally
- *
+ *
*
*/
public class RegionCreationException extends RuntimeException {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
index 2b6f86b..4749251 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
@@ -324,7 +324,7 @@ public class RegionProvider implements Closeable {
/**
* SYNCHRONIZE EXTERNALLY OF this.locks.get(key.toString())!!!!!
- *
+ *
* @param key Key of region to destroy
* @param type Type of region to destroyu
* @return Flag if destroyed
@@ -345,7 +345,7 @@ public class RegionProvider implements Closeable {
/**
* Do not call this method if you are not synchronized on the lock associated with this key
- *
+ *
* @param key Key of region to remove
* @param type Type of key to remove all state
*/
@@ -389,7 +389,7 @@ public class RegionProvider implements Closeable {
/**
* This method creates a Region globally with the given name. If there is an error in the
* creation, a runtime exception will be thrown.
- *
+ *
* @param key Name of Region to create
* @return Region Region created globally
*/
@@ -430,7 +430,7 @@ public class RegionProvider implements Closeable {
/**
* Checks if the given key is associated with the passed data type. If there is a mismatch, a
* {@link RuntimeException} is thrown
- *
+ *
* @param key Key to check
* @param type Type to check to
*/
@@ -470,7 +470,7 @@ public class RegionProvider implements Closeable {
* a delay, which means that both expiring after a time and at a time can be done but the delay to
* expire at a time must be calculated before these calls. It is also important to note that the
* delay is always handled in milliseconds
- *
+ *
* @param key The key to set the expiration for
* @param delay The delay in milliseconds of the expiration
* @return True is expiration set, false otherwise
@@ -487,7 +487,7 @@ public class RegionProvider implements Closeable {
/**
* Modifies an expiration on a key
- *
+ *
* @param key String key to modify expiration on
* @param delay Delay in milliseconds to reset the expiration to
* @return True if reset, false if not
@@ -513,7 +513,7 @@ public class RegionProvider implements Closeable {
/**
* Removes an expiration from a key
- *
+ *
* @param key Key
* @return True is expiration cancelled on the key, false otherwise
*/
@@ -530,7 +530,7 @@ public class RegionProvider implements Closeable {
/**
* Check method if key has expiration
- *
+ *
* @param key Key
* @return True if key has expiration, false otherwise
*/
@@ -540,7 +540,7 @@ public class RegionProvider implements Closeable {
/**
* Get remaining expiration time
- *
+ *
* @param key Key
* @return Remaining time in milliseconds or 0 if no delay or key doesn't exist
*/
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java
index c9d47ab..f95e1a4 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java
@@ -16,17 +16,17 @@ package org.apache.geode.redis.internal.executor;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.Query;
+import org.apache.geode.redis.GeodeRedisServer;
import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.Executor;
import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisDataTypeMismatchException;
import org.apache.geode.redis.internal.RegionProvider;
-import org.apache.geode.redis.GeodeRedisServer;
/**
* The AbstractExecutor is the base of all {@link Executor} types for the {@link GeodeRedisServer}.
- *
+ *
*
*/
public abstract class AbstractExecutor implements Executor {
@@ -51,13 +51,13 @@ public abstract class AbstractExecutor implements Executor {
* given name does not exist. Before getting or creating a Region, a check is first done to make
* sure the desired key doesn't already exist with a different {@link RedisDataType}. If there is
* a data type mismatch this method will throw a {@link RuntimeException}.
- *
+ *
* ********************** IMPORTANT NOTE ********************************************** This
* method will not fail in returning a Region unless an internal error occurs, so if a Region is
* destroyed right after it is created, it will attempt to retry until a reference to that Region
* is obtained
* *************************************************************************************
- *
+ *
* @param context Client client
* @param key String key of desired key
* @param type Type of data type desired
@@ -71,7 +71,7 @@ public abstract class AbstractExecutor implements Executor {
/**
* Checks if the given key is associated with the passed data type. If there is a mismatch, a
* {@link RuntimeException} is thrown
- *
+ *
* @param key Key to check
* @param type Type to check to
* @param context context
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/KeysExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/KeysExecutor.java
index 9398d87..cb11762 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/KeysExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/KeysExecutor.java
@@ -20,13 +20,13 @@ import java.util.Set;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import org.apache.geode.redis.GeodeRedisServer;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
import org.apache.geode.redis.internal.org.apache.hadoop.fs.GlobPattern;
-import org.apache.geode.redis.GeodeRedisServer;
public class KeysExecutor extends AbstractExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/ScanExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/ScanExecutor.java
index 5e625cf..393f24b 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/ScanExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/ScanExecutor.java
@@ -20,12 +20,12 @@ import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import org.apache.geode.redis.GeodeRedisServer;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
-import org.apache.geode.redis.GeodeRedisServer;
public class ScanExecutor extends AbstractScanExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java
index f9f4f19..f9e4588 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HDelExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java
index 9cd673d..0d52214 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HExistsExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java
index 20d2220..8574263 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HGetExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java
index 695982f..c3c21e5 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java
@@ -21,8 +21,8 @@ import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HIncrByExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
index 4c7cb3c..8b4af48 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HIncrByFloatExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java
index bcb37f1..75f9d61 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HLenExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java
index bf1be2b..495e86b 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java
@@ -23,8 +23,8 @@ import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HMGetExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java
index a7be53d..703ca15 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java
@@ -20,11 +20,11 @@ import java.util.Map;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class HMSetExecutor extends HashExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFAddExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFAddExecutor.java
index 8b3b337..4f224f0 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFAddExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFAddExecutor.java
@@ -19,8 +19,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.hll.HyperLogLogPlus;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFMergeExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFMergeExecutor.java
index 6d0bb4f..38383c8 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFMergeExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/PFMergeExecutor.java
@@ -24,8 +24,8 @@ import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class PFMergeExecutor extends HllExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LInsertExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LInsertExecutor.java
index ac9f653..d1649c2 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LInsertExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LInsertExecutor.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.redis.internal.executor.list;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
public class LInsertExecutor extends ListExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LLenExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LLenExecutor.java
index f9e685f..2992edb 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LLenExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LLenExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class LLenExecutor extends ListExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LRemExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LRemExecutor.java
index be0793e..bf1a594 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LRemExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LRemExecutor.java
@@ -24,8 +24,8 @@ import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.executor.ListQuery;
public class LRemExecutor extends ListExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LSetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LSetExecutor.java
index 0a53041..ae033c0 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LSetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LSetExecutor.java
@@ -23,8 +23,8 @@ import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.executor.ListQuery;
public class LSetExecutor extends ListExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LTrimExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LTrimExecutor.java
index de5804f..08abd8e 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LTrimExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LTrimExecutor.java
@@ -23,8 +23,8 @@ import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.executor.ListQuery;
public class LTrimExecutor extends ListExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
index cb365e6..3f0a111 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
@@ -54,7 +54,7 @@ public abstract class ListExecutor extends AbstractExecutor {
* Helper method to be used by the push commands to push elements onto a list. Because our current
* setup requires non trivial code to push elements in to a Region, I wanted all the push code to
* reside in one place.
- *
+ *
* @param key Name of the list
* @param commandElems Pieces of the command, this is where the elements that need to be pushed
* live
@@ -77,7 +77,7 @@ public abstract class ListExecutor extends AbstractExecutor {
/*
* Multi push command
- *
+ *
* For every element that needs to be added
*/
@@ -86,9 +86,9 @@ public abstract class ListExecutor extends AbstractExecutor {
ByteArrayWrapper wrapper = new ByteArrayWrapper(value);
/*
- *
+ *
* First, use the start index to attempt to insert the value into the Region
- *
+ *
*/
Object oldValue;
@@ -101,27 +101,27 @@ public abstract class ListExecutor extends AbstractExecutor {
} while (oldValue != null);
/*
- *
+ *
* Next, update the index in the meta data region. Keep trying to replace the existing index
* unless the index is further out than previously inserted, that's ok. Example below:
- *
+ *
* ********************** LPUSH/LPUSH *************************** Push occurring at the same
* time, further index update first | This push | | | | V V [-4] [-3] [-2] [-1] [0] [1] [2]
- *
+ *
* In this case, -4 would already exist in the meta data region, therefore we do not try to
* put -3 in the meta data region because a further index is already there.
* ***************************************************************
- *
+ *
* Another example
- *
+ *
* ********************** LPUSH/LPOP ***************************** This push | Simultaneous
* LPOP, meta data head index already updated to -2 | | | | V V [-4] [X] [-2] [-1] [0] [1] [2]
- *
+ *
* In this case, -2 would already exist in the meta data region, but we need to make sure the
* element at -4 is visible to all other threads so we will attempt to change the index to -4
* as long as it is greater than -4
* ***************************************************************
- *
+ *
*/
boolean indexSet = false;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PopExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PopExecutor.java
index d5c6e01..3ca7224 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PopExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PopExecutor.java
@@ -17,7 +17,6 @@ package org.apache.geode.redis.internal.executor.list;
import java.util.List;
import org.apache.geode.cache.Region;
-
import org.apache.geode.redis.internal.ByteArrayWrapper;
import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
@@ -54,10 +53,10 @@ public abstract class PopExecutor extends ListExecutor implements Extendable {
ByteArrayWrapper valueWrapper = null;
/**
- *
+ *
* First attempt to hop over an index by moving the index down one in the meta data region. The
* desired index to remove is held within the field index
- *
+ *
*/
boolean indexChanged = false;
@@ -70,11 +69,11 @@ public abstract class PopExecutor extends ListExecutor implements Extendable {
} while (!indexChanged);
/**
- *
+ *
* Now attempt to remove the value of the index. We must do a get to ensure a returned value and
* then call remove with the value to ensure no one else has removed it first. Otherwise, try
* other indexes
- *
+ *
*/
boolean removed = false;
@@ -85,34 +84,34 @@ public abstract class PopExecutor extends ListExecutor implements Extendable {
removed = keyRegion.remove(index, valueWrapper);
/**
- *
+ *
* If remove has passed, our job is done and we can break and stop looking for a value
- *
+ *
*/
if (removed)
break;
/**
- *
+ *
* If the index has not been removed, we need to look at other indexes. Two cases exist:
- *
+ *
* ************************** FIRST MISS *********************************** Push occurring at
* the same time, further index update first | This is location of miss | | | | V V [-4] [X]
* [-2] [-1] [0] [1] [2] <-- Direction of index update If this is the first miss, the index is
* re obtained from the meta region and that index is trying. However, if the index in the
* meta data region is not further out, that index is not used and moves on to the second case
* **************************************************************************
- *
+ *
* ************************* SUBSEQUENT MISSES ****************************** Push occurring
* at the same time, further index update first | This is location of miss | | | | V V [-4]
* [X] [-2] [-1] [0] [1] [2] Direction of index update --> If this is not the first miss then
* we move down to the other end of the list which means the next not empty index will be
* attempted to be removed
* **************************************************************************
- *
+ *
* If it is the case that the list is empty, it will exit this loop
- *
+ *
*/
index += incr;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PushExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PushExecutor.java
index b6017a5..a229b16 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PushExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/PushExecutor.java
@@ -19,11 +19,11 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.Extendable;
import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
public abstract class PushExecutor extends PushXExecutor implements Extendable {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java
index c1d3a4c..795141c 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
public class SCardExecutor extends SetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java
index 62ff597..7bc8375 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
public class SIsMemberExecutor extends SetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java
index e383538..0d2c2a9 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java
@@ -19,8 +19,8 @@ import java.util.Random;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java
index 4594022..fe45b61 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java
@@ -22,14 +22,14 @@ import java.util.Set;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
public class SRandMemberExecutor extends SetExecutor {
- private final static String ERROR_NOT_NUMERIC = "The count provided must be numeric";
+ private static final String ERROR_NOT_NUMERIC = "The count provided must be numeric";
@Override
public void executeCommand(Command command, ExecutionHandlerContext context) {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java
index 18d46ee..4d230bb 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class SRemExecutor extends SetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java
index a5bbebc..a7d9564 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java
@@ -24,8 +24,8 @@ import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.DoubleWrapper;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class ZAddExecutor extends SortedSetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java
index 72eae68..7871c3c 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java
@@ -28,8 +28,8 @@ import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.DoubleWrapper;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.executor.SortedSetQuery;
public class ZCountExecutor extends SortedSetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java
index 6c35720..aa95525 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java
@@ -22,8 +22,8 @@ import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.DoubleWrapper;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class ZIncrByExecutor extends SortedSetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java
index 42791e2..b2c98aa 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java
@@ -24,8 +24,8 @@ import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.DoubleWrapper;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.executor.SortedSetQuery;
public class ZLexCountExecutor extends SortedSetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
index 19bd199..66d1efc 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.redis.internal.executor.sortedset;
-import io.netty.buffer.ByteBuf;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import io.netty.buffer.ByteBuf;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java
index 5cbc7e4..b564a85 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java
@@ -22,8 +22,8 @@ import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.DoubleWrapper;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class ZRemExecutor extends SortedSetExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java
index 7c8c375..cd437f8 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java
index 68fc357..8ca1381 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java
index ca70ae3..96049a8 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
index 6cea057..603ed3c 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java
index 3a52928..31aac75 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java
@@ -16,11 +16,11 @@ package org.apache.geode.redis.internal.executor.string;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class GetExecutor extends StringExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java
index f80099c..56c246f 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java
@@ -19,11 +19,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class GetRangeExecutor extends StringExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java
index 146fff8..adfcbea 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
index 00e2e3b..bb49730 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
index f506fe6..5624275 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java
index a98075b..5952625 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java
@@ -20,11 +20,11 @@ import java.util.Map;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
import org.apache.geode.redis.internal.RedisDataTypeMismatchException;
-import org.apache.geode.redis.internal.Coder;
public class MSetExecutor extends StringExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java
index 774886f..2928662 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java
@@ -20,11 +20,11 @@ import java.util.Map;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
import org.apache.geode.redis.internal.RedisDataTypeMismatchException;
-import org.apache.geode.redis.internal.Coder;
public class MSetNXExecutor extends StringExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java
index 4fb38d1..16ddc0a 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java
index e419ab1..f82a4b7 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
import org.apache.geode.redis.internal.executor.AbstractExecutor;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java
index 3b2d6f8..a25f197 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java
index 215aacb..e4b32df 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java
@@ -18,8 +18,8 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java
index 8d35279..a386acd 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.Coder;
import org.apache.geode.redis.internal.RedisConstants.ArityDef;
+import org.apache.geode.redis.internal.RedisDataType;
public class StrlenExecutor extends StringExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/DiscardExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/DiscardExecutor.java
index 0743076..16bf575 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/DiscardExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/DiscardExecutor.java
@@ -16,8 +16,8 @@ package org.apache.geode.redis.internal.executor.transactions;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.TransactionId;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
public class DiscardExecutor extends TransactionExecutor {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/ExecExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/ExecExecutor.java
index 632a79d..c86b007 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/ExecExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/ExecExecutor.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.redis.internal.executor.transactions;
-import io.netty.buffer.ByteBuf;
-
import java.util.Queue;
+import io.netty.buffer.ByteBuf;
+
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.cache.TransactionId;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/MultiExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/MultiExecutor.java
index d269d93..21a41d3 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/MultiExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/MultiExecutor.java
@@ -16,8 +16,8 @@ package org.apache.geode.redis.internal.executor.transactions;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.TransactionId;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/UnwatchExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/UnwatchExecutor.java
index 3de173e..2323550 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/UnwatchExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/UnwatchExecutor.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.redis.internal.executor.transactions;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/WatchExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/WatchExecutor.java
index ff6865d..1dbe36e 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/WatchExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/transactions/WatchExecutor.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.redis.internal.executor.transactions;
-import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.Command;
import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisConstants;
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/org/apache/hadoop/fs/GlobPattern.java b/geode-core/src/main/java/org/apache/geode/redis/internal/org/apache/hadoop/fs/GlobPattern.java
index b0190f6..94bc21b 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/org/apache/hadoop/fs/GlobPattern.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/org/apache/hadoop/fs/GlobPattern.java
@@ -28,7 +28,7 @@ public class GlobPattern {
/**
* Construct the glob pattern object with a glob pattern string
- *
+ *
* @param globPattern the glob pattern string
*/
public GlobPattern(String globPattern) {
@@ -44,7 +44,7 @@ public class GlobPattern {
/**
* Compile glob pattern string
- *
+ *
* @param globPattern the glob pattern
* @return the pattern object
*/
@@ -54,7 +54,7 @@ public class GlobPattern {
/**
* Match input against the compiled glob pattern
- *
+ *
* @param s input chars
* @return true for successful matches
*/
@@ -64,7 +64,7 @@ public class GlobPattern {
/**
* Set and compile a glob pattern
- *
+ *
* @param glob the glob pattern string
*/
public void set(String glob) {
diff --git a/geode-core/src/main/java/org/apache/geode/security/AccessControl.java b/geode-core/src/main/java/org/apache/geode/security/AccessControl.java
index e35e665..fb86ef0 100644
--- a/geode-core/src/main/java/org/apache/geode/security/AccessControl.java
+++ b/geode-core/src/main/java/org/apache/geode/security/AccessControl.java
@@ -29,11 +29,11 @@ import org.apache.geode.distributed.DistributedMember;
* distributed system for client authorization. When the <code>security-client-accessor-pp</code>
* property is set then the callback mentioned is invoked after the operation completes successfully
* and when sending notifications.
- *
+ *
* When the registration has been done for a client/peer then an object of this class is created for
* each connection from the client/peer and the <code>authorizeOperation</code> method invoked
* before/after each operation.
- *
+ *
* @since GemFire 5.5
*
* @deprecated since Geode 1.0, use {@link SecurityManager} instead
@@ -42,18 +42,18 @@ public interface AccessControl extends CacheCallback {
/**
* Initialize the callback for a client/peer having the given principal.
- *
+ *
* This is invoked when a new connection from a client/peer is created with the host. The callback
* is expected to store authentication information of the given principal for the different
* regions for maximum efficiency when invoking <code>authorizeOperation</code> in each operation.
- *
+ *
* @param principal the principal associated with the authenticated client or peer; a null
* principal implies an unauthenticated client which should be handled properly by
* implementations
* @param remoteMember the {@link DistributedMember} object for the remote authenticated client or
* peer
* @param cache reference to the cache object
- *
+ *
* @throws NotAuthorizedException if some exception condition happens during the initialization;
* in such a case all subsequent client operations on that connection will throw
* <code>NotAuthorizedException</code>
@@ -72,11 +72,11 @@ public interface AccessControl extends CacheCallback {
/**
* Check if the given operation is allowed for the cache/region.
- *
+ *
* This method is invoked in each cache and region level operation. It is, therefore, expected
* that as far as possible relevant information has been cached in the <code>init</code> call made
* when the connection was established so that this call is as quick as possible.
- *
+ *
* @param regionName When null then it indicates a cache-level operation (i.e. one of
* {@link org.apache.geode.cache.operations.OperationContext.OperationCode#REGION_DESTROY}
* or {@link org.apache.geode.cache.operations.OperationContext.OperationCode#QUERY}, else
@@ -84,9 +84,9 @@ public interface AccessControl extends CacheCallback {
* @param context When invoked before the operation then the data required by the operation. When
* invoked as a post-process filter then it contains the result of the operation. The data
* in the context can be possibly modified by the method.
- *
+ *
* @return true if the operation is authorized and false otherwise
- *
+ *
*/
boolean authorizeOperation(String regionName, OperationContext context);
diff --git a/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java b/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
index 0efd958..3e6e645 100644
--- a/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
+++ b/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
@@ -39,10 +39,10 @@ public interface AuthInitialize extends CacheCallback {
/**
* Initialize the callback for a client/peer. This is invoked when a new connection from a
* client/peer is created with the host.
- *
+ *
* @param systemLogger {@link LogWriter} for system logs
* @param securityLogger {@link LogWriter} for security logs
- *
+ *
* @throws AuthenticationFailedException if some exception occurs during the initialization
*
* @deprecated since Geode 1.0, use init()
@@ -63,13 +63,13 @@ public interface AuthInitialize extends CacheCallback {
/**
* Initialize with the given set of security properties and return the credentials for the
* peer/client as properties.
- *
+ *
* This method can modify the given set of properties. For example it may invoke external agents
* or even interact with the user.
- *
+ *
* Normally it is expected that implementations will filter out <i>security-*</i> properties that
* are needed for credentials and return only those.
- *
+ *
* @param securityProps the security properties obtained using a call to
* {@link DistributedSystem#getSecurityProperties} that will be used for obtaining the
* credentials
@@ -77,9 +77,9 @@ public interface AuthInitialize extends CacheCallback {
* connection is being attempted
* @param isPeer true when this is invoked for peer initialization and false when invoked for
* client initialization
- *
+ *
* @throws AuthenticationFailedException in case of failure to obtain the credentials
- *
+ *
* @return the credentials to be used for the given <code>server</code>
*
* When using Integrated security, all members, peer/client will use the same credentials.
diff --git a/geode-core/src/main/java/org/apache/geode/security/AuthenticationFailedException.java b/geode-core/src/main/java/org/apache/geode/security/AuthenticationFailedException.java
index e0b2c52..aeac9b4 100644
--- a/geode-core/src/main/java/org/apache/geode/security/AuthenticationFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/security/AuthenticationFailedException.java
@@ -17,7 +17,7 @@ package org.apache.geode.security;
/**
* Thrown if authentication of this client/peer fails.
- *
+ *
* @since GemFire 5.5
*/
public class AuthenticationFailedException extends GemFireSecurityException {
@@ -26,7 +26,7 @@ public class AuthenticationFailedException extends GemFireSecurityException {
// TODO Derive from SecurityException
/**
* Constructs instance of <code>AuthenticationFailedException</code> with error message.
- *
+ *
* @param message the error message
*/
public AuthenticationFailedException(String message) {
@@ -35,7 +35,7 @@ public class AuthenticationFailedException extends GemFireSecurityException {
/**
* Constructs instance of <code>AuthenticationFailedException</code> with error message and cause.
- *
+ *
* @param message the error message
* @param cause a <code>Throwable</code> that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/security/AuthenticationRequiredException.java b/geode-core/src/main/java/org/apache/geode/security/AuthenticationRequiredException.java
index c067492..7eb8e7d 100644
--- a/geode-core/src/main/java/org/apache/geode/security/AuthenticationRequiredException.java
+++ b/geode-core/src/main/java/org/apache/geode/security/AuthenticationRequiredException.java
@@ -18,7 +18,7 @@ package org.apache.geode.security;
/**
* Thrown if the distributed system is in secure mode and this client/peer has not set the security
* credentials.
- *
+ *
* @since GemFire 5.5
*/
public class AuthenticationRequiredException extends GemFireSecurityException {
@@ -26,7 +26,7 @@ public class AuthenticationRequiredException extends GemFireSecurityException {
/**
* Constructs instance of <code>NotAuthenticatedException</code> with error message.
- *
+ *
* @param message the error message
*/
public AuthenticationRequiredException(String message) {
@@ -35,7 +35,7 @@ public class AuthenticationRequiredException extends GemFireSecurityException {
/**
* Constructs instance of <code>NotAuthenticatedException</code> with error message and cause.
- *
+ *
* @param message the error message
* @param cause a <code>Throwable</code> that is a cause of this exception
*/
diff --git a/geode-core/src/main/java/org/apache/geode/security/Authenticator.java b/geode-core/src/main/java/org/apache/geode/security/Authenticator.java
index 6716986..f1db7ba 100644
--- a/geode-core/src/main/java/org/apache/geode/security/Authenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/security/Authenticator.java
@@ -31,11 +31,11 @@ import org.apache.geode.distributed.DistributedSystem;
* initialized on the group coordinator for each member during the
* {@link DistributedSystem#connect(Properties)} call of a new member. For client-server, an object
* of this class is created for each connection during the client-server handshake.
- *
+ *
* The static creation function should have the following signature:
* <code>public static Authenticator [method-name]();</code> i.e. it should be a zero argument
* function.
- *
+ *
* @since GemFire 5.5
*
* @deprecated since Geode 1.0, use {@link SecurityManager} instead
@@ -45,12 +45,12 @@ public interface Authenticator extends CacheCallback {
/**
* Initialize the callback for a client/peer. This is invoked when a new connection from a
* client/peer is created with the host.
- *
+ *
* @param securityProps the security properties obtained using a call to
* {@link DistributedSystem#getSecurityProperties}
* @param systemLogger {@link LogWriter} for system logs
* @param securityLogger {@link LogWriter} for security logs
- *
+ *
* @throws AuthenticationFailedException if some exception occurs during the initialization
*/
void init(Properties securityProps, LogWriter systemLogger, LogWriter securityLogger)
@@ -63,13 +63,13 @@ public interface Authenticator extends CacheCallback {
/**
* Verify the credentials provided in the properties for the client/peer as specified in member ID
* and returns the principal associated with the client/peer.
- *
+ *
* @param props the credentials of the client/peer as a set of property key/values
* @param member the {@link DistributedMember} object of the connecting client/peer member. NULL
* when invoked locally on the member initiating the authentication request.
- *
+ *
* @return the principal for the client/peer when authentication succeeded
- *
+ *
* @throws AuthenticationFailedException If the authentication of the client/peer fails.
*/
Principal authenticate(Properties props, DistributedMember member)
diff --git a/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java b/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
index 2cab06c..e0a33a9 100644
--- a/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
+++ b/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
@@ -17,13 +17,14 @@ package org.apache.geode.security;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+
import javax.naming.NamingException;
import org.apache.geode.GemFireException;
/**
* The base class for all org.apache.geode.security package related exceptions.
- *
+ *
* @since GemFire 5.5
*/
public class GemFireSecurityException extends GemFireException {
diff --git a/geode-core/src/main/java/org/apache/geode/security/NotAuthorizedException.java b/geode-core/src/main/java/org/apache/geode/security/NotAuthorizedException.java
index 123bee2..421fdb0 100644
--- a/geode-core/src/main/java/org/apache/geode/security/NotAuthorizedException.java
+++ b/geode-core/src/main/java/org/apache/geode/security/NotAuthorizedException.java
@@ -17,11 +17,12 @@ package org.apache.geode.security;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.security.Principal;
+
import javax.naming.NamingException;
/**
* Thrown when a client/peer is unauthorized to perform a requested operation.
- *
+ *
* @since GemFire 5.5
*/
public class NotAuthorizedException extends GemFireSecurityException {
diff --git a/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java b/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
index bad58d8..4573318 100644
--- a/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
@@ -27,7 +27,7 @@ public interface PostProcessor {
/**
* Given the security props of the server, properly initialize the post processor for the server.
* Initialized at cache creation
- *
+ *
* @param securityProps security properties
*/
default void init(Properties securityProps) {}
diff --git a/geode-core/src/main/java/org/apache/geode/security/ResourcePermission.java b/geode-core/src/main/java/org/apache/geode/security/ResourcePermission.java
index d47888f..7cd7763 100644
--- a/geode-core/src/main/java/org/apache/geode/security/ResourcePermission.java
+++ b/geode-core/src/main/java/org/apache/geode/security/ResourcePermission.java
@@ -15,9 +15,10 @@
package org.apache.geode.security;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.cache.Region;
import org.apache.shiro.authz.permission.WildcardPermission;
+import org.apache.geode.cache.Region;
+
/**
* ResourcePermission defines the resource, the operation, the region and the key involved in the
* action to be authorized.
diff --git a/geode-core/src/main/java/org/apache/geode/security/SecurityManager.java b/geode-core/src/main/java/org/apache/geode/security/SecurityManager.java
index c65bca2..b20da1a 100644
--- a/geode-core/src/main/java/org/apache/geode/security/SecurityManager.java
+++ b/geode-core/src/main/java/org/apache/geode/security/SecurityManager.java
@@ -38,7 +38,7 @@ public interface SecurityManager {
/**
* Verify the credentials provided in the properties
- *
+ *
* @param credentials it contains the security-username and security-password as keys of the
* properties
* @return a serializable principal object
@@ -48,7 +48,7 @@ public interface SecurityManager {
/**
* Authorize the ResourcePermission for a given Principal
- *
+ *
* @param principal The principal that's requesting the permission
* @param permission The permission requested
* @return true if authorized, false if not
diff --git a/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java b/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
index 2b8a8b9..193301d 100644
--- a/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
+++ b/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
@@ -13,12 +13,12 @@
* the License.
*/
/**
- *
+ *
*/
package batterytest.greplogs;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.regex.Pattern;
/**
diff --git a/geode-core/src/test/java/com/examples/TestObject.java b/geode-core/src/test/java/com/examples/TestObject.java
index d7fb640..fb0b03f 100644
--- a/geode-core/src/test/java/com/examples/TestObject.java
+++ b/geode-core/src/test/java/com/examples/TestObject.java
@@ -47,4 +47,3 @@ public class TestObject {
}
}
-
diff --git a/geode-core/src/test/java/com/examples/ds/CompanySerializer.java b/geode-core/src/test/java/com/examples/ds/CompanySerializer.java
index 09efe20..c6105d6 100644
--- a/geode-core/src/test/java/com/examples/ds/CompanySerializer.java
+++ b/geode-core/src/test/java/com/examples/ds/CompanySerializer.java
@@ -14,9 +14,10 @@
*/
package com.examples.ds;
-import org.apache.geode.DataSerializer;
import java.io.*;
+import org.apache.geode.DataSerializer;
+
public class CompanySerializer extends DataSerializer {
static {
diff --git a/geode-core/src/test/java/com/examples/ds/Employee.java b/geode-core/src/test/java/com/examples/ds/Employee.java
index 3eeb81b..eba6048 100644
--- a/geode-core/src/test/java/com/examples/ds/Employee.java
+++ b/geode-core/src/test/java/com/examples/ds/Employee.java
@@ -14,11 +14,12 @@
*/
package com.examples.ds;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
import java.io.*;
import java.util.Date;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+
public class Employee implements DataSerializable {
private int id;
private String name;
diff --git a/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java b/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
index a1fea3b..30c2879 100644
--- a/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
+++ b/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
@@ -14,11 +14,12 @@
*/
package com.examples.ds;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
import java.util.Date;
import java.util.Properties;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+
/**
* Places various objects that use {@link org.apache.geode.DataSerializer}s and
* {@link org.apache.geode.Instantiator}s into a cache {@link Region}. Among other things, this is
diff --git a/geode-core/src/test/java/com/examples/ds/User.java b/geode-core/src/test/java/com/examples/ds/User.java
index b330a68..6957d3b 100644
--- a/geode-core/src/test/java/com/examples/ds/User.java
+++ b/geode-core/src/test/java/com/examples/ds/User.java
@@ -14,9 +14,10 @@
*/
package com.examples.ds;
+import java.io.*;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.Instantiator;
-import java.io.*;
public class User implements DataSerializable {
private String name;
diff --git a/geode-core/src/test/java/com/examples/snapshot/MyObject.java b/geode-core/src/test/java/com/examples/snapshot/MyObject.java
index 88ff981..3ee5780 100644
--- a/geode-core/src/test/java/com/examples/snapshot/MyObject.java
+++ b/geode-core/src/test/java/com/examples/snapshot/MyObject.java
@@ -20,7 +20,7 @@ import org.apache.geode.pdx.PdxInstance;
/**
* Data class for testing snapshots, cannot be located in org.apache.*.
- *
+ *
*/
public class MyObject implements Serializable {
protected long f1;
diff --git a/geode-core/src/test/java/com/main/MyDistributedSystemListener.java b/geode-core/src/test/java/com/main/MyDistributedSystemListener.java
index 9151c87..efaf5e4 100644
--- a/geode-core/src/test/java/com/main/MyDistributedSystemListener.java
+++ b/geode-core/src/test/java/com/main/MyDistributedSystemListener.java
@@ -28,11 +28,11 @@ import org.apache.geode.internal.cache.wan.DistributedSystemListener;
* This is an implementation of DistributedSystemListener. When a addedDistributedSystem is called a
* Region is created on both sites and GatewaySender and GatewayReciever is started on site 1 and
* site 2 respectively.
- *
+ *
* When a removedDistributedSystem is called, GatewaySender and GatewayReceiver is stopped on site1
* and site2 respectively.
- *
- *
+ *
+ *
*/
public class MyDistributedSystemListener implements DistributedSystemListener {
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
index c2428a3..36fb41b 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
@@ -31,26 +31,26 @@ import org.apache.geode.internal.ExitCode;
/**
* This is a member representing site 1 who wants to send data to site 2
- *
+ *
* On this member a locator with distributed-system-id = 1 is created. On this member a cache is
* created.
- *
+ *
* A Region and a GatewaySender is created on this member through
* MyDistributedSustemListener#addedDistributedSystemConnection (When a remote locator with
* distributed-system-id = 2 connects to this site, MyDistributedSustemListener's
* addedDistributedSystemConnection will be invoked who will create a region and a GatewaySender.)
- *
+ *
* This member does put for 100 keys on the region. (We have to check that this data for 100 entries
* are sent to remote site)
- *
+ *
* This member also check for the sender's running status.
- *
+ *
* A GatewaySender will be stopped through MyDistributedSustemListener#removedDistributedSystem
* (When a remote locator with distributed-system-id = -2 connects to this site,
* MyDistributedSustemListener's removedDistributedSystem will be invoked who will stop a
* GatewaySender.)
- *
- *
+ *
+ *
*/
public class WANBootStrapping_Site1_Add {
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
index 4ed7e74..17cde61 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
@@ -28,12 +28,12 @@ import org.apache.geode.internal.ExitCode;
/**
* This is a stand alone locator with a distributed-system-id = -1
- *
+ *
* This locator is started so that the locator information regarding the site 1 is removed from site
* 2's locator and at the same time MyDistributedSystemListener's removeDistributedSystem is invoked
* on site 2's locator which will stop the GatewayReceiver
- *
- *
+ *
+ *
*/
public class WANBootStrapping_Site1_Remove {
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
index d191f25..ea6c897 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
@@ -30,26 +30,26 @@ import org.apache.geode.internal.ExitCode;
/**
* This is a member representing site 2 who wants to receive data from site 1
- *
+ *
* On this member a locator with distributed-system-id = 2 is created. On this member a cache is
* created.
- *
+ *
* A Region and a GatewayReceiver is created on this member through
* MyDistributedSustemListener#addedDistributedSystemConnection
- *
+ *
* (When this locator gets the locator information from the site 1, MyDistributedSustemListener's
* addedDistributedSystemConnection will be invoked who will create a region and a GatewayReceiver.)
- *
+ *
* This member expects region size to be 100. (this site received this data from site1)
- *
+ *
* This member also check for the receiver's running status.
- *
+ *
* A GatewayReceiver will be stopped through MyDistributedSustemListener#removedDistributedSystem
* (When a remote locator with distributed-system-id = -1 connects to this site,
* MyDistributedSustemListener's removedDistributedSystem will be invoked who will stop a
* GatewayReceiver.)
- *
- *
+ *
+ *
*/
public class WANBootStrapping_Site2_Add {
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
index af32736..1455484 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
@@ -28,12 +28,12 @@ import org.apache.geode.internal.ExitCode;
/**
* This is a stand alone locator with a distributed-system-id = -2
- *
+ *
* This locator is started so that the locator information regarding the site 2 is removed from site
* 1's locator and at the same time MyDistributedSystemListener's removeDistributedSystem is invoked
* on site 1's locator which will stop the GatewaySender
- *
- *
+ *
+ *
*/
public class WANBootStrapping_Site2_Remove {
diff --git a/geode-core/src/test/java/hydra/MethExecutor.java b/geode-core/src/test/java/hydra/MethExecutor.java
index bc3068c..e70bbb6 100644
--- a/geode-core/src/test/java/hydra/MethExecutor.java
+++ b/geode-core/src/test/java/hydra/MethExecutor.java
@@ -15,7 +15,6 @@
package hydra;
-// import java.io.*;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -24,7 +23,7 @@ import java.util.ArrayList;
import org.apache.geode.SystemFailure;
/**
- *
+ *
* A class specialized for executing (via reflection) the receiver/selector pairs found in
* TestTasks.
*
diff --git a/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java
index 3ba2de1..ae8952f 100644
--- a/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java
@@ -14,22 +14,23 @@
*/
package org.apache.geode;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.util.CacheListenerAdapter;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.pdx.WritablePdxInstance;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.WritablePdxInstance;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests the functionality of the {@link CopyHelper#copy} method and the builtin copy-on-get Cache
diff --git a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
index e550981..faf495d 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -20,11 +20,12 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class DataSerializerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/DeltaTestImpl.java b/geode-core/src/test/java/org/apache/geode/DeltaTestImpl.java
index 5c8710e..fe5f878 100755
--- a/geode-core/src/test/java/org/apache/geode/DeltaTestImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/DeltaTestImpl.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode;
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.PartitionedRegionLocalMaxMemoryDUnitTest.
/**
* Sample test class which implements Delta.
- *
+ *
* @since GemFire 6.1
*/
public class DeltaTestImpl implements DataSerializable, Delta {
@@ -249,7 +249,7 @@ public class DeltaTestImpl implements DataSerializable, Delta {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.Delta#fromDelta(java.io.DataInput)
*/
public void fromDelta(DataInput in) throws IOException {
@@ -310,7 +310,7 @@ public class DeltaTestImpl implements DataSerializable, Delta {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.Delta#hasDelta()
*/
public boolean hasDelta() {
@@ -319,7 +319,7 @@ public class DeltaTestImpl implements DataSerializable, Delta {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.Delta#toDelta(java.io.DataOutput)
*/
public void toDelta(DataOutput out) throws IOException {
diff --git a/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
index 3e493e2..50cc0b6 100644
--- a/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
@@ -14,24 +14,24 @@
*/
package org.apache.geode;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.InternalInstantiator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.fail;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
-import static org.junit.Assert.fail;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.InternalInstantiator;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This class makes sure that instantatiors are persisted to disk and can be recovered.
diff --git a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
index 6a20872..d998312 100644
--- a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
@@ -20,11 +20,12 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class InstantiatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java b/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
index 75601d6..70705c4 100644
--- a/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
@@ -14,24 +14,26 @@
*/
package org.apache.geode;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.transaction.UserTransaction;
+
import org.junit.After;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
-import javax.transaction.UserTransaction;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Ensure that the ignoreJTA Region setting works
diff --git a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java b/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
index 177b317..52481e9 100644
--- a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -21,16 +32,6 @@ import org.apache.geode.distributed.internal.LonerDistributionManager;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.PureJavaMode;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
/**
* This class makes sure an isolated "loner" distribution manager can be created and do some cache
diff --git a/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java
index 78cf324..d0df70f 100644
--- a/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java
@@ -21,6 +21,17 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheTransactionManager;
@@ -33,17 +44,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
index cb37399..cc2f81a 100644
--- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
@@ -18,13 +18,13 @@ import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.awaitility.Awaitility;
@Category(UnitTest.class)
public class SystemFailureJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/TXExpiryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXExpiryJUnitTest.java
index f5903ed..def0076 100644
--- a/geode-core/src/test/java/org/apache/geode/TXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/TXExpiryJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.cache.*;
@@ -24,17 +35,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
-
/**
* Tests transaction expiration functionality
*
diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
index 8f36a9a..d6a9eb0 100644
--- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import javax.transaction.Synchronization;
-import org.apache.geode.cache.util.TxEventTestUtil;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -81,6 +80,7 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.TransactionListenerAdapter;
+import org.apache.geode.cache.util.TxEventTestUtil;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -5745,11 +5745,11 @@ public class TXJUnitTest {
}
}
- private final static int LRUENTRY_NULL = 0;
- private final static int LRUENTRY_STRING = 1;
- private final static int LRUENTRY_INTEGER = 2;
- private final static int LRUENTRY_LONG = 3;
- private final static int LRUENTRY_DOUBLE = 4;
+ private static final int LRUENTRY_NULL = 0;
+ private static final int LRUENTRY_STRING = 1;
+ private static final int LRUENTRY_INTEGER = 2;
+ private static final int LRUENTRY_LONG = 3;
+ private static final int LRUENTRY_DOUBLE = 4;
private static void assertLRUEntries(Set entries, int size, String keyPrefix, int instanceId) {
assertEquals(size, entries.size());
@@ -6781,7 +6781,7 @@ public class TXJUnitTest {
/**
* make sure that we do not expose BucketRegion on transactionListener events
- *
+ *
* @throws Exception
*/
@Test
@@ -6813,7 +6813,7 @@ public class TXJUnitTest {
/**
* make sure that we throw an UnsupportedOperationInTransactionException
- *
+ *
* @throws Exception
*/
@Test
@@ -6843,7 +6843,7 @@ public class TXJUnitTest {
/**
* make sure that we throw an UnsupportedOperationInTransactionException
- *
+ *
* @throws Exception
*/
@Test
@@ -6871,7 +6871,7 @@ public class TXJUnitTest {
/**
* make sure that we throw an UnsupportedOperationInTransactionException
- *
+ *
* @throws Exception
*/
@Test
@@ -6926,7 +6926,7 @@ public class TXJUnitTest {
/**
* make sure that we throw an UnsupportedOperationInTransactionException
- *
+ *
* @throws Exception
*/
@Test
@@ -6975,7 +6975,7 @@ public class TXJUnitTest {
/**
* make sure that we throw an UnsupportedOperationInTransactionException
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/TXWriterOOMEJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXWriterOOMEJUnitTest.java
index d28e24b..553d4a3 100644
--- a/geode-core/src/test/java/org/apache/geode/TXWriterOOMEJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/TXWriterOOMEJUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Extracted from TXWriterJUnitTest. The OOME is problematic and causes the test suite to fail due
* to suspect strings from SystemFailure Watchdog sending output to STDERR.
- *
+ *
*/
@Category(IntegrationTest.class)
public class TXWriterOOMEJUnitTest extends TXWriterTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java b/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java
index ded7409..cf0eecd 100644
--- a/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java
+++ b/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode;
@@ -44,7 +44,7 @@ public class TestDataSerializer extends DataSerializer {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializer#getSupportedClasses()
*/
@Override
@@ -55,7 +55,7 @@ public class TestDataSerializer extends DataSerializer {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializer#toData(java.lang.Object, java.io.DataOutput)
*/
@Override
@@ -67,7 +67,7 @@ public class TestDataSerializer extends DataSerializer {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializer#fromData(java.io.DataInput)
*/
@Override
@@ -77,7 +77,7 @@ public class TestDataSerializer extends DataSerializer {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.DataSerializer#getId()
*/
@Override
@@ -125,4 +125,3 @@ class TestSupportedClass3 {
return this.field;
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java b/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java
index 29150e2..607db57 100644
--- a/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java
+++ b/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java
@@ -22,7 +22,6 @@ import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.DocErrorReporter;
import com.sun.javadoc.MethodDoc;
import com.sun.javadoc.RootDoc;
-
import junit.framework.TestCase;
import perffmwk.Formatter;
diff --git a/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java b/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java
index f66fdbd..e8b51f8 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java
@@ -15,6 +15,7 @@
package org.apache.geode.admin;
import static org.junit.Assert.*;
+
import org.apache.geode.distributed.internal.DistributionManager;
public class AdminTestHelper {
diff --git a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
index 10c0beb..4f79784 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
@@ -20,11 +20,12 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Collections;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Collections;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RegionSubRegionSnapshotTest {
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
index 0894f11..d139587 100755
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.admin.internal;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
-import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests {@link org.apache.geode.admin.internal.AdminDistributedSystemImpl}.
@@ -37,8 +38,8 @@ import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
public class BindDistributedSystemJUnitTest {
- private final static int RETRY_ATTEMPTS = 3;
- private final static int RETRY_SLEEP = 100;
+ private static final int RETRY_ATTEMPTS = 3;
+ private static final int RETRY_SLEEP = 100;
private DistributedSystem system;
@@ -81,4 +82,3 @@ public class BindDistributedSystemJUnitTest {
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
index 3a70527..ac0acae 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
@@ -16,11 +16,6 @@ package org.apache.geode.admin.internal;
import static org.junit.Assert.*;
-import org.apache.geode.admin.*;
-import org.apache.geode.cache.*;
-import org.apache.geode.internal.cache.*;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
import java.util.*;
import org.junit.Rule;
@@ -28,6 +23,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
+import org.apache.geode.admin.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.internal.cache.*;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
/**
* Contains simple tests for the {@link CacheHealthEvaluator}
*
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java b/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
index 74df5c8..0956b8c 100755
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
@@ -14,13 +14,14 @@
*/
package org.apache.geode.admin.internal;
-import org.apache.geode.distributed.DistributedSystem;
-import org.junit.After;
-import org.junit.Before;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.geode.distributed.DistributedSystem;
/**
* Provides common setUp and tearDown for testing the Admin API.
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
index c61cbd0..14927f4 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.admin.internal;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.junit.After;
-import org.junit.Before;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
/**
* Superclass of tests for the {@linkplain org.apache.geode.admin.internal.AbstractHealthEvaluator
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
index d20ce36..81bfcbc 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
@@ -26,9 +26,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.admin.GemFireHealth;
import org.apache.geode.admin.GemFireHealthConfig;
+import org.apache.geode.internal.PureJavaMode;
import org.apache.geode.internal.statistics.GemFireStatSampler;
import org.apache.geode.internal.statistics.platform.ProcessStats;
-import org.apache.geode.internal.PureJavaMode;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
index 71a65da..aab2916 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
@@ -104,7 +104,7 @@ public class DeprecatedAgentLauncherIntegrationTest {
/**
* Test to verify fix for TRAC #44658.
* <p>
- *
+ *
* TRAC #44658: Agent ignores 'property-file' command line option (regression in 6.6.2)
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
index 898f59d..98bb6dc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
@@ -309,7 +309,7 @@ public class AttributesFactoryJUnitTest {
/**
* Tests the cacheListener functionality
- *
+ *
* @since GemFire 5.0
*/
@Test
@@ -410,7 +410,7 @@ public class AttributesFactoryJUnitTest {
/**
* Trivial cache listener impl
- *
+ *
* @since GemFire 5.0
*/
private static class MyCacheListener extends CacheListenerAdapter {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
index 1273c43..ac2cbed 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
@@ -14,30 +14,31 @@
*/
package org.apache.geode.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.RegionMembershipListenerAdapter;
import org.apache.geode.cache.util.RegionRoleListenerAdapter;
import org.apache.geode.cache.util.TransactionListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Unit test for basic CacheListener feature. NOTE: these tests using a loner DistributedSystem and
* local scope regions so all the listener features tested are for local listeners being invoked for
* local operations.
- *
+ *
* @since GemFire 5.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
index 61e7c3a..c2341ef 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
@@ -14,12 +14,14 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
@@ -30,12 +32,9 @@ import org.apache.geode.distributed.internal.DSClock;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.*;
-import org.junit.Ignore;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
index e9cf762..8c08ada 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -35,6 +34,7 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -54,7 +54,7 @@ public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
/**
* Tests that we can have both a connection pool and a bridge loader. The expected order of
* operations for get is. get from server load from loader.
- *
+ *
* Anything that is loaded on the client is put on the server..
*/
@Test
@@ -131,7 +131,7 @@ public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
/**
* Test the we can have both a connection pool and a cache writer.
- *
+ *
* The expected order of operations for put is: local writer put on server
*/
@Test
@@ -228,7 +228,7 @@ public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
/**
* Test that we can have a peer, a server, and a bridge loader for the same region.
- *
+ *
* Expected order 1 localCache 2 peer 3 server 4 loader
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
index 542475a..551d5e4 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.cache;
+import static org.junit.runners.MethodSorters.*;
+
+import org.junit.FixMethodOrder;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import static org.junit.runners.MethodSorters.*;
-import org.junit.FixMethodOrder;
-import org.junit.experimental.categories.Category;
-
@FixMethodOrder(NAME_ASCENDING)
@Category({DistributedTest.class, ClientServerTest.class})
public class ConnectionPoolAutoDUnitTest extends ConnectionPoolDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 376f145..e514bd4 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
@@ -71,6 +70,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@@ -96,10 +96,10 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
protected static int numberOfAfterCreates;
protected static int numberOfAfterUpdates;
- protected final static int TYPE_CREATE = 0;
- protected final static int TYPE_UPDATE = 1;
- protected final static int TYPE_INVALIDATE = 2;
- protected final static int TYPE_DESTROY = 3;
+ protected static final int TYPE_CREATE = 0;
+ protected static final int TYPE_UPDATE = 1;
+ protected static final int TYPE_INVALIDATE = 2;
+ protected static final int TYPE_DESTROY = 3;
@Override
public final void postSetUp() throws Exception {
@@ -191,7 +191,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* By default return 0 which turns off selector and gives thread per cnx. Test subclasses can
* override to run with selector.
- *
+ *
* @since GemFire 5.1
*/
protected int getMaxThreads() {
@@ -334,7 +334,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
* Create a fake EntryEvent that returns the provided region for {@link CacheEvent#getRegion()}
* and returns {@link org.apache.geode.cache.Operation#LOCAL_LOAD_CREATE} for
* {@link CacheEvent#getOperation()}
- *
+ *
* @param r
* @return fake entry event
*/
@@ -702,7 +702,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
* Tests for bug 36684 by having two bridge servers with cacheloaders that should always return a
* value and one client connected to each server reading values. If the bug exists, the clients
* will get null sometimes.
- *
+ *
* @throws InterruptedException
*/
@Test
@@ -1218,7 +1218,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Make sure cnx lifetime expiration working on thread local cnxs.
- *
+ *
* @author darrel
*/
@Test
@@ -1228,7 +1228,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Make sure cnx lifetime expiration working on thread local cnxs.
- *
+ *
* @author darrel
*/
@Test
@@ -3114,7 +3114,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Accessed by reflection DO NOT REMOVE
- *
+ *
* @return
*/
protected static int getCacheServerPort() {
@@ -3232,7 +3232,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a "loner" distributed system that has dynamic region creation enabled.
- *
+ *
* @since GemFire 4.3
*/
protected Cache createDynamicRegionCache(String testName, String connectionPoolName) {
@@ -3247,7 +3247,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* A handy method to poll for arrival of non-null/non-invalid entries
- *
+ *
* @param r the Region to poll
* @param key the key of the Entry to poll for
*/
@@ -5394,47 +5394,47 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Test that the "notify by subscription" attribute is unique for each BridgeServer and Gateway
- *
+ *
* @throws Exception
*/
/*
* public void test035NotifyBySubscriptionIsolation() throws Exception { final String name =
* this.getName(); final Host host = Host.getHost(0); final VM server = host.getVM(3); final VM
* client1 = host.getVM(1); final VM client2 = host.getVM(2);
- *
+ *
* final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(3); final int bs1Port =
* ports[0]; final int bs2Port = ports[1]; final int gwPort = ports[2];
- *
+ *
* final String key1 = "key1-" + name; final String val1 = "val1-" + name; final String key2 =
* "key2-" + name; final String val2 = "val2-" + name;
- *
+ *
* try { server.invoke(new CacheSerializableRunnable("Setup BridgeServers and Gateway") { public
* void run2() throws CacheException { Cache cache = getCache();
- *
+ *
* try {
- *
+ *
* // Create a gateway (which sets notify-by-subscription to true) cache.setGatewayHub(name,
* gwPort).start();
- *
+ *
* // Start the server that does not have notify-by-subscription (server2) CacheServer bridge2 =
* cache.addCacheServer(); bridge2.setPort(bs2Port); bridge2.setNotifyBySubscription(false);
* String[] noNotifyGroup = {"noNotifyGroup"}; bridge2.setGroups(noNotifyGroup); bridge2.start();
* assertFalse(bridge2.getNotifyBySubscription()); { BridgeServerImpl bsi = (BridgeServerImpl)
* bridge2; AcceptorImpl aci = bsi.getAcceptor();
- *
+ *
* //assertFalse(aci.getCacheClientNotifier().getNotifyBySubscription()); }
- *
+ *
* // Start the server that DOES have notify-by-subscription (server1) CacheServer bridge1 =
* cache.addCacheServer(); bridge1.setPort(bs1Port); bridge1.setNotifyBySubscription(true);
* String[] notifyGroup = {"notifyGroup"}; bridge1.setGroups(notifyGroup); bridge1.start();
* assertTrue(bridge1.getNotifyBySubscription()); { BridgeServerImpl bsi = (BridgeServerImpl)
* bridge1; AcceptorImpl aci = bsi.getAcceptor();
* assertTrue(aci.getCacheClientNotifier().getNotifyBySubscription()); }
- *
+ *
* } catch (IOException ioe) { fail("Setup of BridgeServer test " + name + " failed", ioe ); }
- *
+ *
* Region r = createRootRegion(name, getRegionAttributes()); r.put(key1, val1); } });
- *
+ *
* client1.invoke(new
* CacheSerializableRunnable("Test client1 to server with true notify-by-subscription") { public
* void run2() throws CacheException { createLonerDS(); AttributesFactory factory = new
@@ -5445,36 +5445,36 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
* factory.create()); assertNull(r.getEntry(key1)); r.registerInterest(key1);
* assertNotNull(r.getEntry(key1)); assertIndexDetailsEquals(val1, r.getEntry(key1).getValue());
* r.registerInterest(key2); assertNull(r.getEntry(key2)); } });
- *
+ *
* client2.invoke(new
* CacheSerializableRunnable("Test client2 to server with false notify-by-subscription") { public
* void run2() throws CacheException { createLonerDS(); AttributesFactory factory = new
* AttributesFactory();
* ClientServerTestCase.configureConnectionPool(factory,getServerHostName(host),bs2Port,-1,true,-1
* ,-1, "noNotifyGroup");
- *
+ *
* factory.setScope(Scope.LOCAL); factory.setCacheListener(new
* CertifiableTestCacheListener(getLogWriter())); Region r = createRootRegion(name,
* factory.create()); assertNull(r.getEntry(key1)); assertIndexDetailsEquals(val1, r.get(key1));
* assertNull(r.getEntry(key2)); r.registerInterest(key2); assertNull(r.getEntry(key2)); } });
- *
+ *
* server.invoke(new
* CacheSerializableRunnable("Update server with new values for client notification") { public
* void run2() throws CacheException { Region r = getRootRegion(name); assertNotNull(r);
* r.put(key2, val2); // Create a new entry r.put(key1, val2); // Change the first entry } });
- *
+ *
* client1.invoke(new
* CacheSerializableRunnable("Test update from to server with true notify-by-subscription") {
* public void run2() throws CacheException { Region r = getRootRegion(name); assertNotNull(r);
* CertifiableTestCacheListener ctl = (CertifiableTestCacheListener)
* r.getAttributes().getCacheListener();
- *
+ *
* ctl.waitForUpdated(key1); assertNotNull(r.getEntry(key1)); assertIndexDetailsEquals(val2,
* r.getEntry(key1).getValue()); // new value should have been pushed
- *
+ *
* ctl.waitForCreated(key2); assertNotNull(r.getEntry(key2)); // new entry should have been pushed
* assertIndexDetailsEquals(val2, r.getEntry(key2).getValue()); } });
- *
+ *
* client2.invoke(new
* CacheSerializableRunnable("Test update from server with false notify-by-subscription") { public
* void run2() throws CacheException { Region r = getRootRegion(name); assertNotNull(r);
@@ -5482,7 +5482,7 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
* r.getAttributes().getCacheListener(); ctl.waitForInvalidated(key1);
* assertNotNull(r.getEntry(key1)); assertNull(r.getEntry(key1).getValue()); // Invalidate should
* have been pushed assertIndexDetailsEquals(val2, r.get(key1)); // New value should be fetched
- *
+ *
* assertNull(r.getEntry(key2)); // assertNull(r.getEntry(key2).getValue());
* assertIndexDetailsEquals(val2, r.get(key2)); // New entry should be fetched } }); tearDown(); }
* finally { // HashSet destroyedRoots = new HashSet(); try { client1.invoke(() ->
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
index b81c08f..866b7b4 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
@@ -21,16 +32,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Map;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionPoolFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
index 31019f7..ddaaa7e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DiskAccessExceptionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
index ad3052a..e84b655 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
@@ -27,17 +27,17 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test case for Trac <a href="https://svn.gemstone.com/trac/gemfire/ticket/52289">#52289</a>.
- *
+ *
* Asserts fixes for bug JDK-8076152 in JDK 1.8.0u20 to 1.8.0.u45.
* http://bugs.java.com/bugdatabase/view_bug.do?bug_id=8076152
- *
+ *
* The JVM crashes when hotspot compiling a method that uses an array consisting of objects of a
* base class when different child classes is used as actual instance objects AND when the array is
* constant (declared final). The crash occurs during process of the aaload byte code.
- *
+ *
* This test and its corrections can be removed after the release of JDK 1.8.0u60 if we choose to
* not support 1.8.0u20 - 1.8.0u45 inclusive.
- *
+ *
* @since GemFire 8.2
*/
@Category(UnitTest.class)
@@ -48,7 +48,7 @@ public class FinalStaticArrayShouldNotCauseSegFaultTest {
// Iterate enough to cause JIT to compile
// javax.print.attribute.EnumSyntax::readResolve
for (int i = 0; i < 100_000; i++) {
- // Must execute two or more subclasses with final static arrays of
+ // Must execute two or more subclasses with static final arrays of
// different types.
doEvictionAlgorithm();
doEvictionAction();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
index d1d4d32..00fb577 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
@@ -21,10 +21,10 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -70,4 +70,3 @@ public class MembershipAttributesAreSerializableTest {
assertEquals(outSA, inSA);
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
index 7b97f1b..4d36f0f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
@@ -14,6 +14,18 @@
*/
package org.apache.geode.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
@@ -21,21 +33,10 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
/**
* Tests PoolManager
- *
+ *
* @since GemFire 5.7
*/
@Category({IntegrationTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
index 695bdc2..bea20eb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.TransactionListenerAdapter;
@@ -25,21 +36,11 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Unit test for basic DataPolicy.EMPTY feature. NOTE: these tests using a loner DistributedSystem
* and local scope regions
- *
+ *
* @since GemFire 5.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
index 1b3a514..cc8c6b9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
@@ -14,20 +14,9 @@
*/
package org.apache.geode.cache;
-import org.apache.geode.CancelException;
-import org.apache.geode.cache.client.PoolManager;
-import org.apache.geode.cache.util.CacheListenerAdapter;
-import org.apache.geode.cache.util.CacheWriterAdapter;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import static org.apache.geode.cache.RegionShortcut.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
import java.io.File;
import java.io.FileWriter;
@@ -36,13 +25,25 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Properties;
-import static org.apache.geode.cache.RegionShortcut.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit test for the RegionFactory class
- *
+ *
* @since GemFire 5.0
*/
@Category(IntegrationTest.class)
@@ -394,7 +395,7 @@ public class RegionFactoryJUnitTest {
/**
* Ensure that the RegionFactory set methods mirrors those found in RegionAttributes
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
index 365b68c..ea79344 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
@@ -16,14 +16,15 @@ package org.apache.geode.cache;
import static org.junit.Assert.fail;
-import org.apache.geode.internal.cache.InternalRegionArguments;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import org.apache.geode.internal.cache.InternalRegionArguments;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RegionNameValidationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
index 90b11f9..e2c5189 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
@@ -25,14 +25,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.cache.util.CacheListenerAdapter;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class RemoveAllCacheListenerPeerRegressionTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
index 8967a61..2471612 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
@@ -127,4 +127,3 @@ public class RoleExceptionJUnitTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
index 587602a..a2b6918 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
@@ -14,15 +14,17 @@
*/
package org.apache.geode.cache.asyncqueue;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.awaitility.Awaitility;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -30,15 +32,13 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class AsyncEventQueueEvictionAndExpirationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
index 1c203bb..cdef8bd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.cache.asyncqueue.internal;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class SerialAsyncEventQueueImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index f714742..f118741 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -23,7 +23,24 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.junit.runners.MethodSorters.NAME_ASCENDING;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Properties;
+
import org.apache.commons.io.FileUtils;
+import org.jgroups.util.UUID;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.client.internal.ProxyCache;
@@ -41,26 +58,10 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.jgroups.util.UUID;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Properties;
/**
* Unit test for the ClientCacheFactory class
- *
+ *
* @since GemFire 6.5
*/
@FixMethodOrder(NAME_ASCENDING)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
index 433e76c..6ee1a58 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
@@ -14,6 +14,21 @@
*/
package org.apache.geode.cache.client;
+import static org.apache.geode.cache.client.ClientRegionShortcut.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.util.Arrays;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.client.internal.ProxyRegion;
import org.apache.geode.cache.query.Query;
@@ -24,24 +39,10 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-import java.net.InetAddress;
-import java.util.Arrays;
-import java.util.Properties;
-
-import static org.apache.geode.cache.client.ClientRegionShortcut.*;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Unit test for the ClientRegionFactory class
- *
+ *
* @since GemFire 6.5
*/
@Category({IntegrationTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
index ee1fb38..cd467e5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -24,6 +24,15 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -43,14 +52,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.Stack;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
index 0e2404f..74b215f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
@@ -30,6 +30,9 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryEvent;
@@ -49,8 +52,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category({DistributedTest.class, ClientServerTest.class})
public class RemoveAllCacheListenerClientServerRegressionTest extends DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
index ef1f514..261904b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
@@ -20,11 +20,12 @@ import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AbstractOpTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
index deb3325..dc7ad3a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -20,8 +20,8 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import org.junit.Assert;
import org.junit.*;
+import org.junit.Assert;
import org.junit.experimental.categories.*;
import org.apache.geode.cache.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index e57ca83..f1bcb46 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -14,6 +14,38 @@
*/
package org.apache.geode.cache.client.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.*;
import org.apache.geode.cache.client.NoAvailableLocatorsException;
@@ -23,12 +55,12 @@ import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.PoolStatHelper;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.gms.membership.HostAddress;
-import org.apache.geode.distributed.internal.ClusterConfigurationService;
-import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
@@ -40,39 +72,6 @@ import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListener;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-
-import junit.framework.Assert;
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
/**
*
@@ -157,7 +156,7 @@ public class AutoConnectionSourceImplJUnitTest {
* This test validates the AutoConnectionSourceImpl.updateLocatorInLocatorList method. That method
* takes InetSocketAddres of locator which unable to connect to locator. And update that
* InetSocketAddres with hostaddress of locator in locatorlist.
- *
+ *
* In this test we validate this using identityHashCode.
*/
@Test
@@ -297,7 +296,7 @@ public class AutoConnectionSourceImplJUnitTest {
/**
* This tests that discovery works even after one of two locators was shut down
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 46a0914..e5e55dd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -28,6 +28,12 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -52,12 +58,6 @@ import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
/**
* Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for
* details
@@ -567,4 +567,3 @@ public class CacheServerSSLConnectionDUnitTest extends JUnit4DistributedTestCase
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
index 95b5a92..da87243 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -14,6 +14,19 @@
*/
package org.apache.geode.cache.client.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.client.Pool;
@@ -27,18 +40,6 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.net.InetSocketAddress;
-import java.net.SocketTimeoutException;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 700605e..5cc8b28 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -14,17 +14,22 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.PoolManager;
@@ -37,6 +42,7 @@ import org.apache.geode.cache.server.ServerLoad;
import org.apache.geode.cache.server.ServerLoadProbeAdapter;
import org.apache.geode.cache.server.ServerMetrics;
import org.apache.geode.distributed.Locator;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.ServerLocator;
@@ -46,22 +52,15 @@ import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
+import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
-import org.awaitility.Awaitility;
-import org.junit.Assert;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
index 7c168dc..2194932 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
@@ -21,7 +21,19 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -45,17 +57,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
/**
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index 9b1b6e9..f2ad63a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,6 +44,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, ClientServerTest.class})
@@ -475,7 +475,7 @@ public class OpExecutorImplJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.pooling.ConnectionManager#borrowConnection(org.apache.
* geode.distributed.internal.ServerLocation, long)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 992a6f0..1b68191 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -14,6 +14,25 @@
*/
package org.apache.geode.cache.client.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.NoSubscriptionServersAvailableException;
import org.apache.geode.cache.RegionService;
@@ -30,24 +49,6 @@ import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
index e1992d5..2e7bdaf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -22,7 +22,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -41,6 +40,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index 47bf9ad..ca27506 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -31,6 +30,7 @@ import org.apache.geode.cache.client.internal.ServerBlackList.BlackListListenerA
import org.apache.geode.cache.client.internal.ServerBlackList.FailureTracker;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.util.StopWatch;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
index 529ed93..1e68518 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
@@ -17,13 +17,13 @@ package org.apache.geode.cache.client.internal;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
-
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* Test if exceptions are logged when thread is submitted using
* {@code SingleHopClientExecutor#submitTask} method.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
index 0e7d358..f8522fa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The LocatorStatusResponseJUnitTest class is a test suite of test cases testing the contract and
* functionality of the LocatorStatusResponse class.
* </p>
- *
+ *
* @see org.apache.geode.cache.client.internal.locator.LocatorStatusResponse
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index f3afe6e..d6da9e3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -14,6 +14,29 @@
*/
package org.apache.geode.cache.client.internal.pooling;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.client.AllConnectionsInUseException;
import org.apache.geode.cache.client.NoAvailableServersException;
@@ -31,28 +54,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.fail;
@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionManagerJUnitTest {
@@ -788,7 +789,7 @@ public class ConnectionManagerJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.client.internal.ConnectionFactory#createClientToServerConnection(org.
* apache.geode.distributed.internal.ServerLocation)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index 6f71d76..127e4b2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -16,12 +16,12 @@ package org.apache.geode.cache.execute;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.UnitTest;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class FunctionAdapterJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
index daa90ba..ea4456e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
@@ -20,14 +20,15 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class FunctionExceptionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java b/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
index 954b798..d29c142 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
@@ -14,14 +14,8 @@
*/
package org.apache.geode.cache.management;
-import org.apache.geode.LogWriter;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.distributed.DistributedSystem;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import javax.management.Notification;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationListener;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryPoolMXBean;
@@ -31,22 +25,29 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import javax.management.Notification;
+import javax.management.NotificationEmitter;
+import javax.management.NotificationListener;
+
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.distributed.DistributedSystem;
/**
* An test class for exploring the various notification listener behaviors
- *
+ *
* Run it like this:
- *
+ *
* java -cp geode-dependencies.jar:. -Dgemfire.log-file=system.log
* -Dgemfire.statistic-archive-file=statsArchive.gfs
* org.apache.geode.cache.control.MXMemoryPoolListenerExample
- *
+ *
* @since GemFire 6.0
*/
public class MXMemoryPoolListenerExample implements NotificationListener {
private AtomicBoolean critical = new AtomicBoolean();
- final private LogWriter logger;
+ private final LogWriter logger;
/**
* @param ds
@@ -57,7 +58,7 @@ public class MXMemoryPoolListenerExample implements NotificationListener {
/*
* (non-Javadoc)
- *
+ *
* @see javax.management.NotificationListener#handleNotification(javax.management.Notification,
* java.lang.Object)
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 9017fc2..cc1c310 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -65,9 +65,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.statistics.GemFireStatSampler;
-import org.apache.geode.internal.statistics.LocalStatListener;
-import org.apache.geode.internal.statistics.StatisticsImpl;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -81,6 +78,9 @@ import org.apache.geode.internal.cache.control.ResourceAdvisor;
import org.apache.geode.internal.cache.control.ResourceListener;
import org.apache.geode.internal.cache.control.TestMemoryThresholdListener;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.statistics.GemFireStatSampler;
+import org.apache.geode.internal.statistics.LocalStatListener;
+import org.apache.geode.internal.statistics.StatisticsImpl;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.DistributedTestUtils;
@@ -99,14 +99,14 @@ import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the Heap Memory thresholds of {@link ResourceManager}
- *
+ *
* @since GemFire 6.0
*/
@Category(DistributedTest.class)
public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
public static class Range implements Serializable {
- public final static Range DEFAULT = new Range(0, 20);
+ public static final Range DEFAULT = new Range(0, 20);
public final int start;
public final int end;
@@ -215,7 +215,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* test that puts in a server are rejected when a remote VM crosses critical threshold
- *
+ *
* @throws Exception
*/
private void doDistributedRegionRemotePutRejection(boolean localDestroy, boolean cacheClose)
@@ -319,7 +319,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* test that puts in a client are rejected when a remote VM crosses critical threshold
- *
+ *
* @throws Exception
*/
@Test
@@ -363,7 +363,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* test that disabling threshold does not cause remote event and remote DISABLED events are
* delivered
- *
+ *
* @throws Exception
*/
@Test
@@ -417,7 +417,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* Make sure appropriate events are delivered when moving between states.
- *
+ *
* @throws Exception
*/
@Category(FlakyTest.class) // GEODE-427: random ports, time sensitive, waitForCriterions
@@ -1269,7 +1269,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* Starts up a CacheServer.
- *
+ *
* @return a {@link ServerPorts} containing the CacheServer ports.
*/
private ServerPorts startCacheServer(VM server, final float evictionThreshold,
@@ -1485,7 +1485,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* Verifies that the test listener value on the given vm is what is expected Note that for remote
* events useWaitCriterion must be true
- *
+ *
* @param vm the vm where verification should take place
* @param state
* @param value the expected value
@@ -1776,7 +1776,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* Test that LocalRegion cache Loads are not stored in the Region if the VM is in a critical
* state, then test that they are allowed once the VM is no longer critical
- *
+ *
* @throws Exception
*/
@Test
@@ -1902,7 +1902,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
* Test that DistributedRegion cacheLoade and netLoad are passed through to the calling thread if
* the local VM is in a critical state. Once the VM has moved to a safe state then test that they
* are allowed.
- *
+ *
* @throws Exception
*/
@Test
@@ -2115,7 +2115,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* Test that a Partitioned Region loader invocation is rejected if the VM with the bucket is in a
* critical state.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index b5dc9a9..a3ad9e1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -34,6 +34,9 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.CacheException;
@@ -89,12 +92,10 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Tests the Off-Heap Memory thresholds of {@link ResourceManager}
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
@@ -427,7 +428,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
/**
* test that puts in a server are rejected when a remote VM crosses critical threshold
- *
+ *
* @throws Exception
*/
private void doDistributedRegionRemotePutRejection(boolean localDestroy, boolean cacheClose)
@@ -1731,7 +1732,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
* Verifies that the test listener value on the given vm is what is expected Note that for remote
* events useWaitCriterion must be true. Note also that since off-heap local events are async
* local events must also set useWaitCriterion to true.
- *
+ *
* @param vm the vm where verification should take place
* @param value the expected value
* @param useWaitCriterion must be true for both local and remote events (see GEODE-138)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
index 13643ec..af898ee 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
@@ -72,7 +72,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests org.apache.geode.cache.control.ResourceManager.
- *
+ *
* TODO: javadoc this test properly and cleanup the helper methods to be more flexible and
* understandable
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
index 8204d77..442b2e7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.cache.mapInterface;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.*;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.fail;
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ExceptionHandlingJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
index 2c1cd18..e06928e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.cache.mapInterface;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.*;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.fail;
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class MapFunctionalJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index fb9d7b7..0b8470b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
import java.util.TreeMap;
-import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -35,6 +34,7 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.ThreadUtils;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category({IntegrationTest.class, DLockTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
index 02f48cb..93a4538 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.cache.operations;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -22,16 +33,6 @@ import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class PutOperationContextJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
index d54f367..dda1b86 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
@@ -14,22 +14,23 @@
*/
package org.apache.geode.cache.operations.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.operations.PutOperationContextJUnitTest;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
@Category(IntegrationTest.class)
public class GetOperationContextImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
index dd75d67..6701a39 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.cache.partition;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.net.UnknownHostException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -33,6 +26,9 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -51,6 +47,7 @@ import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.partitioned.fixed.FixedPartitioningTestBase.Months_Accessor;
+import org.apache.geode.internal.cache.partitioned.fixed.QuarterPartitionResolver;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
@@ -58,7 +55,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.internal.cache.partitioned.fixed.QuarterPartitionResolver;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
index a46e1c4..1eecb5b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
@@ -21,21 +21,21 @@ package org.apache.geode.cache.query;
import static org.junit.Assert.*;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.data.*;
-import org.apache.geode.cache.query.internal.*;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-import java.util.*;
import java.io.*;
+import java.util.*;
-import org.apache.geode.test.junit.categories.PerformanceTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.query.data.*;
+import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.PerformanceTest;
+
/**
* This test is to baseline and compare the performance figures for index usage benchmarks.
*/
@@ -336,12 +336,12 @@ public class BaseLineAndCompareQueryPerfJUnitTest {
public static void populateData() throws Exception {
/*
* Set villages = new HashSet(); for (int i=0; i<10; i++){ villages.add(new Village(i)); }
- *
+ *
* Set cities = new HashSet(); for (int i=0; i<10; i++){ cities.add(new City(i)); }
- *
+ *
* Set districts = new HashSet(); for (int i=0; i<10; i++){ districts.add(new District(i,
* cities, villages)); }
- *
+ *
* Set states = new HashSet(); for (int i=0; i<10; i++){ states.add(new State(i, districts)); }
*/
@@ -451,13 +451,13 @@ public class BaseLineAndCompareQueryPerfJUnitTest {
/*
* Set set1 = withoutIndexTimeRegion.keySet(); Iterator itr1 = set1.iterator();
- *
+ *
* Set set2 = withIndexTimeRegion.keySet(); Iterator itr2 = set2.iterator();
- *
+ *
* Set set3 = indexNameRegion.keySet(); Iterator itr3 = set3.iterator();
- *
+ *
* Set set4 = withoutIndexResultSetSize.keySet(); Iterator itr4 = set4.iterator();
- *
+ *
* Set set5 = withIndexResultSetSize.keySet(); Iterator itr5 = set5.iterator();
*/
Integer it;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java
index c8bc44b..40d8ff0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java
@@ -14,21 +14,22 @@
*/
package org.apache.geode.cache.query;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.data.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.fail;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.query.data.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Junit test for checking the value constraint region attributes.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java
index 80a7ced..2fc8270 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java
@@ -34,6 +34,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
+import org.apache.geode.cache.query.data.TestData.MyValue;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
@@ -41,7 +42,6 @@ import org.apache.geode.cache.query.internal.QueryUtils;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.cache.query.data.TestData.MyValue;
/**
* Tests reported bugs
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java b/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java
index e5fa846..ddf9405 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java
@@ -27,9 +27,13 @@ import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheTransactionManager;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.GatewayException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.TimeoutException;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.distributed.DistributedSystem;
@@ -37,11 +41,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.cache.TimeoutException;
-import org.apache.geode.cache.CacheWriterException;
-import org.apache.geode.cache.GatewayException;
-import org.apache.geode.cache.RegionExistsException;
-
public class CacheUtils {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
index a474547..492ebb8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
@@ -17,6 +17,13 @@ package org.apache.geode.cache.query;
import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCache;
@@ -25,12 +32,6 @@ import org.apache.geode.cache.client.ClientRegionFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
@Category(IntegrationTest.class)
public class LocalQueryServiceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
index 83e500f..6ca045f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
@@ -14,6 +14,16 @@
*/
package org.apache.geode.cache.query;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -32,19 +42,10 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PdxStringQueryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java b/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java
index 248713c..f12e7a6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache.query;
-import it.unimi.dsi.fastutil.floats.FloatArrayList;
-
import java.text.DateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
+import it.unimi.dsi.fastutil.floats.FloatArrayList;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
index 36d5144..0ead2c2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
@@ -35,8 +35,6 @@ import java.util.Set;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
@@ -49,8 +47,10 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.Scope;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.DefaultQuery;
+import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
index f53faed..cf3a0fc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
@@ -16,7 +16,15 @@ package org.apache.geode.cache.query;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.commons.io.FileUtils;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -32,13 +40,6 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
/**
* Utility class for testing supported queries
*/
@@ -1683,7 +1684,7 @@ public class QueryTestUtils implements Serializable {
* new QueryTestUtils().executeQueries(arr);
* </code>
* </P>
- *
+ *
* @param qarr Array of keys, queries in the values mapped are executed
* @return Object array containing SelectResults
*/
@@ -1701,7 +1702,7 @@ public class QueryTestUtils implements Serializable {
/**
* Execute queries by removing any DISTINCT clause if present
- *
+ *
* @param vm
* @param qarr
*/
@@ -1715,7 +1716,7 @@ public class QueryTestUtils implements Serializable {
/**
* Execute queries by removing any DISTINCT clause if present
- *
+ *
* @param qarr
*/
public Object[] executeQueriesWithoutDistinct(String qarr[]) {
@@ -1742,7 +1743,7 @@ public class QueryTestUtils implements Serializable {
/**
* Execute queries by adding a DISTINCT clause if not present
- *
+ *
* @param vm
* @param qarr
*/
@@ -1756,7 +1757,7 @@ public class QueryTestUtils implements Serializable {
/**
* Execute queries by adding a DISTINCT clause if not present
- *
+ *
* @param qarr
*/
public Object[] executeQueriesWithDistinct(String qarr[]) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
index 7a3fa0d..6b8ef78 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
@@ -35,8 +35,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* A sample test class using the QueryTestUtils
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class QueryTestUtilsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
index 40e77b6..e7a0391 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
@@ -22,6 +22,11 @@ import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -33,11 +38,6 @@ import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
/**
* @implNote This test class has been designed to test the query execution using the
* LocalDataSet.executeQuery where one of the parameters passed is the bucket set to be
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
index c9ccfc4..c1b317e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
@@ -20,30 +20,29 @@ import static org.junit.Assert.fail;
import java.util.Iterator;
-import org.apache.geode.cache.RegionShortcut;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.LocalRegion;
-// for internal access test
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.rules.ExpectedException;
/**
* RegionJUnitTest.java
*
* Created on January 31, 2005, 3:54 PM
- *
+ *
*/
@Category(IntegrationTest.class)
public class RegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
index 0d42554..5b6e506 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
@@ -22,10 +22,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.management.internal.cli.json.TypedJsonPdxIntegrationTest;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.management.internal.cli.json.TypedJson;
+import org.apache.geode.management.internal.cli.json.TypedJsonPdxIntegrationTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java b/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java
index 3835668..6f9cb35 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java
@@ -23,12 +23,12 @@ package org.apache.geode.cache.query;
import java.util.Collection;
import java.util.Iterator;
+import parReg.query.unittest.NewPortfolio;
+
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.cache.query.data.Position;
-import parReg.query.unittest.NewPortfolio;
-
/**
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java b/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
index c14eaac..d77e677 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
@@ -23,6 +23,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.client.Pool;
@@ -31,7 +33,6 @@ import org.apache.geode.cache.query.CqStatusListener;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.awaitility.Awaitility;
/**
*
@@ -57,15 +58,15 @@ public class CqQueryTestListener implements CqStatusListener {
protected volatile boolean eventRegionClear = false;
protected volatile boolean eventRegionInvalidate = false;
- final public Set destroys = Collections.synchronizedSet(new HashSet());
- final public Set creates = Collections.synchronizedSet(new HashSet());
- final public Set invalidates = Collections.synchronizedSet(new HashSet());
- final public Set updates = Collections.synchronizedSet(new HashSet());
- final public Set errors = Collections.synchronizedSet(new HashSet());
+ public final Set destroys = Collections.synchronizedSet(new HashSet());
+ public final Set creates = Collections.synchronizedSet(new HashSet());
+ public final Set invalidates = Collections.synchronizedSet(new HashSet());
+ public final Set updates = Collections.synchronizedSet(new HashSet());
+ public final Set errors = Collections.synchronizedSet(new HashSet());
- static private final String WAIT_PROPERTY = "CqQueryTestListener.maxWaitTime";
+ private static final String WAIT_PROPERTY = "CqQueryTestListener.maxWaitTime";
- static private final int WAIT_DEFAULT = (20 * 1000);
+ private static final int WAIT_DEFAULT = (20 * 1000);
public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();;
@@ -74,7 +75,7 @@ public class CqQueryTestListener implements CqStatusListener {
// This is to avoid reference to PerUserRequestSecurityTest which will fail to
// initialize in a non Hydra environment.
- static public boolean usedForUnitTests = true;
+ public static boolean usedForUnitTests = true;
public ConcurrentLinkedQueue events = new ConcurrentLinkedQueue();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
index 94b840e..1ae16b6 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
@@ -20,8 +20,8 @@
package org.apache.geode.cache.query.data;
-import java.util.*;
import java.io.*;
+import java.util.*;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
index 8fed485..05454ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
@@ -21,8 +21,8 @@
package org.apache.geode.cache.query.data;
-import java.util.Set;
import java.io.*;
+import java.util.Set;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Employee.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Employee.java
index 41033a3..43a715e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Employee.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Employee.java
@@ -82,5 +82,3 @@ public class Employee {
}
}// end of employee class
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java
index b9c0948..d00b738 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache.query.data;
-import java.sql.*;
import java.io.*;
+import java.sql.*;
/*
* author: Prafulla Chaudhari
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Portfolio.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Portfolio.java
index 464a822..70009db 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Portfolio.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Portfolio.java
@@ -201,7 +201,7 @@ public class Portfolio implements Serializable, DataSerializable {
/**
* Getter for property type.S
- *
+ *
* @return Value of property type.
*/
public String getType() {
@@ -307,5 +307,3 @@ public class Portfolio implements Serializable, DataSerializable {
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioData.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioData.java
index b018eeb..857a3f2 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioData.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioData.java
@@ -89,7 +89,7 @@ public class PortfolioData implements Declarable, Serializable {
/**
* Getter for property type.S
- *
+ *
* @return Value of property type.
*/
public String getType() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioNoDS.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioNoDS.java
index 354685c..1a9c40e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioNoDS.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioNoDS.java
@@ -190,7 +190,7 @@ public class PortfolioNoDS implements Serializable {
/**
* Getter for property type.S
- *
+ *
* @return Value of property type.
*/
public String getType() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java
index cc531d7..2a62e20 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java
@@ -21,9 +21,6 @@
package org.apache.geode.cache.query.data;
import java.io.*;
-
-import org.apache.geode.*; // for DataSerializable
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -32,6 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.geode.*;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.PdxReader;
@@ -224,7 +222,7 @@ public class PortfolioPdx implements Serializable, PdxSerializable {
/**
* Getter for property type.S
- *
+ *
* @return Value of property type.
*/
public String getType() {
@@ -298,5 +296,3 @@ public class PortfolioPdx implements Serializable, PdxSerializable {
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java
index b7dfc90..8b7c7a4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache.query.data;
import java.io.*;
import java.util.HashSet;
import java.util.Set;
+
import org.apache.geode.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java
index 93b8dcf..b234844 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache.query.data;
-import java.sql.*;
import java.io.*;
+import java.sql.*;
/*
* author: Prafulla Chaudhari
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
index ebbcece..91d947c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
@@ -23,8 +23,8 @@ package org.apache.geode.cache.query.data;
/**
*
*/
-import java.util.*;
import java.io.Serializable;
+import java.util.*;
public class Quote implements Serializable {
public int cusip;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java
index c48eca9..7346596 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache.query.data;
-import java.sql.*;
import java.io.*;
+import java.sql.*;
/*
* author: Prafulla Chaudhari
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
index 31e9a86..dee29f8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
@@ -20,10 +20,10 @@
package org.apache.geode.cache.query.data;
-import java.util.Set;
+import java.io.*;
import java.util.HashSet;
import java.util.Iterator;
-import java.io.*;
+import java.util.Set;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java
index 3149ee1..5eace01 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.List;
/**
- *
- *
+ *
+ *
*/
public class Student {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
index 0e85cc1..c24673b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
@@ -48,14 +48,14 @@ public class CqTimeTestListener implements CqListener {
protected volatile boolean eventClose = false;
- final public Set destroys = Collections.synchronizedSet(new HashSet());
- final public Set creates = Collections.synchronizedSet(new HashSet());
- final public Set invalidates = Collections.synchronizedSet(new HashSet());
- final public Set updates = Collections.synchronizedSet(new HashSet());
+ public final Set destroys = Collections.synchronizedSet(new HashSet());
+ public final Set creates = Collections.synchronizedSet(new HashSet());
+ public final Set invalidates = Collections.synchronizedSet(new HashSet());
+ public final Set updates = Collections.synchronizedSet(new HashSet());
- static private final String WAIT_PROPERTY = "CQueryTestListener.maxWaitTime";
+ private static final String WAIT_PROPERTY = "CQueryTestListener.maxWaitTime";
- static private final int WAIT_DEFAULT = (20 * 1000);
+ private static final int WAIT_DEFAULT = (20 * 1000);
public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
index 020d94e..5e57730 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
@@ -34,7 +34,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
/**
- *
+ *
*
*/
public abstract class GroupByDUnitImpl extends JUnit4CacheTestCase implements GroupByTestInterface {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
index d79eb52..d73f5ec 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
@@ -39,10 +33,12 @@ import org.apache.geode.cache.query.functional.GroupByTestImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
index 3ef5e7c..1518520 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -14,17 +14,11 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Iterator;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
@@ -47,10 +41,12 @@ import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
index 5f85c3a..c9eaf22 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
@@ -270,4 +270,3 @@ public class HelperTestCase extends JUnit4CacheTestCase {
return p;
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
index 0602fcd..ce9899f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.query.Index;
@@ -34,6 +30,9 @@ import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
public abstract class NonDistinctOrderByDUnitImpl extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
index 606f058..906741e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
@@ -40,10 +34,12 @@ import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
index fda6cf4..f6b8f31 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.cache.query.dunit;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -34,8 +37,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public class PdxLocalQueryVersionedClassDUnitTest extends PDXQueryTestBase {
@@ -45,7 +46,7 @@ public class PdxLocalQueryVersionedClassDUnitTest extends PDXQueryTestBase {
/**
* Testing the isRemote flag which could be inconsistent when bind queries are being executed in
* multiple threads. Bug #49662 is caused because of this inconsistent behavior.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
index 6f5e2c4..ce5a2eb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
@@ -21,9 +21,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -70,7 +70,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PdxQueryDUnitTest extends PDXQueryTestBase {
@@ -2684,7 +2684,7 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
/**
* Test to query a field that is not present in the Pdx object but has a get method
- *
+ *
* @throws CacheException
*/
@Test
@@ -2831,7 +2831,7 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
/**
* Test to query a field that is not present in the Pdx object but is present in some other
* version of the pdx instance
- *
+ *
* @throws CacheException
*/
@Test
@@ -3069,7 +3069,7 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
* 2 servers(replicated) and 2 clients. client2 puts version1 and version2 objects on server1
* client1 had registered interest to server2, hence gets the pdx objects for both versions Test
* local query on client1 Test if client1 fetched pdxtypes from server
- *
+ *
* @throws CacheException
*/
@Test
@@ -3210,7 +3210,7 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
/**
* Test to query a field that is not present in the Pdx object Also the implicit method is absent
* in the class
- *
+ *
* @throws CacheException
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
index cfd38cd..194bc2e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -80,8 +80,8 @@ public class PdxStringQueryDUnitTest extends JUnit4CacheTestCase {
final String regName = "/" + rootRegionName + "/" + regionName;
private static int bridgeServerPort;
- private final static int orderByQueryIndex = 11;
- private final static int[] groupByQueryIndex = new int[] {7, 8, 9, 10};
+ private static final int orderByQueryIndex = 11;
+ private static final int[] groupByQueryIndex = new int[] {7, 8, 9, 10};
private final String[] queryString = new String[] {
"SELECT pos.secId FROM " + regName + " p, p.positions.values pos WHERE pos.secId LIKE '%L'", // 0
@@ -1926,7 +1926,7 @@ public class PdxStringQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test to verify if duplicate results are not being accumulated when PdxString is used in PR
* query
- *
+ *
* @throws CacheException
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
index f41bbe4..e2643ee 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
@@ -18,6 +18,7 @@ package org.apache.geode.cache.query.dunit;
import java.io.*;
import java.util.HashSet;
import java.util.Set;
+
import org.apache.geode.*;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.PdxReader;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
index 44330af..59e10ea 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
@@ -29,7 +29,7 @@ import org.apache.geode.security.NotAuthorizedException;
/**
* Test authorization class for testing the accessibility of query bind parameters from
* QueryOperationContext
- *
+ *
* Used by test:
*
* <li/>QueryParamsAuthorizationDUnitTest (via reflection)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index eff4d29..8b9d9e1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheFactory;
@@ -53,6 +49,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -542,7 +541,7 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
/**
* This function puts portfolio objects into the created Region (PR or Local) *
- *
+ *
* @param regionName
* @param portfolio
* @param to
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index d010772..59ad61a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -47,8 +47,8 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test for accessing query bind parameters from authorization callbacks
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class QueryParamsAuthorizationDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index b5b7c74..f1c3a13 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions;
+import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.HashSet;
@@ -31,6 +23,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
@@ -74,6 +67,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -911,7 +907,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
/**
* Run query using a function executed by client on a region on server with filter.
- *
+ *
* @param function
* @param regionName
* @param filter
@@ -957,7 +953,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
/**
* Runs a {@link LocalDataSet} query on a single server.
- *
+ *
* @param func
* @param filter
* @param query
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index d4f3c3e..3bb9695 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache.query.dunit;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.junit.Assert.*;
import java.io.DataInput;
@@ -25,8 +26,8 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.awaitility.Awaitility;
import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -65,8 +66,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-
/**
* Tests remote (client/server) query execution.
*
@@ -1958,4 +1957,3 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
index 7d0b469..44c683d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -516,7 +516,7 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
/*
* final String name = this.getName(); final Host host = Host.getHost(0); VM vm0 =
* host.getVM(0); VM vm1 = host.getVM(1); // final int numberOfEntries = 100;
- *
+ *
* // Start server vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public
* void run2() throws CacheException { Properties config = new Properties();
* config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() +
@@ -524,77 +524,77 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
* factory.setScope(Scope.LOCAL); createRegion(name, factory.create()); Wait.pause(1000); try {
* startBridgeServer(0, false); } catch (Exception ex) {
* Assert.fail("While starting CacheServer", ex); } } });
- *
+ *
* // Initialize server region vm0.invoke(new CacheSerializableRunnable("Create Bridge Server")
* { public void run2() throws CacheException { Region region =
* getRootRegion().getSubregion(name); Portfolio portfolio = null; Position position1 = null;
* Position position2 = null; Properties portfolioProperties= null; Properties
* position1Properties = null; Properties position2Properties = null;
- *
+ *
* // Create portfolio 1 portfolio = new Portfolio(); portfolioProperties = new Properties();
* portfolioProperties.put("id", new Integer(1)); portfolioProperties.put("type", "type1");
* portfolioProperties.put("status", "active");
- *
+ *
* position1 = new Position(); position1Properties = new Properties();
* position1Properties.put("secId", "SUN"); position1Properties.put("qty", new Double(34000.0));
* position1Properties.put("mktValue", new Double(24.42)); position1.init(position1Properties);
* portfolioProperties.put("position1", position1);
- *
+ *
* position2 = new Position(); position2Properties = new Properties();
* position2Properties.put("secId", "IBM"); position2Properties.put("qty", new Double(8765.0));
* position2Properties.put("mktValue", new Double(34.29)); position2.init(position2Properties);
* portfolioProperties.put("position2", position2);
- *
+ *
* portfolio.init(portfolioProperties); region.put(new Integer(1), portfolio);
- *
+ *
* // Create portfolio 2 portfolio = new Portfolio(); portfolioProperties = new Properties();
* portfolioProperties.put("id", new Integer(2)); portfolioProperties.put("type", "type2");
* portfolioProperties.put("status", "inactive");
- *
+ *
* position1 = new Position(); position1Properties = new Properties();
* position1Properties.put("secId", "YHOO"); position1Properties.put("qty", new Double(9834.0));
* position1Properties.put("mktValue", new Double(12.925)); position1.init(position1Properties);
* portfolioProperties.put("position1", position1);
- *
+ *
* position2 = new Position(); position2Properties = new Properties();
* position2Properties.put("secId", "GOOG"); position2Properties.put("qty", new
* Double(12176.0)); position2Properties.put("mktValue", new Double(21.972));
* position2.init(position2Properties); portfolioProperties.put("position2", position2);
- *
+ *
* portfolio.init(portfolioProperties); region.put(new Integer(2), portfolio);
- *
+ *
* // Create portfolio 3 portfolio = new Portfolio(); portfolioProperties = new Properties();
* portfolioProperties.put("id", new Integer(3)); portfolioProperties.put("type", "type3");
* portfolioProperties.put("status", "active");
- *
+ *
* position1 = new Position(); position1Properties = new Properties();
* position1Properties.put("secId", "MSFT"); position1Properties.put("qty", new
* Double(98327.0)); position1Properties.put("mktValue", new Double(23.32));
* position1.init(position1Properties); portfolioProperties.put("position1", position1);
- *
+ *
* position2 = new Position(); position2Properties = new Properties();
* position2Properties.put("secId", "AOL"); position2Properties.put("qty", new Double(978.0));
* position2Properties.put("mktValue", new Double(40.373)); position2.init(position2Properties);
* portfolioProperties.put("position2", position2);
- *
+ *
* portfolio.init(portfolioProperties); region.put(new Integer(3), portfolio);
- *
+ *
* // Create portfolio 4 portfolio = new Portfolio(); portfolioProperties = new Properties();
* portfolioProperties.put("id", new Integer(4)); portfolioProperties.put("type", "type1");
* portfolioProperties.put("status", "inactive");
- *
+ *
* position1 = new Position(); position1Properties = new Properties();
* position1Properties.put("secId", "APPL"); position1Properties.put("qty", new Double(90.0));
* position1Properties.put("mktValue", new Double(67.356572));
* position1.init(position1Properties); portfolioProperties.put("position1", position1);
- *
+ *
* position2 = new Position(); position2Properties = new Properties();
* position2Properties.put("secId", "ORCL"); position2Properties.put("qty", new Double(376.0));
* position2Properties.put("mktValue", new Double(101.34)); position2.init(position2Properties);
* portfolioProperties.put("position2", position2);
- *
+ *
* portfolio.init(portfolioProperties); region.put(new Integer(4), portfolio); } });
- *
+ *
* // Create client region final int port = vm0.invoke(() ->
* RemoteQueryDUnitTest.getCacheServerPort()); final String host0 =
* NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new
@@ -603,11 +603,11 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
* getCache(); AttributesFactory factory = new AttributesFactory();
* factory.setScope(Scope.LOCAL); ClientServerTestCase.configureConnectionPool(factory, host0,
* port,-1, true, -1, -1, null); createRegion(name, factory.create()); } });
- *
+ *
* // Execute client queries vm1.invoke(new CacheSerializableRunnable("Execute queries") {
* public void run2() throws CacheException { Region region =
* getRootRegion().getSubregion(name); String queryString = null; SelectResults results = null;
- *
+ *
* queryString = "IMPORT Position; " + "SELECT DISTINCT id, status FROM " + region.getFullPath()
* + "WHERE NOT (SELECT DISTINCT * FROM positions.values posnVal TYPE Position " +
* "WHERE posnVal.secId='AOL' OR posnVal.secId='SAP').isEmpty"; try { results =
@@ -616,8 +616,8 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
* //assertIndexDetailsEquals(numberOfEntries, results.size());
* assertTrue(!results.getCollectionType().allowsDuplicates() &&
* results.getCollectionType().getElementType().isStructType()); } });
- *
- *
+ *
+ *
* // Stop server vm0.invoke(new SerializableRunnable("Stop CacheServer") { public void run() {
* stopBridgeServer(getCache()); } });
*/
@@ -1435,31 +1435,31 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
/*
* String queryString = "ticker = 'ibm'"; SelectResults results = region.query(queryString);
- *
+ *
* String queryString = "ticker = 'ibm' and price = 50";
- *
+ *
* String queryString = "select distinct * from /trade";
- *
+ *
* String queryString = "import TestObject; select distinct * from /trade";
- *
+ *
* String queryString = "IMPORT Position; " + "SELECT DISTINCT id, status FROM /root/portfolios " +
* "WHERE NOT (SELECT DISTINCT * FROM positions.values posnVal TYPE Position " +
* "WHERE posnVal.secId='AOL' OR posnVal.secId='SAP').isEmpty";
- *
+ *
* queryString = "SELECT DISTINCT itr.value FROM /trade.entries itr where itr.key = 'key-1'";
- *
+ *
* queryString = "SELECT DISTINCT itr.key FROM /trade.entries itr where itr.key = 'key-1'";
- *
+ *
* String queryString =
* "select distinct a, b.price from /generic/app1/Trade a, /generic/app1/Trade b where a.price = b.price"
* ;
- *
+ *
* String queryString =
* "SELECT DISTINCT a, b.unitPrice from /newegg/arinv a, /newegg/itemPriceSetting b where a.item = b.itemNumber and a.item = '26-106-934'"
* ;
- *
+ *
* String queryString =
* "SELECT DISTINCT a, UNDEFINED from /newegg/arinv a, /newegg/itemPriceSetting b where a.item = b.itemNumber and a.item = '26-106-934'"
* ;
- *
+ *
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index bcdd584..15b606f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -83,8 +83,8 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
private static int MAX_TEST_QUERY_TIMEOUT = 4000;
private static int TEST_QUERY_TIMEOUT = 1000;
- private final static int CRITICAL_HEAP_USED = 950;
- private final static int NORMAL_HEAP_USED = 500;
+ private static final int CRITICAL_HEAP_USED = 950;
+ private static final int NORMAL_HEAP_USED = 500;
@Override
public final void postSetUpClientServerTestCase() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Address.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Address.java
index 22d1e98..39dbc33 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Address.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Address.java
@@ -49,5 +49,3 @@ public class Address {
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Course.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Course.java
index 2de2ed3..8ed1bf5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Course.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Course.java
@@ -18,8 +18,6 @@ package org.apache.geode.cache.query.facets.lang;
import org.apache.geode.cache.query.CacheUtils;
-// import java.util.*;
-
public class Course {
private String _title;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Department.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Department.java
index 4b502e4..0752d01 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Department.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Department.java
@@ -16,8 +16,6 @@
package org.apache.geode.cache.query.facets.lang;
-// import java.util.*;
-
public class Department {
private String _name;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java
index 6f42dc1..ac64993 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java
@@ -51,5 +51,3 @@ public class G_Student extends Student {
_advisor = advisor;
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java
index 6ef7d16..0f5be01 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java
@@ -79,4 +79,3 @@ public class Person {
_ssn = ssn;
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java
index f2b2d7c..d8f86ae 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java
@@ -81,5 +81,3 @@ public class Student extends Person {
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java
index 9f0cebb..350cf94 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java
@@ -51,5 +51,3 @@ public class UG_Student extends Student {
_satScore = satScore;
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java
index 4086d49..145ec2b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java
@@ -15,6 +15,8 @@
package org.apache.geode.cache.query.facets.lang;
+import java.util.*;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -22,7 +24,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.QueryService;
-import java.util.*;
@@ -88,19 +89,19 @@ class Utils {
/*
* static void checkpoint(GsSession gsSession) throws Exception { try { gsSession.commit();
- *
+ *
* } catch (GsTransactionConflictException ex) { gsSession.abort(); throw new
* GsException("Commit Failed"); }
- *
+ *
* gsSession.begin(); }
- *
+ *
* static void canonicalize() throws Exception { // this step won't be necessary when we have a
* query layer filein GsSession gsSession = SessionManagerImpl.getDefault().createSession();
* gsSession.begin(); // load the QueryService interface
* Class.forName("org.apache.persistence.query.QueryService");
* org.apache.persistence.vm.VMFactory.getCurrentVM().commitReposCanonicalObjs(gsSession); try {
* gsSession.commit();
- *
+ *
* } catch (GsTransactionConflictException ex) { System.err.println("Commit Failed"); return; }
* ((GsSession)gsSession).shutdown(); }
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
index ed27ab8..775c0c0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
-// import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
index a2cfa3c..fef2f80 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.functional;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
index 22b5427..7a4f6e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
@@ -17,6 +17,15 @@
*/
package org.apache.geode.cache.query.functional;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
@@ -25,14 +34,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.List;
-
-import static org.junit.Assert.*;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
index b8451bd..86f5700 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,6 +41,7 @@ import org.apache.geode.cache.query.internal.CompiledFunction;
import org.apache.geode.cache.query.internal.CompiledLiteral;
import org.apache.geode.cache.query.internal.CompiledValue;
import org.apache.geode.cache.query.internal.ExecutionContext;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
index 4b97664..9d846c6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
index 61d8de9..c38fc12 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java
index 087f166..0c52036 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java
@@ -46,7 +46,7 @@ import org.apache.geode.cache.query.types.StructType;
/**
* Tests the group by queries with or without aggreagte functions
- *
+ *
*
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
index 89ed85c..56a92de 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
@@ -324,7 +324,7 @@ public class INOperatorJUnitTest {
/**
* Tests optimization of compiled in where we no longer evaluate on every iteration The set is
* saved off into the query context and reused Each query should have it's own query context
- *
+ *
* @throws Exception
*/
@Test
@@ -368,7 +368,7 @@ public class INOperatorJUnitTest {
/**
* Tests optimization of compiled in where we no longer evaluate on every iteration The set is
* saved off into the query context and reused Each query should have it's own query context
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
index 465ff87..cd52bf8 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* IUMJUnitTest.java
- *
+ *
* @ TASK IUM 4 & IUM 3 Created on April 29, 2005, 10:14 AM
*/
package org.apache.geode.cache.query.functional;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
index fd2a729..18f726c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
@@ -793,9 +793,9 @@ public class IUMRMultiIndexesMultiRegionJUnitTest {
* conditions is evalusted first for all Portfolio and Employee objects (999 * 1000) and
* then other condition with AND is executed for pf.ID = 0 and pf.status = ''active' and
* pf.ID = emp.ID. So total results are 999001.
- *
+ *
* For expected results correct parenthesis must be used as in next query.
- *
+ *
*/
{"SELECT pf.status, emp.empId, pf.getType() FROM /portfolio pf, /employee emp WHERE pf.ID = emp.empId AND pf.status='active' OR pf.ID > 0",
"" + 999001},
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
index d69308f..1bf0767 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -19,6 +19,17 @@
*/
package org.apache.geode.cache.query.functional;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.data.*;
@@ -27,16 +38,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
/**
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
index c3be306..6c0f2db 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
@@ -34,7 +34,22 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+import java.util.stream.IntStream;
+
import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -68,20 +83,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.IntStream;
@Category(IntegrationTest.class)
public class IndexCreationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
index bbe10eb..7ed328f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
@@ -25,8 +25,6 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.internal.ResultsSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,10 +38,12 @@ import org.apache.geode.cache.query.IndexStatistics;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
+import org.apache.geode.cache.query.internal.ResultsSet;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
index f659836..4963c42 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
@@ -18,6 +18,16 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.text.ParseException;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
@@ -25,15 +35,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.text.ParseException;
-import java.util.Collection;
-import java.util.Iterator;
@Category(IntegrationTest.class)
public class IndexOnEntrySetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
index 2da970f..c359a4c 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
@@ -770,7 +770,7 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest {
* BugTest for Bug # 38032 Test index usage on PR region & Local region if the where clause
* contains three conditions but only one condition is indexed & the total number of from clause
* iterators is 1.
- *
+ *
*/
@Test
public void testIndexUsageIfOneFieldIndexedAndMoreThanOneUnindexed_Bug38032() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
index 090d686..f4142ea 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
@@ -18,13 +18,12 @@
* Created on April 11, 2005, 11:56 AM
*/
/*
- *
+ *
*/
package org.apache.geode.cache.query.functional;
import static org.junit.Assert.fail;
-// import org.apache.geode.cache.query.internal.StructSet;
import java.util.HashSet;
import java.util.Set;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
index 098d9c3..a2cd777 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
@@ -18,7 +18,7 @@
* Created on April 7, 2005, 12:40 PM
*/
/*
- *
+ *
*/
package org.apache.geode.cache.query.functional;
@@ -146,4 +146,3 @@ public class IteratorTypeDefJUnitTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
index 7b0b92e..cdde9e6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* InOperatorTest.java
- *
+ *
* Created on March 24, 2005, 5:08 PM
*/
package org.apache.geode.cache.query.functional;
@@ -78,7 +78,7 @@ public class LikePredicateJUnitTest {
/**
* Tests simple % terminated pattern with atleast one preceding character
- *
+ *
* @throws Exception
*/
private void likePercentageTerminated_1(boolean useBindParam) throws Exception {
@@ -171,7 +171,7 @@ public class LikePredicateJUnitTest {
/**
* Tests a pattern which just contains a single % indicating all match
- *
+ *
* @throws Exception
*/
private void likePercentageTerminated_2(boolean useBindParam) throws Exception {
@@ -264,7 +264,7 @@ public class LikePredicateJUnitTest {
/**
* Tests a simple % terminated like predicate with an OR condition
- *
+ *
* @throws Exception
*/
private void likePercentageTerminated_3(boolean useBindPrm) throws Exception {
@@ -387,7 +387,7 @@ public class LikePredicateJUnitTest {
/**
* Tests a simple % terminated like predicate with an AND condition
- *
+ *
* @throws Exception
*/
private void likePercentageTerminated_4(boolean useBindPrm) throws Exception {
@@ -617,7 +617,7 @@ public class LikePredicateJUnitTest {
/**
* Tests simple non % or non _ terminated string which in effect means equality
- *
+ *
* @throws Exception
*/
private void equalityForm_1(boolean useBindPrms) throws Exception {
@@ -710,7 +710,7 @@ public class LikePredicateJUnitTest {
/**
* Tests simple \% or \ _ terminated string which in effect means equality
- *
+ *
* @throws Exception
*/
private void equalityForm_2(boolean useBindPrms) throws Exception {
@@ -833,7 +833,7 @@ public class LikePredicateJUnitTest {
/**
* Tests for regular expression meta chars. This has no special meaning with Like.
- *
+ *
* @throws Exception
*/
private void regexMetaChar(boolean useBindPrms) throws Exception {
@@ -906,7 +906,7 @@ public class LikePredicateJUnitTest {
/**
* Tests with combination of % and _ Supported from 6.6
- *
+ *
* @throws Exception
*/
private void enhancedLike(boolean useBindPrms) throws Exception {
@@ -1039,7 +1039,7 @@ public class LikePredicateJUnitTest {
/**
* Query with index on other fields.
- *
+ *
* @throws Exception
*/
@Test
@@ -1130,7 +1130,7 @@ public class LikePredicateJUnitTest {
/**
* Query with index on other fields.
- *
+ *
* @throws Exception
*/
@Test
@@ -1537,7 +1537,7 @@ public class LikePredicateJUnitTest {
/**
* Tests with combination of % and _ and NOT with LIKE Supported from 6.6
- *
+ *
* @throws Exception
*/
private void enhancedNotLike(boolean useBindPrms, boolean useIndex) throws Exception {
@@ -1693,7 +1693,7 @@ public class LikePredicateJUnitTest {
/**
* Query with index on other fields.
- *
+ *
* @throws Exception
*/
@Test
@@ -1884,7 +1884,7 @@ public class LikePredicateJUnitTest {
/**
* Test to verify that query executes using index even when the index is being removed during the
* execution
- *
+ *
* @throws Exception
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
index ef2aa3e..d5a2e8c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.functional;
@@ -53,7 +53,7 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*/
@Category(IntegrationTest.class)
public class LimitClauseJUnitTest {
@@ -218,7 +218,7 @@ public class LimitClauseJUnitTest {
/**
* Tests the limit functionality for Iter evaluated query with distinct clause This tests the
* basic limit functionality for ResultBag wrapped by a SelectResults
- *
+ *
* Tests ResultBag behaviour
*/
@Test
@@ -254,9 +254,9 @@ public class LimitClauseJUnitTest {
* basic limit functionality for ResultBag wrapped by a SelectResults . This test contains
* projection attributes. Since the attribute is unique every time, the limit will be satisfied
* with first 5 iterations
- *
+ *
* Tests ResultBag behaviour
- *
+ *
*/
@Test
public void testLimitDistinctIterEvaluatedQueryForResultBagWithProjectionAttribute() {
@@ -292,7 +292,7 @@ public class LimitClauseJUnitTest {
* duplicate elements. If the distinct clause is present then duplicate elements even if
* satisfying the where clause should not be considered as part of the resultset as distinct will
* eliminate them
- *
+ *
* Tests ResultBag behaviour
*/
@Test
@@ -353,7 +353,7 @@ public class LimitClauseJUnitTest {
* satisfying the where clause should not be considered as part as distinct will eliminate them.
* This test validates the above behaviour if projection sttribute is present and the projection
* attribute may be duplicate
- *
+ *
* Tests ResultBag behaviour
*/
@Test
@@ -408,9 +408,9 @@ public class LimitClauseJUnitTest {
* basic limit functionality for StructBag wrapped by a SelectResults . This test contains
* projection attributes. Since the attribute is unique every time, the limit will be satisfied
* with first 5 iterations
- *
+ *
* Tests StructBag behaviour
- *
+ *
*/
@Test
public void testLimitDistinctIterEvaluatedQueryForStructBagWithProjectionAttribute() {
@@ -444,7 +444,7 @@ public class LimitClauseJUnitTest {
/**
* Tests the limit functionality for Iter evaluated query with distinct clause This tests the
* basic limit functionality for StructBag wrapped by a SelectResults
- *
+ *
* Tests StructBag behaviour
*/
@Test
@@ -479,7 +479,7 @@ public class LimitClauseJUnitTest {
/**
* Tests the limit functionality for Iter evaluated query with distinct clause This tests the
* basic limit functionality for StructBag wrapped by a SelectResults
- *
+ *
* Tests StructBag behaviour
*/
@Ignore
@@ -518,7 +518,7 @@ public class LimitClauseJUnitTest {
* satisfying the where clause should not be considered as part as distinct will eliminate them.
* This test validates the above behaviour if projection attribute is present and the projection
* attribute may be duplicate
- *
+ *
* Tests StructBag behaviour
*/
@Test
@@ -576,7 +576,7 @@ public class LimitClauseJUnitTest {
* duplicate elements. If the distinct clause is present then duplicate elements even if
* satisfying the where clause should not be considered as part of the resultset as distinct will
* eliminate them
- *
+ *
* Tests StructBag behaviour
*/
@Test
@@ -634,7 +634,7 @@ public class LimitClauseJUnitTest {
/**
* Tests the limit functionality for Iter evaluated query with distinct clause This tests the
* basic limit functionality for ResultBag wrapped by a SelectResults
- *
+ *
* Tests ResultBag behaviour
*/
@Test
@@ -667,9 +667,9 @@ public class LimitClauseJUnitTest {
* basic limit functionality for ResultBag wrapped by a SelectResults . This test contains
* projection attributes. Since the attribute is unique every time, the limit will be satisfied
* with first 5 iterations
- *
+ *
* Tests ResultBag behaviour
- *
+ *
*/
@Test
public void testLimitDistinctIterEvaluatedQueryForResultBagWithProjectionAttributeWithIndex() {
@@ -704,7 +704,7 @@ public class LimitClauseJUnitTest {
* duplicate elements. If the distinct clause is present then duplicate elements even if
* satisfying the where clause should not be considered as part of the resultset as distinct will
* eliminate them
- *
+ *
* Tests ResultBag behaviour
*/
@Test
@@ -748,7 +748,7 @@ public class LimitClauseJUnitTest {
* satisfying the where clause should not be considered as part as distinct will eliminate them.
* This test validates the above behaviour if projection sttribute is present and the projection
* attribute may be duplicate
- *
+ *
* Tests ResultBag behaviour
*/
@Test
@@ -790,9 +790,9 @@ public class LimitClauseJUnitTest {
* basic limit functionality for StructBag wrapped by a SelectResults . This test contains
* projection attributes. Since the attribute is unique every time, the limit will be satisfied
* with first 5 iterations
- *
+ *
* Tests StructBag behaviour
- *
+ *
*/
@Test
public void testLimitDistinctIterEvaluatedQueryForStructBagWithProjectionAttributeWithIndex() {
@@ -825,7 +825,7 @@ public class LimitClauseJUnitTest {
/**
* Tests the limit functionality for Iter evaluated query with distinct clause This tests the
* basic limit functionality for StructBag wrapped by a SelectResults
- *
+ *
* Tests StructBag behaviour
*/
@Test
@@ -864,7 +864,7 @@ public class LimitClauseJUnitTest {
* satisfying the where clause should not be considered as part as distinct will eliminate them.
* This test validates the above behaviour if projection attribute is present and the projection
* attribute may be duplicate
- *
+ *
* Tests StructBag behaviour
*/
@Test
@@ -907,7 +907,7 @@ public class LimitClauseJUnitTest {
* duplicate elements. If the distinct clause is present then duplicate elements even if
* satisfying the where clause should not be considered as part of the resultset as distinct will
* eliminate them
- *
+ *
* Tests StructBag behaviour
*/
@Test
@@ -951,10 +951,10 @@ public class LimitClauseJUnitTest {
/**
* Tests the limit functionality for query which has three conditions with AND operator and two
* conditions can be evaluated using index but not the 3rd one.
- *
+ *
* This tests the limit application on intermediate results from Index which should not be true in
* this test.
- *
+ *
*/
@Test
public void testLimitDistinctQueryWithTwoCondButOneIndex() {
@@ -1202,31 +1202,31 @@ public class LimitClauseJUnitTest {
/*
* This test shows an error with order by. Limit does not affect this and will enable this test
* after the bug for order by is logged and fixed
- *
+ *
* @Test public void testNotApplyingLimitAtIndexLevelForMultiIndexAndClauseUsageWithOrderBy()
* throws Exception { //try { Query query; SelectResults result; int limit = 25; Region region =
* CacheUtils.createRegion("portfolios1", Portfolio.class); for (int i = 30; i > 0; i--) {
* Portfolio p = new Portfolio(i); p.positions.clear(); p.positions.put("IBM", new Position("IBM",
* i)); region.put("KEY" + i, p); }
- *
+ *
* String queryString =
* "<trace>SELECT distinct P FROM /portfolios1 P, P.positions.values POS WHERE P.ID > 5 AND POS.secId = 'IBM' ORDER BY P.ID"
* ; query = qs.newQuery(queryString); SelectResults resultsNoIndex = (SelectResults)
* query.execute();
- *
+ *
* //Create Index on ID and secId //Index secIndex = qs.createIndex("secIdIndex", "pos.secId",
* "/portfolios1 p, p.positions.values pos"); Index idIndex = qs.createIndex("idIndex",
* IndexType.FUNCTIONAL, "P.ID", "/portfolios1 P");
- *
+ *
* //assertNotNull(secIndex); assertNotNull(idIndex); assertTrue(idIndex instanceof
* CompactRangeIndex); SelectResults resultsWithIndex = (SelectResults) query.execute();
- *
+ *
* assertIndexDetailsEquals(resultsNoIndex.size(), resultsWithIndex.size());
* assertIndexDetailsEquals(limit, resultsWithIndex.size());
- *
+ *
* int expectedId = 6; Iterator iterator = resultsNoIndex.iterator(); while (iterator.hasNext()) {
* Portfolio p = (Portfolio) iterator.next(); assertIndexDetailsEquals(expectedId++, p.ID); }
- *
+ *
* //check order by results expectedId = 6; iterator = resultsWithIndex.iterator(); while
* (iterator.hasNext()) { Portfolio p = (Portfolio) iterator.next();
* assertIndexDetailsEquals(expectedId++, p.ID); } }
@@ -1768,9 +1768,9 @@ public class LimitClauseJUnitTest {
/*
* helper method to test against a compact range index
- *
+ *
* @param query
- *
+ *
* @throws Exception
*/
private SelectResults helpTestIndexForQuery(String query, String indexedExpression,
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
index b9f69d7..6615dea 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-
import parReg.query.unittest.NewPortfolio;
import org.apache.geode.cache.AttributesFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index c7360ea..82ebd89 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -19,6 +19,18 @@
*/
package org.apache.geode.cache.query.functional;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.data.*;
@@ -27,17 +39,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
// TODO:TEST clean this up and add assertions
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
index 1396229..2161ce0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
@@ -101,4 +101,3 @@ public class MultipleRegionsJUnitTest {
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index 6d1cf8a..3099a66 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -20,19 +20,20 @@
package org.apache.geode.cache.query.functional;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.data.Numbers;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.data.Numbers;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
// TODO:TEST clean this up and add assertions
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
index 75817f3..cf58b40 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
@@ -480,4 +480,3 @@ public class NestedQueryJUnitTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
index 3ac14e9..a414585 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
index fc9f46d..f7f3bc6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
index fd358e9..59696fc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.cache.query.functional;
+import static org.junit.Assert.*;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -25,8 +27,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
@@ -48,8 +48,8 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
/**
- *
- *
+ *
+ *
*/
public abstract class NonDistinctOrderByTestImplementation {
@@ -1512,4 +1512,3 @@ public abstract class NonDistinctOrderByTestImplementation {
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
index b68e431..8f095fe 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
@@ -309,9 +309,9 @@ public class NumericQueryJUnitTest {
/*
* helper method to test against a functional index
- *
+ *
* @param query
- *
+ *
* @throws Exception
*/
private SelectResults helpTestFunctionalIndexForQuery(String query, String indexedExpression,
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
index 5f3728c..cb7cdb5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
@@ -45,7 +45,7 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java
index 8bdc7db..e3734af 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java
@@ -50,8 +50,8 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
/**
- *
- *
+ *
+ *
*/
public abstract class OrderByTestImplementation {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
index e55f566..d03cf43 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.functional;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
index 1e3e120..55ed158 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
@@ -17,6 +17,17 @@
*/
package org.apache.geode.cache.query.functional;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.Serializable;
+import java.text.ParseException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -27,16 +38,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.Serializable;
-import java.text.ParseException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
@Category(IntegrationTest.class)
public class QueryUndefinedJUnitTest implements Serializable {
@@ -278,5 +279,3 @@ public class QueryUndefinedJUnitTest implements Serializable {
}
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
index 1a6de4d..d8826ff 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
@@ -21,7 +21,6 @@ package org.apache.geode.cache.query.functional;
import static org.junit.Assert.fail;
-// import org.apache.geode.cache.query.data.Portfolio;
import java.util.Collection;
import org.junit.After;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
index c1dbb0b..173befb 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
@@ -17,6 +17,18 @@
*/
package org.apache.geode.cache.query.functional;
+import static org.junit.Assert.*;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
@@ -25,17 +37,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-
-import static org.junit.Assert.*;
@Category(IntegrationTest.class)
public class SelectToDateJUnitTest {
@@ -180,7 +181,7 @@ public class SelectToDateJUnitTest {
/******** Region Creation Helper Methods *********/
/**
* Each month will have exactly 20 entries with a matching date Code borrowed from shobhit's test
- *
+ *
* @throws ParseException
*/
private void createLocalRegion() throws ParseException {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index 5242bbe..c9d2ba0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.jmock.Mockery;
import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
@@ -43,6 +42,7 @@ import org.apache.geode.cache.query.internal.aggregate.MaxMin;
import org.apache.geode.cache.query.internal.aggregate.Sum;
import org.apache.geode.cache.query.internal.aggregate.SumDistinct;
import org.apache.geode.cache.query.internal.aggregate.SumDistinctPRQueryNode;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
index 5d311de..f9b528c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
index 504d1fe..f05c6b2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
@@ -32,7 +32,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -48,12 +47,13 @@ import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class CompiledJunctionInternalsJUnitTest {
@@ -1165,7 +1165,7 @@ public class CompiledJunctionInternalsJUnitTest {
* Tests the functionality of organizedOperands function of a RangeJunction which is an AND with
* no IterOperand. If the RangeJunction boils down to a single condition which can be evalauted as
* a CompiledComparison then the filter operand will be a CompiledComparison
- *
+ *
*/
@Test
public void testOrganizedOperandsOfSingleRangeJunctionWithNoIterOperandForAND_1() {
@@ -1206,7 +1206,7 @@ public class CompiledJunctionInternalsJUnitTest {
* no IterOperand but where the operator needs reflection. as the condition is Key > Path ( which
* means Path less than Key) If the RangeJunction boils down toa single condition which can be
* evalauted as a CompiledComparison then the filter operand will be a CompiledComparison
- *
+ *
*/
@Test
public void testOrganizedOperandsOfSingleRangeJunctionWithNoIterOperandForAND_2() {
@@ -1251,7 +1251,7 @@ public class CompiledJunctionInternalsJUnitTest {
* evalauted as a CompiledComparison so the filter operand will be a CompiledComparison. Thus the
* organizdeOperand's filter operand will be a CompiledComparison while its Iteroperand will be a
* CompiledComparison
- *
+ *
*/
@Test
public void testOrganizedOperandsOfSingleRangeJunctionWithIterOperandForAND_1() {
@@ -1295,7 +1295,7 @@ public class CompiledJunctionInternalsJUnitTest {
* evalauted as a CompiledComparison so the filter operand will be a CompiledComparison. Thus the
* organizdeOperand's filter operand will be a CompiledComparison while its Iteroperand will be a
* CompiledJunction
- *
+ *
*/
@Test
public void testOrganizedOperandsOfSingleRangeJunctionWithTwoIterOperandsForAND_2() {
@@ -1342,7 +1342,7 @@ public class CompiledJunctionInternalsJUnitTest {
* which means Path less than Key) The RangeJunction boils down to a condition and a NOT EQUAL
* which will be evalauted as a SingleCondnEvaluator so the filter operand will be a
* SingleCondnEvaluator. Its Iter operand will be a CompiledJunction
- *
+ *
*/
@Test
public void testOrganizedOperandsOfSingleRangeJunctionWithTwoIterOperandsForAND_3() {
@@ -1403,7 +1403,7 @@ public class CompiledJunctionInternalsJUnitTest {
* which will be evalauted as a SingleCondnEvaluator so the filter operand will be a
* SingleCondnEvaluator. Its Iter operand will be a CompiledJunction. This checks for the
* SingleCondnEvaluator with > operator
- *
+ *
*/
@Test
public void testOrganizedOperandsOfSingleRangeJunctionWithTwoIterOperandsForAND_4() {
@@ -1458,7 +1458,7 @@ public class CompiledJunctionInternalsJUnitTest {
* combinations of GREATER THAN and Not equal conditions etc which results in a
* SingleCondnEvaluator or CompiledComparison for a AND junction. It checks the correctness of the
* operator & the evaluated key
- *
+ *
*/
@Test
public void testOrganizedOperandsSingleCondnEvalMultipleGreaterThanInEqualities_AND() {
@@ -1794,7 +1794,7 @@ public class CompiledJunctionInternalsJUnitTest {
* combinations of LESS THAN and Not equal conditions etc which results in a SingleCondnEvaluator
* or CompiledComparison for a AND junction. It checks the correctness of the operator & the
* evaluated key
- *
+ *
*/
@Test
public void testOrganizedOperandsSingleCondnEvalMultipleLessThanInEqualities_AND() {
@@ -2136,7 +2136,7 @@ public class CompiledJunctionInternalsJUnitTest {
/**
* Tests the correct creation of NotEqualConditionEvaluator For AND junction
- *
+ *
*/
@Test
public void testNotEqualConditionEvaluator_AND() {
@@ -2215,7 +2215,7 @@ public class CompiledJunctionInternalsJUnitTest {
* rangeJunction.NotEqualConditionEvaluator for evaluating a !=7 , which however is the case now.
* May be at some point, we should either try to club null & undefined as a part of
* RangeJunctionEvaluator or we should not create an object of NotEqualConditionEvaluator.
- *
+ *
*/
@Ignore
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
index b8e0c12..778ab78 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
@@ -79,7 +79,7 @@ public class CopyOnReadQueryJUnitTest {
/**
- *
+ *
* @param region
* @param numObjects
* @param objectsAndResultsMultiplier number of similar objects to put into the cache so that
@@ -262,7 +262,7 @@ public class CopyOnReadQueryJUnitTest {
// }
/**
- *
+ *
* @param queries
* @param expectedResults
* @param numObjects
@@ -286,7 +286,7 @@ public class CopyOnReadQueryJUnitTest {
}
/**
- *
+ *
* @param queries
* @param expectedResults
* @param numObjects
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
index 1112ee2..5d2fce4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
@@ -15,7 +15,7 @@
/*
* Created on Oct 13, 2005
*
- *
+ *
*/
package org.apache.geode.cache.query.internal;
@@ -46,8 +46,8 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class ExecutionContextJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
index 9b32fda..4498971 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
@@ -14,8 +14,8 @@
*/
/*
* Created on Oct 13, 2005
- *
- *
+ *
+ *
*/
package org.apache.geode.cache.query.internal;
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -35,11 +34,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class QCompilerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
index c18e8cb..a121a1c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* IndexTest.java JUnit based test
- *
+ *
* Created on March 9, 2005, 3:30 PM
*/
package org.apache.geode.cache.query.internal;
@@ -40,7 +40,7 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*/
@Category(IntegrationTest.class)
public class QueryFromClauseCanonicalizationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
index 0ec47ad..16b0c27 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
*
- *
+ *
*/
@Category(IntegrationTest.class)
public class QueryObserverCallbackJUnitTest {
@@ -409,7 +409,7 @@ public class QueryObserverCallbackJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.query.internal.QueryObserver#beforeIndexLookup(org.apache.geode.cache.
* query.Index, int, java.lang.Object, int, java.lang.Object, java.util.Set)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
index 0de5d92..805491c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal;
@@ -74,7 +74,7 @@ public class QueryTraceJUnitTest {
/**
* Tests tracing on queries with <TRACE> or <trace> tag.
- *
+ *
* @throws Exception
*/
@Test
@@ -153,7 +153,7 @@ public class QueryTraceJUnitTest {
/**
* negative testing: if <TRACE> is in comments not tracing is done.
- *
+ *
* @throws Exception
*/
@Test
@@ -195,7 +195,7 @@ public class QueryTraceJUnitTest {
/**
* negative testing: if <TRACE> is in comments not tracing is done.
- *
+ *
* @throws Exception
*/
@Test
@@ -235,7 +235,7 @@ public class QueryTraceJUnitTest {
/**
* No Query comments
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
index bda8338..37fe400 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
@@ -15,7 +15,7 @@
/*
* Created on Oct 13, 2005
*
- *
+ *
*/
package org.apache.geode.cache.query.internal;
@@ -45,8 +45,8 @@ import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class QueryUtilsJUnitTest {
@@ -216,7 +216,7 @@ public class QueryUtilsJUnitTest {
* Portfolio(0), new Portfolio(1), new Portfolio(2), new Portfolio(3)}; region.put("0", new
* Portfolio(0)); region.put("1", new Portfolio(1)); region.put("2", new Portfolio(2));
* region.put("3", new Portfolio(3));
- *
+ *
* Region r3 = CacheUtils.createRegion("employees", Employee.class); Set add1 = new HashSet();
* add1.add(new Address("411045", "Baner")); add1.add(new Address("411001", "DholePatilRd"));
* for(int i=0;i<4;i++){ r3.put(i+"", new Employee("empName",(20+i),i,"Mr.",(5000+i),add1)); } //
@@ -232,7 +232,7 @@ public class QueryUtilsJUnitTest {
* (!set) { set = true; indexToItrMappping[0] = rIter; } else { expand[j++] = rIter; }
* context.bindIterator(rIter); context.addToIndependentRuntimeItrMap(iterDef); } List finalList =
* new ArrayList(); finalList.add(indexToItrMappping[0]);
- *
+ *
* //ResultsSet indexResult = new ResultsSet(new ObjectTypeImpl( Portfolio.class)); ResultsSet
* indexResult = new ResultsSet(new ObjectTypeImpl( Portfolio.class)); for (int i = 0; i <
* po.length; ++i) indexResult.add(po[i]); List expandList = new LinkedList();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
index b8ef10e..80185c0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
index 3dbfc56..9f3858f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
@@ -25,11 +25,11 @@ import java.util.Random;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
index bc73f33..4fd0541 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
index 7e3943b..e4228b5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
@@ -17,13 +17,13 @@ package org.apache.geode.cache.query.internal.cq;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.query.CqAttributes;
import org.apache.geode.cache.query.CqListener;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
@Category(UnitTest.class)
public class CqAttributesImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
index 5d12705..f3b6377 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache.query.internal.index;
import static junit.framework.TestCase.assertFalse;
import static org.apache.geode.internal.Assert.assertTrue;
-import org.apache.geode.pdx.internal.PdxString;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -32,6 +31,7 @@ import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index 6258e99..a10d71b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
@@ -13,29 +13,30 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager.IndexUpdaterThread;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Test create a region (Replicated OR Partitioned) and sets index maintenance Asynchronous so that
* {@link IndexManager} starts a new thread for index maintenance when region is populated. This
* test verifies that after cache close {@link IndexUpdaterThread} is shutdown for each region
* (Replicated/Bucket).
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class AsyncIndexUpdaterThreadShutdownJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
index 6ce9268..a7b6b63 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
index 3295e76..c3ed673 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
@@ -14,22 +14,23 @@
*/
package org.apache.geode.cache.query.internal.index;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.text.ParseException;
+import java.util.HashMap;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.text.ParseException;
-import java.util.HashMap;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
@Category(IntegrationTest.class)
public class CompactRangeIndexIndexMapJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index c8f80a3..6586b78 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -13,21 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.IOException;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -58,9 +54,12 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 8f7359c..0ad1b59 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
@@ -17,19 +17,14 @@
*/
package org.apache.geode.cache.query.internal.index;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
import java.util.Collection;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -53,6 +48,10 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Test creates a persistent-overflow region and performs updates in region which has compact
@@ -714,4 +713,3 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index ea3f8d6..1eb4ef8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
@@ -63,7 +63,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
* This test is similar to {@link ConcurrentIndexUpdateWithoutWLDUnitTest} except that it sets
* system property gemfire.index.INPLACE_OBJECT_MODIFICATION to false so no reverse map is used for
* {@link CompactRangeIndex}.
- *
+ *
* During validation all region operations are paused for a while. Validation happens multiple time
* during one test run on a fixed time interval.
*/
@@ -405,7 +405,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest
/**
* This validator will iterate over RegionEntries and verify their corresponding index key and
* entry presence in index valuesToEntriesMap.
- *
+ *
*
*/
public class IndexValidator {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index 6442581..c19b566 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index cb0950d..2b3baf9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -678,4 +678,3 @@ public class CopyOnReadIndexDUnitTest extends JUnit4CacheTestCase {
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index a33b3b8..e5a9d6a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -14,23 +14,24 @@
*/
package org.apache.geode.cache.query.internal.index;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.cache.query.data.Position;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.HashMap;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.data.Portfolio;
+import org.apache.geode.cache.query.data.Position;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
@@ -76,7 +77,7 @@ public class CopyOnReadIndexJUnitTest {
}
/**
- *
+ *
* @param region
* @param numObjects
* @param objectsAndResultsMultiplier number of similar objects to put into the cache so that
@@ -302,7 +303,7 @@ public class CopyOnReadIndexJUnitTest {
}
/**
- *
+ *
* @param queries
* @param expectedResults
* @param numObjects
@@ -326,7 +327,7 @@ public class CopyOnReadIndexJUnitTest {
}
/**
- *
+ *
* @param queries
* @param expectedResults
* @param numObjects
@@ -488,4 +489,3 @@ public class CopyOnReadIndexJUnitTest {
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
index 4bd7e44..3daaa19 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
@@ -46,8 +46,8 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class HashIndexQueryIntegrationTest {
@@ -88,7 +88,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Helper that tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@@ -122,9 +122,9 @@ public class HashIndexQueryIntegrationTest {
/*
* helper method to test against a compact range index instead of hash index
- *
+ *
* @param query
- *
+ *
* @throws Exception
*/
private void helpTestCRIndexForQuery(String query, String indexedExpression, String regionPath)
@@ -140,7 +140,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index with And query for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -192,7 +192,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index with And query for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -211,7 +211,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index with Short vs Integer comparison
- *
+ *
* @throws Exception
*/
@Test
@@ -233,7 +233,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index with comparison between float and integer
- *
+ *
* @throws Exception
*/
// @Test
@@ -252,7 +252,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index with comparison between float and integer
- *
+ *
* @throws Exception
*/
// @Test
@@ -271,7 +271,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index with And query for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -290,7 +290,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -309,7 +309,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -322,7 +322,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -335,7 +335,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -348,7 +348,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -360,7 +360,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for replicated region
- *
+ *
* @throws Exception
*/
@Test
@@ -372,7 +372,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for partitioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -384,7 +384,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -399,7 +399,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -414,7 +414,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -430,7 +430,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
// @Test
@@ -445,7 +445,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -461,7 +461,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -477,7 +477,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -494,7 +494,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
// @Test
@@ -511,7 +511,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results on local region
- *
+ *
* @throws Exception
*/
@Test
@@ -532,7 +532,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results on replicated
* region
- *
+ *
* @throws Exception
*/
@Test
@@ -553,7 +553,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results on partitioned
* region
- *
+ *
* @throws Exception
*/
@Test
@@ -574,7 +574,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results
- *
+ *
* @throws Exception
*/
@Test
@@ -602,7 +602,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that the value is correctly removed from the index where only
* 1 value is using the key for partitioned regions
- *
+ *
* @throws Exception
*/
@Test
@@ -614,7 +614,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that the value is correctly removed from the index where only
* 1 value is using the key for replicated regions
- *
+ *
* @throws Exception
*/
@Test
@@ -645,7 +645,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that the value is correctly removed from the index where only
* 1 value is using the key for partitioned regions
- *
+ *
* @throws Exception
*/
private void helpTestHashIndexRemove() throws Exception {
@@ -667,7 +667,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that the value is correctly removed from the index where
* multiple entries are using the key on localRegion
- *
+ *
* @throws Exception
*/
@Test
@@ -679,7 +679,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that the value is correctly removed from the index where
* multiple entries are using the key on replicated region
- *
+ *
* @throws Exception
*/
@Test
@@ -691,7 +691,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that the value is correctly removed from the index where
* multiple entries are using the key on partitioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -736,7 +736,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result on local region
- *
+ *
* @throws Exception
*/
@Test
@@ -748,7 +748,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result on replicated region
- *
+ *
* @throws Exception
*/
@Test
@@ -760,7 +760,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result on partitioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -773,7 +773,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results for local
* region
- *
+ *
* @throws Exception
*/
@Test
@@ -792,7 +792,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results for replicated
* region
- *
+ *
* @throws Exception
*/
@Test
@@ -811,7 +811,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct number of results for partitioned
* region
- *
+ *
* @throws Exception
*/
@Test
@@ -829,7 +829,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -841,7 +841,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -853,7 +853,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
@Test
@@ -865,7 +865,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -877,7 +877,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for replicated region
- *
+ *
* @throws Exception
*/
@Test
@@ -889,7 +889,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result for partitioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -901,7 +901,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index is used and that it returns the correct result
- *
+ *
* @throws Exception
*/
private void helpTestHashIndexNotUsedInRangeQuery() throws Exception {
@@ -912,7 +912,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Test order by asc query for local region using hash index
- *
+ *
* @throws Exception
*/
@Test
@@ -924,7 +924,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Test order by asc query for replicated region using hash index
- *
+ *
* @throws Exception
*/
@Test
@@ -936,7 +936,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Test order by asc query for partitioned region using hash index
- *
+ *
* @throws Exception
*/
@Test
@@ -961,7 +961,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Test order by desc query for local region using hash index
- *
+ *
* @throws Exception
*/
@Test
@@ -973,7 +973,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Test order by desc query for replicated region using hash index
- *
+ *
* @throws Exception
*/
@Test
@@ -985,7 +985,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Test order by desc query for partitioned region using hash index
- *
+ *
* @throws Exception
*/
@Test
@@ -997,7 +997,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index on non sequential hashes for local region
- *
+ *
* @throws Exception
*/
@Test
@@ -1025,7 +1025,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index on non sequential hashes for replicated region
- *
+ *
* @throws Exception
*/
@Test
@@ -1053,7 +1053,7 @@ public class HashIndexQueryIntegrationTest {
/**
* Tests that hash index on non sequential hashes for partitioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -1094,7 +1094,7 @@ public class HashIndexQueryIntegrationTest {
/**
* test async exception for hash index using partitioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -1119,7 +1119,7 @@ public class HashIndexQueryIntegrationTest {
/**
* test multiple iterators exception for hash index using local region
- *
+ *
* @throws Exception
*/
@Test
@@ -1130,7 +1130,7 @@ public class HashIndexQueryIntegrationTest {
/**
* test multiple iterators exception for hash index using replicated region
- *
+ *
* @throws Exception
*/
@Test
@@ -1141,7 +1141,7 @@ public class HashIndexQueryIntegrationTest {
/**
* test multiple iterators exception for hash index using partiioned region
- *
+ *
* @throws Exception
*/
@Test
@@ -1162,7 +1162,7 @@ public class HashIndexQueryIntegrationTest {
/**
* test remove and not equals Query
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
index 78830d2..9757345 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
@@ -72,7 +72,7 @@ public class HashIndexSetJUnitTest {
/**
* we are "indexed" on indexKey. Equality of portfolios is based on ID indexKeys are based on 0 ->
* numEntries IDs are startID -> startID + numEntries
- *
+ *
* @param numToCreate how many portfolios to create
* @param startID the ID value to start incrementing from
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
index 369d132..e36b3f1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
@@ -14,6 +14,16 @@
*/
package org.apache.geode.cache.query.internal.index;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.data.Portfolio;
@@ -24,15 +34,6 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import static org.junit.Assert.*;
@Category(IntegrationTest.class)
public class IndexHintJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
index 8911931..fd7fa6e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
@@ -54,7 +54,7 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
index dd47559..a7c1353 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
@@ -64,7 +64,7 @@ import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*/
@Category(IntegrationTest.class)
public class IndexMaintenanceJUnitTest {
@@ -1363,4 +1363,3 @@ public class IndexMaintenanceJUnitTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
index 397adcc..ac0a381 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
@@ -86,7 +86,7 @@ public class IndexStatisticsJUnitTest {
*/
/**
* Test RenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -209,7 +209,7 @@ public class IndexStatisticsJUnitTest {
/**
* Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -332,7 +332,7 @@ public class IndexStatisticsJUnitTest {
/**
* Test CompactMapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -408,7 +408,7 @@ public class IndexStatisticsJUnitTest {
/**
* Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -486,7 +486,7 @@ public class IndexStatisticsJUnitTest {
/**
* Test RenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -563,7 +563,7 @@ public class IndexStatisticsJUnitTest {
/**
* Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -639,7 +639,7 @@ public class IndexStatisticsJUnitTest {
/**
* Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -868,4 +868,3 @@ public class IndexStatisticsJUnitTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 89ca47b..8eefd09 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -13,23 +13,18 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Collection;
import java.util.Map;
import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -57,6 +52,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
@@ -140,7 +138,7 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
/**
* CReates a PR on a VM with NUM_BKTS buckets.
- *
+ *
* @param vm
*/
private void createPR(VM vm) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index 191dab5..f5e8546 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
@@ -13,10 +13,20 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
@@ -30,15 +40,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexTrackingQueryObserverDUnitTest.IndexTrackingTestHook;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collection;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
index a96a96d..4c6f630 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
@@ -53,7 +53,7 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*/
@Category(IntegrationTest.class)
public class IndexUseJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
index 4edba21..236546f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
@@ -24,10 +24,6 @@ import static org.junit.Assert.fail;
import java.util.Collection;
import java.util.HashMap;
-import org.apache.geode.cache.query.Query;
-import org.apache.geode.cache.query.data.Instrument;
-import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
-import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,9 +36,13 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexMaintenanceException;
+import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.data.Instrument;
import org.apache.geode.cache.query.data.Portfolio;
+import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -215,7 +215,7 @@ public class MapRangeIndexMaintenanceJUnitTest {
/**
* Test index object's comapreTo Function implementation correctness for indexes.
- *
+ *
* @throws Exception
*/
@Test
@@ -267,7 +267,7 @@ public class MapRangeIndexMaintenanceJUnitTest {
/**
* Test index object's comapreTo Function implementation correctness for indexes.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index 69098c6..5c7f955 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.cache.query.internal.index;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Collection;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.Index;
@@ -45,6 +41,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class MultiIndexCreationDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index c15b812..8e4fcc7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -19,7 +19,17 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import java.io.File;
+import java.util.Properties;
+
import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -28,15 +38,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.util.Properties;
/**
* @since GemFire 6.6.1
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index 99e0596..6d2c364 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -14,26 +14,27 @@
*/
/*
* Created on Apr 21, 2005 *
- *
+ *
*/
package org.apache.geode.cache.query.internal.index;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.fail;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
*
- *
+ *
*/
@Category(IntegrationTest.class)
public class ProgRegionCreationIndexUpdateTypeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
index 67ab9a4..43eabb9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -46,6 +45,7 @@ import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.internal.QueryExecutionContext;
import org.apache.geode.cache.query.internal.RuntimeIterator;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilTest.java
index 126d13b..7dcdf74 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilTest.java
@@ -16,10 +16,10 @@ package org.apache.geode.cache.query.internal.types;
import static org.junit.Assert.*;
-import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
index 18afff2..f1ef29f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
@@ -14,19 +14,14 @@
*/
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import static org.apache.geode.cache.query.Utils.*;
+import static org.junit.Assert.*;
import java.util.Collection;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.Index;
@@ -44,6 +39,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -80,7 +78,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Tests basic index creation on a partitioned system.
- *
+ *
* @throws Exception if an exception is generated
*/
@Test
@@ -125,7 +123,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Tests creation of multiple index creation on a partitioned region system.
- *
+ *
* @throws Exception if any excpetion are generated
*/
@Test
@@ -288,7 +286,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Test creation of mutilple index on partitioned regions and then adding a new node to the system
* and checking it has created all the indexes already in the sytem.
- *
+ *
*/
@Test
public void testCreatePartitionedRegionThroughXMLAndAPI() {
@@ -437,7 +435,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Test index usage with query on a partitioned region with bucket indexes.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
index 23a32b0..d8b08d9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
@@ -14,20 +14,15 @@
*/
package org.apache.geode.cache.query.partitioned;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions;
+import static org.junit.Assert.*;
import java.io.File;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
@@ -40,9 +35,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class PRBasicIndexCreationDeadlockDUnitTest extends PartitionedRegionDUnitTestCase
@@ -50,7 +48,7 @@ public class PRBasicIndexCreationDeadlockDUnitTest extends PartitionedRegionDUni
{
/**
* constructor
- *
+ *
* @param name
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
index 579250e..6b601d9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
@@ -14,20 +14,15 @@
*/
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import static org.apache.geode.cache.query.Utils.*;
+import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Collection;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.Index;
@@ -40,6 +35,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -66,7 +64,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* Tests basic index creation on a partitioned system.
- *
+ *
* @throws Exception if an exception is generated
*/
@Test
@@ -213,7 +211,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* Test creation of multiple index on partitioned regions and then adding a new node to the system
* and checking it has created all the indexes already in the system.
- *
+ *
*/
@Test
public void testCreatePartitionedRegionThroughXMLAndAPI() {
@@ -401,7 +399,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* Test index usage with query on a partitioned region with bucket indexes.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
index 709f5f1..7ce6d38 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
@@ -14,16 +14,11 @@
*/
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.apache.geode.cache.query.Utils.*;
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-import static org.apache.geode.cache.query.Utils.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -41,11 +36,14 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests creates partition regions with 1 Datastore & 1 Accessor node, firing a simple query
* and validating the ResultSet size and Contents.
- *
+ *
*/
@Category(DistributedTest.class)
public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
@@ -53,7 +51,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
{
/**
* constructor
- *
+ *
* @param name
*/
@@ -67,7 +65,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
}
}
- private final static int MAX_SYNC_WAIT = 30 * 1000;
+ private static final int MAX_SYNC_WAIT = 30 * 1000;
PRQueryDUnitHelper PRQHelp = new PRQueryDUnitHelper();
@@ -83,7 +81,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates a PR Accessor and Data Store with redundantCopies = 0. 2. Populates the region with
* test data. 3. Fires a query on accessor VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -150,7 +148,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
* Populates the region with test data. 3. Fires a query on accessor VM and verifies the result.
* 4. Shuts down the caches, then restarts them asynchronously 5. Attempt the query while the
* regions are being recovered
- *
+ *
* @throws Exception
*/
@Test
@@ -266,7 +264,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
* Populates the region with test data. 3. Fires a query on accessor VM and verifies the result.
* 4. Shuts down the caches, then restarts them asynchronously, but don't restart the child region
* 5. Attempt the query while the region offline because of the missing child region
- *
+ *
* @throws Exception
*/
@SuppressWarnings("rawtypes")
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 582ca5e..e4c4ce7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -13,24 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.partitioned;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import static org.apache.geode.cache.query.Utils.*;
+import static org.junit.Assert.*;
import java.util.ArrayList;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import parReg.query.unittest.NewPortfolio;
import util.TestException;
@@ -68,6 +61,10 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
*
@@ -110,7 +107,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -371,7 +368,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -455,7 +452,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -535,7 +532,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -610,7 +607,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -695,7 +692,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -775,7 +772,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -850,7 +847,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -931,7 +928,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -1010,7 +1007,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -1485,7 +1482,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* A very basic dunit test that <br>
* 1. Creates two PR Data Stores with redundantCopies = 1. 2. Populates the region with test data.
* 3. Fires a LOCAL query on one data store VM and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
index 38b5a65..d948883 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.partitioned;
@@ -101,7 +101,7 @@ public class PRIndexStatisticsJUnitTest {
*/
/**
* Test RenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -171,7 +171,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -241,7 +241,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test CompactMapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -313,7 +313,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -389,7 +389,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test RenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -467,7 +467,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -544,7 +544,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
@@ -625,7 +625,7 @@ public class PRIndexStatisticsJUnitTest {
/**
* Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
index 01ef9f8..a323bd8 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
@@ -15,27 +15,20 @@
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.apache.geode.cache.query.Utils.createPortfolioData;
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-/**
- * This tests creates partition regions across VM's executes Queries on PR's so that they generate
- * various Exceptions
- */
-
-import static org.apache.geode.cache.query.Utils.createPortfolioData;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionDUnitTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase
@@ -43,7 +36,7 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase
{
/**
* constructor *
- *
+ *
* @param name
*/
@@ -74,7 +67,7 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Puts in the data in PR region & the Local Region <br>
* 4. Queries the PR qith an Invalid Query Syntax <br>
* 5. Verfies that there is an QueryInavalidException
- *
+ *
* @throws Exception
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
index b56ad08..e915142 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
@@ -31,8 +31,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* Class verifies Region#query(Select Query) API for PartitionedRegion on a single VM.,As
* region#query doesn't support Select Query for Local Querying it should throw
* QueryInvalidException
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PRInvalidQueryJUnitTest {
@@ -49,7 +49,7 @@ public class PRInvalidQueryJUnitTest {
/**
* Populates the region with the Objects stores in the data Object array.
- *
+ *
* @param region
* @param data
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
index f0e714e..4827656 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
@@ -15,30 +15,17 @@
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
-/**
- * This test tests the PR query behaviour with respect to cache closure happening on one of the data
- * stores. PR is configured with redundantCopies = 1, and cache close is done randomly on one of the
- * data stores and then recreated, thus avoiding any data loss.
- *
- */
-
import static org.apache.geode.cache.query.Utils.createPortfolioData;
+import static org.junit.Assert.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.PartitionedRegionDUnitTestCase;
@@ -50,13 +37,16 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase {
/**
* constructor *
- *
+ *
* @param name
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
index d1b41b8..983526f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
@@ -38,8 +38,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test verifies Region#query()for PartitionedRegion on a single VM with Region#destroyRegion()
* being called on the same with some delay.
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PRQueryCacheClosedJUnitTest {
@@ -81,8 +81,8 @@ public class PRQueryCacheClosedJUnitTest {
* 3. Create a Thread and fire queries on the data and verifies the result.<br>
* 4. Create another Thread and call cache#close()<br>
* 5. Recreates the cache after a delay of 1500ms
- *
- *
+ *
+ *
* @throws Exception
*/
@Test
@@ -232,7 +232,7 @@ public class PRQueryCacheClosedJUnitTest {
/**
* Populates the region with the Objects stores in the data Object array.
- *
+ *
* @param region
* @param data
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
index 77c66ad..6daefcd 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -200,7 +200,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* This function creates a appropriate region PR given the scope & the redundancy parameters *
- *
+ *
* @param regionName
* @param redundancy
* @return cacheSerializable object
@@ -512,7 +512,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* This function creates a colocated region PR given the oher colocated region.
- *
+ *
* @param regionName
* @param redundancy
* @param coloRegionName
@@ -564,7 +564,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* This function puts portfolio objects into the created Region (PR or Local) *
- *
+ *
* @param regionName
* @param portfolio
* @param to
@@ -590,7 +590,7 @@ public class PRQueryDUnitHelper implements Serializable {
* This function puts portfolio objects into the created Region (PR or RR). Also, other operation
* like, invalidate, destroy and create are performed in random manner based on
* {@link Random#nextInt(int)}.
- *
+ *
* @param regionName
* @param to
* @param from
@@ -652,7 +652,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* This function puts portfolio objects into the created Region (PR or Local) *
- *
+ *
* @param regionName
* @param portfolio
* @param to
@@ -675,7 +675,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* This function puts portfolio objects into the created Region (PR or Local) *
- *
+ *
* @param regionName
* @param portfolio
* @param to
@@ -1434,7 +1434,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* This function creates a Accessor node region on the given PR given the scope parameter.
- *
+ *
* @param regionName
* @return cacheSerializable object
*/
@@ -1473,7 +1473,7 @@ public class PRQueryDUnitHelper implements Serializable {
/*
* This function compares the two result sets passed based on <br> 1. Type <br> 2. Size <br> 3.
* Contents <br>
- *
+ *
* @param Object[][] @param length @return
*/
@@ -1531,7 +1531,7 @@ public class PRQueryDUnitHelper implements Serializable {
* 1. Creates & executes a query with Logical Operators on the given PR Region 2. Executes the
* same query on the local region <br>
* 3. Compares the appropriate resultSet <br>
- *
+ *
* @param regionName
*
*
@@ -1578,7 +1578,7 @@ public class PRQueryDUnitHelper implements Serializable {
* This function <br>
* 1. calls the region.close on the VM <br>
* 2. creates the cache again & also the PR <br>
- *
+ *
* @return cacheSerializable object
*/
@@ -1623,7 +1623,7 @@ public class PRQueryDUnitHelper implements Serializable {
* This function <br>
* 1. calls the cache.close on the VM <br>
* 2. creates the cache again & also the PR <br>
- *
+ *
* @return cacheSerializable object
*
* NOTE: Closing of the cache must be done from the test case rather than in
@@ -1812,7 +1812,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* Creats a partiotioned region using an xml file descriptions.
- *
+ *
*
* @return CacheSerializable
*
@@ -1918,7 +1918,7 @@ public class PRQueryDUnitHelper implements Serializable {
/**
* Cacheserializable runnable which removes all the index on a partitioned region
- *
+ *
* @param name name of the partitioned regions
* @return CacheSerializableRunnable
*/
@@ -2475,4 +2475,3 @@ public class PRQueryDUnitHelper implements Serializable {
};
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
index 735c0df..b48659c 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
@@ -15,22 +15,8 @@
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-/**
- * This tests creates partition regions across VM's and a local Region across one of the VM executes
- * Queries both on Local Region & PR's & compare ResultSets
- *
- */
-
import static org.apache.geode.cache.query.Utils.*;
+import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,6 +26,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.PartitionAttributes;
@@ -53,11 +42,14 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionDUnitTestCase;
import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
+import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
@@ -324,7 +316,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
/**
* Test data loss (bucket 0) while the PRQueryEvaluator is processing the query loop
- *
+ *
* @throws Exception
*/
@Test
@@ -614,7 +606,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
/**
* Simulate a data loss (buckets 0 and 2) before the PRQueryEvaluator begins the query loop
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
index 47893b1..41ec7c3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
@@ -38,8 +38,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Class verifies Region#query(String predicate) API for PartitionedRegion on a single VM.
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PRQueryJUnitTest {
@@ -58,7 +58,7 @@ public class PRQueryJUnitTest {
* Tests the execution of query on a PartitionedRegion created on a single data store. <br>
* 1. Creates a PR with redundancy=0 on a single VM. 2. Puts some test Objects in cache. 3. Fires
* queries on the data and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -174,7 +174,7 @@ public class PRQueryJUnitTest {
/**
* Populates the region with the Objects stores in the data Object array.
- *
+ *
* @param region
* @param data
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
index b85b419..b6a860c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
@@ -34,8 +34,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Class verifies Region#query(String predicate) API for PartitionedRegion on a single VM.
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PRQueryNumThreadsJUnitTest {
@@ -55,7 +55,7 @@ public class PRQueryNumThreadsJUnitTest {
* Tests the execution of query on a PartitionedRegion created on a single data store. <br>
* 1. Creates a PR with redundancy=0 on a single VM. 2. Puts some test Objects in cache. 3. Fires
* queries on the data and verifies the result.
- *
+ *
* @throws Exception
*/
@Test
@@ -139,7 +139,7 @@ public class PRQueryNumThreadsJUnitTest {
/**
* Populates the region with the Objects stores in the data Object array.
- *
+ *
* @param region
* @param data
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
index 6aef553..045c0fd 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
@@ -15,31 +15,19 @@
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
-/**
- * This test creates partition regions with one Accessor node & two Datastores Calls region.close()
- * on one of the data stores while the query is being executed and recreates the PR on the VM and
- * verifies the results.
- *
- */
-
import static org.apache.geode.cache.query.Utils.createPortfolioData;
+import static org.junit.Assert.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.query.data.PortfolioData;
+import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.PartitionedRegionDUnitTestCase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -48,14 +36,17 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.internal.cache.ForceReattemptException;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase {
/**
* constructor *
- *
+ *
* @param name
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
index 2bf064c..0523b78 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
@@ -37,8 +37,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test verifies Region#query()for PartitionedRegion on a single VM with Region#close() being called
* on the same with some delay and then recreating the region instantly.
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PRQueryRegionClosedJUnitTest {
@@ -71,8 +71,8 @@ public class PRQueryRegionClosedJUnitTest {
* 2. Puts some test Objects in cache.<br>
* 3. Create a Thread and fire queries on the data and verifies the result.<br>
* 4. Create another Thread and call Region#close() on the PR region.<br>
- *
- *
+ *
+ *
* @throws Exception
*/
@Test
@@ -223,7 +223,7 @@ public class PRQueryRegionClosedJUnitTest {
/**
* Populates the region with the Objects stores in the data Object array.
- *
+ *
* @param region
* @param data
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
index c064348..b682341 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
@@ -15,30 +15,19 @@
package org.apache.geode.cache.query.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-/**
- * This test creates partition regions with one Accessor node & two Datastores Calls
- * region.destroy() on one of the data stores while the query is being executed and recreates the PR
- * on the VM and verifies the results.
- *
- */
-
import static org.apache.geode.cache.query.Utils.createPortfolioData;
+import static org.junit.Assert.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.query.data.PortfolioData;
+import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.PartitionedRegionDUnitTestCase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -47,14 +36,16 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.internal.cache.ForceReattemptException;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestCase {
/**
* constructor *
- *
+ *
* @param name
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
index a9fffd1..e3dc7f5 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
@@ -38,8 +38,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test verifies Region#query()for PartitionedRegion on a single VM with Region#destroyRegion()
* being called on the same with some delay.
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PRQueryRegionDestroyedJUnitTest {
@@ -73,8 +73,8 @@ public class PRQueryRegionDestroyedJUnitTest {
* 2. Puts some test Objects in cache.<br>
* 3. Create a Thread and fire queries on the data and verifies the result.<br>
* 4. Create another Thread and call Region#destroyRegion() on the PR region.<br>
- *
- *
+ *
+ *
* @throws Exception
*/
@Test
@@ -221,7 +221,7 @@ public class PRQueryRegionDestroyedJUnitTest {
/**
* Populates the region with the Objects stores in the data Object array.
- *
+ *
* @param region
* @param data
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
index 1fc806d..13d6772 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache.query.partitioned;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
index 5859806..228ec01 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
@@ -266,7 +266,7 @@ public class QueryAndJtaJUnitTest {
/**
* verify that queries on indexes work with transaction
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
index 8999cda..0eca143 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
@@ -19,10 +19,10 @@ import static org.junit.Assert.assertEquals;
import java.io.File;
import java.util.Map.Entry;
+import com.examples.snapshot.MyObject;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.examples.snapshot.MyObject;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.snapshot.RegionGenerator.RegionType;
import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
index a8791e4..5f0c662 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -17,19 +17,15 @@ package org.apache.geode.cache.snapshot;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import com.examples.snapshot.MyPdxSerializer;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -39,6 +35,8 @@ import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
import org.apache.geode.internal.cache.snapshot.SnapshotOptionsImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
@@ -93,7 +91,7 @@ public class ParallelSnapshotDUnitTest extends JUnit4CacheTestCase {
/**
* This test ensures that parallel import succeeds even when each node does not have a file to
* import (import cluster larger than export one)
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionGenerator.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionGenerator.java
index 6b6169f..5b4b020 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionGenerator.java
@@ -21,6 +21,7 @@ import com.examples.snapshot.MyObjectDataSerializable;
import com.examples.snapshot.MyObjectPdx;
import com.examples.snapshot.MyObjectPdx.MyEnumPdx;
import com.examples.snapshot.MyPdxSerializer.MyObjectPdx2;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EvictionAction;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
index 1de1b03..70a7744 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -14,8 +14,21 @@
*/
package org.apache.geode.cache.snapshot;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import com.examples.snapshot.MyObject;
import com.examples.snapshot.MyPdxSerializer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
@@ -25,18 +38,6 @@ import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
@Category(IntegrationTest.class)
public class RegionSnapshotJUnitTest extends SnapshotTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
index 0eec13d..35cad56 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
@@ -14,22 +14,8 @@
*/
package org.apache.geode.cache.snapshot;
-import org.apache.geode.cache.AttributesMutator;
-import org.apache.geode.cache.DiskStoreFactory;
-import org.apache.geode.cache.asyncqueue.AsyncEvent;
-import org.apache.geode.cache.asyncqueue.AsyncEventListener;
-import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
-import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory;
-
-import org.awaitility.Awaitility;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -41,11 +27,21 @@ import java.util.concurrent.atomic.AtomicInteger;
import com.examples.snapshot.MyObject;
import com.examples.snapshot.MyPdxSerializer;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.asyncqueue.AsyncEvent;
+import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
+import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory;
import org.apache.geode.cache.snapshot.RegionGenerator.RegionType;
import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
@@ -53,6 +49,8 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class SnapshotDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
index dc50440..99c652b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.cache.snapshot;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.io.FilenameFilter;
import java.util.HashMap;
@@ -30,6 +23,9 @@ import java.util.Map;
import com.examples.snapshot.MyObject;
import com.examples.snapshot.MyPdxSerializer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -40,6 +36,9 @@ import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class SnapshotPerformanceDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java
index 25a4c17..4b63865 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java
@@ -15,23 +15,22 @@
package org.apache.geode.cache.snapshot;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import com.examples.snapshot.MyObject;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.DiskStore;
-import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import com.examples.snapshot.MyObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
public class SnapshotTestCase {
private File snapshotDirectory;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
index b62b7bf..1e8f5d6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
@@ -21,12 +21,12 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import com.examples.snapshot.MyObject;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.examples.snapshot.MyObject;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java b/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
index dad18d7..8d9a694 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.cache.util;
-import org.apache.geode.cache.CacheEvent;
-
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.geode.cache.CacheEvent;
+
/**
* Utilty class for getting Transaction events for create, invalidate, put, destroy operations.
*/
@@ -27,7 +27,7 @@ public class TxEventTestUtil {
/**
* Retrieves the cache events with operation create
- *
+ *
* @return list of cache events
*/
public static List getCreateEvents(List<CacheEvent<?, ?>> events) {
@@ -42,7 +42,7 @@ public class TxEventTestUtil {
/**
* Retrieves the cache events with operation update
- *
+ *
* @return list of cache events
*/
public static List getPutEvents(List<CacheEvent<?, ?>> events) {
@@ -57,7 +57,7 @@ public class TxEventTestUtil {
/**
* Retrieves the cache events with operation invalidate
- *
+ *
* @return list of cache events
*/
public static List getInvalidateEvents(List<CacheEvent<?, ?>> events) {
@@ -72,7 +72,7 @@ public class TxEventTestUtil {
/**
* Retrieves the cache events with operation destroy
- *
+ *
* @return list of cache events
*/
public static List getDestroyEvents(List<CacheEvent<?, ?>> events) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
index c9c3b37..8882af3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -60,6 +59,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -77,7 +77,7 @@ public class Bug38741DUnitTest extends ClientServerTestCase {
/**
* Test that CopyOnRead doesn't cause {@link HARegionQueue#peek()} to create a copy, assuming that
* creating copies performs a serialize and de-serialize operation.
- *
+ *
* @throws Exception when there is a failure
* @since GemFire bugfix5.7
*/
@@ -267,7 +267,7 @@ public class Bug38741DUnitTest extends ClientServerTestCase {
/**
* Test to ensure that a PartitionedRegion doesn't make more than the expected number of copies
* when copy-on-read is set to true
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug40255JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug40255JUnitTest.java
index 4ad5496..a13063d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug40255JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug40255JUnitTest.java
@@ -14,24 +14,25 @@
*/
package org.apache.geode.cache30;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug40662JUnitTest.java
index 6152d21..be07746 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug40662JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug40662JUnitTest.java
@@ -14,24 +14,25 @@
*/
package org.apache.geode.cache30;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test for Bug no. 40662. To verify the default action being set in eviction attributes by
* CacheXmlParser when cache.xml has eviction attributes with no eviction action specified. which
* was being set to EvictionAction.NONE
- *
+ *
* @since GemFire 6.6
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
index 9d50da7..2b905c4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
@@ -13,36 +13,37 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.cache30;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.Region.Entry;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.awaitility.Awaitility.with;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
import org.awaitility.core.ConditionTimeoutException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.awaitility.Awaitility.with;
-import static org.junit.Assert.fail;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.Region.Entry;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test for Bug 44418.
- *
+ *
* If a new expiration time is specified that is shorter than an existing one, ensure the new
* shorter time is honored.
- *
+ *
* @since GemFire 7.0
*/
@Category(IntegrationTest.class)
@@ -162,4 +163,3 @@ public class Bug44418JUnitTest { // TODO: rename this test to non-ticket descrip
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
index 44d8ae3..1726cfb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
@@ -14,25 +14,24 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure cache close is working.
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java
index 27057d9..eadba1a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -33,6 +29,9 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.internal.cache.AbstractRegionMap;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* An abstract class whose test methods test the functionality of {@link CacheListener}s that are
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
index 9509c06..5952af7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -35,6 +31,9 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.TimeoutException;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* An abstract class whose test methods test the functionality of {@link CacheLoader}s that are
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
index eb8fec3..78ee0bf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -35,6 +31,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the {@link CacheStatistics} that are maintained by a {@link Region} and a
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java
index 7b33c21..72a2f4a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java
@@ -14,19 +14,16 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.cache.*;
-// import org.apache.geode.cache.util.*;
-// import java.util.*;
-
/**
* An abstract class whose test methods test the functionality of {@link CacheWriter}s that are
* invoked locally.
@@ -302,7 +299,7 @@ public abstract class CacheWriterTestCase extends RegionAttributesTestCase {
/**
* Tests that the <code>CacheWriter</code> is called before a region is destroyed.
- *
+ *
* @see CacheWriter#beforeRegionDestroy
* @see CacheWriter#close
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXMLPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXMLPartitionResolver.java
index 25ee73e..f1f03c1 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXMLPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXMLPartitionResolver.java
@@ -61,7 +61,7 @@ public class CacheXMLPartitionResolver implements PartitionResolver, Serializabl
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.xmlcache.Declarable2#getConfig()
*/
public Properties getConfig() {
@@ -70,7 +70,7 @@ public class CacheXMLPartitionResolver implements PartitionResolver, Serializabl
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index b139bcd..4ce6757 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -77,6 +77,7 @@ import org.apache.geode.cache.MirrorType;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.RegionShortcut;
@@ -85,7 +86,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.cache.SubscriptionAttributes;
import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
-import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.Pool;
@@ -138,7 +138,7 @@ import org.apache.geode.util.test.TestUtil;
/**
* Tests 7.0 cache.xml feature : Fixed Partitioning.
- *
+ *
* @since GemFire 6.6
*/
public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
@@ -2698,7 +2698,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Test EnableSubscriptionConflation region attribute
- *
+ *
* @since GemFire 5.7
*/
@Test
@@ -2829,7 +2829,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Tests that a region created with a named attributes has the correct attributes.
- *
+ *
* This tests currently fails due to (what seem to me as) limitations in the XML generator and the
* comparison of the XML. I have run this test by hand and looked at the generated XML and there
* were no significant problems, however because of the limitations, I am disabling this test, but
@@ -3111,7 +3111,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Tests multiple cache listeners on one region
- *
+ *
* @since GemFire 5.0
*/
@Test
@@ -3195,7 +3195,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Tests multiple transaction listeners
- *
+ *
* @since GemFire 5.0
*/
@Test
@@ -3673,7 +3673,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Test EnableBridgeConflation region attribute
- *
+ *
* @since GemFire 4.2
*/
@Test
@@ -3688,7 +3688,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Test EnableAsyncConflation region attribute
- *
+ *
* @since GemFire 4.2
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml70DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
index a1cd917..972347b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
@@ -20,9 +20,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.cache.util.GatewayConflictHelper;
-import org.apache.geode.cache.util.GatewayConflictResolver;
-import org.apache.geode.cache.util.TimestampedEntryEvent;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -36,6 +33,9 @@ import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
+import org.apache.geode.cache.util.GatewayConflictHelper;
+import org.apache.geode.cache.util.GatewayConflictResolver;
+import org.apache.geode.cache.util.TimestampedEntryEvent;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.internal.cache.xmlcache.AsyncEventQueueCreation;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml81DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
index e6026e1..60b4a66 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
@@ -55,7 +55,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
/**
* Test extensions to <code>cache</code> element.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -88,7 +88,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
/**
* Test extensions to <code>region</code> element.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -128,7 +128,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
/**
* Test {@link Locator} is used in {@link SAXParseException}. Exercises
* {@link XmlParser#setDocumentLocator(Locator)}
- *
+ *
* @since GemFire 8.2
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
index 2951c7a..e163fe1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache30;
-import static org.apache.geode.test.dunit.Assert.*;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.test.dunit.Assert.*;
import java.io.File;
import java.io.FileWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
index da5c65f..86ddf79 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
@@ -16,6 +16,9 @@ package org.apache.geode.cache30;
import static org.apache.geode.test.dunit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.DataPolicy;
@@ -29,8 +32,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Make sure that create are distributed and done in remote regions that are CACHED_ALL_EVENTS*.
@@ -73,7 +74,7 @@ public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase {
/**
* make sure a remote create will be done in a NORMAL+ALL region
- *
+ *
* @param rmtCreate is true if create should happen in remote region
*/
private void remoteCreate(DataPolicy dp, InterestPolicy ip, boolean rmtCreate)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
index 89c8c87..ce02b87 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
@@ -14,20 +14,16 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheListener;
@@ -45,6 +41,9 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test the getCallbackArgument in light of bug 34075.
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java b/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
index 5933d43..5c283fc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
@@ -28,10 +28,10 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
public class CertifiableTestCacheListener extends TestCacheListener implements Declarable2 {
- final public Set destroys = Collections.synchronizedSet(new HashSet());
- final public Set creates = Collections.synchronizedSet(new HashSet());
- final public Set invalidates = Collections.synchronizedSet(new HashSet());
- final public Set updates = Collections.synchronizedSet(new HashSet());
+ public final Set destroys = Collections.synchronizedSet(new HashSet());
+ public final Set creates = Collections.synchronizedSet(new HashSet());
+ public final Set invalidates = Collections.synchronizedSet(new HashSet());
+ public final Set updates = Collections.synchronizedSet(new HashSet());
final LogWriter logger;
@@ -76,8 +76,8 @@ public class CertifiableTestCacheListener extends TestCacheListener implements D
this.updates.add(event.getKey());
}
- static private final String WAIT_PROPERTY = "CertifiableTestCacheListener.maxWaitTime";
- static private final int WAIT_DEFAULT = 30000;
+ private static final String WAIT_PROPERTY = "CertifiableTestCacheListener.maxWaitTime";
+ private static final int WAIT_DEFAULT = 30000;
public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index a6dd126..797d4e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -33,9 +33,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
-import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -51,6 +48,8 @@ import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.*;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.tier.InternalClientMembership;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
@@ -66,6 +65,7 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
index e34db9c..99ef5c9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.cache30;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
index 8af26e3..8352207 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
@@ -20,7 +20,6 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,6 +37,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -434,4 +434,3 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
index a049464..4933d13 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.cache30;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
index 412a4c6..97746bd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
@@ -18,8 +18,6 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
-import org.awaitility.Awaitility;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -30,28 +28,23 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeoutException;
-import org.apache.geode.cache.AttributesMutator;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.ExpirationAction;
-import org.apache.geode.cache.ExpirationAttributes;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.Scope;
-import org.apache.geode.distributed.internal.locks.DLockService;
-import org.apache.geode.distributed.internal.locks.DistributedLockStats;
-import org.apache.geode.internal.cache.CachePerfStats;
-import org.apache.geode.internal.cache.DistributedRegion;
-import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.AttributesMutator;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Scope;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionFactory;
@@ -61,17 +54,23 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.distributed.internal.locks.DLockService;
+import org.apache.geode.distributed.internal.locks.DistributedLockStats;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
+import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.DistributedTombstoneOperation.TombstoneMessage;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
import org.apache.geode.internal.cache.ha.HARegionQueue;
import org.apache.geode.internal.cache.partitioned.PRTombstoneMessage;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
@@ -80,11 +79,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* concurrency-control tests for client/server
- *
+ *
*
*/
@Category({DistributedTest.class, ClientServerTest.class})
@@ -112,7 +112,7 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
* This test sets up two servers each with a client attached. The clients perform operations on
* the same key in a region which, in the servers, has Scope.GLOBAL. There should be no conflation
* and each operation should obtain a lock.
- *
+ *
* @throws Exception
*/
@Test
@@ -304,7 +304,7 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
/**
* test that distributed GC messages are sent to clients and properly processed
- *
+ *
* @param replicatedRegion whether to use a RR or PR in the servers
*/
private void clientServerTombstoneGCTest(String uniqueName, boolean replicatedRegion) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java
index 4f61880..745b185 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java
@@ -333,7 +333,7 @@ public abstract class ClientServerTestCase extends JUnit4CacheTestCase {
public void init(Properties props) {}
}
- public final static String BridgeServerKey = "BridgeServerKey";
+ public static final String BridgeServerKey = "BridgeServerKey";
/**
* Create a server that has a value for every key queried and a unique key/value in the specified
@@ -374,4 +374,3 @@ public abstract class ClientServerTestCase extends JUnit4CacheTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
index 42d1f5a..96930ff 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
@@ -14,15 +14,11 @@
*/
package org.apache.geode.cache30;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -33,6 +29,8 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InitialImageOperation;
import org.apache.geode.internal.cache.InitialImageOperation.GIITestHook;
import org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.RegionMap;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
@@ -40,8 +38,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.RegionMap;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ConcurrentLeaveDuringGIIDUnitTest extends JUnit4CacheTestCase {
@@ -69,7 +68,7 @@ public class ConcurrentLeaveDuringGIIDUnitTest extends JUnit4CacheTestCase {
* B then starts and creates its region, not doing a GII from A since A is still initializing.
* <p>
* A is then allowed to start its GII and pulls an image from B.
- *
+ *
*/
@Ignore
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
index 937cd0d..5516267 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
@@ -14,24 +14,23 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.*;
import org.apache.geode.internal.OSProcess;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
index 6b0c6e2..d72f255 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
@@ -14,18 +14,18 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.*;
-import java.io.*;
import org.apache.geode.internal.OSProcess;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class DiskDistributedNoAckAsyncRegionDUnitTest extends DiskDistributedNoAckRegionTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
index f12672f..f2fb5c7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.lang.reflect.Array;
import java.util.BitSet;
@@ -30,6 +23,9 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -61,6 +57,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the functionality of cache regions whose contents may be written to disk.
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
index eab5a60..460c7db 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
@@ -14,17 +14,11 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -32,6 +26,9 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class DistributedAckOverflowRegionCCEDUnitTest extends DistributedAckRegionCCEDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 04c2d45..bdf648c 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Overflow Region with ConcurrencyChecksEnabled and OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
index c40a7fe..0d53bf1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
@@ -14,7 +14,7 @@
*/
/**
- *
+ *
*/
package org.apache.geode.cache30;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 41d3ecb..5839da7 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Persistent Region with ConcurrencyChecksEnabled and OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
index 2687f34..b29ec29 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -14,7 +14,7 @@
*/
/**
- *
+ *
*/
package org.apache.geode.cache30;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 983f4b9..683880f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
index 826526b..d077eb0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with compression.
- *
+ *
* @since GemFire 8.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
index 8999f83..5630be4 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
index 6b425f3..27c11f8 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
@@ -96,7 +96,7 @@ public class DistributedMulticastRegionDUnitTest extends JUnit4CacheTestCase {
* SerializableRunnable validateMulticastBeforeRegionOps = new
* CacheSerializableRunnable("validateMulticast before region ops") { public void run2() throws
* CacheException { validateMulticastOpsBeforeRegionOps(); } };
- *
+ *
* vm0.invoke(validateMulticastBeforeRegionOps); vm1.invoke(validateMulticastBeforeRegionOps);
*/
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 7c4e3d8..bac47c9 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index 10f9879..331db07 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed NoAck Region with OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
index 3055d38..7e42107 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -41,6 +37,9 @@ import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure dynamic regions work
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
index 8b6a7e8..e9943d9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
@@ -14,18 +14,13 @@
*/
package org.apache.geode.cache30;
-import org.apache.geode.test.junit.categories.DLockTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.locks.Lock;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheLoader;
@@ -39,6 +34,10 @@ import org.apache.geode.cache.TimeoutException;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DLockTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests distributed locking of global region entries.
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
index a5b3cf6..5a6fb82 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
@@ -14,7 +14,7 @@
*/
/**
- *
+ *
*/
package org.apache.geode.cache30;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 7fd0785..3069520 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -14,23 +14,22 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.DistributedTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Global Region with ConcurrencyChecksEnabled and OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
index d054809..83aa6dc 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Global Region with OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
index 659e668..d01c3a3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -55,6 +51,9 @@ import org.apache.geode.internal.cache.lru.LRUStatistics;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic functionality of the lru eviction controller and its statistics.
@@ -346,7 +345,7 @@ public class LRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
/**
* Create two regions, one a "feed" that performs transactions which are replicated to a region
* with an Entry LRU set to one Asserts that the LRU rules are observed
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
index b75342a..0c124de 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Properties;
import java.util.Random;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -41,11 +37,14 @@ import org.apache.geode.internal.cache.lru.LRUStatistics;
import org.apache.geode.internal.cache.lru.MemLRUCapacityController;
import org.apache.geode.internal.size.ReflectionSingleObjectSizer;
import org.apache.geode.internal.size.WellKnownClassSizer;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic functionality of the memory lru eviction controller and its statistics.
- *
- *
+ *
+ *
* @since GemFire 3.2
*/
@Category(DistributedTest.class)
@@ -145,7 +144,7 @@ public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
/**
* Make sure that we only size a class the first time we see the class instance.
- *
+ *
* @throws CacheException
*/
@Test
@@ -205,7 +204,7 @@ public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
/**
* Class used in testCustomObjectSizer
- *
+ *
* @since GemFire 5.0
*/
class CustomObjectSizer implements ObjectSizer {
@@ -230,7 +229,7 @@ public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
/**
* Validate that a custom {@link ObjectSizer} is called, configured propertly, and actually limits
* the size of the <code>Region</code>.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index 50f34ca..d168f9b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -40,7 +40,6 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.geode.cache.util.TxEventTestUtil;
import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Ignore;
@@ -87,6 +86,7 @@ import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.cache.util.TxEventTestUtil;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -1413,7 +1413,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
/**
* Indicate whether this region supports netload
- *
+ *
* @return true if it supports netload
*/
protected boolean supportsNetLoad() {
@@ -2777,7 +2777,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
/**
* Indicate whether replication/GII supported
- *
+ *
* @return true if replication is supported
*/
protected boolean supportsReplication() {
@@ -6232,7 +6232,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
/**
* Indicate whether this region supports transactions
- *
+ *
* @return true if it supports transactions
*/
protected boolean supportsTransactions() {
@@ -6248,7 +6248,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void testTXUpdateLoadNoConflict() throws Exception {
/*
* this no longer holds true - we have load conflicts now
- *
+ *
*/
if (true) {
return;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayEventFilter2.java b/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayEventFilter2.java
index fb56e42..4750903 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayEventFilter2.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayEventFilter2.java
@@ -41,7 +41,7 @@ public class MyGatewayEventFilter2 implements GatewayEventFilter, Declarable2 {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.geode.cache.wan.GatewayEventFilter#afterAcknowledgement(org.apache.geode.cache.util.
* GatewayEvent)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayTransportFilter1.java b/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayTransportFilter1.java
index 815bbb4..bd1e98c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayTransportFilter1.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MyGatewayTransportFilter1.java
@@ -49,4 +49,3 @@ public class MyGatewayTransportFilter1
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index 5241b8c..f301074 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic functionality of the lru eviction controller and its statistics using off-heap
* regions.
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
index 62e7483..d36978d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
@@ -14,24 +14,20 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.distributed.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.distributed.*;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
@@ -53,10 +49,13 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* concurrency-control tests for client/server
- *
+ *
*
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
index f99556a..aa8607f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
@@ -14,23 +14,22 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.compression.Compressor;
import org.apache.geode.compression.SnappyCompressor;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Partitioned Region with compression.
- *
+ *
* @since GemFire 8.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
index f7cd842..0b50c7b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
@@ -414,7 +414,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
/**
* Accessed via reflection
- *
+ *
* @return true if poison found
*/
public static boolean poisonFound() {
@@ -520,4 +520,3 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
assertTrue("Hash mismatch not found", success);
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
index a1df032..e5c7248 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
@@ -18,18 +18,14 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Arrays;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheListener;
@@ -39,6 +35,9 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache30.RegionMembershipListenerDUnitTest.MyRML;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* @since GemFire 6.0
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
index 0e9bd90..c46bcf0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Partitioned Region with OffHeap memory.
- *
+ *
* @since Geode 1.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java
index f74b199..d82e22a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.CacheEvent;
@@ -50,6 +46,9 @@ import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Make sure that operations are distributed and done in regions remote from a PROXY
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
index b25c1b9..af7219d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
@@ -14,29 +14,28 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
import java.util.*;
-import org.apache.geode.distributed.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.*;
+import org.apache.geode.distributed.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.*;
import org.apache.geode.internal.cache.versions.VMVersionTag;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* concurrency-control tests for client/server
- *
+ *
*
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 8b30f02..f878e79 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -14,16 +14,23 @@
*/
package org.apache.geode.cache30;
-import org.awaitility.Awaitility;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
@@ -44,17 +51,8 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.test.dunit.*;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("serial")
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
index 2167a06..dfbd0bf 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
@@ -18,6 +18,13 @@ import static org.apache.geode.internal.Assert.assertTrue;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
@@ -33,12 +40,6 @@ import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* This test exercises auto-reconnect functionality when there is a cache-server that was started by
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
index 55d0a3c..02c885f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.cache30;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
import java.util.Properties;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.experimental.categories.Category;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
@Category({DistributedTest.class, MembershipTest.class, ClientServerTest.class})
public class ReconnectWithUDPSecurityDUnitTest extends ReconnectDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java
index c521539..30a9502 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java
@@ -14,24 +14,21 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.Region.Entry;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.Properties;
-// import org.apache.geode.cache.util.*;
-// import java.util.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.Region.Entry;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* An abstract class whose test methods test the functionality of a {@link RegionAttributes},
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionExpirationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionExpirationDUnitTest.java
index a6afa88..916f7b5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionExpirationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionExpirationDUnitTest.java
@@ -14,13 +14,10 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -34,6 +31,8 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test Region expiration - both time-to-live and idle timeout.
@@ -65,7 +64,7 @@ public class RegionExpirationDUnitTest extends JUnit4CacheTestCase {
*/
/*
* The encode and decode time methods are now private in MetaMap
- *
+ *
* @Test public void testTimeEncoding() throws CacheException { Region r =
* createRegion(getUniqueName(), getRegionAttributes()); long start =
* ((InternalDistributedSystem)getCache().getDistributedSystem()).getStartTime(); long timeMs =
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
index 9fda351..7d662ee 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
@@ -14,18 +14,13 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.distributed.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -36,6 +31,7 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.RegionMembershipListener;
import org.apache.geode.cache.util.RegionMembershipListenerAdapter;
+import org.apache.geode.distributed.*;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
@@ -47,6 +43,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test {@link RegionMembershipListener}
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
index e000d3a..69f974c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.cache.*;
-
/**
* Tests region reliability defined by MembershipAttributes using DISTRIBUTED_ACK scope.
*
@@ -42,4 +41,3 @@ public class RegionReliabilityDistAckDUnitTest extends RegionReliabilityTestCase
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
index 89cf2f1..0129fd4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.cache.*;
-
/**
* Tests region reliability defined by MembershipAttributes using DISTRIBUTED_NO_ACK scope.
*
@@ -42,4 +41,3 @@ public class RegionReliabilityDistNoAckDUnitTest extends RegionReliabilityTestCa
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
index bb546f9..85df97c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.cache.*;
-
/**
* Tests region reliability defined by MembershipAttributes using GLOBAL scope.
*
@@ -42,4 +41,3 @@ public class RegionReliabilityGlobalDUnitTest extends RegionReliabilityTestCase
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
index 7b98bf9..3aba62d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
@@ -211,4 +211,3 @@ public class RegionReliabilityListenerDUnitTest extends ReliabilityTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
index 520f824..1079b8d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
@@ -1449,4 +1449,3 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
index f086125..4b45e62 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
@@ -251,7 +251,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Indicate whether subregions are supported
- *
+ *
* @return
*/
protected boolean supportsSubregions() {
@@ -260,7 +260,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Indicate whether localDestroy and localInvalidate are supported
- *
+ *
* @return true if they are supported
*/
protected boolean supportsLocalDestroyAndLocalInvalidate() {
@@ -418,7 +418,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
assertEquals(subregion, subregions.iterator().next());
}
- static public boolean entryIsLocal(Region.Entry re) {
+ public static boolean entryIsLocal(Region.Entry re) {
if (re instanceof EntrySnapshot) {
return ((EntrySnapshot) re).wasInitiallyLocal();
} else {
@@ -857,15 +857,15 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* Not with ConcurrentHashMaps { Iterator iter = region.entries(false).iterator(); iter.next();
* region.destroy("B");
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
- *
+ *
* { Iterator iter = region.entries(false).iterator(); iter.next(); region.put("D", "d");
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
*/
{
@@ -1131,15 +1131,15 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* not with ConcurrentHashMap { Iterator iter = region.keys().iterator(); iter.next();
* region.destroy("B");
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
- *
+ *
* { Iterator iter = region.keys().iterator(); iter.next(); region.put("D", "d");
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
*/
}
@@ -1728,16 +1728,16 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* not with ConcurrentHashMaps { Iterator iter = region.subregions(false).iterator(); Region sub
* = (Region) iter.next(); sub.destroyRegion();
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
- *
+ *
* { Iterator iter = region.subregions(false).iterator(); iter.next();
* region.createSubregion("D", region.getAttributes());
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
*/
}
@@ -1777,20 +1777,20 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* not with ConcurrentHashMaps { Iterator iter = region.subregions(true).iterator();
* iter.next();
- *
+ *
* // Destroy in the subregion should effect parent region's // iterator B.destroyRegion();
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
- *
+ *
* { Iterator iter = region.subregions(true).iterator(); iter.next();
- *
+ *
* // Modifying the subregion should effect parent region's // iterator A.createSubregion("G",
* getRAs(region.getAttributes()));
- *
+ *
* try { iter.next(); fail("Should have thrown a ConcurrentModificationException");
- *
+ *
* } catch (ConcurrentModificationException ex) { // pass... } }
*/
}
@@ -1857,11 +1857,11 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
// Helper functions
////////////////////////////
- static private final String WAIT_PROPERTY = "UpdatePropagationDUnitTest.maxWaitTime";
- static private final int WAIT_DEFAULT = 60000;
+ private static final String WAIT_PROPERTY = "UpdatePropagationDUnitTest.maxWaitTime";
+ private static final int WAIT_DEFAULT = 60000;
- static private final int SLOP = 1000; // milliseconds
+ private static final int SLOP = 1000; // milliseconds
private Object fetchEntryValue(Region.Entry re) {
if (re.isLocal()) {
@@ -1880,7 +1880,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Since <em>tilt</em> is the earliest time we expect, one must check the current time
* <em>before</em> invoking the operation intended to keep the entry alive.
- *
+ *
* @param entry entry we want to be invalidated
* @param p_tilt earliest time we expect to see the invalidate
*/
@@ -1891,7 +1891,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Since <em>tilt</em> is the earliest time we expect, one must check the current time
* <em>before</em> invoking the operation intended to keep the entry alive.
- *
+ *
* @param entry entry we want to be invalidated
* @param p_tilt earliest time we expect to see the invalidate
* @param pauseMs the number of milliseconds to pause before checking again
@@ -1961,7 +1961,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Since <em>tilt</em> is the earliest time we expect, one must check the current time
* <em>before</em> invoking the operation intended to keep the entry alive.
- *
+ *
* @param entry entry we want to be invalidated
* @param p_tilt earliest time we expect to see the invalidate
*/
@@ -1972,7 +1972,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Since <em>tilt</em> is the earliest time we expect, one must check the current time
* <em>before</em> invoking the operation intended to keep the entry alive.
- *
+ *
* @param entry entry we want to be invalidated
* @param p_tilt earliest time we expect to see the invalidate
* @param pauseMs the number of milliseconds to pause before checking again
@@ -2015,7 +2015,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Since <em>tilt</em> is the earliest time we expect, one must check the current time
* <em>before</em> invoking the operation intended to keep the region alive.
- *
+ *
* @param region region we want to be destroyed
* @param p_tilt earliest time we expect to see the destroy
*/
@@ -2792,7 +2792,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CustomExpiry#getExpiry(org.apache.geode.cache.Region.Entry)
*/
public ExpirationAttributes getExpiry(Entry entry) {
@@ -2807,14 +2807,14 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheCallback#close()
*/
public void close() {}
@@ -3264,7 +3264,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Object --> CountExpiry
- *
+ *
* @guarded.By CountExpiry.class
*/
static final HashMap invokeCounts = new HashMap();
@@ -3279,7 +3279,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CustomExpiry#getExpiry(org.apache.geode.cache.Region.Entry)
*/
public ExpirationAttributes getExpiry(Entry entry) {
@@ -3300,14 +3300,14 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheCallback#close()
*/
public void close() {}
@@ -3569,7 +3569,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Verify that accessing an entry resets its idle time
- *
+ *
* @throws Exception
*/
@Test
@@ -3956,7 +3956,7 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
* Tests basic creation and loading of a snapshot from perspective of single VM
*/
public static Region preSnapshotRegion = null;
- private final static int MAX_KEYS = 10;
+ private static final int MAX_KEYS = 10;
@Test
public void testSnapshot() throws IOException, CacheException, ClassNotFoundException {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
index 9dd2a00..28ba30b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
@@ -427,7 +427,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
}
}
- private transient final ThreadGroup group = new ThreadGroup("RequiredRolesDUnitTest Threads") {
+ private final transient ThreadGroup group = new ThreadGroup("RequiredRolesDUnitTest Threads") {
public void uncaughtException(Thread t, Throwable e) {
if (e instanceof VirtualMachineError) {
SystemFailure.setFailure((VirtualMachineError) e); // don't throw
@@ -438,4 +438,3 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
}
};
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
index 8b97111..eb45a85 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
@@ -194,7 +194,7 @@ public class SearchAndLoadDUnitTest extends JUnit4CacheTestCase {
* This test is for a bug in which a cache loader threw an exception that caused the wrong value
* to be put in a Future in nonTxnFindObject. This in turn caused a concurrent search for the
* object to not invoke the loader a second time.
- *
+ *
* VM0 is used to create a cache and a region having a loader that simulates the conditions that
* caused the bug. One async thread then does a get() which invokes the loader. Another async
* thread does a get() which reaches nonTxnFindObject and blocks waiting for the first thread's
@@ -462,7 +462,7 @@ public class SearchAndLoadDUnitTest extends JUnit4CacheTestCase {
}
/*
* catch(EntryNotFoundException enfe) { fail("While getting value for ACK region", enfe);
- *
+ *
* }
*/
catch (TimeoutException te) {
@@ -561,7 +561,7 @@ public class SearchAndLoadDUnitTest extends JUnit4CacheTestCase {
}
/*
* catch(EntryNotFoundException enfe) { fail("While getting value for ACK region", enfe);
- *
+ *
* }
*/
catch (TimeoutException te) {
@@ -1023,5 +1023,3 @@ public class SearchAndLoadDUnitTest extends JUnit4CacheTestCase {
});
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
index 736d209..69f54ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
@@ -781,17 +781,17 @@ public class SlowRecDUnitTest extends JUnit4CacheTestCase {
private static final String KEY_WAIT = "KEY_WAIT";
private static final String KEY_DISCONNECT = "KEY_DISCONNECT";
- protected final static int CALLBACK_CREATE = 0;
- protected final static int CALLBACK_UPDATE = 1;
- protected final static int CALLBACK_INVALIDATE = 2;
- protected final static int CALLBACK_DESTROY = 3;
- protected final static int CALLBACK_REGION_INVALIDATE = 4;
-
- protected final static Integer CALLBACK_CREATE_INTEGER = new Integer(CALLBACK_CREATE);
- protected final static Integer CALLBACK_UPDATE_INTEGER = new Integer(CALLBACK_UPDATE);
- protected final static Integer CALLBACK_INVALIDATE_INTEGER = new Integer(CALLBACK_INVALIDATE);
- protected final static Integer CALLBACK_DESTROY_INTEGER = new Integer(CALLBACK_DESTROY);
- protected final static Integer CALLBACK_REGION_INVALIDATE_INTEGER =
+ protected static final int CALLBACK_CREATE = 0;
+ protected static final int CALLBACK_UPDATE = 1;
+ protected static final int CALLBACK_INVALIDATE = 2;
+ protected static final int CALLBACK_DESTROY = 3;
+ protected static final int CALLBACK_REGION_INVALIDATE = 4;
+
+ protected static final Integer CALLBACK_CREATE_INTEGER = new Integer(CALLBACK_CREATE);
+ protected static final Integer CALLBACK_UPDATE_INTEGER = new Integer(CALLBACK_UPDATE);
+ protected static final Integer CALLBACK_INVALIDATE_INTEGER = new Integer(CALLBACK_INVALIDATE);
+ protected static final Integer CALLBACK_DESTROY_INTEGER = new Integer(CALLBACK_DESTROY);
+ protected static final Integer CALLBACK_REGION_INVALIDATE_INTEGER =
new Integer(CALLBACK_REGION_INVALIDATE);
private static class CallbackWrapper {
@@ -1460,4 +1460,3 @@ public class SlowRecDUnitTest extends JUnit4CacheTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
index e801392..b636580 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
@@ -16,7 +16,7 @@
/**
* Test various distributed aspects of transactions, e.g. locking/reservation symantics that do not
* need multiple Region configurations. For those tests see <code>MultiVMRegionTestCase</code>.
- *
+ *
*
* @since GemFire 4.0
* @see MultiVMRegionTestCase
@@ -1016,7 +1016,7 @@ public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
* A class used in testLockBatchParticipantsUpdate to pause a transaction in the afterResrvation
* and afterSend states.
*/
- static public class PausibleTX implements Runnable {
+ public static class PausibleTX implements Runnable {
public boolean isRunning = false;
public String rgnName = null;
public Cache myCache = null;
@@ -1557,4 +1557,3 @@ public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java
index f1d74ab..17cc3fb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+
import javax.naming.Context;
import javax.transaction.UserTransaction;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
index aa4a861..a9d9149 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
@@ -16,7 +16,7 @@
/**
* Test the distribution limitations of transactions. Other tests can be found in
* <code>MultiVMRegionTestCase</code>.
- *
+ *
*
* @since GemFire 4.0
* @see MultiVMRegionTestCase
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
index 3004ea8..4d014b1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
@@ -33,7 +33,7 @@ public abstract class TestCacheCallback implements CacheCallback {
/** Was a callback event method invoked? */
volatile boolean invoked = false;
- volatile protected Throwable callbackError = null;
+ protected volatile Throwable callbackError = null;
/**
* Returns whether or not one of this <code>CacheListener</code> methods was invoked. Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
index b7f811a..ee9299f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.cache30;
+import java.util.*;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.*;
-import java.util.*;
/**
* A <code>CacheListener</code> used in testing. Its callback methods are implemented to thrown
@@ -50,7 +51,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
/**
* Enables collection of event history.
- *
+ *
* @since GemFire 5.0
*/
public void enableEventHistory() {
@@ -61,7 +62,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
/**
* Disables collection of events.
- *
+ *
* @since GemFire 5.0
*/
public void disableEventHistory() {
@@ -71,7 +72,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
/**
* Returns a copy of the list of events collected in this listener's history. Also clears the
* current history.
- *
+ *
* @since GemFire 5.0
*/
public List getEventHistory() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
index ea1ed1a..5375689 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache30;
-// import org.apache.geode.internal.LocalLogWriter;
import org.apache.geode.cache.*;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java b/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java
index 771e591..2d29e5f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.LogWriter;
import org.apache.geode.cache.*;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.LogWriter;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.internal.logging.LoggingThreadGroup;
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index f75bc8b..8eb2af7 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -28,16 +28,6 @@ import static org.assertj.core.api.Assertions.fail;
import static org.hamcrest.core.Is.is;
import static org.junit.Assume.assumeThat;
-import org.apache.geode.codeAnalysis.decode.CompiledClass;
-import org.apache.geode.codeAnalysis.decode.CompiledField;
-import org.apache.geode.codeAnalysis.decode.CompiledMethod;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -51,6 +41,17 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import org.apache.geode.codeAnalysis.decode.CompiledClass;
+import org.apache.geode.codeAnalysis.decode.CompiledField;
+import org.apache.geode.codeAnalysis.decode.CompiledMethod;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class AnalyzeSerializablesJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethods.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethods.java
index f59eb17..d63e944 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethods.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethods.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.codeAnalysis;
-import org.apache.geode.codeAnalysis.decode.CompiledClass;
-import org.apache.geode.codeAnalysis.decode.CompiledMethod;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.geode.codeAnalysis.decode.CompiledClass;
+import org.apache.geode.codeAnalysis.decode.CompiledMethod;
+
public class ClassAndMethods implements Comparable {
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndVariableDetails.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndVariableDetails.java
index 2211980..b8630b9 100755
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndVariableDetails.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndVariableDetails.java
@@ -28,7 +28,7 @@ import org.apache.geode.codeAnalysis.decode.CompiledField;
/**
* A class used to store the names of dataserializable classes and the sizes of their
* toData/fromData methods.
- *
+ *
*
*/
public class ClassAndVariableDetails implements Comparable {
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java
index 036353e..7d63037 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java
@@ -43,7 +43,7 @@ public class CompiledClassUtils {
/**
* Parse the given class files and return a map of name->Dclass. Any IO exceptions are consumed by
* this method and written to stderr.
- *
+ *
* @param classFiles
* @return the parsed classes
*/
@@ -66,7 +66,7 @@ public class CompiledClassUtils {
/**
* Parse the files in the given jar file and return a map of name->CompiledClass. Any IO
* exceptions are consumed by this method and written to stderr.
- *
+ *
* @param jar the jar file holding classes
*/
public static Map<String, CompiledClass> parseClassFilesInJar(File jar) {
@@ -119,7 +119,7 @@ public class CompiledClassUtils {
/**
* returns a collection of all of the .class files in the given list of files and directories.
- *
+ *
* @param filenames a list of the files and directories to examine
* @param recursive whether to recurse into subdirectories
* @return a sorted list of the .class files found
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
index 4b03c92..f572c61 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractLauncher.ServiceState}. Tests marshalling of ServiceState to and
* from JSON.
- *
+ *
* @since GemFire 7.0
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java
index 3a69786..04f19a0 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.distributed;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.test.dunit.standalone.DUnitLauncher;
-
import java.rmi.Naming;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.test.dunit.standalone.DUnitLauncher;
+
public class DistributedLockBlackboardImpl extends UnicastRemoteObject
implements DistributedLockBlackboard {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
index 277c604..f152092 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -56,6 +55,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -393,7 +393,7 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Accessed by reflection. DO NOT REMOVE
- *
+ *
* @param i
* @return
*/
@@ -421,7 +421,7 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Accessed via reflection. DO NOT REMOVE
- *
+ *
* @param serviceName
* @return
*/
@@ -436,7 +436,7 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Accessed via reflection. DO NOT REMOVE.
- *
+ *
* @param serviceName
* @return
*/
@@ -450,7 +450,7 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Accessed via reflection. DO NOT REMOVE.
- *
+ *
* @param serviceName
*/
protected static void becomeLockGrantor(String serviceName) {
@@ -2349,7 +2349,7 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Accessed via reflection. DO NOT REMOVE
- *
+ *
* @param serviceName
* @param name
* @return
@@ -3212,4 +3212,3 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
index eb0e658..116fce8 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
@@ -14,6 +14,19 @@
*/
package org.apache.geode.distributed;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.test.dunit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.jgroups.protocols.pbcast.GMS;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.IncompatibleSystemException;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -29,18 +42,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.jgroups.protocols.pbcast.GMS;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
/**
* Tests the functionality of the {@link DistributedMember} class.
@@ -272,7 +273,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
*
* This test ensures that the membership manager can detect and replace a partial ID with one that
* is not partial
- *
+ *
* @throws Exception
*/
@Test
@@ -450,5 +451,3 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
index 2e9550a..16bda85 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
@@ -27,12 +27,6 @@ import static org.apache.geode.test.dunit.Host.getHost;
import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
import static org.assertj.core.api.Assertions.*;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -42,6 +36,12 @@ import java.net.UnknownHostException;
import java.util.Enumeration;
import java.util.Properties;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelException;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.cache.AttributesFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
index 5d82ee0..5957471 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
@@ -21,7 +21,6 @@ import java.io.FileWriter;
import java.net.URL;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -30,6 +29,7 @@ import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Integration tests for DistributedSystem class. These tests require file system I/O.
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
index 548d107..a9178e8 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
@@ -16,12 +16,12 @@ package org.apache.geode.distributed;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
index 1eeef07..1b87c85 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
@@ -14,6 +14,21 @@
*/
package org.apache.geode.distributed;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Host.getHost;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.AbstractLauncher.Status;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.LocatorState;
@@ -30,24 +45,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Host.getHost;
/**
* Extracted from LocatorLauncherLocalIntegrationTest.
- *
+ *
* @since GemFire 8.0
*/
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
index 087f13b..7cda2cb 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* <p>
* This test is an experiment in using given/when/then custom methods for better BDD readability.
- *
+ *
* @since GemFire 8.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index cbe5938..446385d 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -43,9 +43,19 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.geode.distributed.internal.HighPriorityAckedMessage;
-import org.apache.geode.test.dunit.AsyncInvocation;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.ForcedDisconnectException;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.LogWriter;
@@ -56,6 +66,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.internal.DistributionException;
import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.HighPriorityAckedMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.MembershipListener;
@@ -73,6 +84,7 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.internal.tcp.Connection;
+import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
@@ -86,21 +98,10 @@ import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
/**
* Tests the ability of the {@link Locator} API to start and stop locators running in remote VMs.
- *
+ *
* @since GemFire 4.0
*/
@Category({DistributedTest.class, MembershipTest.class})
@@ -1973,7 +1974,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
/**
* Tests starting, stopping, and restarting a locator. See bug 32856.
- *
+ *
* @since GemFire 4.1
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
index d7c96d6..a14cb55 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -14,6 +14,28 @@
*/
package org.apache.geode.distributed;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.internal.AvailablePort.SOCKET;
+import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntSupplier;
+
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.SystemConnectException;
import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
@@ -35,28 +57,6 @@ import org.apache.geode.management.internal.configuration.messages.SharedConfigu
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.function.IntSupplier;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.AvailablePort.SOCKET;
-import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
-import static org.junit.Assert.*;
-
-import org.awaitility.Awaitility;
@Category({IntegrationTest.class, MembershipTest.class})
@RunWith(Parameterized.class)
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
index 89d2507..74148da 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
@@ -19,6 +19,13 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_UDP_DHALGO;
+import java.util.Properties;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.AvailablePort;
@@ -29,12 +36,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
@Category({DistributedTest.class, MembershipTest.class, FlakyTest.class}) // Flaky: GEODE-2542
public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
index 77ad879..aa1a799 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,6 +32,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Tests the setting of Roles in a DistributedSystem
@@ -171,4 +171,3 @@ public class RoleDUnitTest extends JUnit4DistributedTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
index 7b94e6f..5a25244 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* Subclass of {@link ServerLauncherLocalIntegrationTest} which forces the code to not find the
* Attach API. As a result {@link ServerLauncher} ends up using the FileProcessController
* implementation.
- *
+ *
* @since GemFire 8.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
index ccdd02e..0ae1279 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
@@ -22,7 +22,6 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,6 +39,7 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
@Category({DistributedTest.class, MembershipTest.class})
public class Bug40751DUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index 5a1dbf0..e2ed714 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -382,7 +382,7 @@ public class ConsoleDistributionManagerDUnitTest extends JUnit4CacheTestCase
// }
/**
* Accessed via reflection. DO NOT REMOVE
- *
+ *
* @return
*/
protected static long remoteGetConId() {
@@ -395,7 +395,7 @@ public class ConsoleDistributionManagerDUnitTest extends JUnit4CacheTestCase
/**
* Accessed via reflection. DO NOT REMOVE
- *
+ *
* @param lockName
* @return
*/
@@ -435,7 +435,7 @@ public class ConsoleDistributionManagerDUnitTest extends JUnit4CacheTestCase
/**
* INVOKED VIA REFLECTION
- *
+ *
* @return
*/
protected static InternalDistributedMember remoteGetJavaGroupsIdForVM() {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java
index eabc8bf..f6ee8e0 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.distributed.internal;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.Version;
-
import java.io.*;
import java.text.*;
import java.util.*;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.Version;
+
/**
* This message simply contains a date
*/
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
index ac3eaa3..cbc2910 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
@@ -20,9 +20,10 @@ import static org.apache.geode.distributed.internal.DefaultPropertiesGenerator.g
import static org.apache.geode.internal.lang.SystemUtils.getClassPath;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
import org.junit.After;
import org.junit.Before;
@@ -32,10 +33,9 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class DefaultPropertiesGeneratorIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
index 37e0140..27419ce 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,6 +32,7 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
@Category({DistributedTest.class, MembershipTest.class})
public class DistributionAdvisorDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
index ab5124a..1e73ee4 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
@@ -18,10 +18,11 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DistributionAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
index 24d8a8a..66bef78 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
@@ -17,16 +17,13 @@ package org.apache.geode.distributed.internal;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.test.dunit.Assert.*;
-import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.awaitility.Awaitility;
-
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Rule;
@@ -65,7 +62,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* This class tests the functionality of the {@link DistributionManager} class.
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java
index 5e37c18..a648d3b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java
@@ -20,12 +20,13 @@ import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.concurrent.Executor;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.concurrent.Executor;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class DistributionManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
index df6e7c5..33172ec 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
@@ -18,10 +18,11 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DistributionMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
index 5a191bb..dd4147a 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Enumeration;
import java.util.Properties;
import java.util.logging.Level;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Ignore;
@@ -48,11 +47,12 @@ import org.apache.geode.internal.ConfigSource;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Tests the functionality of the {@link InternalDistributedSystem} class. Mostly checks
* configuration error checking.
- *
+ *
* @since GemFire 2.1
*/
@Category({IntegrationTest.class, MembershipTest.class})
@@ -74,7 +74,7 @@ public class InternalDistributedSystemJUnitTest {
/**
* Disconnects any distributed system that was created by this test
- *
+ *
* @see DistributedSystem#disconnect
*/
@After
@@ -243,7 +243,7 @@ public class InternalDistributedSystemJUnitTest {
/**
* Creates a new <code>DistributionConfigImpl</code> with the given locators string.
- *
+ *
* @throws IllegalArgumentException If <code>locators</code> is malformed
* @since GemFire 4.0
*/
@@ -256,7 +256,7 @@ public class InternalDistributedSystemJUnitTest {
/**
* Tests that both the traditional syntax ("host[port]") and post bug-32306 syntax ("host:port")
* can be used with locators.
- *
+ *
* @since GemFire 4.0
*/
@Test
@@ -813,7 +813,7 @@ public class InternalDistributedSystemJUnitTest {
/**
* Detect LinkLocal IPv6 address where the interface is missing, ie %[0-9].
- *
+ *
* @see InetAddress#isLinkLocalAddress()
*/
private static boolean isIPv6LinkLocalAddress(Inet6Address addr) {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
index 356c79f..4d3d118 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
@@ -19,17 +19,18 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.logging.log4j.LogWriterAppender;
-import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.util.Properties;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.util.Properties;
+import org.apache.geode.distributed.Locator;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.logging.log4j.LogWriterAppender;
+import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class InternalLocatorIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
index 15e9b91..be54bc4 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
@@ -37,7 +37,7 @@ public class LocatorLoadSnapshotIntegrationTest {
/**
* A basic test of concurrent functionality. Starts a number of threads making requests and
* expects the load to be balanced between three servers.
- *
+ *
* @throws InterruptedException
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProduceDateMessages.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProduceDateMessages.java
index 231e184..fac42fb 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProduceDateMessages.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProduceDateMessages.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.distributed.internal;
-// import org.apache.geode.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.Assert;
import java.util.Date;
import java.util.Properties;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.Assert;
+
/**
* A little program that periodically produces {@link DateMessage}s.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
index 809b2d2..c2e843d 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
@@ -23,8 +23,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,6 +42,8 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
@Category({DistributedTest.class, MembershipTest.class})
public class ProductUseLogDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
index 4374e85..0282271 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
@@ -20,7 +20,6 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -29,6 +28,7 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, MembershipTest.class}) // Fails on Windows -- see GEODE-373
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
index 224e845..f77f3cf 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
@@ -18,10 +18,11 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ReplyProcessor21Test {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
index af8475b..0791163 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.*;
import java.io.IOException;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -27,6 +26,7 @@ import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* </p>
* TODO: write more unit tests for this class...
* </p>
- *
+ *
* @see org.apache.geode.distributed.internal.ServerLocator
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
index b5a62ca..7a411ac 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
@@ -24,19 +24,19 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.ByteArrayData;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests {@link StartupMessageData}.
- *
+ *
* @since GemFire 7.0
*/
@Category({UnitTest.class, MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
index d71b7e1..08424f0 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
@@ -18,6 +18,19 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
@@ -37,18 +50,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
@Category(DistributedTest.class)
public class GemFireDeadlockDetectorDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java
index 4aeb112..0969696 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java
@@ -87,4 +87,3 @@ public class DLockGrantorHelper {
// }
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
index 937cc1b..55256c7 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.distributed.internal.locks;
-import org.apache.geode.cache.*;
-import org.apache.geode.test.junit.categories.DLockTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.geode.cache.*;
+import org.apache.geode.test.junit.categories.DLockTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category({IntegrationTest.class, DLockTest.class})
public class DLockReentrantLockJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java
index ba300c4..f38d8e3 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java
@@ -20,6 +20,13 @@ import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.ExpirationAction;
@@ -28,12 +35,6 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.internal.cache.DistributedRegion;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
public class DLockServiceCharacterizationTests {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
index bd85eb9..57ec149 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
@@ -19,19 +19,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.ExpirationAction;
-import org.apache.geode.cache.ExpirationAttributes;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.Scope;
-import org.apache.geode.internal.cache.DistributedRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.util.Collection;
import java.util.LinkedList;
import java.util.Properties;
@@ -43,6 +30,20 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.Lock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class DLockServiceLeakTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
index 837f1d4..663cd15 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
@@ -16,9 +16,9 @@ package org.apache.geode.distributed.internal.membership;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.Before;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
index b0e20d9..477e0c5 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
@@ -29,6 +29,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.File;
+import java.net.InetAddress;
+import java.util.List;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.Locator;
@@ -58,13 +66,6 @@ import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Properties;
@Category({IntegrationTest.class, MembershipJUnitTest.class})
public class MembershipJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
index fef77de..7eecc53 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
@@ -23,13 +23,13 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index b5e4cfc..9dde5df 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -25,14 +25,14 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import java.net.InetAddress;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
import org.jgroups.util.UUID;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.MemberAttributes;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -194,7 +194,7 @@ public class GMSMemberJUnitTest {
* <p>
* This must be backward-compatible with Geode 1.0 (Version.GFE_90)
* </p>
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
index 4b4587a..485bb6c 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
/**
* This helper class provides access to membership manager information that is not otherwise public
- *
+ *
* @since GemFire 5.5
*/
public class MembershipManagerHelper {
@@ -48,7 +48,7 @@ public class MembershipManagerHelper {
* <p>
* Note that part of beSickMember's processing is to interrupt and stop any reader threads. A slow
* listener in a reader thread should eat this interrupt.
- *
+ *
* @param sys
*/
public static void beSickMember(DistributedSystem sys) {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
index e8c4e73..a0004ed 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
@@ -17,6 +17,15 @@ package org.apache.geode.distributed.internal.membership.gms.auth;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.security.Principal;
+import java.util.Properties;
+
+import org.apache.shiro.subject.Subject;
+import org.junit.Before;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -27,14 +36,6 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.AuthInitialize;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.Authenticator;
-import org.apache.shiro.subject.Subject;
-import org.junit.Before;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.security.Principal;
-import java.util.Properties;
public abstract class AbstractGMSAuthenticatorTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
index 04eb885..0ef8c2b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
@@ -169,4 +169,3 @@ public class GMSAuthenticatorWithSecurityManagerTest extends AbstractGMSAuthenti
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index e7109ca..0b886b2 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -14,6 +14,35 @@
*/
package org.apache.geode.distributed.internal.membership.gms.fd;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.*;
+
+import java.io.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.jgroups.util.UUID;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -32,41 +61,12 @@ import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRe
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.jgroups.util.UUID;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import java.io.*;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.*;
-
-import org.awaitility.Awaitility;
@Category({IntegrationTest.class, MembershipTest.class})
public class GMSHealthMonitorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index 40c058b..46fffa7 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -25,6 +25,17 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.ObjectOutputStream;
+import java.net.InetAddress;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.distributed.Locator;
@@ -44,16 +55,6 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
-import java.net.InetAddress;
-import java.util.Properties;
@Category({IntegrationTest.class, MembershipTest.class})
public class GMSLocatorRecoveryJUnitTest {
@@ -192,4 +193,3 @@ public class GMSLocatorRecoveryJUnitTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index f4bdbbf..7389465 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -29,10 +29,31 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.DistributionManager;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Timer;
+import java.util.concurrent.TimeUnit;
+
import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.internal.verification.Times;
+import org.mockito.verification.Timeout;
+
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
@@ -62,26 +83,6 @@ import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.internal.verification.Times;
-import org.mockito.verification.Timeout;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Timer;
-import java.util.concurrent.TimeUnit;
@Category({IntegrationTest.class, MembershipTest.class})
public class GMSJoinLeaveJUnitTest {
@@ -321,7 +322,7 @@ public class GMSJoinLeaveJUnitTest {
/**
* prepares and install a view
- *
+ *
* @throws IOException
*/
private void prepareAndInstallView(InternalDistributedMember coordinator,
@@ -865,7 +866,7 @@ public class GMSJoinLeaveJUnitTest {
/**
* If a locator is started and sends out a view to take control of the cluster another member that
* is also in the process of sending out a view should relinquish control to the new locator.
- *
+ *
* @throws Exception
*/
@Test
@@ -1395,4 +1396,3 @@ public class GMSJoinLeaveJUnitTest {
gmsJoinLeave.processMessage(msg);
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index c0d9aa5..41a34fb 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -14,6 +14,26 @@
*/
package org.apache.geode.distributed.internal.membership.gms.membership;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.*;
+
+import java.util.Properties;
+import java.util.concurrent.RejectedExecutionException;
+
+import org.jgroups.Event;
+import org.jgroups.Message;
+import org.jgroups.protocols.UNICAST3.Header;
+import org.jgroups.protocols.pbcast.NakAckHeader2;
+import org.jgroups.stack.Protocol;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.LonerDistributionManager.DummyDMStats;
@@ -25,25 +45,6 @@ import org.apache.geode.distributed.internal.membership.gms.messenger.StatRecord
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.jgroups.Event;
-import org.jgroups.Message;
-import org.jgroups.protocols.UNICAST3.Header;
-import org.jgroups.protocols.pbcast.NakAckHeader2;
-import org.jgroups.stack.Protocol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.concurrent.RejectedExecutionException;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.*;
/**
* This class tests the GMS StatRecorder class, which records JGroups messaging statistics
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
index 78d508bf..a71e767 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
@@ -16,27 +16,10 @@ package org.apache.geode.distributed.internal.membership.gms.messenger;
import static org.mockito.Mockito.*;
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.distributed.internal.membership.NetView;
-import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
-import org.apache.geode.distributed.internal.membership.gms.Services;
-import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.math.BigInteger;
import java.security.Key;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
-
-import org.junit.experimental.categories.Category;
-
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
@@ -50,6 +33,21 @@ import javax.crypto.Mac;
import javax.crypto.SecretKey;
import javax.crypto.spec.DHParameterSpec;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.NetView;
+import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
+import org.apache.geode.distributed.internal.membership.gms.Services;
+import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
+
@Category({IntegrationTest.class, MembershipTest.class})
public class GMSEncryptJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
index 133b2f8..87d9206 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
@@ -24,8 +24,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.jgroups.Event;
import org.jgroups.JChannel;
import org.jgroups.Message;
@@ -42,6 +40,8 @@ import org.mockito.stubbing.Answer;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({IntegrationTest.class, MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index e82f1dd..98134bd 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -14,34 +14,6 @@
*/
package org.apache.geode.distributed.internal.membership.gms.messenger;
-import org.apache.geode.ForcedDisconnectException;
-import org.apache.geode.GemFireIOException;
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.distributed.DistributedSystemDisconnectedException;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.distributed.internal.membership.NetView;
-import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
-import org.apache.geode.distributed.internal.membership.gms.Services;
-import org.apache.geode.distributed.internal.membership.gms.Services.Stopper;
-import org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor;
-import org.apache.geode.distributed.internal.membership.gms.interfaces.JoinLeave;
-import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager;
-import org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler;
-import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
-import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
-import org.apache.geode.distributed.internal.membership.gms.messages.InstallViewMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.JoinRequestMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.JoinResponseMessage;
-import org.apache.geode.distributed.internal.membership.gms.messages.LeaveRequestMessage;
-import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger.JGroupsReceiver;
-import org.apache.geode.internal.*;
-import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
-import org.apache.geode.internal.cache.DistributedCacheOperation;
-import org.apache.geode.internal.logging.log4j.AlertAppender;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.*;
@@ -60,7 +32,6 @@ import java.util.Properties;
import java.util.Set;
import org.apache.commons.lang.SerializationException;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.jgroups.Address;
import org.jgroups.Event;
import org.jgroups.JChannel;
@@ -74,6 +45,11 @@ import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.ForcedDisconnectException;
+import org.apache.geode.GemFireIOException;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -81,11 +57,34 @@ import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.SerialAckedMessage;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.NetView;
+import org.apache.geode.distributed.internal.membership.gms.GMSMember;
+import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
+import org.apache.geode.distributed.internal.membership.gms.Services;
+import org.apache.geode.distributed.internal.membership.gms.Services.Stopper;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.JoinLeave;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager;
+import org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler;
+import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
+import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
+import org.apache.geode.distributed.internal.membership.gms.messages.InstallViewMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.JoinRequestMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.JoinResponseMessage;
+import org.apache.geode.distributed.internal.membership.gms.messages.LeaveRequestMessage;
+import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger.JGroupsReceiver;
+import org.apache.geode.internal.*;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
+import org.apache.geode.internal.cache.DistributedCacheOperation;
+import org.apache.geode.internal.logging.log4j.AlertAppender;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
@Category({IntegrationTest.class, MembershipTest.class})
public class JGroupsMessengerJUnitTest {
@@ -1125,7 +1124,7 @@ public class JGroupsMessengerJUnitTest {
/**
* creates an InternalDistributedMember address that can be used with the doctored JGroups
* channel. This includes a logical (UUID) address and a physical (IpAddress) address.
- *
+ *
* @param port the UDP port to use for the new address
*/
private InternalDistributedMember createAddress(int port) {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
index c58eb31..36d86b7 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
@@ -23,6 +23,21 @@ import static org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.PoolStatHelper;
@@ -36,20 +51,6 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.mockito.Mockito;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
@Category({IntegrationTest.class, MembershipTest.class})
public class TCPServerSSLJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 0bcf608..9daaca5 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,13 +32,14 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* This tests the rolling upgrade for locators with different GOSSIPVERSION.
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
index d02051f..0c46e4f 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
@@ -19,6 +19,22 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.distributed.DistributedSystem;
@@ -30,21 +46,6 @@ import org.apache.geode.internal.cache.tier.sockets.TcpServerFactory;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
@Category({IntegrationTest.class, MembershipTest.class})
public class TcpServerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
index b7c691d..f2aee6e 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
@@ -14,18 +14,16 @@
*/
package org.apache.geode.disttx;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache30.CacheMapTxnDUnitTest;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
index e72823e..d3c2c78 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
@@ -22,6 +22,9 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.AttributesFactory;
@@ -46,9 +49,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
/**
* TODO: reenable this test and fix it when work on Dist TX resumes -- it fails with no members to
* host buckets
@@ -710,7 +710,7 @@ public class DistTXDebugDUnitTest extends JUnit4CacheTestCase {
/**
* @param dataNodeAsCoordinator TODO
- *
+ *
*/
private void performRR_removeAllTest(boolean dataNodeAsCoordinator) {
createCacheInAllVms();
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXExpiryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXExpiryJUnitTest.java
index bcde81b..2948c3d 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXExpiryJUnitTest.java
@@ -14,21 +14,22 @@
*/
package org.apache.geode.disttx;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.util.Properties;
+
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.TXExpiryJUnitTest;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Scope;
-import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
/**
* Same tests as that of {@link TXExpiryJUnitTest} after setting "distributed-transactions" property
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
index ac94676..fc500f9 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.disttx;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
import static junit.framework.TestCase.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
index 5232dfa..0436ee1 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.disttx;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.util.Properties;
+
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.offheap.TxReleasesOffHeapOnCloseJUnitTest;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigJUnitTest.java
index 0a7c5ca..ca20d45 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigJUnitTest.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.lang.reflect.Method;
import java.util.Map;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class AbstractConfigJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
index 88105d3..3be74aa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AbstractConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
index 57ebd10..5b21bc2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.internal;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AssertJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelper.java b/geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelper.java
index 6a1c1d4..b9df4ef 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelper.java
@@ -44,7 +44,7 @@ public class AvailablePortHelper {
/**
* Returns an array of unique randomly available tcp ports
- *
+ *
* @param count number of desired ports
* @param useMembershipPortRange whether to use the configured membership-port-range
* @return the ports
@@ -207,4 +207,3 @@ public class AvailablePortHelper {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java
index 8134f36..d2afb83 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.admin.internal.InetAddressUtil;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.admin.internal.InetAddressUtil;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* multicast availability is tested in JGroupsMessengerJUnitTest
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index b42a923..025d149 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -37,17 +30,21 @@ import java.util.ArrayList;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test the DSFID serialization framework added for rolling upgrades in 7.1
- *
- *
- *
+ *
+ *
+ *
*/
@Category(DistributedTest.class)
public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTestCase {
@@ -88,7 +85,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
/**
* Test if correct toData/toDataPreXXX is called when changes are made to the TestMessage in 66
* and 70 and version of peer is 56
- *
+ *
* @throws Exception
*/
@Test
@@ -103,7 +100,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
/**
* Test if correct toData/toDataXXX is called when changes are made to the TestMessage in 66 and
* 70 and version of peer is 70
- *
+ *
* @throws Exception
*/
@Test
@@ -117,7 +114,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
/**
* Test if correct fromData/fromDataXXX is called when changes are made to the TestMessage in 66
* and 70 and version of peer is 70
- *
+ *
* @throws Exception
*/
@Test
@@ -134,7 +131,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
/**
* Test if correct fromData/fromDataXXX is called when changes are made to the TestMessage in 66
* and 70 and version of peer is 56
- *
+ *
* @throws Exception
*/
@Test
@@ -151,7 +148,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
/**
* Test if all messages implement toDataPreXXX and fromDataPreXXX if the message has been upgraded
* in any of the versions
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/Bug51616JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/Bug51616JUnitTest.java
index 9810caf..33ddb40 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/Bug51616JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/Bug51616JUnitTest.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.cache.*;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class Bug51616JUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ByteArrayData.java b/geode-core/src/test/java/org/apache/geode/internal/ByteArrayData.java
index 7022cad..ebb3cb5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/ByteArrayData.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ByteArrayData.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.tcp.ByteBufferInputStream;
/**
* Provides byte stream for testing. Use {@link #getDataInput()} and {@link #getDataOutput()} to get
* DataInput or DataOutput as needed for testing.
- *
+ *
* @since GemFire 7.0
*/
public class ByteArrayData {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
index ac61687..19db094 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
@@ -14,21 +14,17 @@
*/
package org.apache.geode.internal;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.SerializationException;
import org.apache.geode.cache.AttributesFactory;
@@ -51,6 +47,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
index 772e644..c442b19 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
@@ -54,9 +54,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.test.compiler.ClassBuilder;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.RestoreTCCLRule;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
/**
* Integration tests for {@link ClassPathLoader}.
@@ -613,7 +613,7 @@ public class ClassPathLoaderIntegrationTest {
/**
* Currently unused but potentially useful for some future test. This causes this loader to only
* generate a class that the parent could not find.
- *
+ *
* @param parent the parent class loader to check with first
*/
@SuppressWarnings("unused")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
index 0daa842..99acbc9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ClassPathLoader}.
- *
+ *
* @since GemFire 6.5.1.4
*/
@Category(UnitTest.class)
@@ -559,7 +559,7 @@ public class ClassPathLoaderTest {
/**
* Currently unused but potentially useful for some future test. This causes this loader to only
* generate a class that the parent could not find.
- *
+ *
* @param parent the parent class loader to check with first
*/
@SuppressWarnings("unused")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 12e20c7..4de1470 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -2732,7 +2732,7 @@ public class DataSerializableJUnitTest implements Serializable {
/**
* A <code>DataSerializer</code> that provides default implementations of its methods.
*/
- private static abstract class DataSerializerImpl extends DataSerializer {
+ private abstract static class DataSerializerImpl extends DataSerializer {
public DataSerializerImpl() {}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DeployedJarJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DeployedJarJUnitTest.java
index 853696a..abaa458 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DeployedJarJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DeployedJarJUnitTest.java
@@ -18,8 +18,8 @@ package org.apache.geode.internal;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.junit.Before;
@@ -28,8 +28,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.io.IOException;
+import org.apache.geode.test.compiler.JarBuilder;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class DeployedJarJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
index cbc6acf..076167e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test of methods on HeapDataOutputStream
- *
+ *
* TODO right now this just tests the new write(ByteBuffer) method. We might want to add some unit
* tests for the existing methods.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
index fa79ff2..f8f9eba 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class HeapDataOutputStreamTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InlineKeyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/InlineKeyJUnitTest.java
index 526750d..1b333ed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InlineKeyJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Properties;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -26,16 +37,6 @@ import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapStringKey1;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapStringKey2;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapUUIDKey;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.UUID;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
@Category(IntegrationTest.class)
public class InlineKeyJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
index b60dd49..28bc6e9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
@@ -16,19 +16,20 @@ package org.apache.geode.internal;
import static org.junit.Assert.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
import com.pholser.junit.quickcheck.Property;
import com.pholser.junit.quickcheck.runner.JUnitQuickcheck;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the serialization and deserialization of randomly generated Strings.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
index 4d9f480..32ae5f5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
@@ -19,11 +19,12 @@ import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.ObjIdConcurrentMap.Segment;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.ObjIdConcurrentMap.Segment;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ObjIdConcurrentMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
index 435655d..38708d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
@@ -21,6 +21,17 @@ import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
@@ -40,16 +51,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
@Category(DistributedTest.class)
public class PdxDeleteFieldDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
index affa7e3..6a79bc8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
@@ -19,7 +19,14 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
+import java.io.File;
+import java.util.Collection;
+import java.util.Properties;
+
import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
@@ -41,12 +48,6 @@ import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PdxUnreadData;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Properties;
@Category(IntegrationTest.class)
public class PdxDeleteFieldJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
index b05285a..3720234 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
@@ -21,6 +21,17 @@ import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
@@ -41,16 +52,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
@Category(DistributedTest.class)
public class PdxRenameDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
index 561e8df..eb4423b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
@@ -18,7 +18,15 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
+import java.io.File;
+import java.util.Collection;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
@@ -32,13 +40,6 @@ import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Properties;
-import java.util.regex.Pattern;
@Category(IntegrationTest.class)
public class PdxRenameJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
index 7d7d36c..6055e83 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.fail;
/**
* See bug 52093. Make sure that the contents of arrays are used to test equality on regions ops.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
index e1fe4c1..b8c21b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
@@ -14,21 +14,22 @@
*/
package org.apache.geode.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.management.GemFireProperties;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertTrue;
/**
* Test that DistributionConfigImpl handles SSL options correctly.
- *
+ *
*/
@Category(IntegrationTest.class)
public class SSLConfigIntegrationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
index f47d40e..18f553c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
@@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.awaitility.Awaitility;
@Category(IntegrationTest.class)
public class ScheduledThreadPoolExecutorWithKeepAliveJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
index f645ddb..8818b52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests UniqueIdGenerator.
- *
+ *
* @since GemFire 5.0.2 (cbb5x_PerfScale)
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
index 3c7f083..bb26774 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
@@ -20,9 +20,9 @@ import static org.junit.Assert.assertFalse;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.junit.Test;
-import org.junit.Before;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
index d994fe9..0358ebf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
@@ -19,10 +19,11 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AbstractDiskRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java
index abead95..374b2ce 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java
@@ -20,10 +20,11 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AbstractLRURegionMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
index 5bb60ed..258dff2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
@@ -18,11 +18,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AbstractOplogDiskRegionEntryTest {
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 17acc95..da5c7b0 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
@@ -66,7 +66,7 @@ public class AbstractRegionJUnitTest {
/**
* Test method for {@link AbstractRegion#getExtensionPoint()}.
- *
+ *
* Assert that method returns a {@link SimpleExtensionPoint} instance and assume that
* {@link org.apache.geode.internal.cache.extension.SimpleExtensionPointJUnitTest} has covered the
* rest.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
index 893d842..a06175a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
@@ -30,14 +30,15 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Operation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionHolder;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class AbstractRegionMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
index adbfa02..6c75a4b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class AbstractRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
index d3445df..9c45e2d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
@@ -19,7 +19,30 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
+
import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.admin.internal.PrepareBackupRequest;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -51,29 +74,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.Serializable;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Pattern;
-
@Category(DistributedTest.class)
public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
Logger logger = LogManager.getLogger(BackupDUnitTest.class);
@@ -378,7 +378,7 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
/**
* Test for bug 42420. Invoke a backup when a bucket is in the middle of being moved.
- *
+ *
* @param observer - a message observer that triggers at the backup at the correct time.
*/
private void backupWhileBucketIsMoved(final DistributionMessageObserver observer)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
index 28dc662..af85980 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
@@ -20,24 +20,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.*;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.commons.io.filefilter.RegexFileFilter;
-
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.DiskStore;
-import org.apache.geode.cache.DiskStoreFactory;
-import org.apache.geode.cache.EvictionAction;
-import org.apache.geode.cache.EvictionAttributes;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -53,6 +35,24 @@ import java.util.Properties;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class BackupJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
index 2b17f36..7d2946b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class BucketAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
index d97f3e4..ddc485e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
@@ -15,19 +15,19 @@
package org.apache.geode.internal.cache;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.internal.cache.PartitionedRegion.BucketLock;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberView;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.junit.Assert.*;
@Category(UnitTest.class)
public class BucketPersistenceAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
index 080cec1..c540d8e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
@@ -21,11 +21,12 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class BucketRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
index eaaa3aa..4d70251 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
@@ -17,8 +17,8 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyLong;
import java.io.IOException;
import java.util.concurrent.locks.Lock;
@@ -124,4 +124,3 @@ public class BucketRegionJUnitTest extends DistributedRegionJUnitTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
index 64a49c6..c316de6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
@@ -17,12 +17,12 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
+
/**
* Helper class in the internal cache package to access protected BucketRegionQueue methods.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug33726JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug33726JUnitTest.java
index 609cae1..0563528 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug33726JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug33726JUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.util.CacheListenerAdapter;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.fail;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* AFTER_REGION_CREATE was being sent before region initialization (bug 33726). Test to verify that
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java
index 67f3b67..052e6ae 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34179TooManyFilesOpenJUnitTest.java
@@ -27,12 +27,12 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region perf test for Persist only with Async writes and Buffer. Set Rolling oplog to true
* and setMaxOplogSize to 10240
- *
+ *
* If more than some number of files are open, an Exception is thrown. This ia JDK 1.4 bug. This
* test should be run after transition to JDK 1.5 to verify that the bug does not exceed.
- *
+ *
* The disk properties will ensure that very many oplog files are created.
- *
+ *
* This test is currently not being executed and is marked with an underscore
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34583JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34583JUnitTest.java
index 8204b38..10ff741 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34583JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug34583JUnitTest.java
@@ -14,22 +14,23 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
/**
* Confirm that bug 34583 is fixed. Cause of bug is recursion is entries iterator that causes stack
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37241DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37241DUnitTest.java
index 96dd104..8aec85b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37241DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37241DUnitTest.java
@@ -203,5 +203,3 @@ public class Bug37241DUnitTest extends JUnit4DistributedTestCase {
server2.invoke(() -> Bug37241DUnitTest.closeCache());
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37244JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37244JUnitTest.java
index 07f0839..2ef4115 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37244JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37244JUnitTest.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.Assert;
@@ -21,19 +30,11 @@ import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
/**
* Test for simluating the deadLock condition as in bug#37244
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class Bug37244JUnitTest {
@@ -127,12 +128,12 @@ public class Bug37244JUnitTest {
/**
* Test Implementation class of NewLRUClockHand for bug37244.
- *
- *
- *
+ *
+ *
+ *
*/
- static public class TestLRUClockHand extends NewLRUClockHand {
+ public static class TestLRUClockHand extends NewLRUClockHand {
protected static Object mutex = new Object();
@@ -142,7 +143,7 @@ public class Bug37244JUnitTest {
/**
* Constructor
- *
+ *
* @param region
* @param ccHelper
*/
@@ -179,9 +180,9 @@ public class Bug37244JUnitTest {
}
/**
- *
+ *
* clearThread
- *
+ *
*/
protected static class clearThread implements Runnable {
LocalRegion region = null;
@@ -220,9 +221,9 @@ public class Bug37244JUnitTest {
}
/**
- *
+ *
* putThread
- *
+ *
*/
protected static class putThread implements Runnable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
index e86b0c0..35e00c1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.internal.cache.entries.VersionedThinDiskRegionEntryHeapObjectKey;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -35,14 +31,17 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.entries.VersionedThinDiskRegionEntryHeapObjectKey;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Bug37377 DUNIT Test: The Clear operation during a GII in progress can leave a Entry in the Oplog
* due to a race condition wherein the clearFlag getting set after the entry gets written to the
* disk, The Test verifies the existence of the scenario.
- *
+ *
*/
@Category(DistributedTest.class)
@@ -62,7 +61,7 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase {
private static final int maxEntries = 10000;
- transient private static CountDownLatch clearLatch = new CountDownLatch(1);
+ private static transient CountDownLatch clearLatch = new CountDownLatch(1);
static Boolean clearOccurred = false;
@@ -235,7 +234,7 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase {
* The Clear operation during a GII in progress can leave a Entry in the Oplog due to a race
* condition wherein the clearFlag getting set after the entry gets written to the disk, The Test
* verifies the existence of the scenario.
- *
+ *
*/
@Test
@@ -253,7 +252,7 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase {
}
static class TestAbstractDiskRegionEntry extends VersionedThinDiskRegionEntryHeapObjectKey {
- static private VM thisVM, otherVM;
+ private static VM thisVM, otherVM;
static void setMembers(VM localVM, VM remoteVM) {
thisVM = localVM;
@@ -316,4 +315,3 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37500JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37500JUnitTest.java
index a44618c..a65b30f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37500JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37500JUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache;
+import static org.junit.Assert.*;
import static org.junit.Assert.fail;
import java.io.File;
@@ -26,12 +27,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import static org.junit.Assert.*;
-
/**
* This is a bugtest for bug 37500.
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class Bug37500JUnitTest extends DiskRegionTestingBase {
@@ -61,7 +60,7 @@ public class Bug37500JUnitTest extends DiskRegionTestingBase {
* <li>rolling = true
* <li>syncMode = true
* <li>approx size on disk for operations = 440 bytes<br>
- *
+ *
* 2.Make Roller go into WAIT state via CacheObserverAdapter.beforeGoingToCompact callback<br>
* 3.Put 440 bytes , it will go in oplog1 <br>
* 4.Put another 440 bytes ,it will go in oplog1<br>
@@ -74,7 +73,7 @@ public class Bug37500JUnitTest extends DiskRegionTestingBase {
* expecting Roller to free up the space. The roller, which has now been notified to run, tries to
* roll entry2 for which it seeks entry level lock which has been acquired by put-thread. So the
* put thread eventually comes out of the wait with DiskAccessException<br>
- *
+ *
* Another scenario for this bug is, once the disk space was getting exhausted , the entry
* operation threads which had already taken a lock on Entry got stuck trying to seek the Oplog
* Lock. The switching thread had acquired the Oplog.lock & was waiting for the roller thread to
@@ -83,8 +82,8 @@ public class Bug37500JUnitTest extends DiskRegionTestingBase {
* DiskAccessException after completing the stipulated wait. The Roller was able to free space
* only when it has rolled all the relevant entries which could happen only when the entry
* operation threads released the entry lock after getting DiskAccessException.
- *
- *
+ *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
index c86fba9..15a9a4d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug40299DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug40299DUnitTest.java
index deb79af..fe0f796 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug40299DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug40299DUnitTest.java
@@ -72,7 +72,7 @@ public class Bug40299DUnitTest extends JUnit4CacheTestCase {
/**
* This method is used to create Cache in VM0
- *
+ *
* @return CacheSerializableRunnable
*/
@@ -112,7 +112,7 @@ public class Bug40299DUnitTest extends JUnit4CacheTestCase {
/**
* This method puts in 7 in the Region
- *
+ *
* @return CacheSerializableRunnable
*/
private CacheSerializableRunnable putSomeEntries() {
@@ -130,7 +130,7 @@ public class Bug40299DUnitTest extends JUnit4CacheTestCase {
/**
* This method does concurrent NetSearch.doGet with clear in the Region
- *
+ *
* @return CacheSerializableRunnable
*/
private CacheSerializableRunnable concurrentNetSearchGetAndClear() {
@@ -184,9 +184,9 @@ public class Bug40299DUnitTest extends JUnit4CacheTestCase {
}
/**
- *
+ *
* getThread
- *
+ *
*/
protected class getThread implements Runnable {
LocalRegion region = null;
@@ -206,7 +206,7 @@ public class Bug40299DUnitTest extends JUnit4CacheTestCase {
/**
* This method verifies that region is not destroyed
- *
+ *
* @return CacheSerializableRunnable
*/
private CacheSerializableRunnable verifyRegionNotDestroyed() {
@@ -222,7 +222,7 @@ public class Bug40299DUnitTest extends JUnit4CacheTestCase {
/**
* This method destroys the Region
- *
+ *
* @return CacheSerializableRunnable
*/
private CacheSerializableRunnable destroyRegion() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
index 6d10d61..301c0f5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
@@ -19,7 +19,6 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,6 +42,7 @@ import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -163,4 +163,3 @@ public class Bug41957DUnitTest extends ClientServerTestCase {
});
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug42055DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug42055DUnitTest.java
index fa46731..fcdf327 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug42055DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug42055DUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -36,6 +32,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test that the bucket size does not go negative when we fault out and in a delta object.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug45164DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug45164DUnitTest.java
index aeb6663..a295bfe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug45164DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug45164DUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Map.Entry;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -34,6 +30,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class Bug45164DUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug47667DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug47667DUnitTest.java
index 20d64b9..eecddd5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug47667DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug47667DUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
@@ -34,6 +30,9 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class Bug47667DUnitTest extends LocatorTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
index 7a84dbc..1662e73 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -31,6 +23,10 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
@@ -51,6 +47,9 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the use of CacheDistributionAdvisor in createSubRegion
@@ -283,7 +282,7 @@ public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
/**
* coverage for bug 34255
- *
+ *
* @since GemFire 5.0
*/
@Test
@@ -293,7 +292,7 @@ public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
/**
* coverage for bug 34255
- *
+ *
* @since GemFire 5.0
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
index 3e60ef2..7efa438 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
@@ -21,11 +21,12 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class CacheOperationMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
index 8352e4a..3e87035 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
@@ -17,9 +17,9 @@ package org.apache.geode.internal.cache;
import static org.apache.geode.internal.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
-import org.junit.Test;
-import org.junit.Before;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
index 9695ff3..d31cfee 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class CacheServiceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
index 30a653b..595d340 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* ClearGlobalDUnitTest.java
- *
+ *
* Created on September 13, 2005, 1:47 PM
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
index 266ed85..bc9431b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
@@ -20,6 +20,7 @@
package org.apache.geode.internal.cache;
import static org.apache.geode.test.dunit.Assert.fail;
+
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -53,14 +54,14 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class to verify proper RVV locking interaction between entry operations such as PUT/REMOVE
* and the CLEAR region operation
- *
+ *
* GEODE-599: After an operation completed, it would unlock the RVV. This was occurring before the
* operation was distributed to other members which created a window in which another operation
* could be performed prior to that operation being distributed.
- *
+ *
* The fix for GEODE-599 was to not release the lock until after distributing the operation to the
* other members.
- *
+ *
*/
@SuppressWarnings("serial")
@@ -71,19 +72,19 @@ public class ClearRvvLockingDUnitTest extends JUnit4CacheTestCase {
public transient JUnitSoftAssertions softly = new JUnitSoftAssertions();
/*
* The tests perform a single operation and a concurrent clear.
- *
+ *
* opsVM determines where the single operation will be performed, null will perform the op on the
* test VM (vm0) clearVM determines where the clear operation will be performed, null will perform
* the clear on the test VM (vm0)
- *
+ *
* Specifying NULL/NULL for opsVM and clearVM has the effect of performing both in the same thread
* whereas specifying vm0/vm0 for example will run them both on the same vm, but different
* threads. NULL/NULL is not tested here since the same thread performing a clear prior to
* returning from a put is not possible using the public API.
- *
+ *
* Each test is performed twice once with operation and clear on the same vm, once on different
* vms.
- *
+ *
*/
VM vm0, vm1, opsVM, clearVM;
@@ -578,7 +579,7 @@ public class ClearRvvLockingDUnitTest extends JUnit4CacheTestCase {
}
static VM theOtherVM;
- transient static CountDownLatch step1Latch, step2Latch;
+ static transient CountDownLatch step1Latch, step2Latch;
public static void primeStep1Latch(int waitCount) {
step1Latch = new CountDownLatch(waitCount);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
index 1b97cc4..a2ea145 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
@@ -24,6 +24,13 @@ import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
+import org.apache.logging.log4j.Logger;
+import org.assertj.core.api.JUnitSoftAssertions;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.cache.CacheFactory;
@@ -44,23 +51,16 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.logging.log4j.Logger;
-import org.assertj.core.api.JUnitSoftAssertions;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
/**
* Test class to verify proper locking interaction between transactions and the CLEAR region
* operation.
- *
+ *
* GEODE-1740: It was observed that operations performed within a transaction were not holding
* region modification locks for the duration of commit processing. This lock is used to ensure
* region consistency during CLEAR processing. By not holding the lock for the duration of commit
* processing, a window was opened that allowed region operations such as clear to occur in
* mid-commit.
- *
+ *
* The fix for GEODE-1740 was to acquire and hold read locks for any region involved in the commit.
* This forces CLEAR to wait until commit processing is complete.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index 09f61e5..de202fa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -14,6 +14,19 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheFactory;
@@ -23,23 +36,11 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.ha.HAContainerWrapper;
import org.apache.geode.internal.cache.ha.HARegionQueue;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Test to verify that each bridge sever creates its own client_messages_region at its start and
* destroys it when it stops.
- *
+ *
* @since GemFire 5.7
*/
@Category(IntegrationTest.class)
@@ -55,7 +56,7 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest {
/**
* Create the cache in setup.
- *
+ *
* @throws Exception - thrown if any exception occurs in setUp
*/
@Before
@@ -65,7 +66,7 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest {
/**
* Create and attach bridge server to cache
- *
+ *
* @throws IOException
*/
@@ -146,7 +147,7 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest {
/**
* Close the cache in tear down *
- *
+ *
* @throws Exception - thrown if any exception occurs in tearDown
*/
@After
@@ -158,7 +159,7 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest {
/**
* Creates the cache instance for the test
- *
+ *
* @return the cache instance
* @throws CacheException - thrown if any exception occurs in cache creation
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
index 063be78..745f156 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -51,6 +50,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -847,4 +847,3 @@ public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index 0b69864..26f0771 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -50,6 +49,7 @@ import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
index 8253e55..95209b0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -35,6 +31,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* test client initiated transactions with concurrency checks enabled.
@@ -51,7 +50,7 @@ public class ClientServerTransactionCCEDUnitTest extends ClientServerTransaction
}
/**
- *
+ *
*/
private static final long serialVersionUID = -6785438240204988439L;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index c707703..cf312cd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -14,15 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.LogWriterUtils.getDUnitLogLevel;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -41,8 +39,9 @@ import javax.transaction.UserTransaction;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.*;
import org.apache.geode.cache.Region.Entry;
@@ -67,11 +66,8 @@ import org.apache.geode.internal.jta.TransactionImpl;
import org.apache.geode.internal.jta.TransactionManagerImpl;
import org.apache.geode.internal.jta.UserTransactionImpl;
import org.apache.geode.test.dunit.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.apache.geode.test.dunit.LogWriterUtils.getDUnitLogLevel;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the basic client-server transaction functionality
@@ -218,7 +214,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.RemoteTransactionDUnitTest#getVMForTransactions(dunit.VM,
* dunit.VM)
*/
@@ -1681,7 +1677,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
/**
* there is one txState and zero or more txProxyStates
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
index 66484d9..5138e98 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
@@ -15,8 +15,8 @@
package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
index c16de31..b841867 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
@@ -26,13 +26,10 @@ import static org.mockito.Mockito.when;
import java.util.Locale;
-import org.mockito.ArgumentCaptor;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
-
import org.apache.logging.log4j.core.Logger;
import org.junit.After;
import org.junit.AfterClass;
@@ -42,6 +39,7 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.Region;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
index 4c062cc..59ffe44 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java
@@ -38,29 +38,29 @@ import org.apache.geode.internal.logging.LogService;
* This function can be used by GemFire clients and peers to commit an existing transaction. A
* {@link TransactionId} corresponding to the transaction to be committed must be provided as an
* argument while invoking this function.<br />
- *
+ *
* This function should execute only on one server. If the transaction is not hosted on the server
* where the function is invoked then this function decides to invoke a nested
* {@link NestedTransactionFunction} which executes on the member where transaction is hosted.<br />
- *
+ *
* This function returns a single Boolean as result, whose value is <code>Boolean.TRUE</code> if the
* transaction committed successfully otherwise the return value is
* <code>Boolean.FALSE</code>.<br />
- *
+ *
* To execute this function, it is recommended to use the {@link Execution} obtained by using
* TransactionFunctionService. <br />
- *
+ *
* To summarize, this function should be used as follows:
- *
+ *
* <pre>
* Execution exe = TransactionFunctionService.onTransaction(txId);
* List l = (List) exe.execute(commitFunction).getResult();
* Boolean result = (Boolean) l.get(0);
* </pre>
- *
+ *
* This function is <b>not</b> registered on the cache servers by default, and it is the user's
* responsibility to register this function. see {@link FunctionService#registerFunction(Function)}
- *
+ *
* @since GemFire 6.6.1
*/
public class CommitFunction implements Function {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
index 668ddcf..b562663 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
@@ -44,7 +44,7 @@ public class ComplexDiskRegionJUnitTest extends DiskRegionTestingBase {
/**
* Test method for 'org.apache.geode.internal.cache.ComplexDiskRegion.addToBeCompacted(Oplog)'
- *
+ *
* The test will test that an oplog is correctly being added to be rolled
*/
@Test
@@ -101,7 +101,7 @@ public class ComplexDiskRegionJUnitTest extends DiskRegionTestingBase {
/**
* Test method for 'org.apache.geode.internal.cache.ComplexDiskRegion.removeFirstOplog(Oplog)'
- *
+ *
* The test verifies the FIFO property of the oplog set (first oplog to be added should be the
* firs to be rolled).
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
index 7a79135..f54a5a7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -35,6 +31,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
index 36f5352..a266649 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This JUnit tests concurrent rolling and normal region operations put,get,clear,destroy in both
* sync and async mode
- *
+ *
* A region operation is done on the same key that is about to be rolled or has just been rolled and
* the region operation is verified to have been correctly executed.
*/
@@ -38,9 +38,9 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
/**
* A put is done on the same entry before flushing that entry
- *
+ *
* The test ensures that put is not done twice by using a alreadyComeHere boolean.
- *
+ *
* @param region
*/
void putBeforeFlush(final Region region) {
@@ -70,9 +70,9 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
/**
* a single get is done on the entry about to be flushed. multiple gets are avoided by the
* alreadyComeHere boolean
- *
- *
- *
+ *
+ *
+ *
* @param region
*/
void getBeforeFlush(final Region region) {
@@ -99,7 +99,7 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
/**
* the entry which is about to be flushed is deleted
- *
+ *
* @param region
*/
void delBeforeFlush(final Region region) {
@@ -145,7 +145,7 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
* region is closed before going to be flushed The region is going to be closed in a separate
* thread. A 3000 ms wait is done to ensure that the separate thread has successfully closed the
* region
- *
+ *
* @param region
*/
void closeBeforeFlush(final Region region) {
@@ -189,7 +189,7 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
/**
* A region close is done after flush is over. The close is done in a separate thread and a 3000
* ms wait is put to ensure that the separate thread has closed the region
- *
+ *
* @param region
*/
void closeAfterFlush(final Region region) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
index 70da102..5e1b1d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -178,7 +178,7 @@ public class ConcurrentMapOpsDUnitTest extends JUnit4CacheTestCase {
});
}
- private static abstract class AbstractConcMapOpsListener
+ private abstract static class AbstractConcMapOpsListener
implements CacheListener<Integer, String> {
public void afterCreate(EntryEvent<Integer, String> event) {
validate(event);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
index d5cd508..3f15e7c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
@@ -40,13 +40,13 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* This is a multi threaded tests. This test creates two regions. Region1 which is persistent and
* Region2 which is not. There will be four sets of threads. One set doing put, second one doing
* gets ,third one doing destroy(key) and the fourth one doing force rolling.
- *
+ *
* The put are done for Integer Key objects which are random generated and whose values are between
* 0-9 and the Integer value objects whose value can be between -99 to 99.
- *
+ *
* Since the keys are only 0-9, this will ensure a high level of concurrency on the same thread
* since there are more than 10 threads acting at the same time.
- *
+ *
* After all the operations are done, the two regions are checked for equality. After that the
* persistent region is closed and recreated so that it can recover the old values and again the two
* regions are checked for equality. * This test is run for all modes persist, persist+overflow,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
index 538a000..fd88c20 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This JUnit test tests concurrent rolling and normal region operations put,get,clear,destroy in
* both sync and async mode
- *
+ *
* A region operation is done on the same key that is about to be rolled or has just been rolled and
* the region operation is verified to have been correctly executed.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConflationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
index f80dfa7..4162d91 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
@@ -14,25 +14,25 @@
*/
/*
* Created on Feb 20, 2006
- *
+ *
* TODO To change the template for this generated file go to Window - Preferences - Java - Code
* Style - Code Templates
*/
package org.apache.geode.internal.cache;
+import static org.junit.Assert.*;
+
import java.util.Collection;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
-
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test does a check that conflation in the buffer happen correctly
- *
+ *
* Conflation cases tested include:
* <ul>
* <li>create, modify
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
index b52fe4d..e8ba2c4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
@@ -18,15 +18,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCK
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.Repeat;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.RepeatRule;
+import java.util.Properties;
+
import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
@@ -36,7 +29,15 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.Repeat;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.RepeatRule;
/**
* A test of 46438 - missing response to an update attributes message
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
index e3c4872..5c077bb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
@@ -13,18 +13,18 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
+import java.io.Serializable;
+
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.internal.cache.execute.data.CustId;
import org.apache.geode.internal.cache.execute.data.OrderId;
import org.apache.geode.internal.cache.execute.data.ShipmentId;
-import java.io.Serializable;
-
public class CustomerIDPartitionResolver implements PartitionResolver {
private static CustomerIDPartitionResolver customerIDPartitionResolver = null;
@@ -77,5 +77,3 @@ public class CustomerIDPartitionResolver implements PartitionResolver {
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
index 75b93c4..477e339 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -36,6 +32,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test that the bucket size does not go negative when we fault out and in a delta object.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
index c83b3c5..c337f5b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -119,7 +119,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* No error or resending of delta.
- *
+ *
* @throws Exception
*/
@Test
@@ -146,7 +146,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* Simulates error in fromDelta() and toDelta()
- *
+ *
* @throws Exception
*/
@Test
@@ -176,7 +176,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* Simulates old value null, entry null, InvalidDeltaExeption
- *
+ *
* @throws Exception
*/
@Ignore("TODO")
@@ -185,7 +185,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* No error or resending of delta.
- *
+ *
* @throws Exception
*/
@Test
@@ -215,7 +215,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* Simulates error in fromDelta()
- *
+ *
* @throws Exception
*/
@Test
@@ -251,7 +251,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* Simulates old value null, entry null
- *
+ *
* @throws Exception
*/
@Ignore("TODO")
@@ -260,7 +260,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* No error or resending of delta.
- *
+ *
* @throws Exception
*/
@Test
@@ -292,7 +292,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* Simulates error in fromDelta() and toDelta()
- *
+ *
* @throws Exception
*/
@Test
@@ -323,7 +323,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
/**
* Simulates old value null, entry null
- *
+ *
* @throws Exception
*/
@Ignore("TODO")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
index be21fa3..eb8f616 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -42,6 +38,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyEntryWithConcurrentOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyEntryWithConcurrentOperationJUnitTest.java
index 98e99a8..c0acd21 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyEntryWithConcurrentOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyEntryWithConcurrentOperationJUnitTest.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* TestCase that emulates the conditions that entry destroy with concurrent destroy region or cache
@@ -73,7 +74,7 @@ public class DestroyEntryWithConcurrentOperationJUnitTest {
/**
* Close a cache.
- *
+ *
* @param gfc the cache to close.
*/
protected void closeCache(GemFireCacheImpl gfc) {
@@ -110,7 +111,7 @@ public class DestroyEntryWithConcurrentOperationJUnitTest {
/**
* Creates and returns the test region.
- *
+ *
* @param concurrencyChecksEnabled concurrency checks will be enabled if true.
*/
protected Region<Object, Object> createRegion(boolean concurrencyChecksEnabled,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
index 8ffbdaf..6d0b537 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
@@ -19,11 +19,12 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DestroyMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
index 9dee08b..b9e3231 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache;
+import static org.junit.Assert.*;
+
import java.io.File;
import java.util.Collections;
import java.util.HashSet;
@@ -24,8 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
-
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.Scope;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
index f26332f..9f470db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.CountDownLatch;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
@@ -291,4 +292,3 @@ public class DiskLruRegRecoveryJUnitTest extends DiskRegionTestingBase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
index 01cfc0a..839b61c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
@@ -14,14 +14,13 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.File;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,8 +34,8 @@ import org.apache.geode.cache.DiskWriteAttributesFactory;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests the old disk apis to make sure they do the correct thing. Once we drop these old deprecated
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
index 983f569..9a93804 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache;
+import static org.junit.Assert.*;
+
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.Arrays;
@@ -26,8 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
-
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.EntryNotFoundException;
@@ -59,19 +59,19 @@ public class DiskRandomOperationsAndRecoveryJUnitTest extends DiskRegionTestingB
testId++;
}
- private final static int ITERATIONS = 4;
- private final static long MAX_OPLOG_SIZE_IN_BYTES = 1024 * 16;
+ private static final int ITERATIONS = 4;
+ private static final long MAX_OPLOG_SIZE_IN_BYTES = 1024 * 16;
/**
* Need to limit he max open oplogs so that we don't run out of file descriptors
*/
- private final static int MAX_OPEN_OPLOGS = 400;
- private final static long RECORDS_PER_OPLOG =
+ private static final int MAX_OPEN_OPLOGS = 400;
+ private static final long RECORDS_PER_OPLOG =
MAX_OPLOG_SIZE_IN_BYTES / (ENTRY_SIZE + 24/* for key and record overhead */);
/**
* Maximum number of ops a test can do w/o running out of file descriptors due to open oplogs
*/
- private final static long OPS_PER_TEST = RECORDS_PER_OPLOG * MAX_OPEN_OPLOGS;
- private final static long OPS_PER_ITERATION = OPS_PER_TEST / ITERATIONS;
+ private static final long OPS_PER_TEST = RECORDS_PER_OPLOG * MAX_OPEN_OPLOGS;
+ private static final long OPS_PER_ITERATION = OPS_PER_TEST / ITERATIONS;
@Test
public void testRollingDisabledRecoverValuesFalsePersistOnly() throws Exception {
@@ -614,7 +614,7 @@ public class DiskRandomOperationsAndRecoveryJUnitTest extends DiskRegionTestingB
* Create cache. Create Region. Put entries. Close cache. STEP 2: Create cache. Create Region with
* the same name as that of in STEP 1. Delete some entries. 3) Recreate the deleted entries Close
* the Cache * 3: Again Create cache. 4) check if the region creation is successful
- *
+ *
*/
public int startOperations(final int startKey, final Object value) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
index 390575e..8e983c2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.Arrays;
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -36,16 +32,19 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Disk Reg DUNIT Test: A byte array value when put in a remote VM , gets pushed to local VM as a
* VMCachedDeserializable object & that should get persisted in the DiskRegion correctly. The value
* when obtained from the disk ,locally , should be correctly obtained as ByteArrray.
- *
+ *
*/
@Category(DistributedTest.class)
@@ -57,7 +56,7 @@ public class DiskRegByteArrayDUnitTest extends JUnit4CacheTestCase {
static Region region;
static CacheTransactionManager cacheTxnMgr;
protected static File[] dirs = null;
- final static byte[] value = new byte[1024];
+ static final byte[] value = new byte[1024];
public DiskRegByteArrayDUnitTest() {
super();
@@ -166,7 +165,7 @@ public class DiskRegByteArrayDUnitTest extends JUnit4CacheTestCase {
vm1.invoke(() -> DiskRegByteArrayDUnitTest.flushMethod());
/*
* get the val from disk verify that the value retrieved from disk represents a byte[]
- *
+ *
*/
vm1.invoke(DiskRegByteArrayDUnitTest.class, "verifyByteArray", objArr);
@@ -259,4 +258,3 @@ public class DiskRegByteArrayDUnitTest extends JUnit4CacheTestCase {
}
}// end of class
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
index 81747f1..4fc7f06 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -39,10 +39,10 @@ import org.apache.geode.util.test.TestUtil;
/**
* This test is for testing Disk attributes set via xml.
- *
+ *
* A cache and region are created using an xml. The regions are then verified to make sure that all
* the attributes have been correctly set
- *
+ *
* @since GemFire 5.1
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
index 1bb06d1..4e27fa9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
@@ -331,7 +331,7 @@ public class DiskRegOplogSwtchingAndRollerJUnitTest extends DiskRegionTestingBas
/**
* DiskRegOplog1OverridingOplog2JUnitTest: Disk Region test : oplog1 flush overriding oplog2 flush
- *
+ *
* This test will hold the flush of oplog1 and flush oplog2 before it. After that oplog1 is
* allowed to flush. A get of an entry which was first put in oplog1 and then in oplog2 should
* result in the get being done from oplog2.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
index 86f17f0..1984347 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region recovery tests
- *
+ *
* @since GemFire 5.1
*/
@Category(IntegrationTest.class)
@@ -1415,4 +1415,3 @@ public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
index 44036c0..1bfcaa5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
@@ -19,14 +19,6 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.commons.io.FileUtils;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
@@ -34,6 +26,15 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class DiskRegionAsyncRecoveryJUnitTest extends DiskRegionTestingBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
index e1758eb..f6b21c8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test will test that there are no unexpected behaviours if the the region attributes are
* changed after starting it again.
- *
+ *
* The behaviour should be predictable
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
index 8a99972..83837b8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test methods to ensure that disk Clear is apparently atomic to region clear.
- *
+ *
* Data on disk should reflect data in memory. A put while clear is going on should wait for clear
* and if it is successfully recorded in memory than it should be recorded on disk. Else if not
* successfully recorded in memory than should not be recorded on disk
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionHelperFactory.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionHelperFactory.java
index 4ad246f..eef1c74 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionHelperFactory.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionHelperFactory.java
@@ -20,10 +20,10 @@ import org.apache.geode.cache.*;
import org.apache.geode.cache.util.ObjectSizer;
/**
- *
+ *
* A testing helper factory to get a disk region with the desired configuration
- *
- *
+ *
+ *
*/
public class DiskRegionHelperFactory {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
index a9a9902..6abda96 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
@@ -21,6 +21,20 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.EntryEvent;
@@ -37,19 +51,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.lang.reflect.Array;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* JUnit tests covering some miscellaneous functionality of Disk Region.
@@ -492,7 +493,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase {
/**
* DiskDirectoriesJUnitTest:
- *
+ *
* This tests the potential deadlock situation if the region is created such that rolling is
* turned on but the Max directory space is less than or equal to the Max Oplog Size. In such
* situations , if during switch over , if the Oplog to be rolled is added after function call of
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionProperties.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionProperties.java
index e7299c0..693b053 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionProperties.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionProperties.java
@@ -20,14 +20,14 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.DiskStoreFactory;
-
import java.io.File;
import java.util.Arrays;
+import org.apache.geode.cache.DiskStoreFactory;
+
/**
* A properties object used to create persistent/overflow regions for testing objects
- *
+ *
* @since GemFire 5.1
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
index 2d3ac3a..5a9c7b2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
@@ -24,6 +24,18 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -35,24 +47,13 @@ import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
/**
* DiskRegionTestingBase: This class is extended to write more JUnit tests for Disk Regions.
* <p>
* All disk region unit tests extend this base class , common method to be used in all tests are
* present here.
- *
+ *
* @since GemFire 5.1
*/
public abstract class DiskRegionTestingBase {
@@ -234,7 +235,7 @@ public abstract class DiskRegionTestingBase {
/**
* clears and closes the region
- *
+ *
*/
protected void closeDown() {
try {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
index f2806fe..3b9df65 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
@@ -18,12 +18,13 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.ArrayList;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.ArrayList;
+import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class DistPeerTXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
index cba7c98..c0eb997 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
@@ -20,15 +20,16 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.HashMap;
-import java.util.Map;
@Category(UnitTest.class)
public class DistributedCacheOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
index 3d60475..9fd09dd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DistributedPutAllOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
index 7c6aebc..5716d6b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
@@ -19,11 +19,12 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DistributedRegionFunctionStreamingMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
index 78cdd84..aff2428 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedMember;
@@ -151,4 +152,3 @@ public class DistributedRegionJUnitTest extends AbstractDistributedRegionJUnitTe
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
index 30fb728..4435f01 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
@@ -29,6 +29,7 @@ import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Operation;
@@ -184,4 +185,3 @@ public class DistributedRegionSearchLoadJUnitTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
index 67b0c6c..3196b03 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
@@ -20,10 +20,11 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DistributedRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
index 42780db..cd5ecd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DistributedRemoveAllOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionDUnitTest.java
index a674eeb..cdac80c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionDUnitTest.java
@@ -69,7 +69,7 @@ public class EvictionDUnitTest extends EvictionTestBase {
/**
* Test Case Description: 2 VM's. 2 PR's. 4 buckets each PR. PR1 has action -Local destroy and PR2
* has action - Overflow To Disk.
- *
+ *
* Test Case verifies:If naturally Eviction up and eviction Down events are raised. Centralized
* and Inline eviction are happening.All this verificatio is done thorugh logs. It also verifies
* that during eviction, if one node goes down and then comes up again causing GII to take place,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
index 8cdbd6d..dd054f4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
@@ -14,20 +14,16 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.internal.cache.entries.AbstractLRURegionEntry;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -40,11 +36,14 @@ import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.SharedLibrary;
+import org.apache.geode.internal.cache.entries.AbstractLRURegionEntry;
import org.apache.geode.internal.cache.lru.HeapLRUCapacityController;
import org.apache.geode.internal.cache.lru.Sizeable;
import org.apache.geode.internal.size.ReflectionSingleObjectSizer;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class EvictionObjectSizerDUnitTest extends JUnit4CacheTestCase {
@@ -94,7 +93,7 @@ public class EvictionObjectSizerDUnitTest extends JUnit4CacheTestCase {
/**
* With object sizer for standard objects.Key -Integer Value ByteArray
- *
+ *
*/
@Test
public void testObjectSizerForHeapLRU_StandardObjects() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionStatsDUnitTest.java
index 9a7591c..cd919e6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionStatsDUnitTest.java
@@ -14,22 +14,16 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -39,6 +33,7 @@ import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.DistributedSystem;
@@ -50,9 +45,13 @@ import org.apache.geode.internal.cache.lru.HeapEvictor;
import org.apache.geode.internal.cache.lru.HeapLRUCapacityController;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class EvictionStatsDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionTestBase.java
index e30636c..2aa441b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionTestBase.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.cache.util.ObjectSizer;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
@@ -36,6 +35,7 @@ import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
index 4bcebda..68969dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
@@ -18,10 +18,11 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ExpiryTaskTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
index c52ead8..2dca67a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
@@ -15,6 +15,12 @@
package org.apache.geode.internal.cache;
+import static java.util.concurrent.TimeUnit.*;
+import static org.awaitility.Awaitility.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.*;
import org.apache.geode.cache.client.internal.LocatorTestBase;
@@ -29,11 +35,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.awaitility.Awaitility.*;
-import static java.util.concurrent.TimeUnit.*;
@Category(DistributedTest.class)
public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
index d4db9a7..6928d1c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -27,8 +27,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.ServerLocation;
import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -46,8 +44,10 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.ClientMetadataService;
import org.apache.geode.cache.client.internal.ClientPartitionAdvisor;
import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.Locator;
+import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.partitioned.fixed.QuarterPartitionResolver;
import org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index 54c73c2..d66a0ca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
@@ -13,18 +13,19 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.GemFireIOException;
@@ -43,17 +44,15 @@ import org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType;
import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.UpdateOperation.UpdateMessage;
+import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-
@Category(DistributedTest.class)
public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
@@ -541,7 +540,7 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
/**
* vm0 and vm1 are peers, each holds a DR. Let provider to have higher RVVGC than requester's RVV
* It should trigger fullGII
- *
+ *
* This test also verify tombstoneGC happened in middle of GII, but BEFORE GII thread got GIILock.
* i.e. before GII, P's RVVGC=P0,R0, upon received RequestImageMessage, it becomes P4,R0 it should
* cause the fullGII.
@@ -1267,9 +1266,9 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
* GII, P's RVV is P7,R6(3-6), RVVGC is P0,R0; R's RVV is P3,R6, RVVGC is P0,R0 vm1 becomes
* offline then restarts. Use testHook to pause the GII, then do tombstone GC at P only. The
* deltaGII should send correct tombstonedelta to R, revoke unfinished opeation R4,R5
- *
+ *
* There's member T doing GII from P at the same time.
- *
+ *
* In this test, GII thread will get the GIILock before tombstone GC, so tombstone GC should wait
* for all GIIs to finish
*/
@@ -1921,7 +1920,7 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
/**
* Test the case where a member has an untrusted RVV and still initializes from the local data.
* See bug 48066
- *
+ *
* @throws Throwable
*/
@Test
@@ -1997,7 +1996,7 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
/**
* Test case to make sure that if a tombstone GC occurs during a full GII, we still have the
* correct RVV on the GII recipient at the end.
- *
+ *
* @throws Throwable
*/
@Category(FlakyTest.class) // GEODE-1137: orphaned AsyncInvocations, time sensitive, GC,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
index 3ea841f..edc64b2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -40,13 +36,16 @@ import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.internal.cache.InitialImageOperation.ImageReplyMessage;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
-import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
index d867959..fdd9ead 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
@@ -23,13 +23,13 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.SystemTimer;
+import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.lru.HeapEvictor;
import org.apache.geode.internal.cache.lru.OffHeapEvictor;
import org.apache.geode.pdx.internal.TypeRegistry;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
index afaa04b..c2e65ac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
@@ -20,15 +20,16 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.List;
@Category(UnitTest.class)
public class GridProfileTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 1012eea..ba4f8c4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -51,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the size of clientUpdateMessageImpl with the size calculated by
* {@link org.apache.geode.internal.cache.lru.MemLRUCapacityController} for HA overFlow
- *
+ *
* @since GemFire 5.7
*/
@Category(DistributedTest.class)
@@ -276,7 +276,7 @@ public class HAOverflowMemObjectSizerDUnitTest extends JUnit4DistributedTestCase
/**
* perform put on server region that will put entries on CMR region
- *
+ *
* @param lowerLimit
* @param higerlimit - lower and upper limit on put
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
index 2c831c1..cc245f6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
@@ -120,7 +120,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Abstracts the logging mechanism.
- *
+ *
* @param message a message to log.
*/
private void log(String message) {
@@ -168,7 +168,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the directory for a given member.
- *
+ *
* @param vm a distributed system member.
* @return the disk directories for a member.
*/
@@ -183,7 +183,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Invokes {@link AdminDistributedSystem#getMissingPersistentMembers()} on a member.
- *
+ *
* @param vm a member of the distributed system.
* @return a set of missing members for the distributed system.
*/
@@ -200,7 +200,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Invokes {@link BackupUtil#backupAllMembers(DM, File, File)} on a member.
- *
+ *
* @param vm a member of the distributed system
* @return the status of the backup.
*/
@@ -263,7 +263,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Invokes {@link DistributedSystem#getDistributedMember()} on a member.
- *
+ *
* @param vm a distributed system member.
* @return the member's id.
*/
@@ -291,7 +291,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Locates the PersistentID for the testStore disk store for a distributed member.
- *
+ *
* @param vm a distributed member.
* @return a PersistentID for a member's disk store.
*/
@@ -311,7 +311,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Locates the PersistentID for the testStore disk store for a distributed member.
- *
+ *
* @param vm a distributed member.
* @return a PersistentID for a member's disk store.
*/
@@ -321,7 +321,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Invokes {@link DistributedSystem#disconnect()} on a member.
- *
+ *
* @param disconnectVM a member of the distributed system to disconnect.
* @param testVM a member of the distributed system to test for the missing member (just
* disconnected).
@@ -363,7 +363,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Invokes {@link CacheFactory#create()} on a member.
- *
+ *
* @param vm a member of the distributed system.
*/
private void openCache(VM vm) {
@@ -372,7 +372,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Blocks and waits for a backup operation to finish on a distributed member.
- *
+ *
* @param vm a member of the distributed system.
*/
private void waitForBackup(VM vm) {
@@ -396,7 +396,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Performs a full backup.
- *
+ *
* @return the backup status.
*/
private BackupStatus performBaseline() {
@@ -405,7 +405,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Performs an incremental backup.
- *
+ *
* @return the backup status.
*/
private BackupStatus performIncremental() {
@@ -448,7 +448,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Returns an individual member's backup directory.
- *
+ *
* @param rootDir the directory to begin searching for the member's backup dir from.
* @param memberId the member's identifier.
* @return the member's backup directory.
@@ -484,7 +484,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Executes a shell command in an external process.
- *
+ *
* @param command a shell command.
* @return the exit value of processing the shell command.
*/
@@ -544,7 +544,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Peforms an operation log restore for a member.
- *
+ *
* @param backupDir the member's backup directory containing the restore script.
*/
private void performRestore(File memberDir, File backupDir)
@@ -582,7 +582,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Adds an incomplete marker to the baseline backup for a member.
- *
+ *
* @param vm a distributed system member.
*/
private void markAsIncomplete(VM vm) throws IOException {
@@ -617,7 +617,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/**
* Used to confirm valid BackupStatus data. Confirms fix for defect #45657
- *
+ *
* @param backupStatus contains a list of members that were backed up.
*/
private void assertBackupStatus(final BackupStatus backupStatus) {
@@ -796,7 +796,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
* Successful if a member performs a full backup when its backup data is not present in the
* baseline (for whatever reason). This also tests what happens when a member is offline during
* the baseline backup.
- *
+ *
* The test is regarded as successful when all of the missing members oplog files are backed up
* during an incremental backup. This means that the member peformed a full backup because its
* oplogs were missing in the baseline.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
index d28fe13..1ecb71a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -46,6 +42,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests interrupting gemfire threads and seeing what happens
@@ -78,7 +77,7 @@ public class InterruptClientServerDUnitTest extends JUnit4CacheTestCase {
/**
* A simple test case that we are actually persisting with a PR.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
index 54e8908..377981a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
@@ -14,26 +14,27 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.File;
import java.util.Properties;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test of interrupting threads doing disk writes to see the effect.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
index 8cf8dec..6bc0528 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
@@ -14,19 +14,14 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -40,6 +35,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests interrupting gemfire threads during a put operation to see what happens
@@ -72,7 +70,7 @@ public class InterruptsDUnitTest extends JUnit4CacheTestCase {
/**
* A simple test case that we are actually persisting with a PR.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
index a1922cf..fe8c13f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
@@ -13,27 +13,26 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.util.Iterator;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-
-import java.util.Iterator;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test that keys iterator do not returned keys with removed token as its values
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 5816981..6ba39fd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -14,27 +14,28 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.lru.LRUStatistics;
-import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.lru.LRUStatistics;
+import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test verifies region is LIFO enabled by ENTRY COUNT verifies correct stats updating and
* faultin is not evicting another entry - not strict LIFO
- *
+ *
* @since GemFire 5.7
*/
@Category(IntegrationTest.class)
@@ -72,7 +73,7 @@ public class LIFOEvictionAlgoEnabledRegionJUnitTest {
/**
* Method for intializing the VM and create region with LIFO attached
- *
+ *
* @throws Exception
*/
private static void initializeVM() throws Exception {
@@ -310,4 +311,3 @@ public class LIFOEvictionAlgoEnabledRegionJUnitTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index 27eae38..d59d60c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.lru.EnableLRU;
-import org.apache.geode.internal.cache.lru.LRUClockNode;
-import org.apache.geode.internal.cache.lru.LRUStatistics;
-import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
@@ -28,17 +28,18 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.lru.EnableLRU;
+import org.apache.geode.internal.cache.lru.LRUClockNode;
+import org.apache.geode.internal.cache.lru.LRUStatistics;
+import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test verifies region is LIFO enabled by MEMORY verifies correct stats updating and
* faultin is not evicting another entry - not strict LIFO
- *
+ *
* @since GemFire 5.7
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -84,7 +85,7 @@ public class LIFOEvictionAlgoMemoryEnabledRegionJUnitTest {
/**
* Method for intializing the VM and create region with LIFO attached
- *
+ *
* @throws Exception
*/
private static void initializeVM() throws Exception {
@@ -407,4 +408,3 @@ class TestLRUNode implements LRUClockNode {
return evicted;
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
index f388042..af304bd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
@@ -15,7 +15,7 @@
/*
* Created on Sep 13, 2005
*
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -51,7 +51,7 @@ public class MapClearGIIDUnitTest extends JUnit4CacheTestCase {
protected static boolean wasGIIInProgressDuringClear = false;
- volatile static Region region;
+ static volatile Region region;
public static boolean checkImageStateFlag() throws Exception {
Region rgn = new MapClearGIIDUnitTest().getCache().getRegion("/map");
@@ -211,4 +211,3 @@ public class MapClearGIIDUnitTest extends JUnit4CacheTestCase {
}
}
}// end of test class
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
index 3fea214..9d29796 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
@@ -15,7 +15,7 @@
/*
* Created on Aug 23, 2005
*
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -43,8 +43,8 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class MapInterface2JUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
index b9cb872..37531bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class MemberFunctionStreamingMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
index fbd7571..9644c9a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
@@ -18,11 +18,10 @@ import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.awaitility.Awaitility;
-
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
index 4a208d4..48ce7c2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java
@@ -32,15 +32,15 @@ import org.apache.geode.internal.logging.LogService;
* This function is used by {@link CommitFunction} to commit existing transaction. A
* {@link TransactionId} corresponding to the transaction to be committed must be provided as an
* argument while invoking this function.<br />
- *
+ *
* When executed this function commits a transaction if it exists locally.<br />
- *
+ *
* This function returns a single Boolean as result, whose value is <code>Boolean.TRUE</code> if the
* transaction committed successfully otherwise the return value is <code>Boolean.FALSE</code><br />
- *
+ *
* This function is <b>not</b> registered on the cache servers by default, and it is the user's
* responsibility to register this function. see {@link FunctionService#registerFunction(Function)}
- *
+ *
* @see CommitFunction
* @since GemFire 6.6.1
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
index f293c21..ee2e769 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
@@ -18,6 +18,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAction;
@@ -41,8 +44,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public class NetSearchMessagingDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
index 1f99dac..c807fa4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
@@ -19,10 +19,11 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class NonLocalRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapEvictionDUnitTest.java
index d9d1ecd..8971c86 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapEvictionDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
@@ -36,6 +35,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Performs eviction dunit tests for off-heap memory.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapTestUtil.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapTestUtil.java
index 75aeeec..1758258 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapTestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapTestUtil.java
@@ -20,10 +20,10 @@ import java.util.Collections;
import java.util.List;
import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
import org.apache.geode.internal.offheap.MemoryBlock;
import org.apache.geode.internal.offheap.RefCountChangeInfo;
import org.apache.geode.internal.offheap.ReferenceCountHelper;
-import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
@SuppressWarnings("deprecation")
public class OffHeapTestUtil {
@@ -60,4 +60,3 @@ public class OffHeapTestUtil {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
index 7b33696..cb5832a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.IntStream;
-import org.awaitility.Awaitility;
import org.apache.commons.io.FileUtils;
+import org.awaitility.Awaitility;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -73,7 +73,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
static final int OP_DEL = 3;
- protected volatile static Random random = new Random();
+ protected static volatile Random random = new Random();
protected long expectedOplogSize = Oplog.OPLOG_NEW_ENTRY_BASE_REC_SIZE;
@@ -89,7 +89,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
protected boolean flushOccurredAtleastOnce = false;
- volatile protected boolean assertDone = false;
+ protected volatile boolean assertDone = false;
boolean failure = false;
@@ -3079,7 +3079,7 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
/**
* Test to force a recovery to follow the path of switchOutFilesForRecovery and ensuring that
* IOExceptions do not come as a result. This is also a bug test for bug 37682
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
index 5c80db3..f115c52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
@@ -16,15 +16,15 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
+import java.io.File;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.commons.io.FileUtils;
-import org.apache.geode.StatisticsFactory;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
-import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.lib.concurrent.Synchroniser;
@@ -36,13 +36,14 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
+import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class OplogRVVJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
index ad9a18e..e63f4ba 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -556,4 +556,3 @@ public class P2PDeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
check = false;
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
index 6771295..4e75e2f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.*;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -36,12 +32,15 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests a toData that always throws an IOException. This test does a put with the bad to data from
* an accessor to see if it will keep trying to resend the put to the data store
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PRBadToDataDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
index ba5f0b3..2ac985e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests ConcurrentMap operations on a PartitionedRegion on a single node.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
index ca91013..93e7662 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests PartitionedRegion DataStore currentAllocatedMemory operation.
- *
+ *
* @since Geode 1.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
index 882b1e9..66c0655 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
-import static org.assertj.core.api.Assertions.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,6 +27,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributes;
@@ -45,6 +42,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings({"serial", "rawtypes", "deprecation", "unchecked"})
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
index 0b18ebc..3a784dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
@@ -14,20 +14,16 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -45,12 +41,14 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.cache30.TestCacheLoader;
import org.apache.geode.distributed.internal.ReplyException;
-
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is a dunit test for PartitionedRegion creation and Region API's functionality. This test is
@@ -180,7 +178,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Search the entires PartitionedRegion for the key, to validate that indeed it doesn't exist
- *
+ *
* @returns true if it does exist
* @param par
* @param key
@@ -205,7 +203,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Test the Region operations after the PartitionedRegion has been destroyed
- *
+ *
* @param prName
*/
public void partitionedRegionTestAfterDestroyRegion(final String prName) {
@@ -916,7 +914,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
/*
* validate the data in PartionedRegion at different VM's
- *
+ *
*/
CacheSerializableRunnable validateRegionAPIs =
new CacheSerializableRunnable("validateInserts") {
@@ -1219,7 +1217,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Test the PartitionedRegion operations when the Scope is set to
* {@link AttributesFactory#setEarlyAck(boolean)}
- *
+ *
* @throws Exception
*/
@Test
@@ -1279,7 +1277,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Verify that localMaxMemory is set correctly when using attributes
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
index 0d8496c..f115e9a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -33,12 +29,15 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This dunit test verifies that PartitionedRegion destroyRegion, localDestroyRegion and close call
* works properly when PartitionedRegion is in ParentRegion/ChildRegion/PartitionedRegion hierarchy.
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionAsSubRegionDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -200,7 +199,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends PartitionedRegionDUni
/**
* This method test the destroyRegion call on a Child region in
* ParentRegion/ChildRegion/PartitionedRegion hierarchy which has PartitionedRegion as sub region.
- *
+ *
* @throws Exception
*/
@Test
@@ -231,7 +230,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends PartitionedRegionDUni
/**
* This method test the localDestroyRegion call on a Child region in
* ParentRegion/ChildRegion/PartitionedRegion hierarchy which has PartitionedRegion as sub region.
- *
+ *
* @throws Exception
*/
@Test
@@ -259,7 +258,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends PartitionedRegionDUni
/**
* This method test the close call on a Child region in ParentRegion/ChildRegion/PartitionedRegion
* hierarchy which has PartitionedRegion as sub region.
- *
+ *
* @throws Exception
*/
@Test
@@ -287,10 +286,10 @@ public class PartitionedRegionAsSubRegionDUnitTest extends PartitionedRegionDUni
/**
* This private methods sets the passed attributes and returns RegionAttribute object, which is
* used in create region
- *
+ *
* @param redundancy
* @param localMaxMem
- *
+ *
* @return
*/
protected RegionAttributes createRegionAttributesForPR(int redundancy, int localMaxMem) {
@@ -305,7 +304,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends PartitionedRegionDUni
/**
* This method creates RegionAttributes for the Parent and Child region of the
* ParentRegion/ChildRegion/PartitionedRegion hierarchy
- *
+ *
* @return
*/
protected RegionAttributes createRegionAttributesForDACKRegions() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index 1e56d00..986bac4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -531,7 +531,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
/**
* This function performs destroy(key) operations in multiple Partiton Regions. The range of keys
* to be destroyed is from 100 to 200. Each Vm destroys different set of the keys.
- *
+ *
* @param startIndexForRegion
* @param endIndexForRegion
* @param startIndexForDestroy
@@ -571,7 +571,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
/**
* This function performs destroy(key) operations in multiple Partiton Regions. The range of keys
* to be destroyed is from 100 to 200. Each Vm destroys different set of the keys.
- *
+ *
* @param startIndexForRegion
* @param endIndexForRegion
* @param startIndexForInvalidate
@@ -639,7 +639,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
/**
* This function performs put() operation from the single vm in multiple partition regions.
- *
+ *
* @param vm0
* @param startIndexForRegion
* @param endIndexForRegion
@@ -673,7 +673,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
/**
* This function performs put() in multiple partition regions for the given node.
- *
+ *
* @param startIndexForKey
* @param endIndexForKey
* @param startIndexForRegion
@@ -978,7 +978,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
* <br>
* (4) In case of the partition regions with redundancy > 0 no two bucket regions with same
* bucketId should be generated on the same node.</br>
- *
+ *
* @param startIndexForRegion
* @param endIndexForRegion
* @return
@@ -1107,7 +1107,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
* (3) Size of bucket2Node region should be 0.</br>
* <br>
* (4) Parent region of the bucket2Node region shoud be root i.e. region with name "PRRoot".</br>
- *
+ *
* @param startIndexForRegion
* @param endIndexForRegion
* @return
@@ -1308,7 +1308,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
* and redundancy=2. 5. third quarter of total partition regions are of scope = DISTRIBUTED_NO_ACK
* and redundancy=0. 4. fourth quarter of total partition regions are of scope =
* DISTRIBUTED_NO_ACK and redundancy=2.
- *
+ *
* @param startIndexForRegion
* @param endIndexForRegion
*/
@@ -1405,7 +1405,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
/**
* This function calculates memory of partition region at each node and puts it in storage region.
- *
+ *
* @param startIndexForKey
* @param endIndexForKey
* @return
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
index 4027680..d09ea8e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -41,13 +37,16 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify the meta-data cleanUp done at the time of cache close Op. This test creates 2
* PRs(both data stores) on 2 VMs with redundantCopies "1". Put Ops are done on both the VMs. Each
* bucket will be created in both the nodes as redundantCopies is 1.
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -57,7 +56,7 @@ public class PartitionedRegionCacheCloseDUnitTest extends PartitionedRegionDUnit
super();
}// end of constructor
- final static int MAX_REGIONS = 1;
+ static final int MAX_REGIONS = 1;
final int totalNumBuckets = 5;
@@ -271,10 +270,10 @@ public class PartitionedRegionCacheCloseDUnitTest extends PartitionedRegionDUnit
/**
* This private methods sets the passed attributes and returns RegionAttribute object, which is
* used in create region
- *
+ *
* @param redundancy
* @param localMaxMem
- *
+ *
* @return
*/
protected RegionAttributes createRegionAttributesForPR(int redundancy, int localMaxMem) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForRootRegion.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForRootRegion.java
index ba8f30d..97b08b0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForRootRegion.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForRootRegion.java
@@ -20,8 +20,8 @@ import java.util.Properties;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheLoaderException;
-import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.LoaderHelper;
/**
* This class is CacheLoader for partition region
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForSubRegion.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForSubRegion.java
index 2e97259..668fb02 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForSubRegion.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheLoaderForSubRegion.java
@@ -18,11 +18,11 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheLoaderException;
-import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.LoaderHelper;
+import org.apache.geode.cache.PartitionAttributesFactory;
/**
* This class is cacheLoader for the partition region
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
index 692515e..349f119 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
@@ -14,17 +14,11 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Properties;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
@@ -46,6 +40,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -57,7 +54,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTestCase {
/**
* constructor
- *
+ *
* @param name
*/
public PartitionedRegionCreationDUnitTest() {
@@ -102,7 +99,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* This test create regions with scope = DISTRIBUTED_NO_ACK and then validating these partition
* regons
- *
+ *
* @throws Exception
*/
// TODO: fix the hang that concurent creation often runs into -- mthomas
@@ -150,7 +147,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
* This test create regions with scope = DISTRIBUTED_NO_ACK and then validating these partition
* regons. Test specially added for SQL fabric testing since that always creates regions in
* parallel.
- *
+ *
* @throws Exception
*/
@Test
@@ -371,7 +368,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* This test creates partition region with scope = DISTRIBUTED_ACK and tests whether all the
* attributes of partiotion region are properlt initialized
- *
+ *
* @throws Exception
*/
@Category(FlakyTest.class) // GEODE-1104: time sensitive, async actions
@@ -426,7 +423,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* This tests registration of partition region is happened in allpartition region
- *
+ *
* @throws Exception
*/
@Test
@@ -481,7 +478,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* This tests persistence conflicts btw members of partition region
- *
+ *
* @throws Exception
*/
@Test
@@ -551,7 +548,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* this function tests psConfig for the regions
- *
+ *
* @param rgionName
* @return
*/
@@ -741,7 +738,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* this function validates partition regions
- *
+ *
* @param regionName
* @return
*/
@@ -831,7 +828,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* This method validates that TotalNumberOfBuckets are getting set properly.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
index 7149c8e..abdd811 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
@@ -57,8 +57,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* 4) testpartionedRegionBucketToNodeCreate - Tests the PR's BUCKET_2_NODE region creation
* </p>
- *
- *
+ *
+ *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(IntegrationTest.class)
@@ -311,7 +311,7 @@ public class PartitionedRegionCreationJUnitTest {
* <p>
* (4) Test if PARTITIONED_REGION_CONFIG_NAME exist and isDistributedAck and the mirror type is
* MirrorType.KEYS_VALUES.
- *
+ *
* @throws RegionExistsException
*/
@Test
@@ -360,7 +360,7 @@ public class PartitionedRegionCreationJUnitTest {
* Test for partitioned Region registration. All partitioned regions created must have a entry in
* PARTITIONED_REGION_CONFIG_NAME. Every PR has PR name / PartitionRegionConfig entry in region
* PARTITIONED_REGION_CONFIG_NAME
- *
+ *
*/
@Test
public void test003partionedRegionRegistration() {
@@ -389,7 +389,7 @@ public class PartitionedRegionCreationJUnitTest {
/**
* creates multiple partitioned region from different threads.
- *
+ *
*/
private void createMultiplePartitionedRegions() {
if (PRCreateDone)
@@ -415,7 +415,7 @@ public class PartitionedRegionCreationJUnitTest {
/**
* Verifies creation of partitioned region.
- *
+ *
*/
private void verifyCreateResults() {
if (TOTAL_RETURNS != TOTAL_THREADS)
@@ -430,7 +430,7 @@ public class PartitionedRegionCreationJUnitTest {
/**
* Thread to create the partitioned region.
- *
+ *
*/
public class PartionedRegionCreateThread extends Thread {
public void run() {
@@ -458,7 +458,7 @@ public class PartitionedRegionCreationJUnitTest {
/**
* Increments and returns the PR nmber used for PR creation. Thread safe function.
- *
+ *
* @return the PR number
*/
protected int getPRNumber() {
@@ -489,7 +489,7 @@ public class PartitionedRegionCreationJUnitTest {
/**
* Increments total creation thread returns.
- *
+ *
*/
protected void updateTotalReturns() {
synchronized (PR_TOTAL_RETURNS) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDUnitTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDUnitTestCase.java
index c3aff4c..49f37da 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDUnitTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDUnitTestCase.java
@@ -73,7 +73,7 @@ public class PartitionedRegionDUnitTestCase extends JUnit4CacheTestCase {
/**
* Sets the loglevel for the provided log writer
- *
+ *
* @param l the {@link LogWriter}
* @param logLevl the new log level as specified in {@link LogWriterImpl}
* @return the old log level
@@ -122,9 +122,9 @@ public class PartitionedRegionDUnitTestCase extends JUnit4CacheTestCase {
/**
* This function creates multiple partition regions in a VM. The name of the Partition Region will
* be PRPrefix+index (index starts from startIndexForRegion and ends to endIndexForRegion)
- *
+ *
* @param PRPrefix : Used in the name of the Partition Region
- *
+ *
* These indices Represents range of the Partition Region
*/
public CacheSerializableRunnable createMultiplePartitionRegion(final String PRPrefix,
@@ -137,9 +137,9 @@ public class PartitionedRegionDUnitTestCase extends JUnit4CacheTestCase {
/**
* This function creates multiple partition regions in a VM. The name of the Partition Region will
* be PRPrefix+index (index starts from startIndexForRegion and ends to endIndexForRegion)
- *
+ *
* @param PRPrefix : Used in the name of the Partition Region
- *
+ *
* These indices Represents range of the Partition Region
* @param startIndexForRegion :
* @param endIndexForRegion
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
index d9396da..ad5bb36 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
@@ -14,25 +14,26 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test checks functionality of the PartitionedRegionDatastore on a sinle node.
- *
+ *
* Created on Dec 23, 2005
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class PartitionedRegionDataStoreJUnitTest {
@@ -106,7 +107,7 @@ public class PartitionedRegionDataStoreJUnitTest {
/**
* This method checks whether the canAccomodateMoreBytesSafely returns false after reaching the
* localMax memory.
- *
+ *
*/
@Test
public void testCanAccommodateMoreBytesSafely() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index 86e9be7..dea0ff5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -14,18 +14,12 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
@@ -42,6 +36,9 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@SuppressWarnings("synthetic-access")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
index 0ba103a..f61d9f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Iterator;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -43,12 +39,15 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test aims to test the destroyRegion functionality.
- *
- *
- *
+ *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionDestroyDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -61,7 +60,7 @@ public class PartitionedRegionDestroyDUnitTest extends PartitionedRegionDUnitTes
public static final String PR_PREFIX = "PR";
- final static int MAX_REGIONS = 2;
+ static final int MAX_REGIONS = 2;
final int totalNumBuckets = 5;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
index f7a757a..bea2428 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -35,11 +31,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests total entry count of partitioned regions.
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionEntryCountDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
index 0c9b02f..59a6a96 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
@@ -22,8 +22,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.dunit.IgnoredException;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,6 +41,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.SubscriptionAttributes;
import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.OSProcess;
@@ -52,6 +51,7 @@ import org.apache.geode.internal.cache.lru.HeapEvictor;
import org.apache.geode.internal.cache.lru.HeapLRUCapacityController;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
index 304861b..1315ec4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Properties;
@@ -30,6 +23,9 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -51,9 +47,12 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase {
@@ -68,16 +67,16 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
Properties props = new Properties();
- volatile static int regionCnt = 0;
+ static volatile int regionCnt = 0;
- final static int MAX_REGIONS = 1;
+ static final int MAX_REGIONS = 1;
final int totalNumBuckets = 5;
/**
* Test to ensure that we have proper bucket failover, with no data loss, in the face of
* sequential cache.close() events.
- *
+ *
* @throws Exception
*/
@Test
@@ -380,7 +379,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
/**
* This verifies the Bucket Regions on the basis of redundantCopies set in RegionAttributes.
- *
+ *
* @see PartitionedRegionSingleNodeOperationsJUnitTest#test018BucketScope()
* @throws Exception
*/
@@ -471,10 +470,10 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
/**
* This private methods sets the passed attributes and returns RegionAttribute object, which is
* used in create region
- *
+ *
* @param redundancy
* @param localMaxMem
- *
+ *
* @return
*/
protected RegionAttributes createRegionAttributesForPR(int redundancy, int localMaxMem) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
index fcbdad7..efd11bd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
@@ -13,18 +13,14 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheWriterException;
@@ -38,6 +34,9 @@ import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests invalidateRegion functionality on partitioned regions
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
index 92699e5..b12d61d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
@@ -174,7 +174,7 @@ public class PartitionedRegionLocalMaxMemoryDUnitTest extends PartitionedRegionD
* Object used for the put() operation as key and object. The objectIdentifier is used to provide
* a predetermined hashcode for the object.
*/
- static public class TestObject1 implements DataSerializable, Sizeable {
+ public static class TestObject1 implements DataSerializable, Sizeable {
String name;
byte arr[] = new byte[1024 * 4];
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index 2806883..42b6178 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests PartitionedRegion localMaxMemory with Off-Heap memory.
- *
+ *
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
index ff63d20..ce144a1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -33,11 +29,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test is dunit test for the multiple Partition Regions in 4 VMs.
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionMultipleDUnitTest extends PartitionedRegionDUnitTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
index cc3af9c..9ff8ff3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
@@ -14,19 +14,16 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import java.util.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache30.*;
@@ -36,16 +33,19 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
* This class tests PRID generation in multiple partiton regions on 4 VMs
*/
@Category(DistributedTest.class)
public class PartitionedRegionPRIDDUnitTest extends PartitionedRegionDUnitTestCase {
/** Maximum number of regions * */
- public final static int MAX_REGIONS = 1;
+ public static final int MAX_REGIONS = 1;
/** redundancy used for the creation of the partition region */
// int redundancy = 0;
@@ -63,7 +63,7 @@ public class PartitionedRegionPRIDDUnitTest extends PartitionedRegionDUnitTestCa
/**
* This test performs following operations 1. creates 25 partition regions on 3 nodes. 2. creates
* more 25 partition regions on 4 nodes 3. tests PRID generation
- *
+ *
*/
@Test
public void testPRIDGenerationInMultiplePartitionRegion() throws Exception {
@@ -132,7 +132,7 @@ public class PartitionedRegionPRIDDUnitTest extends PartitionedRegionDUnitTestCa
* This function perfoms following checks on PRID creation 1. PRID generated should be between 0
* to number of partition regions in distributed system 2. PRID should be unique for the partition
* regions
- *
+ *
* @param startIndexForRegion
* @param endIndexForRegion
* @return
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
index 297dbd4..b34979b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
@@ -14,22 +14,8 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.internal.index.AbstractIndex;
-import org.apache.geode.pdx.PdxReader;
-import org.apache.geode.pdx.PdxSerializable;
-import org.apache.geode.pdx.PdxWriter;
-import org.apache.geode.test.dunit.DUnitEnv;
-import org.apache.geode.test.dunit.SerializableRunnableIF;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -44,6 +30,10 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.IntStream;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.DataSerializable;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -54,8 +44,8 @@ import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.control.RebalanceOperation;
import org.apache.geode.cache.control.RebalanceResults;
-import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexExistsException;
import org.apache.geode.cache.query.IndexNameConflictException;
import org.apache.geode.cache.query.NameResolutionException;
@@ -64,25 +54,34 @@ import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.DefaultQuery;
+import org.apache.geode.cache.query.internal.index.AbstractIndex;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.partitioned.QueryMessage;
import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.DUnitEnv;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
index 169e270..34b6807 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
@@ -61,7 +61,7 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
/**
* Test for the helper method getNodeToBucketMap.
- *
+ *
*/
@Test
public void testGetNodeToBucketMap() {
@@ -118,7 +118,7 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
/**
* This function populates bucket2Node region of the partition region
- *
+ *
* @param pr
*/
public void populateBucket2Node(PartitionedRegion pr, List nodes, int numOfBuckets) {
@@ -160,7 +160,7 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
/**
* This function decides number of the nodes in the list of bucket2Node region
- *
+ *
* @param i
* @return
*/
@@ -204,7 +204,7 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
/**
* This functions number of new nodes specified by nCount.
- *
+ *
* @param nCount
* @return
*/
@@ -240,7 +240,7 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
/**
* this function creates new node.
- *
+ *
* @return
*/
public Node createNode(int i) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
index 0eba655..9c207f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
@@ -22,11 +22,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class PartitionedRegionRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
index 21d83fb..53a40a8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache;
/**
* Following test create a region and threads which perform get and put operations simutaneously on
* that single region. Object used while putting in region is serializable.
- *
+ *
*/
import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index f53885f..b7ae2fe 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -33,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -79,6 +78,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index 6186ba7..2f2a974 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -63,6 +62,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
index cd8408a..ee9084a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
@@ -56,8 +56,8 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <P>
* (1) testPut() - Tests teh put() functionality for the partitioned region.
* </P>
- *
- *
+ *
+ *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(IntegrationTest.class)
@@ -89,8 +89,8 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
* 2)test the put() operation and validate that old values are returned in case of PR with scope
* D_ACK.
* </p>
- *
- *
+ *
+ *
*/
@Test
public void test000Put() throws Exception {
@@ -178,7 +178,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* This is a test for PartitionedRegion destroy(key) operation.
- *
+ *
*/
@Test
public void test001Destroy() throws Exception {
@@ -241,7 +241,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* This is a test for PartitionedRegion get(key) operation.
- *
+ *
*/
@Test
public void test002Get() throws Exception {
@@ -350,7 +350,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* Tests getCache() API of PR. This should return same value as the cache used.
- *
+ *
*/
@Test
public void test004GetCache() throws Exception {
@@ -370,7 +370,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* Tests getFullPath() API of PartitionedRegion.
- *
+ *
*/
@Test
public void test005GetFullPath() throws Exception {
@@ -388,7 +388,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* Tests getParentRegion() API of PR. This should return null as PR doesnt have a parentRegion
- *
+ *
*/
@Test
public void test006GetParentRegion() throws Exception {
@@ -407,7 +407,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* Tests getName() API of PR. Name returned should be same as the one used to create PR.
- *
+ *
*/
@Test
public void test007GetName() throws Exception {
@@ -469,7 +469,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* Tests close() API of PR. It should close the accessor and delete the data-store and related
* meta-data information.
- *
+ *
*/
@Test
public void test010Close() throws Exception {
@@ -507,7 +507,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* Tests localDestroyRegion() API of PR. It should locallyDestroy the accessor, data store and
* meta-data.
- *
+ *
*/
@Test
public void test011LocalDestroyRegion() throws Exception {
@@ -541,7 +541,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* This method is used to test the isDestroyed() functionality.
- *
+ *
*/
@Test
public void test012IsDestroyed() throws Exception {
@@ -571,23 +571,23 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/**
* This method validates that PR closed behavior matches that of local region closed behavior.
- *
+ *
*/
/*
* public void xxNoTestValidateCloseFunction() throws Exception { String partitionRegionName =
* "testValidateCloseFunction"; PartitionedRegion pr =
* (PartitionedRegion)PartitionedRegionTestHelper .createPartitionedRegion(partitionRegionName,
* String.valueOf(200), 2, Scope.DISTRIBUTED_ACK); String diRegion = "diRegion";
- *
+ *
* Region distRegion = null;
- *
+ *
* AttributesFactory af = new AttributesFactory(); RegionAttributes regionAttributes; // setting
* property af.setScope(Scope.DISTRIBUTED_ACK); // creating region attributes regionAttributes =
* af.create(); try { distRegion = PartitionedRegionTestHelper.createCache().createRegion(
* diRegion, regionAttributes); } catch (RegionExistsException rex) { distRegion =
* PartitionedRegionTestHelper.createCache() .getRegion(diRegion); } // Closing the regions
* distRegion.close(); pr.close();
- *
+ *
* if (!pr.getCache().equals(distRegion.getCache())) {
* fail("testValidateCloseFunction: getCache is not matching. "); } else { if
* (logger.fineEnabled()) { logger.fine("getCache() matched on closed PR and distributed region
@@ -595,12 +595,12 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
* fail("testValidateCloseFunction: getName behavior not matching. "); } else { if
* (logger.fineEnabled()) { logger.fine("getName) matched on closed PR and distributed region ");
* } }
- *
+ *
* if (distRegion.getFullPath().length() != pr.getFullPath().length()) {
* fail("testValidateCloseFunction: getFullPath behavior not matching. "); } else { if
* (logger.fineEnabled()) { logger .fine("getFullPath) matched on closed PR and distributed region
* "); } }
- *
+ *
* if (logger.fineEnabled()) { logger .fine("PartitionedRegionSingleNodeOperationsJUnitTest -
* testValidateCloseFunction() Completed successfully ... "); } }
*/
@@ -888,7 +888,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
* This method is used to test the setUserAttributes functionality. It verifies that it sets the
* UserAttributes on an open PR without throwing any exception. It also verifies that it throws
* RegionDestroyedException on a closed PR.
- *
+ *
*/
@Test
public void test015SetUserAttributes() throws Exception {
@@ -923,7 +923,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
* This method is used to test the getUserAttributes functionality. It verifies that it gets the
* UserAttributes on an open PR without throwing any exception. It also verifies that it throws
* RegionDestroyedException on a closed PR.
- *
+ *
*/
@Test
public void test016GetUserAttributes() throws Exception {
@@ -953,7 +953,7 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
* This method is used to test the getAttributesMutator functionality. It verifies that it gets
* the handle for attributes mutator on an open PR without throwing any exception. It also
* verifies that it throws RegionDestroyedException on a closed PR.
- *
+ *
*/
@Test
public void test017GetAttributesMutator() throws Exception {
@@ -1035,18 +1035,18 @@ public class PartitionedRegionSingleNodeOperationsJUnitTest {
/*
* PartitionedRegion pr1 = (PartitionedRegion)PartitionedRegionTestHelper
* .createPartitionedRegion(regionName + 2, String.valueOf(200), 0, Scope.DISTRIBUTED_ACK);
- *
+ *
* putSomeValues(pr1); java.util.Iterator buckRegionIterator1 =
* pr1.getDataStore().localBucket2RegionMap .values().iterator(); while
* (buckRegionIterator1.hasNext()) { Region bucket = (Region)buckRegionIterator1.next();
* assertIndexDetailsEquals(Scope.DISTRIBUTED_ACK, bucket.getAttributes().getScope());
* assertIndexDetailsEquals(MirrorType.KEYS_VALUES, bucket.getAttributes() .getMirrorType()); }
- *
+ *
* pr1.destroyRegion();
- *
+ *
* PartitionedRegion pr2 = (PartitionedRegion)PartitionedRegionTestHelper
* .createPartitionedRegion(regionName + 2, String.valueOf(200), 0, Scope.DISTRIBUTED_NO_ACK);
- *
+ *
* putSomeValues(pr2); java.util.Iterator buckRegionIterator2 =
* pr2.getDataStore().localBucket2RegionMap .values().iterator(); while
* (buckRegionIterator2.hasNext()) { Region bucket = (Region)buckRegionIterator2.next();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
index e5a5110..c40db61 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -46,13 +42,16 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test verifies the size API for 100 thousand put operations (done synch/asynch) on
* PartitionedRegions with different combinations of Scope and Redundancy (Scope DIST_ACK,
* Redundancy 1 AND Scope DIST_NO_ACK, Redundancy 0).
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -65,9 +64,9 @@ public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCa
static final Boolean value = new Boolean(true);
- final static int MAX_REGIONS = 1;
+ static final int MAX_REGIONS = 1;
- final static int cnt = 100;
+ static final int cnt = 100;
final int totalNumBuckets = 5;
@@ -75,7 +74,7 @@ public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCa
* This method creates Partitioned Region (Scope DIST_ACK, Redundancy = 1) with DataStores on 3
* VMs and only accessor on 4th VM. Then it does put operations synchronosly and checks that size
* is matched.
- *
+ *
* @throws Exception
*/
public void sizeOpsForDistAckSync() throws Exception {
@@ -163,7 +162,7 @@ public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCa
* This method creates Partitioned Region (Scope DIST_ACK, Redundancy = 1) with DataStores on 3
* VMs and only accessor on 4th VM. Then it does put operations Asynchronosly and checks that size
* is matched.
- *
+ *
* @throws Exception
*/
public void sizeOpsForDistAckASync() throws Throwable {
@@ -261,7 +260,7 @@ public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCa
* VMs and then it does put operations synchronosly. After that it brings up two VMs with
* datastore again and does size validation. After that it disconnects first and last VM and
* validates size again.
- *
+ *
* @throws Exception
*/
public void sizeOpsForDistAckSyncChangingVMCount() throws Exception {
@@ -350,7 +349,7 @@ public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCa
/**
* This test method invokes methods doing size validation on PRs.
- *
+ *
* @throws Exception
*/
@Test
@@ -552,10 +551,10 @@ public class PartitionedRegionSizeDUnitTest extends PartitionedRegionDUnitTestCa
/**
* This private methods sets the passed attributes and returns RegionAttribute object, which is
* used in create region
- *
+ *
* @param redundancy
* @param localMaxMem
- *
+ *
* @return
*/
protected RegionAttributes createRegionAttributesForPR(int redundancy, int localMaxMem) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
index e2328a4..be4b1b1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.CancellationException;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.Statistics;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -43,9 +39,12 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -312,11 +311,11 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
/*
* Redundant Copies related statistics validation vm0.invoke(validateRedundantCopiesStats);
- *
+ *
* vm1.invoke(disconnectVM);
- *
+ *
* Thread.sleep(20000);
- *
+ *
* vm0.invoke(validateRedundantCopiesStatsAfterDisconnect);
*/
}
@@ -419,7 +418,7 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
/**
* Test to make sure the datastore entry count is accurate.
- *
+ *
* @throws InterruptedException
*/
@Test
@@ -610,10 +609,10 @@ public class PartitionedRegionStatsDUnitTest extends PartitionedRegionDUnitTestC
/**
* This private methods sets the passed attributes and returns RegionAttribute object, which is
* used in create region
- *
+ *
* @param redundancy
* @param localMaxMem
- *
+ *
* @return
*/
protected RegionAttributes createRegionAttributesForPR(int redundancy, int localMaxMem) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
index e433771..e497d1e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
@@ -22,7 +22,18 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Set;
+
import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.LogWriter;
import org.apache.geode.Statistics;
import org.apache.geode.cache.AttributesFactory;
@@ -34,19 +45,9 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.PartitionedRegionStorageException;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Random;
-import java.util.Set;
/**
- *
+ *
*/
@Category(IntegrationTest.class)
public class PartitionedRegionStatsJUnitTest {
@@ -111,7 +112,7 @@ public class PartitionedRegionStatsJUnitTest {
/**
* This test verifies that PR statistics are working properly for single/multiple
* PartitionedRegions on single node.
- *
+ *
* @throws Exception
*/
@Test
@@ -247,7 +248,7 @@ public class PartitionedRegionStatsJUnitTest {
* int maxRedundantCopies = stats.get("maxRedundantCopies").intValue(); int minRedundantCopies =
* stats.get("minRedundantCopies").intValue(); int avgRedundantCopies =
* stats.get("avgRedundantCopies").intValue();
- *
+ *
* assertIndexDetailsEquals(minRedundantCopies, 2); assertIndexDetailsEquals(maxRedundantCopies,
* 2); assertIndexDetailsEquals(avgRedundantCopies, 2);
*/
@@ -264,7 +265,7 @@ public class PartitionedRegionStatsJUnitTest {
/**
* This test verifies that PR statistics are working properly for single/multiple
* PartitionedRegions on single node.
- *
+ *
* @throws Exception
*/
@Test
@@ -286,7 +287,7 @@ public class PartitionedRegionStatsJUnitTest {
/**
* This test verifies that PR statistics are working properly for single/multiple
* PartitionedRegions on single node.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java
index 18bc2a1..06fb8dd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java
@@ -14,24 +14,25 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+import org.junit.Assert;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.distributed.DistributedSystem;
-import org.junit.Assert;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
/**
* This helper class is used by other test. This has functions to create region.
- *
- *
+ *
+ *
*/
public class PartitionedRegionTestHelper
@@ -42,7 +43,7 @@ public class PartitionedRegionTestHelper
/**
* This method creates a partitioned region with all the default values. The cache created is a
* loner, so this is only suitable for single VM tests.
- *
+ *
* @param regionname
* @return region
* @throws RegionExistsException
@@ -141,7 +142,7 @@ public class PartitionedRegionTestHelper
* 2) local max memory
* </p>
* 3) redundancy and scope.
- *
+ *
* The cache created is a loner, so this is only suitable for single VM tests.
*/
@@ -177,7 +178,7 @@ public class PartitionedRegionTestHelper
/**
* This function is used to create serializable object for the partition region test.
- *
+ *
* @param name
* @param id
* @return
@@ -191,7 +192,7 @@ public class PartitionedRegionTestHelper
/**
* This method creates cache. The cache created is a loner, so this is only suitable for single VM
* tests.
- *
+ *
* @return
*/
public static synchronized InternalCache createCache() {
@@ -225,7 +226,7 @@ public class PartitionedRegionTestHelper
/**
* This method is used to return existing region.
- *
+ *
* @param PRName
* @return
*/
@@ -237,7 +238,7 @@ public class PartitionedRegionTestHelper
/**
* Gets the log writer for the The cache created is a loner, so this is only suitable for single
* VM tests.
- *
+ *
* @return LogWriter
*/
public static LogWriter getLogger() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index e769b4c..0f3b82a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -137,7 +137,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends PartitionedRegionDUnitT
/**
* Test the test method PartitionedRegion.getAllNodes Verify that it returns nodes after a value
* has been placed into the PartitionedRegion.
- *
+ *
* @see PartitionedRegion#getAllNodes()
*/
public static class TestGetNodesKey implements DataSerializable {
@@ -346,7 +346,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends PartitionedRegionDUnitT
/**
* Test the test method PartitionedRegion.getAllNodes Verify that it returns nodes after a value
* has been placed into the PartitionedRegion.
- *
+ *
* @see PartitionedRegion#getAllNodes()
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
index 2c88c96..44a8568 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
@@ -14,25 +14,21 @@
*/
/*
* Created on Mar 24, 2006
- *
+ *
* TODO To change the template for this generated file go to Window - Preferences - Java - Code
* Style - Code Templates
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -49,6 +45,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test is to verify creation of partition region and distributed region with same name.
@@ -73,9 +72,9 @@ public class PartitionedRegionWithSameNameDUnitTest extends PartitionedRegionDUn
/**
* Used to decide whether to create subregion as distributed region or partitioned region
*/
- static protected final int DISTRIBUTED_REGION = 0;
+ protected static final int DISTRIBUTED_REGION = 0;
- static protected final int PARTITIONED_REGION = 1;
+ protected static final int PARTITIONED_REGION = 1;
public PartitionedRegionWithSameNameDUnitTest() {
super();
@@ -758,9 +757,9 @@ public class PartitionedRegionWithSameNameDUnitTest extends PartitionedRegionDUn
/**
* This function creates multiple partition regions in a VM. The name of the Partition Region will
* be PRPrefix+index (index starts from startIndexForRegion and ends to endIndexForRegion)
- *
+ *
* @param PRPrefix : Used in the name of the Partition Region
- *
+ *
* These indices Represents range of the Partition Region
* @param startIndexForRegion :
* @param endIndexForRegion
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
index 1bc45be..78886ae 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
@@ -19,7 +19,16 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+
import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -33,14 +42,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
@Category(IntegrationTest.class)
public class PersistentPartitionedRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
index a638b14..daa8418 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class PlaceHolderDiskRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
index 115a1d9..05feed5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ProxyBucketRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
index ce41114..3270ef2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
index 28c456f..4fb6c9d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class RegionListenerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java
index f02da45..13fbf11 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java
@@ -19,11 +19,12 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class RemoteFetchEntryMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java
index 29c5a78..a47b78f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java
@@ -18,11 +18,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.DataInput;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.DataInput;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RemotePutAllMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java
index 1205c9a..efdab2a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java
@@ -18,11 +18,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.DataInput;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.DataInput;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RemoteRemoveAllMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
index e629618..dcf2a85 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
index 8b37a22..a528633 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.transaction.RollbackException;
@@ -420,10 +421,10 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
/*
* assertNotNull(orderRegion.getEntry(orderId)); assertIndexDetailsEquals(expectedOrder,
* orderRegion.getEntry(orderId).getValue());
- *
+ *
* assertNotNull(orderRegion.getEntry(orderId2)); assertIndexDetailsEquals(expectedOrder2,
* orderRegion.getEntry(orderId2).getValue());
- *
+ *
* assertNotNull(orderRegion.getEntry(orderId3)); assertIndexDetailsEquals(expectedOrder3,
* orderRegion.getEntry(orderId3).getValue());
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
index f010acd..244ca15 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
@@ -183,5 +183,3 @@ public class RemoveDAckDUnitTest extends JUnit4DistributedTestCase { // TODO: re
}// end of class
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
index e714e6d..93aaa47 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache;
+import static org.junit.Assert.assertEquals;
+
import java.util.Properties;
import org.junit.After;
@@ -22,7 +24,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.assertEquals;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateCacheListenerInvocationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateCacheListenerInvocationTest.java
index cd00e1b..32d567b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateCacheListenerInvocationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateCacheListenerInvocationTest.java
@@ -193,7 +193,7 @@ public class ReplicateCacheListenerInvocationTest implements Serializable {
/**
* Overridden within tests to increment shared counters.
*/
- static abstract class BaseCacheListener extends CacheListenerAdapter<String, Integer>
+ abstract static class BaseCacheListener extends CacheListenerAdapter<String, Integer>
implements Serializable {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
index 96c312f..062b0f0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.InitialImageOperation.RequestFilterInfoMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.InitialImageOperation.RequestFilterInfoMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class RequestFilterInfoMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
index 11f633a..b7f04b1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class RequestImageMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
index 8355e5c..6504223 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.InitialImageOperation.RequestRVVMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.InitialImageOperation.RequestRVVMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class RequestRVVMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
index 6d47e56..6beba93 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java
@@ -37,29 +37,29 @@ import org.apache.geode.internal.logging.LogService;
* This function can be used by GemFire clients and peers to rollback an existing transaction. A
* {@link TransactionId} corresponding to the transaction to be rolledback must be provided as an
* argument while invoking this function.<br />
- *
+ *
* This function should execute only on one server. If the transaction is not hosted on the server
* where the function is invoked then this function decides to invoke a
* {@link NestedTransactionFunction} which executes on the member where transaction is hosted.<br />
- *
+ *
* This function returns a single Boolean as result, whose value is <code>Boolean.TRUE</code> if the
* transaction rolled back successfully otherwise the return value is
* <code>Boolean.FALSE</code>.<br />
- *
+ *
* To execute this function, it is recommended to use the {@link Execution} obtained by using
* TransactionFunctionService. <br />
- *
+ *
* To summarize, this function should be used as follows:
- *
+ *
* <pre>
* Execution exe = TransactionFunctionService.onTransaction(txId);
* List l = (List) exe.execute(rollbackFunction).getResult();
* Boolean result = (Boolean) l.get(0);
* </pre>
- *
+ *
* This function is <b>not</b> registered on the cache servers by default, and it is the user's
* responsibility to register this function. see {@link FunctionService#registerFunction(Function)}
- *
+ *
* @since GemFire 6.6.1
*/
public class RollbackFunction implements Function {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
index f38f2ad..39547c1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
@@ -22,8 +22,10 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.ExpirationAttributes;
@@ -36,7 +38,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.awaitility.Awaitility;
@Category(UnitTest.class)
public class SearchLoadAndWriteProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
index 8a5e10e..ac5d965 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* Created on Feb 15, 2006
- *
+ *
* TODO To change the template for this generated file go to Window - Preferences - Java - Code
* Style - Code Templates
*/
@@ -36,7 +36,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Testing methods for SimpleDiskRegion.java api's
- *
+ *
* @since GemFire 5.1
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
index 0283674..2d4e021 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
@@ -20,7 +20,15 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
@@ -47,13 +55,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
@Category(DistributedTest.class)
public class SingleHopStatsDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
index af8a934..4a313ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.File;
@@ -30,6 +23,9 @@ import java.io.IOException;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.AttributesFactory;
@@ -58,13 +54,16 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* A test of the when we will use the object sizer to determine the actual size of objects wrapped
* in CacheDeserializables.
- *
- *
- *
+ *
+ *
+ *
* TODO - I was intending to add tests that have an index and object sizer, but it appears we don't
* support indexes on regions with overflow to disk.
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SnapshotTestUtil.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SnapshotTestUtil.java
index c1e556d..bc1d14d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SnapshotTestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SnapshotTestUtil.java
@@ -14,13 +14,15 @@
*/
package org.apache.geode.internal.cache;
+import static org.junit.Assert.*;
+
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import static org.junit.Assert.*;
import com.examples.snapshot.MyObject;
+
import org.apache.geode.cache.snapshot.SnapshotIterator;
import org.apache.geode.cache.snapshot.SnapshotReader;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
index 761064f..5bec242 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class StateMarkerMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
index 08f56d9..5dfb347 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
@@ -20,6 +20,10 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelException;
import org.apache.geode.LogWriter;
import org.apache.geode.SystemFailure;
@@ -39,13 +43,9 @@ import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
/**
* This class tests the response of GemFire to various occurrences of {@link VirtualMachineError}
- *
+ *
* @since GemFire 5.1
*/
@Category(DistributedTest.class)
@@ -54,7 +54,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
static final String REGION_NAME = "SystemFailureDUnitTest";
static final Scope SCOPE = Scope.DISTRIBUTED_ACK;
- volatile static Object newValue, oldValue;
+ static volatile Object newValue, oldValue;
@Test
public void testNullFailure() {
@@ -199,10 +199,10 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* This class can never be successfully loaded.
- *
+ *
*/
static class SickoClass {
- static private boolean threeCardMonte() {
+ private static boolean threeCardMonte() {
return true;
}
@@ -238,13 +238,13 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
}
- static protected final AtomicInteger listenerCount = new AtomicInteger(0);
+ protected static final AtomicInteger listenerCount = new AtomicInteger(0);
- static protected Integer getListenerCount() {
+ protected static Integer getListenerCount() {
return new Integer(listenerCount.get());
}
- static private final Runnable listener1 = new Runnable() {
+ private static final Runnable listener1 = new Runnable() {
public void run() {
org.apache.geode.test.dunit.LogWriterUtils.getLogWriter().info("Inside of preListener1");
listenerCount.addAndGet(1);
@@ -381,7 +381,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
}
- static protected volatile ArrayList peskyMemory;
+ protected static volatile ArrayList peskyMemory;
private Object doExec(String method) {
Host host = Host.getHost(0);
@@ -420,7 +420,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
sub.create(name, new Integer(0), sub.getCache().getDistributedSystem().getDistributedMember());
}
- static private final GenericListener listener_stackOverflow = new GenericListener() {
+ private static final GenericListener listener_stackOverflow = new GenericListener() {
/**
* gratuitous and stupid recursion
*/
@@ -451,7 +451,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
};
- static private final GenericListener listener_persistentOutOfMemory = new GenericListener() {
+ private static final GenericListener listener_persistentOutOfMemory = new GenericListener() {
/**
* Allocate objects until death
*/
@@ -495,7 +495,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
};
- static private final GenericListener listener_memoryMonitor = new GenericListener() {
+ private static final GenericListener listener_memoryMonitor = new GenericListener() {
/**
* Allocate objects until we are chronically low, but don't generate OutOfMemoryError
@@ -562,7 +562,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
};
- static private final GenericListener listener_internalError = new GenericListener() {
+ private static final GenericListener listener_internalError = new GenericListener() {
/**
* not really any good way to convince Java to do this, so I'm just gonna throw it directly.
*/
@@ -577,7 +577,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
};
- static private final GenericListener listener_unknownError = new GenericListener() {
+ private static final GenericListener listener_unknownError = new GenericListener() {
/**
* Not actually used in current JRE?
@@ -593,7 +593,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
}
};
- static private final GenericListener listener_error = new GenericListener() {
+ private static final GenericListener listener_error = new GenericListener() {
private void forceError() {
new SickoClass();
}
@@ -607,11 +607,11 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* Set a listener that generates some sort of error
- *
+ *
* @param which makes it test dependent
* @return the listener
*/
- static private GenericListener getListener(String which) {
+ private static GenericListener getListener(String which) {
GenericListener listener;
if (which.equals("testStackOverflow")) {
listener = listener_stackOverflow;
@@ -654,7 +654,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* Sets a listener based on the test, and then (attempts to) create an entry in this test's region
* with the given name
- *
+ *
* @param name the test we are running
*/
protected static void createEntry(String name) throws CacheException {
@@ -689,7 +689,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* is called when an object is newly loaded into cache.
- *
+ *
* @param oevt the ObjectEvent object representing the source object of the event.
*/
public void afterCreate(EntryEvent oevt) {
@@ -698,7 +698,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* is called when an object is invalidated.
- *
+ *
* @param oevt the ObjectEvent object representing the source object of the event.
*/
public void afterInvalidate(EntryEvent oevt) {
@@ -707,7 +707,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* is called when an object is destroyed.
- *
+ *
* @param oevt the ObjectEvent object representing the source object of the event.
*/
public void afterDestroy(EntryEvent oevt) {
@@ -716,7 +716,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* is called when an object is replaced.
- *
+ *
* @param oevt the ObjectEvent object representing the source object of the event.
*/
public void afterUpdate(EntryEvent oevt) {
@@ -725,7 +725,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* is called when a region is invalidated.
- *
+ *
* @param revt a RegionEvent to represent the source region.
* @throws CacheException if any error occurs.
*/
@@ -735,7 +735,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
/**
* is called when a region is destroyed.
- *
+ *
* @param revt a RegionEvent to represent the source region.
* @throws CacheException if any error occurs.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
index 052d174..f8abef7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class TXEventTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
index d252d92..3503731 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
@@ -14,12 +14,17 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.util.Properties;
+import java.util.Queue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -29,14 +34,9 @@ import org.junit.rules.TestName;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import java.util.Properties;
-import java.util.Queue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* junit test for suspend and resume methods
@@ -70,7 +70,7 @@ public class TXManagerImplJUnitTest {
/**
* two threads suspend and resume a single transaction, while making changes.
- *
+ *
* @throws Exception
*/
@Test
@@ -254,7 +254,7 @@ public class TXManagerImplJUnitTest {
/**
* test that timeout of Long.MAX_VALUE does not return immediately
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
index 8eecaec..f8edb46 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -31,7 +32,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.partitioned.DestroyMessage;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.awaitility.Awaitility;
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
index 76c1e79..4263be0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class TXMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
index b4f5b3b..6a9072a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.util.Collections;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Collections;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.dunit.ThreadUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class TXReservationMgrJUnitTest {
@@ -58,8 +59,8 @@ public class TXReservationMgrJUnitTest {
this.ds.disconnect();
}
- private final static int THREAD_COUNT = Integer.getInteger("junit.THREAD_COUNT", 30).intValue();
- private final static int KEY_COUNT = Integer.getInteger("junit.KEY_COUNT", 50).intValue();
+ private static final int THREAD_COUNT = Integer.getInteger("junit.THREAD_COUNT", 30).intValue();
+ private static final int KEY_COUNT = Integer.getInteger("junit.KEY_COUNT", 50).intValue();
protected void doThreadBody(final TXReservationMgr mgr) {
final String tName = Thread.currentThread().getName();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplJUnitTest.java
index 9ce76c5..a6ddb7c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplJUnitTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.region.entry.RegionEntryFactoryBuilder;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
index 6c5a349..af692f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
@@ -19,11 +19,12 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.tx.TXRegionStub;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.tx.TXRegionStub;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class TXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TestNonSizerObject.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TestNonSizerObject.java
index 65a6527..6713652 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TestNonSizerObject.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TestNonSizerObject.java
@@ -20,8 +20,8 @@ import org.apache.commons.lang.StringUtils;
/**
* Test object which does not implement ObjectSizer, used as Key/Value in put operation.
- *
- *
+ *
+ *
*/
public class TestNonSizerObject implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TestObjectSizerImpl.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TestObjectSizerImpl.java
index 1f54e8b..379f551 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TestObjectSizerImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TestObjectSizerImpl.java
@@ -21,8 +21,8 @@ import org.apache.geode.cache.util.ObjectSizer;
/**
* Test object which implements ObjectSizer, used as Key/Value in put operation as well as used as a
* Sizer for HeapLru testing.
- *
- *
+ *
+ *
*/
public class TestObjectSizerImpl implements ObjectSizer, Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
index 754e2b4..5dd2f8b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.net.InetAddress;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -23,16 +34,6 @@ import org.apache.geode.internal.cache.entries.VersionedThinRegionEntryHeap;
import org.apache.geode.internal.cache.entries.VersionedThinRegionEntryHeapObjectKey;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-import java.net.InetAddress;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
@Category(IntegrationTest.class)
public class TombstoneCreationJUnitTest {
@@ -82,7 +83,7 @@ public class TombstoneCreationJUnitTest {
* In bug #47868 a thread puts a REMOVED_PHASE1 entry in the map but is unable to lock the entry
* before a Destroy thread gets it. The Destroy thread did not apply its operation but threw an
* EntryNotFoundException. It is supposed to create a Tombstone.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
index e153605..1011c14 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
@@ -13,17 +13,21 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Iterator;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.Delta;
import org.apache.geode.InvalidDeltaException;
@@ -42,14 +46,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Iterator;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
index b69486d..470557a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
@@ -13,10 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.Region.Entry;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
@@ -25,18 +32,12 @@ import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
/**
* This test creates an entry and verifies if {@link UpdateOperation} applies correctly on it after
* various other operations have been applied on it (Including destroy when entry is a
* {@link Tombstone}).
- *
+ *
* @since GemFire 7.0.1
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
index c1dc9be..414f591 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test for the new variable length format
- *
+ *
* TODO these tests need some work. I don't think they really represent edge cases for this variable
* length value.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
index 9311051..b2b4b63 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -21,6 +21,7 @@ import java.lang.management.ManagementFactory;
import java.lang.management.MemoryPoolMXBean;
import java.util.Properties;
import java.util.Set;
+
import javax.management.ListenerNotFoundException;
import javax.management.NotificationEmitter;
@@ -78,17 +79,17 @@ public class MemoryMonitorJUnitTest {
}
}
- final static String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
+ static final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
.getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
public static final String addExpectedAbove =
"<ExpectedException action=add>" + expectedEx + "</ExpectedException>";
public static final String removeExpectedAbove =
"<ExpectedException action=remove>" + expectedEx + "</ExpectedException>";
- final static String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
+ static final String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
.getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
- public final static String addExpectedBelow =
+ public static final String addExpectedBelow =
"<ExpectedException action=add>" + expectedBelow + "</ExpectedException>";
- public final static String removeExpectedBelow =
+ public static final String removeExpectedBelow =
"<ExpectedException action=remove>" + expectedBelow + "</ExpectedException>";
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index 3dd883d..8fdde17 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal.cache.control;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
@@ -22,16 +33,6 @@ import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceT
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
/**
*/
@@ -65,17 +66,17 @@ public class MemoryMonitorOffHeapJUnitTest {
}
}
- final static String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
+ static final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
.getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
public static final String addExpectedAbove =
"<ExpectedException action=add>" + expectedEx + "</ExpectedException>";
public static final String removeExpectedAbove =
"<ExpectedException action=remove>" + expectedEx + "</ExpectedException>";
- final static String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
+ static final String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
.getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
- public final static String addExpectedBelow =
+ public static final String addExpectedBelow =
"<ExpectedException action=add>" + expectedBelow + "</ExpectedException>";
- public final static String removeExpectedBelow =
+ public static final String removeExpectedBelow =
"<ExpectedException action=remove>" + expectedBelow + "</ExpectedException>";
@Test
@@ -336,4 +337,3 @@ public class MemoryMonitorOffHeapJUnitTest {
assertEquals(0f, monitor.getCriticalThreshold(), 0.01);
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
index ec59bf9..a1da0bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -452,7 +452,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test that we correctly use the redundancy-zone property to determine where to place redundant
* copies of a buckets.
- *
+ *
* @param simulate
*/
public void enforceZone(final boolean simulate) {
@@ -1661,7 +1661,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Check to make sure that we balance buckets between two hosts with no redundancy.
- *
+ *
* @param simulate
*/
public void moveBucketsNoRedundancy(final boolean simulate) {
@@ -1792,7 +1792,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Check to make sure that we balance buckets between two hosts with no redundancy.
- *
+ *
* @param simulate
*/
public void filterRegions(final boolean simulate) {
@@ -2386,7 +2386,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to make sure that we move buckets to balance between three hosts with a redundancy of 1
* and two colocated regions. Makes sure that the buckets stay colocated when we move them.
- *
+ *
* @param simulate
*/
public void moveBucketsColocatedRegions(final boolean simulate) {
@@ -2509,7 +2509,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to make sure that moving primaries waits for a put
- *
+ *
* @throws Exception
*/
@Test
@@ -2523,7 +2523,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to make sure that moving primaries waits for a put
- *
+ *
* @throws Exception
*/
@Test
@@ -2537,7 +2537,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to make sure that moving primaries waits for a put
- *
+ *
* @throws Exception
*/
@Test
@@ -2551,7 +2551,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to make sure that moving primaries waits for a put
- *
+ *
* @throws Exception
*/
@Test
@@ -2567,7 +2567,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to ensure that we wait for in progress write operations before moving a primary.
- *
+ *
* @throws Exception
*/
public void runTestWaitForOperation(final Operation op) throws Exception {
@@ -2854,7 +2854,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/*
* Simulates a rebalance if simulation flag is set. Otherwise, performs a rebalance.
- *
+ *
* A rebalance will replace offline buckets, so this should restore redundancy
*/
rebalanceVM.invoke(new SerializableRunnable("simulateRebalance") {
@@ -2999,7 +2999,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Check to make sure that we balance buckets between two hosts with no redundancy.
- *
+ *
* @param simulate
*/
public void balanceBucketsByCount(final boolean simulate) {
@@ -3123,7 +3123,7 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
/**
* Test to ensure that we wait for in progress write operations before moving a primary.
- *
+ *
* @throws CancellationException
*/
public void moveBucketsWithUnrecoveredValuesRedundancy(final boolean simulate) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
index 324c121..6f167c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
@@ -19,11 +19,12 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ResourceAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/TestMemoryThresholdListener.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/TestMemoryThresholdListener.java
index 8183670..654c7fc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/TestMemoryThresholdListener.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/TestMemoryThresholdListener.java
@@ -112,7 +112,7 @@ public class TestMemoryThresholdListener implements ResourceListener<MemoryEvent
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.control.ResourceListener#onEvent(java.lang.Object)
*/
@Override
@@ -169,7 +169,7 @@ public class TestMemoryThresholdListener implements ResourceListener<MemoryEvent
/**
* Convert a percentage as a double to an integer e.g. 0.09 => 9 also legal is 0.095 => 9
- *
+ *
* @param percentHeap a percentage value expressed as a double e.g. 9.5% => 0.095
* @return the calculated percent as an integer >= 0 and <= 100
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
index 9d9367e..a9f81bd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
@@ -190,7 +190,7 @@ public class DiskRegionOverflowAsyncRollingOpLogJUnitTest extends DiskRegionTest
/**
* getLRUStats
- *
+ *
* @param region1
* @return
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
index a9c0226..186cced 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import org.apache.geode.internal.cache.*;
+import static org.junit.Assert.*;
import java.util.*;
@@ -23,10 +23,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
-
import org.apache.geode.*;
import org.apache.geode.cache.*;
+import org.apache.geode.internal.cache.*;
import org.apache.geode.internal.cache.lru.LRUStatistics;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
@@ -36,7 +35,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* 1) Performance of Get Operation for Entry faulting in from current Op Log 2) Performance of Get
* operation for Entry faulting in from previous Op Log 3) Performance of Get operation for Entry
* faulting in from H Tree
- *
+ *
*/
@Category(IntegrationTest.class)
public class DiskRegionOverflowSyncRollingOpLogJUnitTest extends DiskRegionTestingBase {
@@ -181,7 +180,7 @@ public class DiskRegionOverflowSyncRollingOpLogJUnitTest extends DiskRegionTesti
}
/**
- *
+ *
* @param region1
* @return
*/
@@ -191,4 +190,3 @@ public class DiskRegionOverflowSyncRollingOpLogJUnitTest extends DiskRegionTesti
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
index 6d3005b..0dd2774 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
@@ -156,7 +156,7 @@ public class DiskRegionPersistOnlySyncJUnitTest extends DiskRegionTestingBase {
* OP_COUNT can be increased/decrease as per the requirement. If required to be set as higher
* value such as 1000000 one needs to set the VM heap size accordingly. (For example:Default
* setting in build.xml is <jvmarg value="-Xmx256M"/>
- *
+ *
*/
OP_COUNT = 1000;
UNIQUE_KEYS = Boolean.getBoolean("DRP.UNIQUE_KEYS");
@@ -203,4 +203,3 @@ public class DiskRegionPersistOnlySyncJUnitTest extends DiskRegionTestingBase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
index 9c87176..f989114 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
-import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.io.File;
+import java.util.Properties;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import java.io.File;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
+import org.apache.geode.test.dunit.ThreadUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class MultiThreadedOplogPerJUnitPerformanceTest {
@@ -77,7 +78,7 @@ public class MultiThreadedOplogPerJUnitPerformanceTest {
/**
* cleans all the directory of all the files present in them
- *
+ *
*/
protected static void deleteFiles() {
for (int i = 0; i < 4; i++) {
@@ -177,11 +178,11 @@ public class MultiThreadedOplogPerJUnitPerformanceTest {
region.put(new Integer((i + 1) + num), bytes);
/*
* DiskRegion dr =((LocalRegion)region).getDiskRegion();
- *
+ *
* DiskEntry entry = (DiskEntry)(((LocalRegion)region).basicGetEntry(new
* Integer((i+1)+num))); try{ byte[] val = (byte[])dr.getNoBuffer(entry.getDiskId());
* }catch(Exception e) {
- *
+ *
* System.out.print("EROR. "+ " Count ="+i ); e.printStackTrace(); }
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
index fd69f98..bebf994 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Operation;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index becc511..3e311ed 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -20,6 +20,15 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -45,14 +54,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomResultCollector.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomResultCollector.java
index a4ba7a8..b21452b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomResultCollector.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomResultCollector.java
@@ -15,8 +15,8 @@
package org.apache.geode.internal.cache.execute;
import java.util.ArrayList;
-
import java.util.concurrent.TimeUnit;
+
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
index 6d39a3f..14f7603 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
@@ -13,18 +13,18 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute;
+import java.io.Serializable;
+
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.internal.cache.execute.data.CustId;
import org.apache.geode.internal.cache.execute.data.OrderId;
import org.apache.geode.internal.cache.execute.data.ShipmentId;
-import java.io.Serializable;
-
public class CustomerIDPartitionResolver implements PartitionResolver {
private static CustomerIDPartitionResolver customerIDPartitionResolver = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index a04d658..4282f03 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -422,13 +422,13 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
* AsyncInvocationArrSize = 1; AsyncInvocation[] async = new
* AsyncInvocation[AsyncInvocationArrSize]; async[0] = empty.invokeAsync(() ->
* DistributedRegionFunctionExecutionDUnitTest.executeFunctionHA());
- *
+ *
* replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.closeCache());
- *
+ *
* replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm());
* replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer(
* DataPolicy.REPLICATE ));
- *
+ *
* DistributedTestCase.join(async[0], 50 * 1000, getLogWriter()); if (async[0].getException() !=
* null) { fail("UnExpected Exception Occurred : ", async[0].getException()); } List l =
* (List)async[0].getReturnValue();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
index bdcbd07..a23a3df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
@@ -30,6 +23,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.execute.Execution;
@@ -46,12 +42,15 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnitTestCase {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
index 711d6ed..6bc332a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
@@ -21,6 +21,10 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -37,10 +41,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
public abstract class FunctionServiceClientAccessorPRBase extends FunctionServiceClientBase {
public static final String REGION = "region";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
index bf0998c..94dc26a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
/**
* Tests function execution with a client accessing a single member with a PR using onRegion calls.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
index 02c05a8..884f088 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.client.internal.ClientMetadataService;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
/**
* Tests function execution with a client accessing multiple members with a PR with redundancy 0
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
index 1e1bbbd..cc18592 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
/**
* Tests onRegion using multiple servers from a single client that has single hop disabled
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
index 579a420..701b22a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
/**
* Tests onServers using multiple servers from a single client.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java
index 46b2184..21966bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.junit.Before;
-
public abstract class FunctionServiceClientOnServerBase extends FunctionServiceClientBase {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
index 7e237df..2f45a98 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
-
/**
* Tests onServers using a single server from a single client.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
index fbdcd17..63c9250 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
@@ -21,9 +24,6 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
index bdc0562..de64e78 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
index af504f4..c2031df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
@@ -17,6 +17,9 @@ package org.apache.geode.internal.cache.execute;
import java.util.HashSet;
import java.util.Set;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
@@ -24,9 +27,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java
index ee535b1..9456fc7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+import org.junit.Ignore;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
@@ -22,9 +25,6 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.junit.Before;
-import org.junit.Ignore;
-
public abstract class FunctionServicePeerAccessorPRBase extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
index b1bfe71..446eebb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
@@ -23,10 +27,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
index 6d0c1fa..fe695b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
@@ -23,10 +27,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
index 66a09ff..fd290a8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
@@ -22,9 +25,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index 1fa523c..46c00c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -178,7 +178,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
* 1-client 3-Servers Function : TEST_FUNCTION2 Function : TEST_FUNCTION3 Execution of the
* function on serverRegion with set multiple keys as the routing object and using the name of the
* function
- *
+ *
* On server side, function execution calls should be equal to the no of function executions
* completed.
*/
@@ -338,7 +338,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
* 1-client 3-Servers server1 : Replicate server2 : Replicate server3 : Replicate client : Empty
* Function : TEST_FUNCTION2 Execution of the function on serverRegion with set multiple keys as
* the routing object and using the name of the function
- *
+ *
* On server side, function execution calls should be equal to the no of function executions
* completed.
*/
@@ -702,7 +702,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
/**
* Ensure that the execution is happening all the PR as a whole
- *
+ *
* Function Execution will not take place on accessor, accessor will onlu receive the
* resultsReceived. On datastore, no of function execution calls should be equal to the no of
* function execution calls from the accessor.
@@ -995,7 +995,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
/**
* Test the execution of function on all memebers haveResults = true
- *
+ *
* member1 calls for the function executions sp the results received on memeber 1 should be equal
* to the no of function execution calls. Function Execution should happen on all other members
* too. so the no of function execution calls and no of function executions completed should be
@@ -1145,7 +1145,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
/**
* Test the exception occurred while invoking the function execution on all members of DS
- *
+ *
* Function throws the Exception, The check is added to for the no of function execution execption
* in datatostore1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
index 3a11b89..042a7f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
@@ -33,6 +26,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -76,10 +72,13 @@ import org.apache.geode.internal.cache.functions.LocalDataSetFunction;
import org.apache.geode.internal.cache.lru.HeapLRUCapacityController;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class LocalDataSetIndexingDUnitTest extends JUnit4CacheTestCase {
@@ -289,12 +288,12 @@ class RegionValue implements Serializable, Comparable<RegionValue> {
/*
* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
* 36 37 38 39
- *
+ *
* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
- *
+ *
* 5 10 15 20 - 4 buckets
- *
+ *
* 5, 2, 7, 4
- *
+ *
* Result : 5, 13, 2, 10 , 18 , 7, 15, 4, 12, 20
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 18d3e44..0bd3e87 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -47,9 +47,9 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.LonerDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
@@ -85,7 +85,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on all memebers haveResults = true
- *
+ *
* @throws Exception
*/
@Test
@@ -131,7 +131,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on all memebers haveResults = true
- *
+ *
* @throws Exception
*/
@Test
@@ -256,7 +256,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on all memebers haveResults = false
- *
+ *
* @throws Exception
*/
@Test
@@ -267,7 +267,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on local memebers haveResults = true
- *
+ *
* @throws Exception
*/
@Test
@@ -278,7 +278,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on local memebers haveResults = true
- *
+ *
* @throws Exception
*/
@Test
@@ -290,7 +290,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on other memebers haveResults = true
- *
+ *
* @throws Exception
*/
@Test
@@ -301,7 +301,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
/**
* Test the execution of function on other memebers haveResults = true
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
index cb3259c..3d35509 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -45,6 +41,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("serial")
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java
index 4714001..06f2b07 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java
@@ -19,13 +19,13 @@ public class MyFunctionExecutionException extends RuntimeException {
/**
* Creates new exception with given error message.
- *
+ *
*/
public MyFunctionExecutionException() {}
/**
* Creates new exception with given error message.
- *
+ *
* @param msg
*/
public MyFunctionExecutionException(String msg) {
@@ -34,7 +34,7 @@ public class MyFunctionExecutionException extends RuntimeException {
/**
* Creates new exception with given error message and optional nested exception.
- *
+ *
* @param msg
* @param cause
*/
@@ -44,7 +44,7 @@ public class MyFunctionExecutionException extends RuntimeException {
/**
* Creates new exception given Throwable as a cause and source of error message.
- *
+ *
* @param cause
*/
public MyFunctionExecutionException(Throwable cause) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index 812a550..22dd27c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -32,6 +24,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
@@ -40,11 +35,15 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServerTestBase {
/**
- *
+ *
*/
private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 3d18067..60a3837 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -29,7 +29,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -64,6 +63,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 19d6ca8..11cbce6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -57,6 +56,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 0755966..21a5328 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.EOFException;
import java.io.IOException;
import java.io.Serializable;
@@ -39,6 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheClosedException;
@@ -64,6 +57,10 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index c24c7ae..fd7626c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -19,6 +19,24 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.rmi.ServerException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Execution;
@@ -45,23 +63,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.rmi.ServerException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index ba6f948..002c1f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.EOFException;
import java.io.IOException;
import java.io.Serializable;
@@ -39,6 +31,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Execution;
@@ -62,6 +57,10 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
@@ -1198,4 +1197,3 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
index d447c5f..7b0f3b1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
@@ -80,7 +80,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is the test for the custom and colocated partitioning of PartitionedRegion
- *
+ *
*/
@SuppressWarnings("synthetic-access")
@Category(DistributedTest.class)
@@ -100,11 +100,11 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
protected static int defaultStringSize = 0;
- final static String CustomerPartitionedRegionName = "CustomerPartitionedRegion";
+ static final String CustomerPartitionedRegionName = "CustomerPartitionedRegion";
- final static String OrderPartitionedRegionName = "OrderPartitionedRegion";
+ static final String OrderPartitionedRegionName = "OrderPartitionedRegion";
- final static String ShipmentPartitionedRegionName = "ShipmentPartitionedRegion";
+ static final String ShipmentPartitionedRegionName = "ShipmentPartitionedRegion";
String regionName = null;
@@ -1275,7 +1275,7 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
* Member 1: PR2 colocatedWith PR1 <br>
* Member 2: PR2 is not colocated <br>
* Should throw IllegalStateException
- *
+ *
* @throws Throwable
*/
@Test
@@ -1424,7 +1424,7 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
/**
* Confirm that the redundancy must be the same for colocated partitioned regions
- *
+ *
* @throws Exception
*/
@Test
@@ -1459,7 +1459,7 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
/**
* Tests to make sure that a VM will not make copies of any buckets for a region until all of the
* colocated regions are created.
- *
+ *
* @throws Throwable
*/
@Test
@@ -1762,10 +1762,10 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
/**
* Test for hang condition observed with the PRHARedundancyProvider.createMissingBuckets code.
- *
+ *
* A parent region is populated with buckets. Then the child region is created simultaneously on
* several nodes.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java
index a9ba8a6..0d58be6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java
@@ -14,19 +14,16 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.*;
-/**
- * This is a dunit test for PartitionedRegion creation and Region API's for put and get
- * functionality in case of Custom Partitioning.
- */
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.*;
@@ -39,12 +36,9 @@ import org.apache.geode.internal.cache.PartitionedRegionDUnitTestCase;
import org.apache.geode.internal.cache.PartitionedRegionDataStore.BucketVisitor;
import org.apache.geode.internal.cache.xmlcache.Declarable2;
import org.apache.geode.test.dunit.*;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRCustomPartitioningDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -129,7 +123,7 @@ public class PRCustomPartitioningDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Search the entires PartitionedRegion for the key, to validate that indeed it doesn't exist
- *
+ *
* @returns true if it does exist
* @param par
* @param key
@@ -452,12 +446,12 @@ public class PRCustomPartitioningDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Example implementation of a Partition Resolver which uses part of the value for custom
* partitioning.
- *
+ *
*/
class MonthBasedPartitionResolver implements PartitionResolver, Declarable2 {
private static MonthBasedPartitionResolver mbrResolver = null;
- final static String id = "MonthBasedPartitionResolverid1";
+ static final String id = "MonthBasedPartitionResolverid1";
private Properties properties;
private String resolverName;
@@ -508,7 +502,7 @@ class MonthBasedPartitionResolver implements PartitionResolver, Declarable2 {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.xmlcache.Declarable2#getConfig()
*/
public Properties getConfig() {
@@ -541,4 +535,3 @@ class SerializableMonth implements DataSerializable {
return 3;
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 24ab82d..8882993 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -3015,4 +3015,3 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
index a846808..ef7fe9d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -33,6 +26,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -58,6 +54,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -73,7 +72,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg
/**
* Test remote execution by a pure accessor which doesn't have the function factory present.
- *
+ *
* @throws Exception
*/
@Test
@@ -155,7 +154,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg
/**
* Test remote execution by a pure accessor which doesn't have the function factory present And
* the function doesn't send last result. FunctionException is expected in this case
- *
+ *
* @throws Exception
*/
@Test
@@ -226,7 +225,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg
/**
* Test multi-key remote execution by a pure accessor which doesn't have the function factory
* present. ResultCollector = DefaultResultCollector haveResults = true;
- *
+ *
* @throws Exception
*/
@Test
@@ -316,7 +315,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg
/**
* Test ability to execute a multi-key function by a local data store ResultCollector =
* DefaultResultCollector haveResult = true
- *
+ *
* @throws Exception
*/
@Test
@@ -382,7 +381,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg
/**
* Test local execution on datastore with function that doesn't send last result.
* FunctionException is expected in this case
- *
+ *
* @throws Exception
*/
@Test
@@ -434,10 +433,10 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends PartitionedReg
}
/**
- *
+ *
* Test execution on all datastores with function that doesn't send last result. FunctionException
* is expected in this case
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
index 1df574f..fa17044 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRPerformanceTestDUnitTest.java
@@ -14,20 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-/**
- * This is a dunit test for PartitionedRegion creation and Region API's for put and get
- * functionality in case of Custom Partitioning.
- */
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -41,6 +29,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -64,6 +55,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PRPerformanceTestDUnitTest extends PartitionedRegionDUnitTestCase {
@@ -147,7 +141,7 @@ public class PRPerformanceTestDUnitTest extends PartitionedRegionDUnitTestCase {
/**
* Search the entires PartitionedRegion for the key, to validate that indeed it doesn't exist
- *
+ *
* @returns true if it does exist
* @param par
* @param key
@@ -390,7 +384,7 @@ class SerializablePerfMonth implements DataSerializable {
/*
* if(this.month<4) return 1; else if(this.month >= 4 && this.month < 8) return 2; else return
* 3;
- *
+ *
*/
return this.month;
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
index b5522e9..93875c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
@@ -26,6 +26,15 @@ import java.util.Map;
import javax.naming.Context;
import javax.transaction.UserTransaction;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -39,15 +48,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.logging.log4j.Logger;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
index 791f3fe..8e10eed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
@@ -23,6 +23,15 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
@@ -37,15 +46,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.logging.log4j.Logger;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransaction2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransaction2DUnitTest.java
index cff4057..d0b73d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransaction2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransaction2DUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -28,8 +31,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public class PRTransaction2DUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
index 88e4007..ad7b9b5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
@@ -14,24 +14,21 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static com.googlecode.catchexception.CatchException.catchException;
import static com.googlecode.catchexception.CatchException.caughtException;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.logging.log4j.Logger;
-import org.assertj.core.api.Assertions;
-
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.logging.log4j.Logger;
+import org.assertj.core.api.Assertions;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import util.TestException;
import org.apache.geode.cache.CacheTransactionManager;
@@ -71,6 +68,7 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test for co-located PR transactions. the test creates two data hosts and uses function execution
@@ -147,7 +145,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* Test two non colocated functions in a transaction. This method invokes
* {@link MyTransactionFunction} and tells it what to test, using different arguments.
- *
+ *
* @param redundantBuckets redundant buckets for colocated PRs
*/
protected void basicPRTXInNonColocatedFunction(int redundantBuckets) {
@@ -209,7 +207,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* Test all the basic functionality of colocated transactions. This method invokes
* {@link MyTransactionFunction} and tells it what to test, using different arguments.
- *
+ *
* @param redundantBuckets redundant buckets for colocated PRs
* @param populateData if false tests are carried out on empty colocated PRs
*/
@@ -400,7 +398,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* This method executes a transaction with get on non colocated entries and expects the
* transaction to fail with TransactionDataNotColocatedException.
- *
+ *
* @param bucketRedundancy redundancy for the colocated PRs
*/
protected void basicPRTXWithNonColocatedGet(int bucketRedundancy) {
@@ -537,7 +535,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* This method executes a transaction with operation on a key in a moved bucket, and expects
* transaction to fail with TransactionDataRebalancedException.
- *
+ *
* @param op which entry op to be executed
* @param bucketRedundancy redundancy for the colocated PRs
*/
@@ -733,7 +731,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* This method executes a transaction with entry op on non colocated entries and expects the
* transaction to fail with TransactionDataNotColocatedException.
- *
+ *
* @param bucketRedundancy redundancy for the colocated PRs
*/
protected void basicPRTXWithNonColocatedOp(Op op, int bucketRedundancy) {
@@ -867,7 +865,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* This method executes a transaction inside a cache listener
- *
+ *
* @param bucketRedundancy redundancy for the colocated PRs
*/
protected void basicPRTXInCacheListener(int bucketRedundancy) {
@@ -904,7 +902,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
/**
* verify that 10 orders are created for each customer
- *
+ *
* @throws ClassNotFoundException
*/
public static void validatePRTXInCacheListener() throws ClassNotFoundException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
index 76f2abb..7c6c0f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java
index 87b43a3..125e2d2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java
@@ -32,7 +32,7 @@ public class PerformanceTestFunction extends FunctionAdapter {
/**
* Application execution implementation
- *
+ *
* @since GemFire 5.8Beta
*/
public void execute(FunctionContext context) {
@@ -55,7 +55,7 @@ public class PerformanceTestFunction extends FunctionAdapter {
/**
* Get the function identifier, used by clients to invoke this function
- *
+ *
* @return an object identifying this function
* @since GemFire 5.8Beta
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
index cbd64be..c661977 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
@@ -14,15 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -31,6 +24,8 @@ import java.util.Map;
import java.util.Map.Entry;
import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.internal.ClientMetadataService;
@@ -41,6 +36,9 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/TestFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/TestFunction.java
index 475871e..52ecaf7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/TestFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/TestFunction.java
@@ -122,7 +122,7 @@ public class TestFunction extends FunctionAdapter {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.xmlcache.Declarable2#getConfig()
*/
public Properties getConfig() {
@@ -131,7 +131,7 @@ public class TestFunction extends FunctionAdapter {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
index b9a6b22..8ef1a5c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
@@ -13,17 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute.data;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+
public class CustId implements DataSerializable {
Integer custId;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java
index 5b7e5b6..46c4d85 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java
@@ -13,18 +13,18 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute.data;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.cache.execute.PRColocationDUnitTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.cache.execute.PRColocationDUnitTest;
+
public class Customer implements DataSerializable {
String name;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java
index 91caf03..3d1c8b5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java
@@ -13,18 +13,18 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute.data;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.cache.execute.PRColocationDUnitTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.cache.execute.PRColocationDUnitTest;
+
public class Order implements DataSerializable {
String orderName;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
index 4958e08..151441f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
@@ -13,17 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute.data;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+
public class OrderId implements DataSerializable {
Integer orderId;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java
index 407a5aa..8de72e0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java
@@ -13,18 +13,18 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute.data;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.cache.execute.PRColocationDUnitTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.cache.execute.PRColocationDUnitTest;
+
public class Shipment implements DataSerializable {
String shipmentName;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
index c22de42..7bdfcdf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
@@ -13,17 +13,17 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.execute.data;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+
public class ShipmentId implements DataSerializable {
Integer shipmentId;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
index 02ac966..c8eb03f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
@@ -20,18 +20,14 @@ import static org.junit.Assert.assertEquals;
import java.io.Serializable;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.extension.mock.MockCacheExtension;
import org.apache.geode.internal.cache.extension.mock.MockExtensionCommands;
@@ -41,7 +37,10 @@ import org.apache.geode.internal.cache.xmlcache.XmlParser;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category({DistributedTest.class})
@SuppressWarnings("serial")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index f11d2d5..4d34332 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -20,12 +20,12 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.test.fake.Fakes;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
+import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java
index bdd32bd..e9522ee 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* Base class for Mock Extension.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
index d33bc16..0a33f98 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
@@ -19,7 +19,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* Base class for Mock Extension XML Generators.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
index e0e9b16..1e6d448 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
@@ -34,7 +34,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function to create {@link MockCacheExtension} on a {@link Region}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
index 4f02f32..b9a451a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function to alter {@link MockRegionExtension} on a {@link Region}.
- *
+ *
* <dl>
* <dt>Arguments:</dt>
* <dd>
@@ -45,7 +45,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
* </dl>
* </dt>
* </dl>
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
index 8d17bab..98152cf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function to create {@link MockCacheExtension} on a {@link Region}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
index 034e0c0..1e8b50e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
@@ -32,7 +32,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function to create {@link MockRegionExtension} on a {@link Region}.
- *
+ *
* <dl>
* <dt>Arguments:</dt>
* <dd>
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
* </dl>
* </dt>
* </dl>
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
index 19129e5..1a455a6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
@@ -34,7 +34,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function to create {@link MockCacheExtension} on a {@link Region}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
index bab843e..117d509 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* Function to destroy {@link MockRegionExtension} on a {@link Region}.
- *
+ *
* <dl>
* <dt>Arguments:</dt>
* <dd>
@@ -43,7 +43,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
* </dl>
* </dt>
* </dl>
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
index a378323..e5f728b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
@@ -21,13 +21,13 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* Mock Extension for {@link Cache}.
- *
+ *
* <dl>
* <dt>Uses</dt>
* <dd>org.apache.geode.management.internal.configuration.ClusterConfigurationDUnitTest</dd>
* <dd>{@link org.apache.geode.cache30.CacheXml81DUnitTest}</dd>
* </dl>
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
index 235fe43..66a3d38 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* {@link MockCacheExtension} {@link XmlGenerator}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
index 712c970..5d15eda 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
@@ -64,7 +64,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Creates a {@link MockRegionExtension} on the given <code>regionName</code>.
- *
+ *
* @param regionName {@link Region} name on which to create {@link MockRegionExtension} .
* @param value {@link String} value to set on {@link MockRegionExtension#setValue(String)}.
* @return {@link Result}
@@ -82,7 +82,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Alters a {@link MockRegionExtension} on the given <code>regionName</code>.
- *
+ *
* @param regionName {@link Region} name on which to create {@link MockRegionExtension} .
* @param value {@link String} value to set on {@link MockRegionExtension#setValue(String)}.
* @return {@link Result}
@@ -100,7 +100,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Destroy the {@link MockRegionExtension} on the given <code>regionName</code>.
- *
+ *
* @param regionName {@link Region} name on which to create {@link MockRegionExtension} .
* @return {@link Result}
* @since GemFire 8.1
@@ -116,7 +116,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Creates a {@link MockCacheExtension}.
- *
+ *
* @param value {@link String} value to set on {@link MockCacheExtension#setValue(String)}.
* @return {@link Result}
* @since GemFire 8.1
@@ -132,7 +132,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Alter a {@link MockCacheExtension}.
- *
+ *
* @param value {@link String} value to set on {@link MockCacheExtension#setValue(String)}.
* @return {@link Result}
* @since GemFire 8.1
@@ -148,7 +148,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Destroy a {@link MockCacheExtension}.
- *
+ *
* @return {@link Result}
* @since GemFire 8.1
*/
@@ -162,7 +162,7 @@ public class MockExtensionCommands implements GfshCommand {
/**
* Call <code>function</code> with <code>args</code> on all members, tabulate results and persist
* shared config if changed.
- *
+ *
* @param function {@link Function} to execute.
* @param addXmlElement If <code>true</code> then add result {@link XmlEntity} to the config,
* otherwise delete it.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
index 2c85e57..5ff664a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlParser;
/**
* Mock Extension {@link XmlParser}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
index 9524803..e9b9fb0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* Mock Extension for {@link Region}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
index 84aa1f9..56eec44 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
/**
* {@link MockRegionExtension} {@link XmlGenerator}.
- *
+ *
*
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
index 438cdd3..7f7a56a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
@@ -14,6 +14,16 @@
*/
package org.apache.geode.internal.cache.functions;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.*;
import org.apache.geode.cache.control.RebalanceFactory;
@@ -40,16 +50,6 @@ import org.apache.geode.internal.cache.xmlcache.Declarable2;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.CancellationException;
-
public class TestFunction extends FunctionAdapter implements Declarable2 {
public static final String TEST_FUNCTION10 = "TestFunction10";
public static final String TEST_FUNCTION9 = "TestFunction9";
@@ -116,7 +116,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 {
/**
* Application execution implementation
- *
+ *
* @since GemFire 5.8Beta
*/
@Override
@@ -1033,7 +1033,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 {
/**
* Get the function identifier, used by clients to invoke this function
- *
+ *
* @return an object identifying this function
* @since GemFire 5.8Beta
*/
@@ -1063,7 +1063,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.xmlcache.Declarable2#getConfig()
*/
public Properties getConfig() {
@@ -1072,7 +1072,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
index 4591639..e9eabc6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -32,20 +31,21 @@ import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test runs all tests of HARQAddOperationJUnitTest using BlockingHARegionQueue instead of
* HARegionQueue
- *
- *
+ *
+ *
*/
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest {
/**
* Creates Blocking HA region-queue object
- *
+ *
* @return Blocking HA region-queue object
* @throws IOException
* @throws ClassNotFoundException
@@ -61,7 +61,7 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
/**
* Creates Blocking HA region-queue object
- *
+ *
* @return Blocking HA region-queue object
* @throws IOException
* @throws ClassNotFoundException
@@ -77,7 +77,7 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
/**
* Tests the take() functionality of <code>BlockingHARegionQueue<code> with conflation disabled.
- *
+ *
* @throws Exception
*/
@Test
@@ -90,9 +90,9 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
/**
* Tests the take() functionality of <code>BlockingHARegionQueue<code> with conflation enabled.
- *
+ *
* @throws Exception
- *
+ *
*/
@Test
public void testBlockingTakeConflationEnabled() throws Exception {
@@ -108,10 +108,10 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
* significant time that the thread is still alive as it should be blocked on take() since there
* are no events in the queue.<br>
* 3)Do a put into the queue and verify that the take thread returns with the same object.
- *
+ *
* @param conflationEnabled - whether conflation is enabled or not
* @throws Exception
- *
+ *
*/
public void doBlockingTake(boolean conflationEnabled) throws Exception {
@@ -155,9 +155,9 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
* 3)Put two object into the queue. <br>
* 4)Verify both both take() threads return with an object by ensuring that the size of the list
* containing return objects is two.<br>
- *
+ *
* @throws Exception
- *
+ *
*/
@Test
public void testConcurrentBlockingTake() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
index 581d79a..0b0fc56 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
@@ -16,24 +16,24 @@ package org.apache.geode.internal.cache.ha;
import java.io.IOException;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test runs all tests of HARegionQueueStatsJUnitTest using BlockingHARegionQueue instead of
* HARegionQueue
- *
- *
+ *
+ *
*/
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARQStatsJUnitTest extends HARegionQueueStatsJUnitTest {
/**
* Creates a BlockingHARegionQueue object.
- *
+ *
* @param name - name of the underlying region for region-queue
* @return the BlockingHARegionQueue instance
* @throws IOException
@@ -50,7 +50,7 @@ public class BlockingHARQStatsJUnitTest extends HARegionQueueStatsJUnitTest {
/**
* Creates a BlockingHARegionQueue object.
- *
+ *
* @param name - name of the underlying region for region-queue
* @param attrs - attributes for the BlockingHARegionQueue
* @return the BlockingHARegionQueue instance
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
index ee8b6fa..6c15bed 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -19,8 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -30,9 +28,11 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 4fb851f..8dee70b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,6 +43,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -51,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* picks up that is not in the primary. But it is also possible that it would cause data that is in
* the primary queue to be expired. And this can cause a data loss. This issue is mostly related to
* Expiry mechanism and not HA, but it affects HA functionality).
- *
+ *
* This test has a cache-client connected to one cache-server. The expiry-time of events in the
* queue for the client at the server is set low and dispatcher is set for delayed start. This will
* make some of the events in the queue expire before dispatcher can start picking them up for
@@ -108,7 +108,7 @@ public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
/**
* Creates the cache
- *
+ *
* @param props - distributed system props
* @throws Exception - thrown in any problem occurs in creating cache
*/
@@ -185,7 +185,7 @@ public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
* added, before waiting, to expire before the dispatcher to pick them up and then do a put on a
* LAST_KEY couple of times so that atleast one of these is dispatched to client and when client
* recieves this in the listener, the test is notified to proceed for validation.
- *
+ *
* @throws Exception - thrown if any problem occurs in put operation
*/
private static void generateEvents() throws Exception {
@@ -208,7 +208,7 @@ public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
* corresponding to the LAST_KEY in the listener, the test is notified to proceed for validation.
* Then, it is validated that all the events that were added prior to the LAST_KEY are dispatched
* to the client. Due to the bug#36853, those events will expire and validation will fail.
- *
+ *
* @throws Exception - thrown if any exception occurs in test
*/
@Test
@@ -244,7 +244,7 @@ public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
/**
* Closes the cache
- *
+ *
*/
private static void unSetExpiryTimeAndCloseCache() {
System.clearProperty(HARegionQueue.REGION_ENTRY_EXPIRY_TIME);
@@ -253,7 +253,7 @@ public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
/**
* Closes the caches on clients and servers
- *
+ *
* @throws Exception - thrown if any problem occurs in closing client and server caches.
*/
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
index 00ce44b..2d15649 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
@@ -24,6 +24,15 @@ import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARC
import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
import static org.junit.Assert.assertEquals;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
@@ -50,15 +59,6 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class Bug48571DUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
index efed99c..8e7952e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -41,6 +40,7 @@ import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
@@ -225,4 +225,3 @@ public class Bug48879DUnitTest extends JUnit4DistributedTestCase {
vm1.invoke(() -> Bug48879DUnitTest.verifyStats(threads * putsPerThread, threads));
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
index 915cddf..eda00d6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
@@ -22,8 +22,8 @@ import org.apache.geode.internal.cache.EventID;
/**
* Implementing class for <code>Conflatable</code> interface. Objects of this class will be add to
* the queue
- *
- *
+ *
+ *
*/
public class ConflatableObject implements Conflatable, Serializable {
@@ -48,7 +48,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Constructor
- *
+ *
* @param key - The key for this entry
* @param value - The value for this entry
* @param eventId - eventID object for this entry
@@ -66,7 +66,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Returns whether the object should be conflated
- *
+ *
* @return whether the object should be conflated
*/
public boolean shouldBeConflated() {
@@ -75,7 +75,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Returns the name of the region for this <code>Conflatable</code>
- *
+ *
* @return the name of the region for this <code>Conflatable</code>
*/
public String getRegionToConflate() {
@@ -84,7 +84,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Returns the key for this <code>Conflatable</code>
- *
+ *
* @return the key for this <code>Conflatable</code>
*/
public Object getKeyToConflate() {
@@ -93,7 +93,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Returns the value for this <code>Conflatable</code>
- *
+ *
* @return the value for this <code>Conflatable</code>
*/
public Object getValueToConflate() {
@@ -102,7 +102,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Sets the latest value for this <code>Conflatable</code>
- *
+ *
* @param value The latest value
*/
public void setLatestValue(Object value) {
@@ -111,7 +111,7 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* Return this event's identifier
- *
+ *
* @return this event's identifier
*/
public EventID getEventId() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
index 09e39d8..b408844 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache.ha;
import static java.util.concurrent.TimeUnit.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.awaitility.Awaitility.*;
import static org.junit.Assert.*;
@@ -22,7 +24,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -55,11 +56,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-
/**
* This test verifies that eventId, while being sent across the network ( client to server, server
* to client and peer to peer) , goes as optimized byte-array. For client to server messages, the
@@ -174,7 +173,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates the cache
- *
+ *
* @param props - distributed system props
* @throws Exception - thrown in any problem occurs in creating cache
*/
@@ -209,7 +208,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates the client cache1, connected to server1
- *
+ *
* @param port - bridgeserver port
* @throws Exception - thrown if any problem occurs in setting up the client
*/
@@ -230,7 +229,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates the client cache2, connected to server3
- *
+ *
* @param port - bridgeserver port
* @throws Exception - thrown if any problem occurs in setting up the client
*/
@@ -281,7 +280,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Generates events having specific values of threadId and sequenceId, via put operation through
* connection object
- *
+ *
* @throws Exception - thrown if any problem occurs in put operation
*/
public static void generateEventsByPutOperation() throws Exception {
@@ -298,7 +297,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Generates events having specific values of threadId and sequenceId, via destroyEntry operation
* through connection object
- *
+ *
* @throws Exception - thrown if any problem occurs in destroyEntry operation
*/
public static void generateEventsByDestroyEntryOperation() throws Exception {
@@ -320,7 +319,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Generates events having specific values of threadId and sequenceId, via destroyRegionOperation
* through connection object
- *
+ *
* @throws Exception - thrown if any problem occurs in destroyRegionOperation
*/
public static void generateEventsByDestroyRegionOperation() throws Exception {
@@ -340,7 +339,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Generates events having specific values of threadId and sequenceId, via clearRegionOperation
* through connection object
- *
+ *
* @throws Exception - thrown if any problem occurs in clearRegionOperation
*/
public static void generateEventsByClearRegionOperation() throws Exception {
@@ -357,7 +356,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Generates events having specific values of threadId and sequenceId from client1 via put
* operation and verifies that the values received on client2 match with those sent from client1.
- *
+ *
* @throws Exception - thrown if any exception occurs in test
*/
@Test
@@ -371,7 +370,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
* Generates events having specific values of threadId and sequenceId from client1 via
* destroyEntry operation and verifies that the values received on client2 match with those sent
* from client1.
- *
+ *
* @throws Exception - thrown if any exception occurs in test
*/
@Test
@@ -384,7 +383,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
* Generates events having specific values of threadId and sequenceId from client1 via
* destroyRegion operation and verifies that the values received on client2 match with those sent
* from client1.
- *
+ *
* @throws Exception - thrown if any exception occurs in test
*/
@Test
@@ -396,7 +395,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Generates events having specific values of threadId and sequenceId from client1 via clearRegion
* operation and verifies that the values received on client2 match with those sent from client1.
- *
+ *
* @throws Exception - thrown if any exception occurs in test
*/
@Test
@@ -446,7 +445,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Closes the cache
- *
+ *
*/
public static void closeCache() {
if (cache != null && !cache.isClosed()) {
@@ -470,7 +469,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/**
* Function to assert that the ThreadIdtoSequence id Map is not Null and has only one entry.
- *
+ *
* @return - eventID object from the ThreadIdToSequenceIdMap
*/
public static Object assertThreadIdToSequenceIdMapHasEntryId() {
@@ -504,7 +503,7 @@ public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
* Validates that the eventId of the event received in callback is contained in the eventId array
* originally used by client1 to generate the events and notifies client2 to proceed for
* validation once the LAST_KEY is received
- *
+ *
* @param key - the key of the event for EntryEvent / token indicating type of region operation
* for RegionEvent
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index 523f0d2..2fb1c38 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -21,15 +21,16 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -204,7 +205,7 @@ public class EventIdOptimizationJUnitTest {
* expected, then reads the values for eventId and sequenceId from this byte-array using
* <code>EventID#readEventIdPartsFromOptmizedByteArray</code> api and verifies that they are
* decoded properly.
- *
+ *
* @param threadId the long value of threadId
* @param sequenceId the long value of sequenceId
* @param expectedArrayLength expected length of the optimized byte-array
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
index 9f8bc0d..2b07821 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
@@ -20,7 +20,6 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -50,6 +49,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
index 0be0700..c146eaa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,6 +39,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -57,8 +57,8 @@ public class HABugInPutDUnitTest extends JUnit4DistributedTestCase {
private VM client1 = null;
private VM client2 = null;
- final static String KEY1 = "KEY1";
- final static String VALUE1 = "VALUE1";
+ static final String KEY1 = "KEY1";
+ static final String VALUE1 = "VALUE1";
protected static Cache cache = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
index 12ce01d..6d2ad69 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -48,6 +47,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
index e05c279..d7f11fb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,6 +44,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -128,7 +128,7 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
/**
* In this test do a create & then update on same key , the client should receive 2 calabcks.
- *
+ *
* @throws Exception
*/
@@ -145,7 +145,7 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
/**
* In this test do create , then update & update. The client should receive 2 callbacks , one for
* create & one for the last update.
- *
+ *
* @throws Exception
*/
@Test
@@ -169,7 +169,7 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
/**
* In this test do create , then update, update, invalidate. The client should receive 3
* callbacks, one for create one for the last update and one for the invalidate.
- *
+ *
* @throws Exception
*/
@Test
@@ -188,7 +188,7 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
/**
* In this test do a create , update , update & destroy. The client should receive 3 callbacks (
* craete , conflated update & destroy).
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
index f8a1ec1..e3f86a2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -48,6 +47,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index eae8029..189ee43 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -60,6 +59,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -279,15 +279,15 @@ public class HAEventIdPropagationDUnitTest extends JUnit4DistributedTestCase {
protected static EventID putAlleventId5 = null;
- protected final static String PUTALL_KEY1 = "putAllKey1";
+ protected static final String PUTALL_KEY1 = "putAllKey1";
- protected final static String PUTALL_KEY2 = "putAllKey2";
+ protected static final String PUTALL_KEY2 = "putAllKey2";
- protected final static String PUTALL_KEY3 = "putAllKey3";
+ protected static final String PUTALL_KEY3 = "putAllKey3";
- protected final static String PUTALL_KEY4 = "putAllKey4";
+ protected static final String PUTALL_KEY4 = "putAllKey4";
- protected final static String PUTALL_KEY5 = "putAllKey5";
+ protected static final String PUTALL_KEY5 = "putAllKey5";
/**
* This test: 1) creates a client server configuration 2) asserts that the ThreadIdToSequenceIdMap
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
index 3dda4c8..450f7b8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
@@ -18,8 +18,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,6 +36,7 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
@@ -46,6 +45,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -171,7 +171,7 @@ public class HAExpiryDUnitTest extends JUnit4DistributedTestCase {
/**
* This function checks the regionqueue size before expiration. size should be > 0.
- *
+ *
* @throws Exception
*/
public static void checkSizeBeforeExpiration() throws Exception {
@@ -197,7 +197,7 @@ public class HAExpiryDUnitTest extends JUnit4DistributedTestCase {
/**
* This function checks the regionqueue size After expiration. size should be = 0.
- *
+ *
* @throws Exception
*/
public static void checkSizeAfterExpiration() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
index 1ced81d..63f117e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -42,6 +40,7 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -52,6 +51,7 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -83,9 +83,9 @@ public class HAGIIBugDUnitTest extends JUnit4DistributedTestCase {
static boolean isTestFailed = false;
- final static int NO_OF_PUTS = 100;
+ static final int NO_OF_PUTS = 100;
- final static int NO_OF_PUTS_BEFORE_GII = 10000;;
+ static final int NO_OF_PUTS_BEFORE_GII = 10000;;
static int TOTAL_NO_OF_PUTS = 0;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
index b411d9b..d497b77 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -58,6 +57,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
index 71716dd..10ce428 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
@@ -23,9 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.ha.HARegionQueue.MapWrapper;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.logging.log4j.Logger;
import org.awaitility.Awaitility;
import org.junit.After;
@@ -46,8 +43,11 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.ha.HARegionQueue.MapWrapper;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.dunit.ThreadUtils;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -66,13 +66,13 @@ public class HARQAddOperationJUnitTest {
/** The <code>RegionQueue</code> instance */
private HARegionQueue rq = null;
- protected final static String KEY1 = "Key-1";
+ protected static final String KEY1 = "Key-1";
- protected final static String KEY2 = "Key-2";
+ protected static final String KEY2 = "Key-2";
- protected final static String VALUE1 = "Value-1";
+ protected static final String VALUE1 = "Value-1";
- protected final static String VALUE2 = "Value-2";
+ protected static final String VALUE2 = "Value-2";
protected boolean testFailed = false;
@@ -80,7 +80,7 @@ public class HARQAddOperationJUnitTest {
protected int barrierCount = 0;
- volatile static int expiryCount = 0;
+ static volatile int expiryCount = 0;
@Before
public void setUp() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
index d85d945..e9e53de 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.Test;
@@ -58,12 +57,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This DUnit contains various tests to ensure new implementation of ha region queues works as
* expected.
- *
+ *
* @since GemFire 5.7
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
index c73fa68..b6072b3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
@@ -18,8 +18,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,14 +31,16 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify :
- *
+ *
* 1)put() on a mirrored HARegion does not propagate 2)localDestroy() allowed on a mirrored region
* 3) GII happens normally
*/
@@ -80,7 +80,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* create cache
- *
+ *
* @return
* @throws Exception
*/
@@ -101,7 +101,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
* 1) Create mirrored HARegion region1 in VM1 and VM2 2) do a put in VM1 3) assert that the put
* has not propagated from VM1 to VM2 4) do a put in VM2 5) assert that the value in VM1 has not
* changed to due to put in VM2 6) assert put in VM2 was successful by doing a get
- *
+ *
*/
@Test
public void testLocalPut() {
@@ -121,7 +121,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
* changed to due to put in VM2 6) assert respective puts the VMs were successful by doing a get
* 7) localDestroy key in VM1 8) assert key has been destroyed in VM1 9) assert key has not been
* destroyed in VM2
- *
+ *
*/
@Test
public void testLocalDestroy() {
@@ -141,7 +141,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
* 1) Create mirrored HARegion region1 in VM1 2) do a put in VM1 3) get teh value in VM1 to assert
* put has happened successfully 4) Create mirrored HARegion region1 in VM2 5) do a get in VM2 to
* verify that value was got through GII 6) do a put in VM2 7) assert put in VM2 was successful
- *
+ *
*/
@Test
public void testGII() {
@@ -159,7 +159,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
* 1) Create mirrored HARegion region1 in VM1 2) do a put in VM1 3) get teh value in VM1 to assert
* put has happened successfully 4) Create mirrored HARegion region1 in VM2 5) do a get in VM2 to
* verify that value was got through GII 6) do a put in VM2 7) assert put in VM2 was successful
- *
+ *
*/
@Test
public void testLocalDestroyRegion() {
@@ -172,7 +172,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* Destroy the region
- *
+ *
*/
public static void destroyRegion() {
cache.getRegion(REGION_NAME).localDestroyRegion(null);
@@ -190,7 +190,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
* 1) Create mirrored HARegion region1 in VM1 2) do a put in VM1 3) get teh value in VM1 to assert
* put has happened successfully 4) Create mirrored HARegion region1 in VM2 5) do a get in VM2 to
* verify that value was got through GII 6) do a put in VM2 7) assert put in VM2 was successful
- *
+ *
*/
@Test
public void testQRM() {
@@ -207,7 +207,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* create a client with 2 regions sharing a common writer
- *
+ *
* @throws Exception
*/
@@ -225,8 +225,8 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
// private static int counter = 0;
/**
- *
- *
+ *
+ *
* @throws Exception
*/
@@ -273,7 +273,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* close the cache
- *
+ *
*/
public static void closeCache() {
if (cache != null && !cache.isClosed()) {
@@ -284,7 +284,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* do three puts on key-1
- *
+ *
*/
public static void putValue1() {
try {
@@ -298,7 +298,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* do three puts on key-1
- *
+ *
*/
public static void putValue2() {
try {
@@ -312,7 +312,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* do a get on region1
- *
+ *
*/
public static void getValue1() {
try {
@@ -329,7 +329,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* do a get on region1
- *
+ *
*/
public static void getNull() {
try {
@@ -346,7 +346,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* do a get on region1
- *
+ *
*/
public static void getValue2() {
try {
@@ -363,7 +363,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
/**
* destroy key-1
- *
+ *
*/
public static void destroy() {
try {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
index 7e9eeab..a1a1321 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.io.IOException;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -46,6 +45,7 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
index f5e0cc4..d197be8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -22,8 +22,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,12 +43,14 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
index 929093d..65bb80a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -619,17 +619,17 @@ public class HARegionQueueJUnitTest {
* This test tests remove operation is causing the insertion of sequence ID for existing
* ThreadIdentifier object and concurrently the QRM thread is iterating over the Map to form the
* Data Set for dispatch. There should not be any Data Loss
- *
+ *
* In this test, first we add x number of events for unique thread id for the same region then we
* start two concurrent threads. One which does add to dispatched events map with sequence id's
* greater than x but the same ThreadIds as previous. The second thread does createMessageList
* (which removes from the dispatched events map) and stores the list
- *
+ *
* After the two threads have operated, createMessageList is called again and the data is stored
* in another list.
- *
+ *
* The data in the list is populated on a map against the threadId.
- *
+ *
* It is then verified to see that all the sequence should be greater than x
*/
@Test
@@ -724,12 +724,12 @@ public class HARegionQueueJUnitTest {
* start two concurrent threads. One which does add to dispatched events map with sequence id's
* greater than x and the second one which does createMessageList (which removes from the
* dispatched events map) and stores the list
- *
+ *
* After the two threads have operated, createMessageList is called again and the data is stored
* in another list.
- *
+ *
* The data in the list is populated on a map against the threadId.
- *
+ *
* It is then verified to see that the map size should be 2x
*/
@Test
@@ -817,15 +817,15 @@ public class HARegionQueueJUnitTest {
*
* In this test, first we add x number of events for unique thread id for the 2 regions then we
* start two concurrent threads. One which does add to dispatched events map to 3 new regions
- *
+ *
* the second thread does createMessageList (which removes from the dispatched events map) and
* stores the list
- *
+ *
* After the two threads have operated, createMessageList is called again and the data is stored
* in another list.
- *
+ *
* The data in the list is populated on a map against the threadId.
- *
+ *
* It is then verified to see that a total of x entries are present in the map
*/
@Test
@@ -926,19 +926,19 @@ public class HARegionQueueJUnitTest {
* ThreadIdentifier Object ( that is the HA Regio name exists but ThreadIdentifier object is
* appearing 1st time) and concurrently the QRM thread is iterating over the Map to form the Data
* Set for dispatch. There should not be any DataLoss
- *
+ *
* In this test, first we add x number of events for unique thread id for the multiples regions
* then we start two concurrent threads. One which does add to dispatched events map with sequence
* id's greater than x and new ThreadIdentifiers
- *
+ *
* the second thread does createMessageList (which removes from the dispatched events map) and
* stores the list
- *
+ *
* After the two threads have operated, createMessageList is called again and the data is stored
* in another list.
- *
+ *
* The data in the list is populated on a map against the threadId.
- *
+ *
* It is then verified to see that the map size should be 2x * number of regions
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index f7fe5de..53468bc 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -14,27 +14,28 @@
*/
package org.apache.geode.internal.cache.ha;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
/**
* JUnit test for verifying the proper functioning of HARegionQueue related statistics.
- *
- *
+ *
+ *
*/
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARegionQueueStatsJUnitTest {
@@ -44,7 +45,7 @@ public class HARegionQueueStatsJUnitTest {
/**
* Create the cache in setup. Currently the HA related stats are active under fine logging only.
- *
+ *
* @throws Exception - thrown if any exception occurs in setUp
*/
@Before
@@ -54,7 +55,7 @@ public class HARegionQueueStatsJUnitTest {
/**
* Close the cache in tear down *
- *
+ *
* @throws Exception - thrown if any exception occurs in tearDown
*/
@After
@@ -64,7 +65,7 @@ public class HARegionQueueStatsJUnitTest {
/**
* Creates the cache instance for the test
- *
+ *
* @return the cache instance
* @throws CacheException - thrown if any exception occurs in cache creation
*/
@@ -74,7 +75,7 @@ public class HARegionQueueStatsJUnitTest {
/**
* Creates a HARegionQueue object.
- *
+ *
* @param name - name of the underlying region for region-queue
* @return the HARegionQueue instance
* @throws IOException
@@ -91,7 +92,7 @@ public class HARegionQueueStatsJUnitTest {
/**
* Creates a HARegionQueue object.
- *
+ *
* @param name - name of the underlying region for region-queue
* @param attrs - attributes for the HARegionQueue
* @return the HARegionQueue instance
@@ -117,7 +118,7 @@ public class HARegionQueueStatsJUnitTest {
* 3)Verify that statistics object is not null<br>
* 4)Verify that total events added matches the eventsEnqued stats<br>
* 5)Verify that eventsConflated stats is zero.
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -150,7 +151,7 @@ public class HARegionQueueStatsJUnitTest {
* 3)Verify that statistics object is not null<br>
* 4)Verify that total events added matches the eventsEnqued stats<br>
* 5)Verify that eventsConflated stats is total events added minus 1.
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -185,7 +186,7 @@ public class HARegionQueueStatsJUnitTest {
* 4)Verify that total events added matches the eventsEnqued stats<br>
* 5)Verify that eventsExpired stats is same as total events added as all events should have
* expired by 1 sec.
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -222,7 +223,7 @@ public class HARegionQueueStatsJUnitTest {
* 5)Verify that total events added matches the eventsEnqued stats<br>
* 6)Verify that eventsRemoved stats is same as the maximum batch size peeked in above peek
* operations(step 3).
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -267,7 +268,7 @@ public class HARegionQueueStatsJUnitTest {
* 5)Verify that total events added matches the eventsEnqued stats<br>
* 6)Verify that eventsTaken stats is same as the sum of events taken in batch and individually
* (Step 3)
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -310,7 +311,7 @@ public class HARegionQueueStatsJUnitTest {
* 5)Verify that total events added matches the eventsEnqued stats<br>
* 6)Verify that eventsRemovedByQrm stats is same as the number of events removed by QRM (upto the
* event having lastDispatchedSeqId, step 3).
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -349,7 +350,7 @@ public class HARegionQueueStatsJUnitTest {
* 4)Verify that total events added matches the eventsEnqued stats<br>
* 5)Verify that threadIdentifiers stats is same as the number of events added as all the events
* had different ThreadIdentifier objects.
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -385,7 +386,7 @@ public class HARegionQueueStatsJUnitTest {
* 6)Verify that total events added matches the eventsEnqued stats<br>
* 7)Verify that numVoidRemovals stats is same as the total events added since all the peeked
* events were removed by take() call and remove() was a void operation.
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -424,7 +425,7 @@ public class HARegionQueueStatsJUnitTest {
* 4)Verify that numSequenceViolated stats is same as number of duplicate events.<br>
* 5)Verify that eventsEnqued stats is same as the queue size ( i.e. eventsEnqued stats is not
* updated for duplicate events.)
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
index 0c21162..7242527 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.cache.ha;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.net.SocketException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -42,8 +42,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HASlowReceiverDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
index e29e67a..30d97f9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,6 +43,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
index 59aa79a..74ae511 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
@@ -16,6 +16,14 @@ package org.apache.geode.internal.cache.ha;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -30,13 +38,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
@Category(DistributedTest.class)
public class PreferSerializedHARegionQueueTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
index 6fb7c45..4cb3bb1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -52,6 +51,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -305,22 +305,22 @@ public class PutAllDUnitTest extends JUnit4DistributedTestCase {
/** EventId * */
protected static EventID eventId = null;
- protected volatile static EventID putAlleventId1 = null;
- protected volatile static EventID putAlleventId2 = null;
- protected volatile static EventID putAlleventId3 = null;
- protected volatile static EventID putAlleventId4 = null;
- protected volatile static EventID putAlleventId5 = null;
- protected volatile static EntryEvent putAllevent1 = null;
- protected volatile static EntryEvent putAllevent2 = null;
- protected volatile static EntryEvent putAllevent3 = null;
- protected volatile static EntryEvent putAllevent4 = null;
- protected volatile static EntryEvent putAllevent5 = null;
-
- protected final static String PUTALL_KEY1 = "putAllKey1";
- protected final static String PUTALL_KEY2 = "putAllKey2";
- protected final static String PUTALL_KEY3 = "putAllKey3";
- protected final static String PUTALL_KEY4 = "putAllKey4";
- protected final static String PUTALL_KEY5 = "putAllKey5";
+ protected static volatile EventID putAlleventId1 = null;
+ protected static volatile EventID putAlleventId2 = null;
+ protected static volatile EventID putAlleventId3 = null;
+ protected static volatile EventID putAlleventId4 = null;
+ protected static volatile EventID putAlleventId5 = null;
+ protected static volatile EntryEvent putAllevent1 = null;
+ protected static volatile EntryEvent putAllevent2 = null;
+ protected static volatile EntryEvent putAllevent3 = null;
+ protected static volatile EntryEvent putAllevent4 = null;
+ protected static volatile EntryEvent putAllevent5 = null;
+
+ protected static final String PUTALL_KEY1 = "putAllKey1";
+ protected static final String PUTALL_KEY2 = "putAllKey2";
+ protected static final String PUTALL_KEY3 = "putAllKey3";
+ protected static final String PUTALL_KEY4 = "putAllKey4";
+ protected static final String PUTALL_KEY5 = "putAllKey5";
private static String PUTALL_VALUE1 = "putAllValue1";
private static String PUTALL_VALUE2 = "putAllValue2";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
index 8007b7d..20f3bcc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,6 +42,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -107,7 +107,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Create the cache
- *
+ *
* @param props - properties for DS
* @return the cache instance
* @throws Exception - thrown if any problem occurs in cache creation
@@ -172,7 +172,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates and starts the cache-server
- *
+ *
* @return - the port on which cache-server is running
* @throws Exception - thrown if any problem occurs in cache/server creation
*/
@@ -199,7 +199,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Initializes the cache client
- *
+ *
* @param port1 - port for the primary cache-server
* @param port2 for the secondary cache-server
* @throws Exception-thrown if any problem occurs in initializing the client
@@ -219,7 +219,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Initializes the cache client
- *
+ *
* @param port1 - port for the primary cache-server
* @param port2 for the secondary cache-server
* @throws Exception-thrown if any problem occurs in initializing the client
@@ -241,7 +241,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Verify that the invalidates stats at the client accounts for the operations done by both,
* primary and secondary.
- *
+ *
*/
public static void verifyNumInvalidates() {
long invalidatesRecordedByStats = pool.getInvalidateCount();
@@ -260,7 +260,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Stops the cache server
- *
+ *
*/
public static void stopServer() {
try {
@@ -287,7 +287,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Do PUT operations
- *
+ *
* @param keyPrefix - string prefix for the keys for all the entries do be done
* @throws Exception - thrown if any exception occurs in doing PUTs
*/
@@ -300,7 +300,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Prepopulate the client with the entries that will be done by cache-servers
- *
+ *
* @throws Exception
*/
public static void prepopulateClient() throws Exception {
@@ -310,7 +310,7 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
/**
* Close the cache
- *
+ *
*/
public static void closeCache() {
if (cache != null && !cache.isClosed()) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java
index 2ae699e..20bbdf2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java
@@ -25,9 +25,9 @@ import org.apache.geode.internal.logging.LogService;
/**
* Test class for Blocking HA region queue functionalities
- *
- *
- *
+ *
+ *
+ *
*/
// TODO:Asif: Modify the test to allow working with the new class containing
@@ -51,10 +51,10 @@ public class TestBlockingHARegionQueue extends HARegionQueue.TestOnlyHARegionQue
/**
* Does a put and a notifyAll() multiple threads can possibly be waiting on this queue to put
- *
+ *
* @throws CacheException
* @throws InterruptedException
- *
+ *
* @return boolean whether object was successfully put onto the queue
*/
@@ -75,7 +75,7 @@ public class TestBlockingHARegionQueue extends HARegionQueue.TestOnlyHARegionQue
/**
* blocking peek. This method will not return till it has acquired a legitimate object from teh
* queue.
- *
+ *
* @throws InterruptedException
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
index a5de844..3457de5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
@@ -18,15 +18,15 @@ import static org.junit.Assert.*;
import java.net.InetAddress;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.ha.ThreadIdentifier.WanType;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.internal.cache.ha.ThreadIdentifier.WanType;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
index c23b64f..5f664d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -14,14 +14,26 @@
*/
package org.apache.geode.internal.cache.locks;
-import static org.awaitility.Awaitility.await;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.distributed.DistributedSystem;
@@ -43,17 +55,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
/**
* This class tests distributed ownership via the DistributedLockService api.
@@ -576,7 +577,7 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates a new DistributedLockService in a remote VM.
- *
+ *
* @param name The name of the newly-created DistributedLockService. It is recommended that the
* name of the Region be the {@link #getUniqueName()} of the test, or at least derive from
* it.
@@ -826,4 +827,3 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java
index 3341083..2a49712 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.internal.cache.lru;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LRUAlgorithmTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUClockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUClockJUnitTest.java
index 39759f4..2317361 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUClockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUClockJUnitTest.java
@@ -37,10 +37,10 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -514,4 +514,3 @@ public class LRUClockJUnitTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/TransactionsWithOverflowTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/TransactionsWithOverflowTest.java
index fbd5cb5..ffdf5d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/TransactionsWithOverflowTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/TransactionsWithOverflowTest.java
@@ -15,18 +15,19 @@
package org.apache.geode.internal.cache.lru;
-import org.apache.geode.cache.*;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import java.io.File;
+import java.util.Properties;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import java.io.File;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.geode.cache.*;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test for transactional operations on overflowed data
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
index 9dd1cd8..6d6afac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class BucketBackupMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
index e2f3757..69cc6cb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -21,6 +21,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.DiskStoreFactory;
@@ -40,10 +45,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category({DistributedTest.class})
public class BucketRebalanceStatRegressionTest extends CacheTestCase {
@@ -91,7 +92,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Verify that overflow stats are updated when a bucket moves due to rebalancing.
- *
+ *
* @param shortcut The region shortcut to use to create the region.
* @param overflow If true the region is configured for overflow to disk, false otherwise.
* @throws Exception
@@ -112,7 +113,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Initialize region on the distributed members.
- *
+ *
* @param shortcut The region shortcut to use to create the region.
* @param overflow If true, use overflow on the region, false otherwise.
*/
@@ -130,7 +131,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Do validation on the initial region before rebalancing. It is expected that all buckets and
* data live on vm0; vm1 does not host any buckets.
- *
+ *
* @param overflow If true the region is set for overflow to disk, false otherwise.
* @param vm0 One of the members hosting the partitioned region under test.
* @param vm1 Another member hosting the partitioned region under test.
@@ -148,7 +149,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Do validation the initial region for the member containing all the data
- *
+ *
*/
private void validateInitialOverflowStats() {
assertThat(vm0.invoke(() -> ((PartitionedRegion) (getCache().getRegion(REGION_NAME)))
@@ -160,7 +161,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Validate that the overflow stats are as expected on the given member.
- *
+ *
* @param vm The member to check stats on.
* @param vmName The name of the member.
*/
@@ -179,7 +180,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Rebalance the region, waiting for the rebalance operation to complete
- *
+ *
* @throws Exception
*/
private void rebalance() throws Exception {
@@ -191,7 +192,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Load the region with some data
- *
+ *
*/
private void loadRegion() {
Region aRegion = getCache().getRegion(REGION_NAME);
@@ -203,7 +204,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Return stats from the region's disk statistics, specifically the numEntriesInVM stat and the
* numOverflowOnDisk stat.
- *
+ *
* @return [0] numEntriesInVM stat [1] numOverflowOnDisk stat
*/
private long[] getOverflowStats() {
@@ -217,7 +218,7 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
/**
* Return the actual values for entries in the jvm (in memory) and entries on disk. These values
* are the sum of all buckets in the current member.
- *
+ *
* @return [0] total entries in VM [1] total entries on disk
*/
private long[] getActualOverflowEntries() {
@@ -264,4 +265,3 @@ public class BucketRebalanceStatRegressionTest extends CacheTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug47388DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug47388DUnitTest.java
index 9010c2c..daad641 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug47388DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug47388DUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.partitioned;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java
index bf5afbf..428ba5c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.partitioned;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
index c5fea71..70a7b23 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
@@ -20,16 +20,17 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ColocatedRegionDetailsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
index 0b3e784..f6fad6c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.partitioned;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class DeposePrimaryBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
index 6132432..7f150e4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.Region.Entry;
@@ -46,6 +42,9 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
index 3a9b58d..571144a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.partitioned;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class FetchEntryMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
index b3e4310..d3e9701 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.partitioned;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class FetchPartitionDetailsMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
index f6071a9..7b16d19 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.partitioned;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class MoveBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
index 316845e..1052d89 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
@@ -13,19 +13,20 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheTransactionManager;
@@ -41,8 +42,8 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.LocalRegion.IteratorType;
+import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.execute.CustomerIDPartitionResolver;
import org.apache.geode.internal.cache.execute.data.CustId;
import org.apache.geode.internal.cache.execute.data.Customer;
@@ -51,11 +52,9 @@ import org.apache.geode.internal.cache.execute.data.OrderId;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Verifies that the {@link org.apache.geode.cache.PartitionResolver} is called only once on a node,
@@ -65,8 +64,8 @@ import java.util.concurrent.atomic.AtomicInteger;
@Category(DistributedTest.class)
public class PartitionResolverDUnitTest extends JUnit4CacheTestCase {
- final private static String CUSTOMER = "custRegion";
- final private static String ORDER = "orderRegion";
+ private static final String CUSTOMER = "custRegion";
+ private static final String ORDER = "orderRegion";
Host host;
VM accessor;
VM datastore1;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
index 0b90dc1..a372a5c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
@@ -503,7 +503,7 @@ public class PartitionedRegionLoadModelJUnitTest {
/**
* Test which illustrates the problem with our greedy algorithm. It doesn't necessarily end up
* with a balanced result.
- *
+ *
* TODO rebalance - change this test or fix the algorithm?
*/
@Ignore
@@ -767,9 +767,9 @@ public class PartitionedRegionLoadModelJUnitTest {
/**
* This is a more complicated test of primary moving where moving primaries for some buckets then
* forces other primaries to move.
- *
+ *
* P = primary R = redundant X = not hosting
- *
+ *
* Bucket 0 1 2 3 4 5 6 7 8 Member1 P P P P P P X X X Member2 R R R R R R P P R Member3 X X X X X
* X R R P
*/
@@ -1594,7 +1594,7 @@ public class PartitionedRegionLoadModelJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -1608,7 +1608,7 @@ public class PartitionedRegionLoadModelJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -1648,7 +1648,7 @@ public class PartitionedRegionLoadModelJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -1662,7 +1662,7 @@ public class PartitionedRegionLoadModelJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
index 06c9527..5a2c191 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -42,6 +38,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PartitionedRegionLoaderWriterDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
index 1f7e7ab..72631d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.RegionFactory;
@@ -29,12 +25,15 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
@@ -162,7 +161,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends JUnit4CacheTestCa
/**
* Try to create the region with the given attributes. This will try 20 times to create the region
* until the region can be successfully created without an illegal state exception.
- *
+ *
* This is a workaround for bug 47125, because the metadata cleanup happens asynchronously.
*/
private void waitForCreate(VM vm0, final String regionName, final int expirationTime) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java
index 74ac735..edc068f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Properties;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Declarable;
@@ -35,11 +31,14 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic use cases for PR persistence.
@@ -53,7 +52,7 @@ public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
/**
* do a put/modify/destroy while closing disk store
- *
+ *
* to turn on debug, add following parameter in local.conf: hydra.VmPrms-extraVMArgs +=
* "-Ddisk.KRF_DEBUG=true";
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 3dd4371..c526fc2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -27,7 +27,25 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -64,23 +82,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
@Category(DistributedTest.class)
public class PersistentColocatedPartitionedRegionDUnitTest
@@ -1151,9 +1152,9 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* The colocation tree has the regions started in a specific order so that the logging is
* predictable. For each entry in the list, the array values are:
- *
+ *
* <pre>
- *
+ *
* [0] - the region name
* [1] - the name of that region's parent
* [2] - the number of warnings that will be logged after the region is created (1 warning for
@@ -1243,7 +1244,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
* Testing that all missing persistent PRs in a colocation tree hierarchy are logged as warnings.
* This test is a combines the "multiple children" and "hierarchy of children" tests. This is the
* colocation tree for this test
- *
+ *
* <pre>
* Parent
* / \
@@ -1590,7 +1591,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test that if we replace an offline member, even if colocated regions are in different disk
* stores, we still keep our metadata consistent.
- *
+ *
* @throws Throwable
*/
@Test
@@ -1648,11 +1649,11 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test for support issue 7870. 1. Run three members with redundancy 1 and recovery delay 0 2.
* Kill one of the members, to trigger replacement of buckets 3. Shutdown all members and restart.
- *
+ *
* What was happening is that in the parent PR, we discarded our offline data in one member, but
* in the child PR the other members ended up waiting for the child bucket to be created in the
* member that discarded it's offline data.
- *
+ *
* @throws Throwable
*/
public void replaceOfflineMemberAndRestart(SerializableRunnable createPRs) throws Throwable {
@@ -1869,14 +1870,14 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test for support issue 7870. 1. Run three members with redundancy 1 and recovery delay 0 2.
* Kill one of the members, to trigger replacement of buckets 3. Shutdown all members and restart.
- *
+ *
* What was happening is that in the parent PR, we discarded our offline data in one member, but
* in the child PR the other members ended up waiting for the child bucket to be created in the
* member that discarded it's offline data.
- *
+ *
* In this test case, we're creating the child PR later, after the parent buckets have already
* been completely created.
- *
+ *
* @throws Throwable
*/
public void replaceOfflineMemberAndRestartCreateColocatedPRLate(
@@ -1981,7 +1982,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test what happens when we crash in the middle of satisfying redundancy for a colocated bucket.
- *
+ *
* @throws Throwable
*/
// This test method is disabled because it is failing
@@ -2303,7 +2304,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test that a rebalance will regions are in the middle of recovery doesn't cause issues.
- *
+ *
* This is slightly different than {{@link #testRebalanceWithOfflineChildRegion()} because in this
* case all of the regions have been created, but they are in the middle of actually recovering
* buckets from disk.
@@ -2478,7 +2479,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test that a user is not allowed to change the colocation of a PR with persistent data.
- *
+ *
* @throws Throwable
*/
@Category(FlakyTest.class) // GEODE-900: disk dependency, filesystem sensitive
@@ -2726,7 +2727,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Create three PRs on a VM, named region1, region2, and region3. The colocated with attribute
* describes which region region3 should be colocated with.
- *
+ *
* @param colocatedWith
*/
private void createColocatedPRs(final String colocatedWith) {
@@ -2756,7 +2757,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
/**
* Test for bug 43570. Rebalance a persistent parent PR before we recover the persistent child PR
* from disk.
- *
+ *
* @throws Throwable
*/
public void rebalanceWithOfflineChildRegion(SerializableRunnable createParentPR,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index bd3bb44..014eea8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.awaitility.Awaitility.*;
import static java.util.concurrent.TimeUnit.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.*;
import static org.junit.Assert.*;
import java.io.DataInput;
@@ -34,9 +34,11 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -76,9 +78,9 @@ import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
-import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.partitioned.ManageBucketMessage.ManageBucketReplyMessage;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -96,7 +98,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.awaitility.Awaitility;
/**
* Tests the basic use cases for PR persistence.
@@ -234,7 +235,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
/**
* Test to make sure that we can recover from a complete system shutdown with redundancy 0
- *
+ *
* @throws Throwable
*/
@Test
@@ -244,7 +245,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
/**
* Test to make sure that we can recover from a complete system shutdown with redundancy 1
- *
+ *
* @throws Throwable
*/
@Test
@@ -889,7 +890,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
/**
* Test to make sure that we recreate a bucket if a member is revoked
- *
+ *
* @throws Throwable
*/
@Test
@@ -967,7 +968,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
/**
* Test to make sure that we recreate a bucket if a member is revoked, and that we do it
* immediately if recovery delay is set to 0.
- *
+ *
* @throws Throwable
*/
@Test
@@ -1686,7 +1687,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
* member A that it hosts the bucket 3. Member A crashes 4. Member B destroys the bucket and
* throws a partition offline exception, because it wasn't able to complete initialization. 5.
* Member A recovers, and gets stuck waiting for member B.
- *
+ *
* @throws Throwable
*/
@Category(FlakyTest.class) // GEODE-1208: time sensitive, multiple non-thread-safe test hooks,
@@ -1768,7 +1769,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
/**
* A test to make sure that we allow the PR to be used after at least one copy of every bucket is
* recovered, but before the secondaries are initialized.
- *
+ *
* @throws Throwable
*/
@Test
@@ -1936,10 +1937,10 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
/**
* Another test for bug 41436. If the GII source crashes before the GII is complete, we need to
* make sure that later we can recover redundancy.
- *
+ *
* In this test case, we bring the GII down before we bring the source back up, to make sure the
* source still discovers that the GII target is no longer hosting the bucket.
- *
+ *
* @throws InterruptedException
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java
index 7d2c709..4a39f55 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java
@@ -14,20 +14,19 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PersistentPartitionedRegionOldConfigDUnitTest
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
index ded783c..d401b7f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
@@ -16,9 +16,22 @@ package org.apache.geode.internal.cache.partitioned;
import static org.apache.geode.test.dunit.Assert.assertEquals;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.commons.io.filefilter.RegexFileFilter;
+
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.AdminDistributedSystemFactory;
import org.apache.geode.admin.AdminException;
@@ -59,18 +72,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.util.Collection;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public abstract class PersistentPartitionedRegionTestBase extends JUnit4CacheTestCase {
public static String PR_REGION_NAME = "region";
@@ -83,7 +84,7 @@ public abstract class PersistentPartitionedRegionTestBase extends JUnit4CacheTes
/*
* (non-Javadoc) Set the region name for this test so that multiple subclasses of this test base
* do not conflict with one another during parallel dunit runs
- *
+ *
* @see dunit.DistributedTestCase#setUp()
*/
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
index fdf495f..5da461b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheTransactionManager;
@@ -34,6 +30,9 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic use cases for PR persistence.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
index 92b1d2d..e253b65 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
@@ -18,10 +18,11 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class RemoveAllPRMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
index a49db16..8ed75eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.partitioned;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class RemoveBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 7b88679..062c6e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -419,16 +419,16 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase {
* @Test public void testStopNonPersistRegions() throws Throwable { Host host = Host.getHost(0);
* VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); createRegion(vm0,
* "region", null, true, 1); createRegion(vm1, "region", "disk", true, 1);
- *
+ *
* createData(vm0, 0, 1, "a", "region");
- *
+ *
* shutDownAllMembers(vm2, 2);
- *
+ *
* // restart vms, and let vm0 to do GII from vm0 createRegion(vm1, "region", "disk", true, 1);
* createRegion(vm0, "region", null, true, 1);
- *
+ *
* checkData(vm0, 0, 1, "a", "region"); checkData(vm1, 0, 1, "a", "region");
- *
+ *
* checkPRRecoveredFromDisk(vm1, "region", 0, true); checkPRRecoveredFromDisk(vm0, "region", 0,
* false); }
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
index da3b94b..5f27391 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.internal.cache.partitioned;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class SizeMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
index 9fa8d64..69b6f1e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
@@ -17,15 +17,8 @@
//
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -34,6 +27,9 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -53,6 +49,9 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class StreamingPartitionOperationManyDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
index 1cf89c0..808dba2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
@@ -18,15 +18,8 @@
//
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
@@ -37,6 +30,9 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.LogWriter;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
@@ -57,6 +53,9 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class StreamingPartitionOperationOneDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index be18c40..49e3a15 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -14,18 +14,12 @@
*/
package org.apache.geode.internal.cache.partitioned.fixed;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DuplicatePrimaryPartitionException;
@@ -34,9 +28,12 @@ import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.cache.partition.PartitionNotAvailableException;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -84,7 +81,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
/**
* This tests validate that same partition name cannot be added more than once as primary as well
* as secondary on same member.
- *
+ *
*/
@Test
@@ -1026,7 +1023,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
* When the primary partition joins the system then this new member should create the primary
* buckets for this partition on itself. And Secondary partitions who were holding primary buckets
* status should now act as secondary buckets.
- *
+ *
*/
@Test
@@ -1089,18 +1086,18 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
* Member2 = Q2(9,10,11) Q3(3,4,5), Q4(6,7,8) Member3 = Q3(3,4,5) Q1(0,1,2), Q2(9,10,11) Member4 =
* Q4(6,7,8) Q1(0,1,2), Q2(9,10,11) Put happens for all buckets Member 4 goes down, then either
* member1 or member2 holds primary for member4
- *
+ *
* Primary Secondary Member1 = Q1(0,1,2) Q3(3,4,5), Q4(6,7,8) Member2 = Q2(9,10,11), Q4(6,7,8)
* Q3(3,4,5) Member3 = Q3(3,4,5) Q1(0,1,2), Q2(9,10,11)
- *
+ *
* Put happens considering Member2 is holding primary for Q4.
- *
+ *
* Member4 comes again, then Memeber4 should do the GII from member2 for buckets 6,7,8 and should
* acqiure primary status Member1 = Q1(0,1,2) Q3(3,4,5), Q4(6,7,8) Member2 = Q2(9,10,11)
* Q3(3,4,5), Q4(6,7,8) Member3 = Q3(3,4,5) Q1(0,1,2), Q2(9,10,11) Member4 = Q4(6,7,8) Q1(0,1,2),
* Q2(9,10,11)
- *
- *
+ *
+ *
*/
@Test
public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() {
@@ -1193,12 +1190,12 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
* Datastore = 4 Datastores Primary Secondary Member1 = Q1(0,1,2) Q2(3,4,5) Member2 = Q2(3,4,5)
* Q3(6,7,8) Member3 = Q3(6,7,8) Q4(9,10,11) Member4 = Q4(9,10,11) Q1(0,1,2) Put happens for all
* buckets Member 4 goes down, then either member1 or member2 holds primary for member4
- *
+ *
* Primary Secondary Member1 = Q1(0,1,2) Q2(3,4,5) Member2 = Q2(3,4,5) Q3(6,7,8) Member3 =
* Q3(6,7,8), Q4(9,10,11)
- *
+ *
* Put happens considering Member3 is holding primary for Q4.
- *
+ *
* Member4 comes again, then Memeber4 should do the GII from member2 for buckets 6,7,8 and should
* acqiure primary status Datastores Primary Secondary Member1 = Q1(0,1,2) Q2(3,4,5) Member2 =
* Q2(3,4,5) Q3(6,7,8) Member3 = Q3(6,7,8) Q4(9,10,11) Member4 = Q4(9,10,11) Q1(0,1,2)
@@ -1393,19 +1390,19 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
* Datastore = 4 Datastores Primary Secondary Member1 = Q1(0,1,2) Q2(3,4,5),Q3(6,7,8),Q4(9,10,11)
* Member2 = Q3(6,7,8) Q1(0,1,2), Q2(3,4,5),Q4(9,10,11) Member3 = Q2(3,4,5),Q4(9,10,11) Q1(0,1,2),
* Q3(6,7,8)
- *
+ *
* Put happens for all buckets
- *
+ *
* Member 3 goes down, then either member1 or member2 holds primary for member4
- *
+ *
* Primary Secondary Member1 = Q1(0,1,2),Q2(3,4,5) Q3(6,7,8), Q4(9,10,11) Member2 =
* Q3(6,7,8),Q4(9,10,11) Q1(0,1,2), Q2(3,4,5)
- *
+ *
* Member 3 comes again then it should be same as it was before member 3 went down
- *
+ *
* Member1 = Q1(0,1,2) Q2(3,4,5),Q3(6,7,8),Q4(9,10,11) Member2 = Q3(6,7,8) Q1(0,1,2),
* Q2(3,4,5),Q4(9,10,11) Member3 = Q2(3,4,5),Q4(9,10,11) Q1(0,1,2), Q3(6,7,8)
- *
+ *
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index de06a5e..3b8f4a1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -21,8 +21,22 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -62,19 +76,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
/**
* This is the base class to do operations
@@ -1247,7 +1248,7 @@ public class FixedPartitioningTestBase extends JUnit4DistributedTestCase {
/**
* Local destroy all root regions and close the cache.
*/
- protected synchronized static void remoteTearDown() {
+ protected static synchronized void remoteTearDown() {
try {
if (cache != null && !cache.isClosed()) {
// try to destroy the root regions first so that
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
index cb3d0a2..5a9bc9b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
@@ -20,9 +20,9 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Date;
-import org.junit.Test;
-import org.junit.Before;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
index f206b85..ce73fbc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
@@ -14,23 +14,22 @@
*/
package org.apache.geode.internal.cache.partitioned.fixed;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class FixedPartitioningWithColocationAndPersistenceDUnitTest
@@ -54,7 +53,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest
/**
* This tests validates that in colocation of FPRs child region cannot specify
* FixedPartitionAttributes
- *
+ *
*/
@Test
@@ -86,15 +85,15 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest
/**
* This tests validates that in Customer-Order-shipment colocation, Order and shipment have the
* FixedPartitionAttributes of the parent region Customer.
- *
+ *
* Put happens for all 3 regions. Colocation of the data is achieved by using a partition-resolver
* {@link CustomerFixedPartitionResolver#getRoutingObject(org.apache.geode.cache.EntryOperation)}
* Also the Fixed Partitioning is achieved using same partition-resolver
* {@link CustomerFixedPartitionResolver#getPartitionName(org.apache.geode.cache.EntryOperation, java.util.Set)}
- *
+ *
* Validation are done for the same number of the buckets Validation are done for the same buckets
* on particular member for all 3 regions.
- *
+ *
*/
@Test
@@ -646,7 +645,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest
/**
* Tests validate the behavior of FPR with persistence when all members goes down and comes up.
- *
+ *
*/
@Test
public void testFPR_Persistence() {
@@ -821,7 +820,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest
/**
* Tests validate the behavior of FPR with persistence and with colocation when all members goes
* down and comes up.
- *
+ *
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/QuarterPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/QuarterPartitionResolver.java
index 7c34dd7..8e063ba 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/QuarterPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/QuarterPartitionResolver.java
@@ -105,7 +105,7 @@ public class QuarterPartitionResolver
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.xmlcache.Declarable2#getConfig()
*/
public Properties getConfig() {
@@ -114,7 +114,7 @@ public class QuarterPartitionResolver
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/SingleHopQuarterPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/SingleHopQuarterPartitionResolver.java
index 5627371..5f247e0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/SingleHopQuarterPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/SingleHopQuarterPartitionResolver.java
@@ -137,7 +137,7 @@ public class SingleHopQuarterPartitionResolver
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.internal.cache.xmlcache.Declarable2#getConfig()
*/
public Properties getConfig() {
@@ -146,7 +146,7 @@ public class SingleHopQuarterPartitionResolver
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.Declarable#init(java.util.Properties)
*/
public void init(Properties props) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
index ff5a2a0..564a153 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.spy;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -61,8 +61,8 @@ public class BucketOperatorWrapperTest {
private int bucketId = 1;
private InternalDistributedMember sourceMember, targetMember;
- private final static String PR_LEADER_REGION_NAME = "leadregion1";
- private final static String PR_COLOCATED_REGION_NAME = "coloregion1";
+ private static final String PR_LEADER_REGION_NAME = "leadregion1";
+ private static final String PR_COLOCATED_REGION_NAME = "coloregion1";
@Before
public void setUp() throws UnknownHostException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorIntegrationTest.java
index c4de9ee..704a6e1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorIntegrationTest.java
@@ -23,13 +23,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
/**
* Tests for the BackupInspector.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupPrepareAndFinishMsgDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupPrepareAndFinishMsgDUnitTest.java
index e0fea77..2dfc16c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupPrepareAndFinishMsgDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupPrepareAndFinishMsgDUnitTest.java
@@ -35,6 +35,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
+import org.awaitility.Awaitility;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.admin.internal.FinishBackupRequest;
import org.apache.geode.admin.internal.PrepareBackupRequest;
import org.apache.geode.cache.Cache;
@@ -54,10 +59,6 @@ import org.apache.geode.internal.cache.BackupLock;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category({DistributedTest.class})
public abstract class BackupPrepareAndFinishMsgDUnitTest extends CacheTestCase {
@@ -213,7 +214,7 @@ public abstract class BackupPrepareAndFinishMsgDUnitTest extends CacheTestCase {
/**
* Create a region, installing the test hook in the backup lock
- *
+ *
* @param shortcut The region shortcut to use to create the region
* @return The newly created region.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index 09b7842..920f556 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache.persistence;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.File;
@@ -33,6 +25,10 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -72,15 +68,18 @@ import org.apache.geode.internal.cache.TombstoneService;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase {
@@ -250,7 +249,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
/**
* Test that we correctly recover and expire recovered tombstones, with compaction enabled.
- *
+ *
* This test differs from above test in that we need to make sure tombstones start expiring based
* on their original time-stamp, NOT the time-stamp assigned during scheduling for expiration
* after recovery.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index 5f2575d..df17039 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -155,7 +155,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Tests to make sure that we stop waiting for a member that we revoke.
- *
+ *
* @throws Exception
*/
@Test
@@ -291,7 +291,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Tests to make sure that we can revoke a member before initialization, and that member will stay
* revoked
- *
+ *
* @throws Exception
*/
@Test
@@ -387,7 +387,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Test which members show up in the list of members we're waiting on.
- *
+ *
* @throws Exception
*/
@Test
@@ -526,7 +526,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Use Case AB are alive A crashes. B crashes. B starts up. It should not wait for A.
- *
+ *
* @throws Exception
*/
@Test
@@ -558,7 +558,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Tests that if two members crash simultaneously, they negotiate which member should initialize
* with what is on disk and which member should copy data from that member.
- *
+ *
* @throws Exception
*/
@Test
@@ -1428,7 +1428,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Tests to make sure that we stop waiting for a member that we revoke.
- *
+ *
* @throws Exception
*/
@Test
@@ -1673,7 +1673,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
/**
* Tests to make sure that after we get a conflicting persistent data exception, we can still
* recover.
- *
+ *
* This is bug XX.
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
index 478f18c..0ee54db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.cache.persistence;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.File;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.DiskStore;
@@ -35,6 +31,9 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
index aaff810..22670e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
@@ -16,7 +16,13 @@ package org.apache.geode.internal.cache.persistence;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.io.FileUtils;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.DiskStore;
@@ -33,11 +39,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-
public abstract class PersistentReplicatedTestBase extends JUnit4CacheTestCase {
protected static final int MAX_WAIT = 30 * 1000;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index 8037583..a625dda 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -19,7 +19,32 @@ import static org.apache.geode.test.dunit.Assert.assertFalse;
import static org.apache.geode.test.dunit.Assert.assertTrue;
import static org.apache.geode.test.dunit.Assert.fail;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -80,41 +105,17 @@ import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
/**
* This test will not run properly in eclipse at this point due to having to bounce vms Currently,
* bouncing vms is necessary because we are starting gemfire with different class loaders and the
* class loaders are lingering (possibly due to daemon threads - the vm itself is still running)
- *
+ *
* Note: to run in eclipse, I had to copy over the jg-magic-map.txt file into my GEMFIRE_OUTPUT
* location, in the same directory as #MagicNumberReader otherwise the two systems were unable to
* talk to one another due to one using a magic number and the other not. Also turnOffBounce will
* need to be set to true so that bouncing a vm doesn't lead to a NPE.
- *
+ *
* @author jhuynh
*/
@Category({DistributedTest.class, BackwardCompatibilityTest.class})
@@ -1284,13 +1285,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
/*
* @param rollServer
- *
+ *
* @param createRegionMethod
- *
+ *
* @param regionName
- *
+ *
* @param locatorPorts if null, uses dunit locator
- *
+ *
* @throws Exception
*/
private VM rollServerToCurrentAndCreateRegion(VM oldServer, RegionShortcut shortcut,
@@ -1319,13 +1320,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
/*
* @param rollClient
- *
+ *
* @param createRegionMethod
- *
+ *
* @param regionName
- *
+ *
* @param locatorPorts if null, uses dunit locator
- *
+ *
* @throws Exception
*/
private VM rollClientToCurrentAndCreateRegion(VM oldClient, ClientRegionShortcut shortcut,
@@ -1966,7 +1967,7 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
/**
* Get the port that the standard dunit locator is listening on.
- *
+ *
* @return
*/
public static String getDUnitLocatorAddress() {
@@ -2003,4 +2004,3 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
index c83d1b4..002f7b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
@@ -14,7 +14,25 @@
*/
package org.apache.geode.internal.cache.rollingupgrade;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -32,23 +50,6 @@ import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
/**
* RollingUpgrade dunit tests are distributed among subclasses of RollingUpgradeDUnitTest to avoid
@@ -57,12 +58,12 @@ import java.util.Properties;
* This test will not run properly in eclipse at this point due to having to bounce vms Currently,
* bouncing vms is necessary because we are starting gemfire with different class loaders and the
* class loaders are lingering (possibly due to daemon threads - the vm itself is still running)
- *
+ *
* Note: to run in eclipse, I had to copy over the jg-magic-map.txt file into my GEMFIRE_OUTPUT
* location, in the same directory as #MagicNumberReader otherwise the two systems were unable to
* talk to one another due to one using a magic number and the other not. Also turnOffBounce will
* need to be set to true so that bouncing a vm doesn't lead to a NPE.
- *
+ *
* @author jhuynh
*/
@@ -364,13 +365,13 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
/*
* @param rollServer
- *
+ *
* @param createRegionMethod
- *
+ *
* @param regionName
- *
+ *
* @param locatorPorts if null, uses dunit locator
- *
+ *
* @throws Exception
*/
private void rollServerToCurrentAndCreateRegion(VM rollServer, String shortcutName,
@@ -1010,7 +1011,7 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
/**
* Starts a locator with given configuration.
- *
+ *
* @param props TODO
*/
public static void startLocator(final String serverHostName, final int port,
@@ -1049,7 +1050,7 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
/**
* Get the port that the standard dunit locator is listening on.
- *
+ *
* @return
*/
public static String getDUnitLocatorAddress() {
@@ -1057,4 +1058,3 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
index a744004..995d517 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
@@ -24,6 +24,11 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.TreeMap;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -47,10 +52,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public class GFSnapshotDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
index 7ed9d4a..aa01b89 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,11 +38,12 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test delta propagation for faulty delta implementation
- *
+ *
* @since GemFire 6.1
*/
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDUnitTest.java
index f5a2e63..c0b2d07 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDUnitTest.java
@@ -65,9 +65,9 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
public class AcceptorImplClientQueueDUnitTest implements Serializable {
private final Host host = Host.getHost(0);
- private final static int numberOfEntries = 200;
- private final static AtomicInteger eventCount = new AtomicInteger(0);
- private final static AtomicBoolean completedClient2 = new AtomicBoolean(false);
+ private static final int numberOfEntries = 200;
+ private static final AtomicInteger eventCount = new AtomicInteger(0);
+ private static final AtomicBoolean completedClient2 = new AtomicBoolean(false);
@ClassRule
public static DistributedTestRule distributedTestRule = new DistributedTestRule();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
index 6edb46c..d2618e3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
@@ -15,7 +15,17 @@
package org.apache.geode.internal.cache.tier.sockets;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.List;
+import java.util.Properties;
+
import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.GemFireCache;
@@ -36,16 +46,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.List;
-import java.util.Properties;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-
-import static org.junit.Assert.*;
/**
* Tests for AcceptorImpl.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
index 6c46eff..f3c2157 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
@@ -14,6 +14,22 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.net.BindException;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.server.CacheServer;
@@ -24,21 +40,6 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.net.BindException;
-import java.util.Collections;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
@Category({IntegrationTest.class, ClientServerTest.class})
public class AcceptorImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index f126859..3dedc01 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -42,6 +41,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
index e361ccf..65c4611 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,6 +44,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
index d578412..c825dae 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -47,11 +46,12 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Bug Test for bug#36457
- *
+ *
* Region destroy message from server to client results in client calling unregister to server (an
* unnecessary callback). The unregister encounters an error because the region has been destroyed
* on the server and hence falsely marks the server dead.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
index c70789c..3a75ed4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,18 +43,17 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* bug test for bug 36805
*
* When server is running but region is not created on server. Client sends register interest
* request, server checks for region, and if region is not exist on server, it throws an exception
* to the client. Hence, client marks server as dead.
- *
+ *
* To avoid this, there should not be any check of region before registration. And region
* registration should not fail due to non existent region.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
index 69b8a79..9e408ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -36,6 +35,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
index 66fff6b..8cf667b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -20,7 +20,6 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -41,6 +40,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 1401611..1fafa58 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,6 +44,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -71,7 +71,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Creates the cache server and sets the port
- *
+ *
* @throws Exception - thrown if any problem occurs in initializing the test
*/
@Override
@@ -86,7 +86,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Create the cache
- *
+ *
* @param props - properties for DS
* @return the cache instance
* @throws Exception - thrown if any problem occurs in cache creation
@@ -105,7 +105,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* close the cache instances in server and client during tearDown
- *
+ *
* @throws Exception thrown if any problem occurs in closing cache
*/
@Override
@@ -125,7 +125,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
* 4)Explicity close the CacheClientProxy on the server. <br>
* 5)Verify that HARegionQueue stats are closed and entry for the haregion is removed from
* dispatchedMessagesMap.
- *
+ *
* @throws Exception - thrown if any problem occurs in test execution
*/
@Test
@@ -148,7 +148,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Creates and starts the cache-server
- *
+ *
* @return - the port on which cache-server is running
* @throws Exception - thrown if any problem occurs in cache/server creation
*/
@@ -176,9 +176,9 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Initializes the cache client
- *
+ *
* @param port - port for the primary cache-server
- *
+ *
* @throws Exception-thrown if any problem occurs in initializing the client
*/
public static void createClientCache(String host, Integer port) throws Exception {
@@ -206,7 +206,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Close the CacheClientProxy of the client on the server and verify that ha-stats are closed and
* the entry for the region is removed from dispatchedMessagesMap.
- *
+ *
*/
public static void closeCacheClientProxyAndVerifyStats() {
assertEquals("More than one BridgeServers found ", 1, cache.getCacheServers().size());
@@ -236,7 +236,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Do some PUT operations
- *
+ *
* @throws Exception - thrown if any exception occurs in doing PUTs
*/
public static void doEntryOperations() throws Exception {
@@ -249,7 +249,7 @@ public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
/**
* Close the cache
- *
+ *
*/
public static void closeCache() {
if (cache != null && !cache.isClosed()) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
index 58f1b1c..a6c4b5f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -37,6 +36,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
index e7d918d..62623d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
@@ -18,11 +18,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater.CCUStats;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater.CCUStats;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class CCUStatsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index f0334e1..f164453 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -42,6 +41,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
index 8734af0..93ef5b8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Just like its parent but enables the server thread pool (aka selector).
- *
- *
+ *
+ *
*/
@Category({IntegrationTest.class, ClientServerTest.class})
public class CacheServerSelectorMaxConnectionsJUnitTest extends CacheServerMaxConnectionsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
index fdf6512..d3fc3ae 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -64,10 +64,10 @@ public class CacheServerTestUtil extends JUnit4DistributedTestCase {
private static PoolImpl pool = null;
- protected final static int TYPE_CREATE = 0;
- protected final static int TYPE_UPDATE = 1;
- protected final static int TYPE_INVALIDATE = 2;
- protected final static int TYPE_DESTROY = 3;
+ protected static final int TYPE_CREATE = 0;
+ protected static final int TYPE_UPDATE = 1;
+ protected static final int TYPE_INVALIDATE = 2;
+ protected static final int TYPE_DESTROY = 3;
public static void createCacheClient(Pool poolAttr, String regionName) throws Exception {
createCacheClient(poolAttr, regionName, getClientProperties(), Boolean.FALSE);
@@ -489,7 +489,7 @@ public class CacheServerTestUtil extends JUnit4DistributedTestCase {
/**
* Enables the shuffling of endpoints for a client
- *
+ *
* @since GemFire 5.7
*/
public static void enableShufflingOfEndpoints() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index d7841dd..72aadf8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -50,6 +49,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
index e882b70..09981df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java
index 8cd7622..5ecb212 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import java.util.List;
+import java.util.Set;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.cache.CacheServerImpl;
-import java.util.List;
-import java.util.Set;
-
/**
* Provides tests a way to access CacheServer, AcceptorImpl and ServerConnection
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index c53028b..cb15d74 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -54,6 +53,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 31f67aa..ed8e923 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -52,6 +51,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -171,7 +171,7 @@ public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* create client 2 with 2 regions each with a unique writer and unique listeners
- *
+ *
* @throws Exception
*/
public static void createClientCache(String host, Integer port, String conflation)
@@ -233,12 +233,12 @@ public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
*/
// For first region with server conflation setting on
- volatile static int counterCreate1 = 0;
- volatile static int counterUpdate1 = 0;
+ static volatile int counterCreate1 = 0;
+ static volatile int counterUpdate1 = 0;
// For first region with server conflation setting off
- volatile static int counterCreate2 = 0;
- volatile static int counterUpdate2 = 0;
+ static volatile int counterCreate2 = 0;
+ static volatile int counterUpdate2 = 0;
/**
* assert all the counters are zero
@@ -511,4 +511,3 @@ public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
vm0.invoke(() -> ClientConflationDUnitTest.closeCacheServer());
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index af086fc..d8a1eb5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -119,7 +119,7 @@ public class ClientHealthMonitorJUnitTest {
}
}
- private final static int TIME_BETWEEN_PINGS = 50;
+ private static final int TIME_BETWEEN_PINGS = 50;
/**
* Creates and starts the server instance
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
index 660c725..4f3cb8e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Just like its parent but enables the server thread pool (aka selector).
- *
- *
+ *
+ *
*/
@Category({IntegrationTest.class, ClientServerTest.class, FlakyTest.class})
public class ClientHealthMonitorSelectorJUnitTest extends ClientHealthMonitorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index b569cf3..2c73979 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.Iterator;
@@ -21,7 +22,6 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -52,10 +52,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* This test verifies the per-client notify-by-subscription (NBS) override functionality along with
* register interest new receiveValues flag. Taken from the existing ClientConflationDUnitTest.java
@@ -296,7 +295,7 @@ public class ClientInterestNotifyDUnitTest extends JUnit4DistributedTestCase {
/**
* create client with 3 regions each with a unique listener
- *
+ *
* @throws Exception
*/
public static void createClientCache(String host, Integer port, /* String nbs, */
@@ -567,4 +566,3 @@ public class ClientInterestNotifyDUnitTest extends JUnit4DistributedTestCase {
closeCacheServer();
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index 1a76daa..0d00d59 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -54,6 +53,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 1824513..0ab9125 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -677,16 +677,16 @@ public class ClientServerMiscDUnitTest extends JUnit4CacheTestCase {
}
/**
- *
+ *
* bug 35380: Cycling a DistributedSystem with an initialized pool causes interest registration
* NPE
- *
+ *
* Test Scenario:
- *
+ *
* Create a DistributedSystem (DS1). Create a pool, initialize (creates a proxy with DS1 memberid)
* Disconnect DS1. Create a DistributedSystem (DS2). Create a Region with pool, it attempts to
* register interest using DS2 memberid, gets NPE.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
index 6ea9c67..7671044 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
index b1e16ee..b31b827 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -55,6 +54,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -109,7 +109,7 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* Set the boolean to make the dispatcher thread pause <code>milis</code> miliseconds.
- *
+ *
*/
public static void setIsSlowStart(String milis) {
CacheClientProxy.isSlowStartForTesting = true;
@@ -225,7 +225,7 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* create pool for a client
- *
+ *
* @return created pool
*/
private static Pool createPool(String host, String name, Integer port, boolean enableQueue) {
@@ -239,7 +239,7 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* create a client with 2 regions sharing a common writer
- *
+ *
* @throws Exception
*/
@@ -256,7 +256,7 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* create a client with 2 regions sharing a common writer
- *
+ *
* @throws Exception
*/
@@ -275,7 +275,7 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* create client 2 with 2 regions with sharing a common writer and having a common listener
- *
+ *
* @throws Exception
*/
public static void createClientCache2CommonWriter(String host, Integer port) throws Exception {
@@ -387,7 +387,7 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* create client 2 with 2 regions each with a unique writer but both having a common listener
- *
+ *
* @throws Exception
*/
public static void createClientCache2UniqueWriter(String host, Integer port) throws Exception {
@@ -436,10 +436,10 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
/**
* variables to count operations (messages received on client from server)
*/
- volatile static int count = 0;
- volatile static int counterCreate = 0;
- volatile static int counterUpdate = 0;
- volatile static int counterDestroy = 0;
+ static volatile int count = 0;
+ static volatile int counterCreate = 0;
+ static volatile int counterUpdate = 0;
+ static volatile int counterDestroy = 0;
/**
* assert all the counters are zero
@@ -861,4 +861,3 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
vm0.invoke(() -> ConflationDUnitTest.closeCache());
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index 6c19c13..c67743d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -18,6 +18,19 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
@@ -36,18 +49,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Map;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index bde99ad..3ccf29d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -22,7 +22,6 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -58,6 +57,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@@ -651,7 +651,7 @@ public class DataSerializerPropogationDUnitTest extends JUnit4DistributedTestCas
/**
* Test's same eventId being same for the dataserializers at all clients & servers
- *
+ *
*/
@Test
public void testDataSerializersEventIdVerificationClientsAndServers() throws Exception {
@@ -812,7 +812,7 @@ public class DataSerializerPropogationDUnitTest extends JUnit4DistributedTestCas
/**
* This method creates the server cache
- *
+ *
* @param maxThreads
* @return
* @throws Exception
@@ -836,7 +836,7 @@ public class DataSerializerPropogationDUnitTest extends JUnit4DistributedTestCas
/**
* This method creates the server cache
- *
+ *
* @param maxThreads
* @return
* @throws Exception
@@ -872,7 +872,7 @@ public class DataSerializerPropogationDUnitTest extends JUnit4DistributedTestCas
/**
* sets the EventId value in the VM
- *
+ *
* @param eventID
*/
public static void setEventId(EventID eventID) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaEOFException.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaEOFException.java
index 95e1644..b252993 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaEOFException.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaEOFException.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
/**
* Faulty delta implementation, raising EndOfFile exception as fromDelta reads more fields then
* wrote by toDelta
- *
+ *
* @since GemFire 6.1
*/
public class DeltaEOFException extends FaultyDelta {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index f902c71..84d5a0d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -56,6 +55,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index 2186c01..cb38115 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -41,6 +40,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index de6d3c5..0d45482 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -19,23 +19,21 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.util.JSR166TestCase.m2;
import static org.junit.Assert.*;
-import org.awaitility.Awaitility;
-
import java.io.Serializable;
import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.cache.CacheListener;
-import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.cache.RegionEvent;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheListener;
+import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCacheFactory;
@@ -54,6 +52,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
index cc0e658..c8ec547 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -25,6 +24,7 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index c1be930..2630b9e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -58,11 +57,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests for durable reconnect issue
- *
+ *
* @since GemFire 5.2
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
@@ -767,4 +767,3 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index 8286afe..52f5d81 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Properties;
import java.util.concurrent.RejectedExecutionException;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -41,6 +40,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -49,7 +49,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* 2) QueueDroppedCount -> Incremented Each time a queue for a durable client is dropped after
* durable Timeout 3) EventsEnqueuedWhileClientAwayCount -> Incremented Each time an entry is made
* when client is away.
- *
+ *
* In the given test DurableClient comes up and goes down discreetly with different
* DurableClientTimeouts so as to increment the counts
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index fbd1815..b0d6e9e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
@@ -28,6 +28,9 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.InterestResultPolicy;
@@ -54,20 +57,18 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* We have 2 servers and One client which registers some keys with durable interest and some without
* it. We maintain queues on only One server as redundancy level is one. Following 2 tests have the
* two TestCase scenarios
- *
+ *
* There are two Tests First Test does the follows : // Step 1: Starting the servers // Step 2:
* Bring Up the Client // Step 3: Client registers Interests // Step 4: Update Values on the Server
* for Keys // Step 5: Verify Updates on the Client // Step 6: Close Cache of the DurableClient //
* Step 7: Update the Values // Step 8: Re-start the Client // Step 9: Verify Updates on the Client
* // Step 10 : Stop all VMs
- *
+ *
* For Test 2 the steps are as follows // Step 1: Starting the servers // Step 2: Bring Up the
* Client // Step 3: Client registers Interests // Step 4: Update Values on the Server for Keys //
* Step 5: Verify Updates on the Client // Step 6: Close Cache of the DurableClient // Step 7:
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 3e4c7ad..05728f2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -48,11 +47,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests that the Matris defined in <code>ServerResponseMatrix</code> is applied or not
- *
+ *
* @since GemFire 5.1
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index 08ca06f..a7fed31 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -51,6 +50,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -141,7 +141,7 @@ public class EventIDVerificationDUnitTest extends JUnit4DistributedTestCase {
/**
* Verify that EventId is prapogated to server in case of region clear. It also checks that peer
* nodes also get the same EventID.
- *
+ *
*/
@Test
public void testEventIDPrapogationOnServerDuringRegionClear() {
@@ -447,4 +447,3 @@ public class EventIDVerificationDUnitTest extends JUnit4DistributedTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index 655519a..b1eb802 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,6 +39,7 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FaultyDelta.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FaultyDelta.java
index 7de7b6c..38a6ddb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FaultyDelta.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FaultyDelta.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
/**
* Faulty delta implementation, raising ArrayIndexOutOfBound exception as fromDelta reads incorrect
* sequence then wrote by toDelta
- *
+ *
* @since GemFire 6.1
*/
public class FaultyDelta implements Delta, DataSerializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
index 965f60e..56d06e9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import java.text.ParseException;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -25,11 +31,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.text.ParseException;
-import java.util.concurrent.CountDownLatch;
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class FilterProfileIntegrationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
index 5d6b36e..75ce1a0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
@@ -21,20 +21,21 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.FilterProfile;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
@Category({UnitTest.class, ClientSubscriptionTest.class})
public class FilterProfileJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
index 2a36630..fe159d6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
@@ -14,21 +14,16 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheListener;
@@ -58,6 +53,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index 9781c34..8e0209d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -18,17 +18,17 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Runs force invalidate eviction tests with off-heap regions.
- *
+ *
* @since Geode 1.0
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
index 1c03a0f..0f544e9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
@@ -19,7 +19,6 @@ import static org.awaitility.Awaitility.*;
import static org.awaitility.Duration.*;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,6 +38,7 @@ import org.apache.geode.internal.cache.ha.HAHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
index cb1169c..198473f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("serial")
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
index 5d3ae2d..c371c95 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -94,7 +94,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
protected static VM server2 = null;
protected static VM server3 = null;
- protected volatile static boolean exceptionOccurred = false;
+ protected static volatile boolean exceptionOccurred = false;
@Override
public final void postSetUp() throws Exception {
@@ -142,7 +142,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
/**
* Return the current primary waiting for a primary to exist.
- *
+ *
* @since GemFire 5.7
*/
public static VM getPrimaryVM() {
@@ -152,7 +152,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
/**
* Return the current primary waiting for a primary to exist and for it not to be the oldPrimary
* (if oldPrimary is NOT null).
- *
+ *
* @since GemFire 5.7
*/
public static VM getPrimaryVM(final VM oldPrimary) {
@@ -206,7 +206,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
/**
* Given a server vm (server1, server2, or server3) return its port.
- *
+ *
* @since GemFire 5.7
*/
public static int getServerPort(VM vm) {
@@ -224,7 +224,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
/**
* Given a server port (PORT1, PORT2, or PORT3) return its vm.
- *
+ *
* @since GemFire 5.7
*/
public static VM getServerVM(int port) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 7b7f4a7..6cea897 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -23,6 +23,15 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -52,14 +61,6 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
/**
* Test to verify Startup. and failover during startup.
@@ -679,4 +680,3 @@ public class HAStartupAndFailoverDUnitTest extends JUnit4DistributedTestCase {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandShakeTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandShakeTest.java
index 2850500..266ce43 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandShakeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandShakeTest.java
@@ -19,11 +19,12 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.apache.geode.internal.i18n.LocalizedStrings.HandShake_NO_SECURITY_CREDENTIALS_ARE_PROVIDED;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.geode.security.AuthenticationRequiredException;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class HandShakeTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 1fcb06a..4ffbfc7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.Properties;
import java.util.Random;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -59,6 +58,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
index 1008d54..331ed4f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -63,6 +62,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -96,10 +96,10 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
private static final String REGION_NAME = "InterestListDUnitTest_region";
// using a Integer instead of String to make sure ALL_KEYS works on non-String keys
- private final static Integer key1 = new Integer(1);
- private final static Integer key2 = new Integer(2);
- private final static String key1_originalValue = "key-1-orig-value";
- private final static String key2_originalValue = "key-2-orig-value";
+ private static final Integer key1 = new Integer(1);
+ private static final Integer key2 = new Integer(2);
+ private static final String key1_originalValue = "key-1-orig-value";
+ private static final String key2_originalValue = "key-2-orig-value";
private static Cache cache = null;
@@ -764,7 +764,7 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
/**
* exercises the ClientSession interface to register interest in a server on behalf of a client
- *
+ *
* @param clientId the DM of the client
* @param key the key that the client is interested in
*/
@@ -867,7 +867,7 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
/**
* unregister a key for a particular client in the server
- *
+ *
* @param clientId the client's ID
* @param key the key it's no longer interest in
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index c3053b2..e98c87e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -53,6 +52,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
index 5a04c47..9656d9c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
@@ -14,18 +14,17 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.cache.*;
-
/**
* subclass of InterestListEndpointDUnitTest to exercise partitioned regions
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
index 0f3a5ec..bd09b8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index f9c7371..d8ee138 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.*;
import java.util.Iterator;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -36,6 +35,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -292,5 +292,3 @@ public class InterestListFailoverDUnitTest extends JUnit4DistributedTestCase {
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 041cd38..12f880b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -54,6 +53,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index 1ac06b0..db5c8e3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -49,6 +48,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -492,4 +492,3 @@ public class InterestRegrListenerDUnitTest extends JUnit4DistributedTestCase {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 6a0f116..ee8fb23 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -47,6 +46,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -59,7 +59,7 @@ public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase {
VM vm0, vm1 = null;
/** total entries pre-populated on server */
- final static int PREPOPULATED_ENTRIES = 10;
+ static final int PREPOPULATED_ENTRIES = 10;
/** the cache instance for the test */
private static Cache cache = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
index 0bc6381..acfd072 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
@@ -21,17 +21,18 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.geode.security.AuthenticationRequiredException;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.io.DataOutputStream;
-import java.io.IOException;
+import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class MessageIdExtractorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index b2d903c..20b11bd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -20,12 +20,12 @@ import static org.mockito.Mockito.*;
import java.net.Socket;
import java.nio.ByteBuffer;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.Version;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 857bab3..c731181 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -37,6 +36,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -59,7 +59,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates the server cache on test-VMs
- *
+ *
* @throws Exception thrown if any problem occurs in set-up
*/
@Override
@@ -86,7 +86,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
/**
* Closes the cache on test VMs
- *
+ *
* @throws Exception thrown if any problem occurs while closing the cache
*/
@Override
@@ -97,13 +97,13 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates the cache and the region on the test VM with given parameters
- *
+ *
* @param enableWan boolean to make test-region wan-enabled
* @param setPublisher boolean to make test-region as publisher
* @param enableConflation boolean to enable conflation for test-region
* @param enableAsyncConflation boolean to enable async conflation on test-region
* @throws Exception thrown if any problem occurs while creating cache or test-region
- *
+ *
* @see AttributesFactory#setPublisher(boolean)
* @see AttributesFactory#setEnableConflation(boolean)
* @see AttributesFactory#setEnableAsyncConflation(boolean)
@@ -124,7 +124,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates cache instance
- *
+ *
* @param props - properties of the distributed system
* @return cache
* @throws Exception - thrown if any problem occurs while connecting to distributed system or
@@ -157,7 +157,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
* 2)Perform PUTs from one VM and verify that all of them reach the other VM<br>
* 3)Perform PUTs,INVALIDATEs and DESTROYs from one VM and verify at the end that all are
* destroyed in the other VM also<br>
- *
+ *
* @see AttributesFactory#setPublisher(boolean)
* @see AttributesFactory#setEnableConflation(boolean)
* @see AttributesFactory#setEnableAsyncConflation(boolean)
@@ -246,7 +246,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
/**
* Gets the total number of entries in the test region
- *
+ *
* @return total entries
*/
public static Object getEntryCount() {
@@ -259,7 +259,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
* This method invokes all the registerInterest related API's for the test-region and verifies
* that <code>UnsupportedOperationException</code> is thrown in all the cases since test-region
* does not have bridge-server or bridge-client.
- *
+ *
* @see Region#registerInterest(Object)
* @see Region#registerInterest(Object, InterestResultPolicy)
* @see Region#registerInterestRegex(String)
@@ -350,7 +350,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
* This method invokes all the unregisterInterest related API's for the test-region and verifies
* that <code>UnsupportedOperationException</code> is thrown in all the cases since test-region
* does not have bridge-server or bridge-client.
- *
+ *
* @see Region#unregisterInterest(Object)
* @see Region#unregisterInterestRegex(String)
*/
@@ -403,7 +403,7 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
* This method invokes all the getter API's for interest-list on the test-region and verifies that
* <code>UnsupportedOperationException</code> is thrown in all the cases since test-region does
* not have bridge-server or bridge-client.
- *
+ *
* @see Region#getInterestList()
* @see Region#getInterestListRegex()
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index 52b5dc0..6994139 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -19,12 +19,12 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.List;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.CopyHelper;
import org.apache.geode.internal.util.BlobHelper;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
index 5720357..490b041 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
@@ -18,12 +18,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class PartTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index d94fc1f..5d5a885 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -14,6 +14,16 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -23,19 +33,10 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
/**
* Tests the proper intialization of redundancyLevel property.
- *
+ *
*/
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class RedundancyLevelJUnitTest {
@@ -80,8 +81,8 @@ public class RedundancyLevelJUnitTest {
* file.(Please note that the purpose of this test is to just verify that the value is initialized
* correctly from cache-xml and so only client is started and the connection-exceptions due to no
* live servers, which appear as warnings, are ignored.)
- *
- *
+ *
+ *
*/
@Test
public void testRedundancyLevelSetThroughXML() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index 64e1bbf..7af1972 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -27,6 +26,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index 3b110e8..304926d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -26,6 +25,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 505d0a1..6bf9132 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -27,6 +26,7 @@ import org.apache.geode.internal.cache.ClientServerObserverHolder;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 1e62dcd..bc67f1a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -20,8 +20,6 @@ import static org.junit.Assert.*;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,7 +43,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Test to verify that client side region.close() should unregister the client with the server. It
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index 6aac6e8..4f453fc 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -47,6 +46,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -54,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* been created. After that if a region is created and the new region gets data from another
* mirrored node, it should propagate to the client which registered interest before the region was
* created.
- *
+ *
* The scenario is: - 2 servers 2 clients - client1 connected to server1 - client2 connected to
* server2 - client2 registers interest for region1 on server2 before region1 is created - data is
* put on region1 in server1 - mirrored region1 is created on server2 - data will come to region1 on
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 1f72c97..47d8050 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,6 +44,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
index a2bbb01..7ade5bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
@@ -14,18 +14,17 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.cache.*;
-
/**
* subclass of UpdatePropagationDUnitTest to exercise partitioned regions
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index 7c6d7b2..7f534d8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -53,6 +52,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@@ -124,7 +124,7 @@ public class ReliableMessagingDUnitTest extends JUnit4DistributedTestCase {
/**
* Wait for acknowledgment from client, verify creation time is correct
- *
+ *
* @throws Exception
*/
public static void waitForClientAck() throws Exception {
@@ -222,7 +222,7 @@ public class ReliableMessagingDUnitTest extends JUnit4DistributedTestCase {
}
}
- static private void sleep(int ms) {
+ private static void sleep(int ms) {
try {
Thread.sleep(ms);
} catch (InterruptedException e) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
index e11b206..74c3e7f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
@@ -15,12 +15,14 @@
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.client.protocol.exception.ServiceLoadingFailureException;
-import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.Socket;
import org.assertj.core.api.Assertions;
import org.junit.Rule;
@@ -28,14 +30,12 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.client.protocol.exception.ServiceLoadingFailureException;
+import org.apache.geode.internal.cache.tier.CachedRegionHelper;
+import org.apache.geode.internal.cache.tier.CommunicationMode;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* We don't test the path where the service providing protobufProtocolHandler is actually present,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
index bd23223..dbda3d7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
@@ -25,14 +25,11 @@ import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.security.AuthenticationRequiredException;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.geode.test.junit.rules.RestoreLocaleRule;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.Locale;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -41,10 +38,14 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.Locale;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.tier.CommunicationMode;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.rules.RestoreLocaleRule;
@Category(UnitTest.class)
public class ServerConnectionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index 520509a..88d0df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- *
+ *
*/
package org.apache.geode.internal.cache.tier.sockets;
@@ -23,7 +23,6 @@ import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -50,6 +49,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
@@ -101,9 +101,9 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
* The test starts two clients who register interest in "ALL_KEYS" but close without unregistering
* the same. The test then verifies that the server cleans up the register interest artifacts of
* these clients properly.
- *
+ *
* See bug #47619
- *
+ *
* @throws Exception
*/
@Test
@@ -123,9 +123,9 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
* The test starts two clients who register interest in a list keys but close without
* unregistering the same. The test then verifies that the server cleans up the register interest
* artifacts of these clients properly.
- *
+ *
* See bug #47619
- *
+ *
* @throws Exception
*/
@Test
@@ -145,9 +145,9 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
* The test starts two clients who register interest with regular expression "[a-z]*[0-9]" but
* close without unregistering the same. The test then verifies that the server cleans up the
* register interest artifacts of these clients properly.
- *
+ *
* See bug #47619
- *
+ *
* @throws Exception
*/
@Test
@@ -168,9 +168,9 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
* receiving updates as invalidates. One of the clients later unregisters its interests in the
* list of keys. Server then does some puts on the keys. The test then verifies that the server
* does send these updates to the second client while first client sees no events.
- *
+ *
* See bug #47717
- *
+ *
* @throws Exception
*/
@Test
@@ -195,9 +195,9 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
* with the regular expression. Server then does some puts on the keys. The test then verifies
* that the server does send these updates to the second client while the first client sees no
* events.
- *
+ *
* See bug #47717
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index a3b0c2a..dd0df21 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
import static junit.framework.TestCase.assertNotNull;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -27,7 +27,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -56,6 +55,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -322,5 +322,3 @@ public class UpdatePropagationDUnitTest extends JUnit4CacheTestCase {
}
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index 24b3b0d..b967443 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,6 +38,7 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 4851c5b..8d73452 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -46,6 +45,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index 24b53f0..fe29f65 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -1565,7 +1565,7 @@ public class RegionVersionHolderJUnitTest {
/**
* Construct a region version holder that matches the seen revisions passed in the bit set.
- *
+ *
*/
private RegionVersionHolder buildHolder(BitSet bs) {
@@ -1673,10 +1673,10 @@ public class RegionVersionHolderJUnitTest {
/**
* Test the dominates relation between RegionVersionHolders.
- *
+ *
* This test currently fails in the last case with two different holders with the same exception
* list expressed differently. Hence it is disabled.
- *
+ *
* See bug 47106
*/
@Test
@@ -1853,7 +1853,7 @@ public class RegionVersionHolderJUnitTest {
/**
* Return true if bs1 dominates bs2 - meaning that at least all of the bits set in bs2 are set in
* bs1.
- *
+ *
* @param bs1
* @param bs2
* @return
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
index a5df4b3..8612d3f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* A test of the region version holder, where all of the test methods will now build there RVV by
* applying versions in a random order.
- *
+ *
* This test also contains some other non deterministic RVV junit tests
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorJUnitTest.java
index 12f7321..b124fc7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorJUnitTest.java
@@ -33,6 +33,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index cb03cbe..945994f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -18,15 +18,16 @@ import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public class TombstoneDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 6ba8c66..47dbba1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -38,9 +38,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.internal.cache.control.InternalResourceManager;
-import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserver;
import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
@@ -74,6 +71,7 @@ import org.apache.geode.cache.control.RebalanceFactory;
import org.apache.geode.cache.control.RebalanceOperation;
import org.apache.geode.cache.control.RebalanceResults;
import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.cache.persistence.PartitionOfflineException;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.wan.GatewayEventFilter;
@@ -90,6 +88,8 @@ import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.RegionQueue;
+import org.apache.geode.internal.cache.control.InternalResourceManager;
+import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserver;
import org.apache.geode.internal.cache.lru.Sizeable;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
@@ -507,7 +507,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
* This method verifies the queue size of a ParallelGatewaySender. For ParallelGatewaySender
* conflation happens in a separate thread, hence test code needs to wait for some time for
* expected result
- *
+ *
* @param asyncQueueId Async Queue ID
* @param numQueueEntries expected number of Queue entries
* @throws Exception
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/MyGatewayEventFilter.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/MyGatewayEventFilter.java
index 7bf6195..8207d5e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/MyGatewayEventFilter.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/MyGatewayEventFilter.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.cache.wan;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayQueueEvent;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
-
// Note: This class is used by AsyncEventQueueValidationsJUnitTest
// testAsyncEventQueueConfiguredFromXmlUsesFilter
public class MyGatewayEventFilter implements GatewayEventFilter, Declarable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/PossibleDuplicateAsyncEventListener.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/PossibleDuplicateAsyncEventListener.java
index 45f3dc5..2028855 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/PossibleDuplicateAsyncEventListener.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/PossibleDuplicateAsyncEventListener.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.wan;
-import org.apache.geode.cache.asyncqueue.AsyncEvent;
-import org.apache.geode.cache.asyncqueue.AsyncEventListener;
-
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.cache.asyncqueue.AsyncEvent;
+import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+
public class PossibleDuplicateAsyncEventListener implements AsyncEventListener {
private final CountDownLatch latch = new CountDownLatch(1);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java
index 17696bb..408dfd6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.internal.cache.wan;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.RegionQueue;
-import org.junit.After;
-import org.junit.Before;
-
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.mockito.Mockito.*;
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.RegionQueue;
+
public abstract class WaitUntilGatewaySenderFlushedCoordinatorJUnitTest {
protected GemFireCacheImpl cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AbstractMovingAsyncEventListener.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AbstractMovingAsyncEventListener.java
index 2e746ae..625bcd1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AbstractMovingAsyncEventListener.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AbstractMovingAsyncEventListener.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.internal.cache.wan.asyncqueue;
-import org.apache.geode.cache.asyncqueue.AsyncEvent;
-import org.apache.geode.cache.asyncqueue.AsyncEventListener;
-import org.apache.geode.distributed.DistributedMember;
-
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.geode.cache.asyncqueue.AsyncEvent;
+import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+import org.apache.geode.distributed.DistributedMember;
+
/**
* Created by dan on 5/10/17.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index 6964edf..717d8d5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -20,6 +20,23 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
+import org.awaitility.Awaitility;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
@@ -52,22 +69,6 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
@Category(DistributedTest.class)
public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
@@ -234,7 +235,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: false
*/
@@ -318,10 +319,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async queue persistence
* enabled: false
- *
+ *
* Error is thrown from AsyncEventListener implementation while processing the batch. Added to
* test the fix done for defect #45152.
*/
@@ -371,7 +372,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: false AsyncEventQueue conflation enabled: true
*/
@@ -451,10 +452,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async event queue persistence
* enabled: false
- *
+ *
* Note: The test doesn't create a locator but uses MCAST port instead.
*/
@Ignore("TODO: Disabled until I can sort out the hydra dependencies - see bug 52214")
@@ -487,10 +488,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: true
- *
+ *
* No VM is restarted.
*/
@@ -528,10 +529,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: true
- *
+ *
* There is only one vm in the site and that vm is restarted
*/
@Ignore("TODO: Disabled for 52351")
@@ -570,10 +571,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: true
- *
+ *
* There are 3 VMs in the site and the VM with primary sender is shut down.
*/
@Ignore("TODO: Disabled for 52351")
@@ -621,7 +622,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Dispatcher threads: more than 1 Order policy: key based ordering
*/
@Test
@@ -658,7 +659,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Region persistence enabled: false Async queue persistence
* enabled: false
*/
@@ -737,7 +738,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Partitioned WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: false
*/
@@ -769,7 +770,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Partitioned WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: false AsyncEventQueue conflation enabled: true
*/
@@ -846,10 +847,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Partitioned WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: true
- *
+ *
* No VM is restarted.
*/
@Test
@@ -884,10 +885,10 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
/**
* Test configuration::
- *
+ *
* Region: Partitioned WAN: Serial Region persistence enabled: false Async channel persistence
* enabled: true
- *
+ *
* There is only one vm in the site and that vm is restarted
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
index 0041aba..b774ab3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.asyncqueue;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index f09fe2c..b131b46 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -14,21 +14,20 @@
*/
package org.apache.geode.internal.cache.wan.asyncqueue;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.wan.AsyncEventQueueTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index b21ca90..b6524a7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -17,16 +17,16 @@
*/
package org.apache.geode.internal.cache.wan.asyncqueue;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
import static junitparams.JUnitParamsRunner.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.awaitility.Awaitility;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
+import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
index 67ab3dd..4dda995 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
@@ -14,20 +14,19 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.internal.cache.wan.AsyncEventQueueTestBase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
@@ -89,7 +88,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Dispatcher threads: more than 1 Order policy: key based ordering
*/
@@ -137,7 +136,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Dispatcher threads: more than 1 Order policy: Thread ordering
*/
@@ -198,7 +197,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
/**
* Test configuration::
- *
+ *
* Region: PartitionedRegion WAN: Parallel Dispatcher threads: more than 1 Order policy: key based
* ordering
*/
@@ -254,7 +253,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
/**
* Test configuration::
- *
+ *
* Region: PartitionedRegion WAN: Parallel Dispatcher threads: more than 1 Order policy: PARTITION
* based ordering
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
index f3c798c..d3ad505 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
index 12989f0..cb707a8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
@@ -14,18 +14,17 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.AsyncEventQueueTestBase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
index 5732504..b0e4eb6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
index 5e12ed5..4b46e54 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
@@ -14,16 +14,13 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.internal.cache.BucketRegionQueue;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
-import org.apache.geode.internal.cache.wan.WaitUntilGatewaySenderFlushedCoordinatorJUnitTest;
-import org.apache.geode.internal.cache.wan.parallel.WaitUntilParallelGatewaySenderFlushedCoordinator.WaitUntilBucketRegionQueueFlushedCallable;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.Mockito;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.HashSet;
@@ -31,13 +28,17 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.BucketRegionQueue;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
+import org.apache.geode.internal.cache.wan.WaitUntilGatewaySenderFlushedCoordinatorJUnitTest;
+import org.apache.geode.internal.cache.wan.parallel.WaitUntilParallelGatewaySenderFlushedCoordinator.WaitUntilBucketRegionQueueFlushedCallable;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
index 54038a4..21bdeb1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.wan.serial;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation.DestroyMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class DestroyMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java
index b4694db..30068d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java
@@ -37,7 +37,7 @@ public abstract class AbstractEntityResolverTest {
/**
* Assert that {@link PivotalEntityResolver} extends {@link DefaultEntityResolver2}.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -48,7 +48,7 @@ public abstract class AbstractEntityResolverTest {
/**
* Find the {@link PivotalEntityResolver} in the {@link ClassPathLoader}. Verifies that the
* META-INF/services file is correctly found and the the implementation class is loadable.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -68,7 +68,7 @@ public abstract class AbstractEntityResolverTest {
/**
* Resolve the cache.xml XSD using the {@link PivotalEntityResolver}. Verifies that the
* META-INF/schemas files are correctly found.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -81,7 +81,7 @@ public abstract class AbstractEntityResolverTest {
/**
* Test {@link PivotalEntityResolver#resolveEntity(String, String)} with <code>null</code>
* <code>systemId</code>. Asserts that returns to <code>null<code>.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -95,7 +95,7 @@ public abstract class AbstractEntityResolverTest {
* Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
* <code>"--not-a-valid-system-id--"</code> <code>systemId</code>, which is not in the Pivotal
* namespace.. Asserts that returns to <code>null<code>.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -109,7 +109,7 @@ public abstract class AbstractEntityResolverTest {
* Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
* <code>"http://schema.pivotal.io/this/should/be/not/found.xsd"</code> <code>systemId</code>,
* which should not be found. Asserts that returns to <code>null<code>.
- *
+ *
* @since GemFire 8.1
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
index c728cb0..38b2304 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
@@ -21,9 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.wan.GatewayReceiver;
-import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -31,7 +28,10 @@ import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.apache.geode.cache.Region;
import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.wan.GatewayReceiver;
+import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.CacheServerLauncher;
import org.apache.geode.internal.cache.InternalCache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
index f89622b..437dc45 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
@@ -20,11 +20,12 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class CacheTransactionManagerCreationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
index 8f6ab5a..afcc207 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
@@ -23,11 +23,13 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
@@ -36,12 +38,11 @@ import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Properties;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test cases for {@link CacheXmlParser}.
@@ -64,13 +65,13 @@ public class CacheXmlParserJUnitTest {
/**
* Test {@link CacheXmlParser#getDelegate(String)}.
- *
+ *
* Asserts that a delegate is found and that the stack and logWriter are setup correctly.
- *
+ *
* Asserts that delegate is cached between calls and that the same instance is returned.
- *
+ *
* Asserts that null is returned when no {@link XmlParser} is registered for namespace.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -102,7 +103,7 @@ public class CacheXmlParserJUnitTest {
/**
* Test that {@link CacheXmlParser} can parse the test cache.xml file.
- *
+ *
* @since Geode 1.2
*/
@Test
@@ -121,7 +122,7 @@ public class CacheXmlParserJUnitTest {
/**
* Test that {@link CacheXmlParser} can parse the test cache.xml file, using the Apache Xerces XML
* parser.
- *
+ *
* @since Geode 1.3
*/
@Test
@@ -134,7 +135,7 @@ public class CacheXmlParserJUnitTest {
/**
* Test that {@link CacheXmlParser} falls back to DTD parsing when locale language is not English.
- *
+ *
* @since Geode 1.0
*/
@Test
@@ -155,7 +156,7 @@ public class CacheXmlParserJUnitTest {
/**
* Test that {@link CacheXmlParser} falls back to DTD parsing when locale language is not English,
* using the Apache Xerces XML parser.
- *
+ *
* @since Geode 1.3
*/
@Test
@@ -168,7 +169,7 @@ public class CacheXmlParserJUnitTest {
/**
* Get access to {@link CacheXmlParser} protected methods and fields.
- *
+ *
* @since GemFire 8.1
*/
private static class TestCacheXmlParser extends CacheXmlParser {
@@ -203,7 +204,7 @@ public class CacheXmlParserJUnitTest {
/**
* Access to {@link CacheXmlParser} getDelegate(String) method.
- *
+ *
* @since GemFire 8.1
*/
public XmlParser getDelegate(final String namespaceUri) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index 130d177..eee7bc2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -32,7 +32,7 @@ public class CacheXmlVersionJUnitTest {
* Previous strings based version just check ordinal comparison of strings. It failed test for
* "8_0".compareTo("8.1") < 0. It also would have failed for "9.0".compareTo("10.0") < 0. Testing
* that ENUM based solution is ordinal correct for comparisons.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -57,7 +57,7 @@ public class CacheXmlVersionJUnitTest {
/**
* Test that {@link CacheXmlVersion#valueForVersion(String)} matches the same
* {@link CacheXmlVersion} via {@link CacheXmlVersion#getVersion()}.
- *
+ *
* @since GemFire 8.1
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
index 9a00420..7aec5de 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.cache.xmlcache;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.xml.sax.InputSource;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class DefaultEntityResolver2Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 4aee004..941ee97 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link RegionCreation}.
- *
+ *
* @since GemFire 8.1
*/
@Category(UnitTest.class)
@@ -35,7 +35,7 @@ public class RegionCreationJUnitTest {
/**
* Test method for {@link RegionCreation#getExtensionPoint()}.
- *
+ *
* Assert that method returns a {@link SimpleExtensionPoint} instance and assume that
* {@link SimpleExtensionPointJUnitTest} has covered the rest.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
index b07f6b4..882b9c6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
@@ -18,6 +18,7 @@ import static javax.xml.XMLConstants.*;
import static org.junit.Assert.*;
import java.util.concurrent.atomic.AtomicReference;
+
import javax.xml.XMLConstants;
import org.junit.Test;
@@ -32,7 +33,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit Tests for {@link XmlGeneratorUtils}.
- *
+ *
* @since GemFire 8.1
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
index 6fa4b69..c1ed393 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
@@ -94,7 +94,7 @@ public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Asserts that a region is compressed using a given compressor.
- *
+ *
* @param vm a peer.
* @param compressor a compressor.
* @param regionName a compressed region.
@@ -113,7 +113,7 @@ public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new Cache for a given VM using a cache.xml.
- *
+ *
* @param vm a peer.
* @param cacheXml a declaritive xml file.
* @return true if the cache was created, false otherwise.
@@ -144,7 +144,7 @@ public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a temporary cache.xml on the file system.
- *
+ *
* @param contents cache.xml contents.
* @return A File representing the created file.
* @throws IOException something bad happened.
@@ -160,7 +160,7 @@ public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the VM for a given identifier.
- *
+ *
* @param vm a virtual machine identifier.
*/
private VM getVM(int vm) {
@@ -169,7 +169,7 @@ public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Removes created regions from a VM.
- *
+ *
* @param vm the virtual machine to cleanup.
*/
private void cleanup(final VM vm) {
@@ -184,4 +184,3 @@ public class CompressionCacheConfigDUnitTest extends JUnit4CacheTestCase {
});
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
index a021ea1..f2b68d5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.internal.compression;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.DataPolicy;
@@ -42,11 +38,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Asserts that values received in EntryEvents for CacheWriters and CacheListeners are not
* compressed.
- *
+ *
*/
@Category(DistributedTest.class)
public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
@@ -166,7 +165,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new CompressionCacheListenerDUnitTest.
- *
+ *
* @param name a test name.
*/
public CompressionCacheListenerDUnitTest() {
@@ -193,7 +192,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the VM for a given identifier.
- *
+ *
* @param vm a virtual machine identifier.
*/
protected VM getVM(int vm) {
@@ -202,7 +201,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* Removes created regions from a VM.
- *
+ *
* @param vm the virtual machine to cleanup.
*/
private void cleanup(final VM vm) {
@@ -224,7 +223,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* Tests that received values in EntryEvents are not compressed for the following methods:
- *
+ *
* <ul>
* <li>{@link CacheWriter#beforeCreate(EntryEvent)}</li>
* <li>{@link CacheListener#afterCreate(EntryEvent)}</li>
@@ -234,7 +233,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
* <li>{@link CacheWriter#beforeDestroy(EntryEvent)}</li>
* <li>{@link CacheListener#afterDestroy(EntryEvent)}</li>
* </ul>
- *
+ *
* @param vm a virtual machine to perform the test on.
*/
private void testCacheListenerAndWriterWithVM(final VM vm) {
@@ -311,7 +310,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -334,7 +333,7 @@ public class CompressionCacheListenerDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param name a region name.
* @param compressor a compressor.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
index 919cbd5..2cf2ebd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
@@ -14,17 +14,13 @@
*/
package org.apache.geode.internal.compression;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.IOException;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCache;
@@ -42,11 +38,14 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Sanity checks on a number of basic cluster configurations with compression turned on.
- *
+ *
*/
@Category(DistributedTest.class)
public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
@@ -73,7 +72,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new CompressionRegionOperationsDUnitTest.
- *
+ *
* @param name a test name.
*/
public CompressionRegionConfigDUnitTest() {
@@ -82,7 +81,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Sanity check using two peers sharing a replicated region.
- *
+ *
* @throws Exception
*/
@Test
@@ -98,7 +97,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Sanity check for two peers sharing a persisted replicated region.
- *
+ *
* @throws Exception
*/
@Test
@@ -188,7 +187,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* closes a region on a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param region the region to close.
*/
@@ -203,7 +202,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Flushes a disk store on a vm causing region entries to be written to disk.
- *
+ *
* @param vm the virtual machine to perform the flush on.
* @param diskStore the disk store to flush.
*/
@@ -218,7 +217,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Returns when a put has been replicated to a peer.
- *
+ *
* @param vm a peer.
* @param key the key to wait on.
*/
@@ -238,7 +237,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Performs a put operation on a client virtual machine.
- *
+ *
* @param vm a client.
* @param key the key to put.
* @param value the value to put.
@@ -258,7 +257,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Performs a put operation on a peer.
- *
+ *
* @param vm a peer.
* @param key the key to put.
* @param value the value to put.
@@ -277,7 +276,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Performs a get operation on a client.
- *
+ *
* @param vm a client.
* @param key a region entry key.
* @return the value.
@@ -296,7 +295,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Performs a get operation on a peer.
- *
+ *
* @param vm the peer.
* @param key a region entry key.
* @return the value.
@@ -314,7 +313,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the VM for a given identifier.
- *
+ *
* @param vm a virtual machine identifier.
*/
private VM getVM(int vm) {
@@ -323,7 +322,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Closes opened regions on a client.
- *
+ *
* @param vm a client.
*/
private void cleanupClient(final VM vm) {
@@ -337,7 +336,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Removes created regions from a VM.
- *
+ *
* @param vm the virtual machine to cleanup.
*/
private void cleanup(final VM vm) {
@@ -353,7 +352,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor..
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -378,7 +377,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -403,7 +402,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -428,7 +427,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a compressed region on a client.
- *
+ *
* @param vm the client.
* @param name the region.
* @param compressor a compressor.
@@ -454,7 +453,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a compressed region for a client.
- *
+ *
* @param name a region.
* @param compressor a compressor.
* @param shortcut the type of client.
@@ -469,7 +468,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param name the region name.
* @param dataPolicy the type of peer.
* @param compressor a compressor.
@@ -483,7 +482,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a compressed region and adds a cache server to a peer.
- *
+ *
* @param name the region name.
* @param dataPolicy the type of peer.
* @param compressor a compressor
@@ -503,7 +502,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param name the region name.
* @param dataPolicy the type of peer.
* @param compressor a compressor.
@@ -519,7 +518,7 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new ClientCacheFactory.
- *
+ *
* @param dunitLocatorPort a locator port.
* @return the newly created ClientCacheFactory.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
index 7d6771c..41fe832 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.compression;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -32,6 +28,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests that the compressor region attribute is properly set or rejected by a RegionFactory.
@@ -55,7 +54,7 @@ public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new CompressionRegionFactoryDUnitTest.
- *
+ *
* @param name test name.
*/
public CompressionRegionFactoryDUnitTest() {
@@ -75,7 +74,7 @@ public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the VM for a given identifier.
- *
+ *
* @param vm a virtual machine identifier.
*/
private VM getVM(int vm) {
@@ -84,7 +83,7 @@ public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Removes created regions from a VM.
- *
+ *
* @param vm the virtual machine to cleanup.
*/
private void cleanup(final VM vm) {
@@ -98,7 +97,7 @@ public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Asserts that a given compressor has been assigned to a region.
- *
+ *
* @param vm the virtual machine to run the assertions on.
* @param name a region name.
* @param compressor a compressor.
@@ -117,7 +116,7 @@ public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -141,7 +140,7 @@ public class CompressionRegionFactoryDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param name a region name.
* @param compressor a compressor.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
index ac6b877..46c950f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
@@ -171,7 +171,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Tests the following operations on a region with compression enabled:
- *
+ *
* <ul>
* <li>{@link Region#put(Object, Object)}</li>
* <li>{@link Region#putAll(Map)}</li>
@@ -179,7 +179,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
* <li>{@link Region#get(Object)}</li>
* <li>{@link Region#getAll(Collection)}</li>
* </ul>
- *
+ *
* @param vm a test virtual machine.
*/
private void testGetPutOperationsOnVM(final VM vm) {
@@ -233,7 +233,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Tests the following region key, value operations:
- *
+ *
* <ul>
* <li>{@link Region#invalidate(Object)}</li>
* <li>{@link Region#containsKey(Object)}</li>
@@ -246,7 +246,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
* <li>{@link Region#values()}</li>
* <li>{@link Region#keySet()}</li>
* </ul>
- *
+ *
* @param vm a test virtual machine.
*/
private void testKeysAndValuesOperationsOnVM(final VM vm) {
@@ -309,7 +309,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Tests compressed put/get region operations using CachedDeserializable values.
- *
+ *
* @see CompressionRegionOperationsDUnitTest#testGetPutOperations()
*/
@Test
@@ -320,7 +320,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Tests the following operations on a region with compression enabled using CachedDeserializable
* values:
- *
+ *
* <ul>
* <li>{@link Region#put(Object, Object)}</li>
* <li>{@link Region#putAll(Map)}</li>
@@ -328,7 +328,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
* <li>{@link Region#get(Object)}</li>
* <li>{@link Region#getAll(Collection)}</li>
* </ul>
- *
+ *
* @param vm a test virtual machine.
*/
private void testGetPutOperationsWithCachedDeserializableOnVM(final VM vm) {
@@ -377,7 +377,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Tests compressed put/get region operations using byte[] values.
- *
+ *
* @see CompressionRegionOperationsDUnitTest#testGetPutOperations()
*/
@Test
@@ -387,7 +387,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Tests the following operations on a region with compression enabled using byte[] values:
- *
+ *
* <ul>
* <li>{@link Region#put(Object, Object)}</li>
* <li>{@link Region#putAll(Map)}</li>
@@ -395,7 +395,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
* <li>{@link Region#get(Object)}</li>
* <li>{@link Region#getAll(Collection)}</li>
* </ul>
- *
+ *
* @param vm a test virtual machine.
*/
private void testGetPutOperationsWithByteArraysOnVM(final VM vm) {
@@ -446,7 +446,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the VM for a given identifier.
- *
+ *
* @param vm a virtual machine identifier.
*/
protected VM getVM(int vm) {
@@ -455,7 +455,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Removes created regions from a VM.
- *
+ *
* @param vm the virtual machine to cleanup.
*/
private void cleanup(final VM vm) {
@@ -469,7 +469,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -498,7 +498,7 @@ public class CompressionRegionOperationsDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param name a region name.
* @param compressor a compressor.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
index 5f5d284..56913ad 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
@@ -15,17 +15,13 @@
package org.apache.geode.internal.compression;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.Serializable;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache30.CacheTestCase;
@@ -37,10 +33,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests compression statistics.
- *
+ *
* @since GemFire 8.0
*/
@Category(DistributedTest.class)
@@ -71,7 +70,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a new CompressionStatsDUnitTest.
- *
+ *
* @param name test name.
*/
public CompressionStatsDUnitTest() {
@@ -80,7 +79,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Asserts that all compression statistics start with zero values.
- *
+ *
* @param vm the virtual machine to gather statistics on.
*/
private void assertStartingValues(final VM vm) {
@@ -112,7 +111,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Performs puts on region one and asserts that the second region's stats are unaffected and that
* the region stats have rolled up to the cache stats.
- *
+ *
* @param vm the virtual machine to perform puts on.
* @param stats holder for stat values.
*/
@@ -176,7 +175,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Performs puts on the second region and asserts that the compression stats are recorded.
- *
+ *
* @param vm a virtual machine to peform puts on.
* @param stats a compression stats holder.
*/
@@ -271,7 +270,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Asserts that the cache stats are totals of the region one and region two stats.
- *
+ *
* @param stats a compression stats container.
*/
private void assertStatTotals(final CompressionStats stats) {
@@ -329,7 +328,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Does put operations on a designated virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName a region for the puts.
* @param puts the number of puts to perform.
@@ -349,7 +348,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total number of post-compressed bytes stat for a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName designates a region on which to collect the number of decompressed bytes.
* Null indicates the whole cache.
@@ -377,7 +376,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the number of post-decompressed bytes stat for a region.
- *
+ *
* @param regionName a region.
*/
private long getTotalPostCompressedBytes(String regionName) {
@@ -389,7 +388,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the number of pre-compressed bytes stat on a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName a region. Indicates whole cache if null.
*/
@@ -416,7 +415,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the number of pre-compressed bytes stat for a region.
- *
+ *
* @param regionName a region.
*/
private long getTotalPreCompressedBytes(String regionName) {
@@ -428,7 +427,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the number of decompressions stat for a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName a region. Indicates the whole cache when null.
*/
@@ -455,7 +454,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the number of decompressions stat for a region.
- *
+ *
* @param regionName a region.
*/
private long getTotalDecompressions(String regionName) {
@@ -467,7 +466,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total number of compressions stat for a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName a region. Indicates the entire cache when null.
*/
@@ -494,7 +493,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total number of compressions stat for a region.
- *
+ *
* @param regionName a region.
*/
private long getTotalCompressions(String regionName) {
@@ -506,7 +505,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total decompression time stat for a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName a region. Indicates the whole cache when null.
*/
@@ -533,7 +532,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total decompression time stat for a region.
- *
+ *
* @param regionName a region.
*/
private long getTotalDecompressionTime(String regionName) {
@@ -545,7 +544,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total compression time stat for a virtual machine.
- *
+ *
* @param vm a virtual machine.
* @param regionName a region.
*/
@@ -572,7 +571,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Returns the total compression time stat for a region.
- *
+ *
* @param regionName a region.
*/
private long getTotalCompressionTime(String regionName) {
@@ -584,7 +583,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Destroys a region.
- *
+ *
* @param vm a virtual machine.
* @param regionName the region to destroy.
*/
@@ -599,7 +598,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Destroys a region.
- *
+ *
* @param regionName the region to destroy.
*/
private void destroyRegion(String regionName) {
@@ -611,7 +610,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param vm a virtual machine to create the region on.
* @param name a region name.
* @param compressor a compressor.
@@ -655,7 +654,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Creates a region and assigns a compressor.
- *
+ *
* @param name a region name.
* @param compressor a compressor.
*/
@@ -666,7 +665,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Enables clock stats on a VM.
- *
+ *
* @param vm a virtual machine
* @param clockStatsEnabled enables clock stats if true, disables if false
* @return previous clock stats value
@@ -682,7 +681,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Enables clock stats.
- *
+ *
* @param clockStatsEnabled enables clock stats if true, disables if false
* @return previous clock stats value
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
index 3b182d3..7c8dfa4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import javax.naming.Context;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
index 826691d..615e662 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
@@ -17,27 +17,28 @@
*/
package org.apache.geode.internal.datasource;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.fail;
+
+import java.sql.Connection;
+import java.util.Properties;
+
+import javax.naming.Context;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import javax.naming.Context;
-import java.sql.Connection;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.fail;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.util.test.TestUtil;
-// import javax.sql.PooledConnection;
/**
- *
+ *
* To change the template for this generated type comment go to Window - Preferences - Java - Code
* Generation - Code and Comments
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
index f8fa5a7..05db136 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
@@ -14,30 +14,32 @@
*/
/*
* ConnectionPoolCacheImplJUnitTest.java JUnit based test
- *
+ *
* Created on March 3, 2005, 5:26 PM
*/
package org.apache.geode.internal.datasource;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.fail;
-import javax.naming.Context;
-import javax.sql.PooledConnection;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.fail;
+import javax.naming.Context;
+import javax.sql.PooledConnection;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.util.test.TestUtil;
/*
* this is a Multithreaded test for datasource connection pool.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
index 112e51a..6ee3a33 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
@@ -14,23 +14,10 @@
*/
package org.apache.geode.internal.datasource;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
-import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import javax.transaction.UserTransaction;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
@@ -38,13 +25,28 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import javax.transaction.UserTransaction;
+
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.util.test.TestUtil;
/**
- *
- *
+ *
+ *
*/
@Category(IntegrationTest.class)
public class ConnectionPoolingJUnitTest {
@@ -92,7 +94,7 @@ public class ConnectionPoolingJUnitTest {
* ConnectionPoolingJUnitTest(); test.setup(); try { test.testGetSimpleDataSource(); } catch
* (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); fail(); }
* test.testConnectionPoolFunctions(); test.teardown();
- *
+ *
*/
@Test
public void testConnectionPoolFunctions() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
index e69dd5b..320cd05 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
import java.sql.Connection;
import java.util.Properties;
+
import javax.naming.Context;
import org.junit.After;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
index 39bdf6c..dd32ab1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
@@ -17,26 +17,27 @@
*/
package org.apache.geode.internal.datasource;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+
+import javax.transaction.TransactionManager;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.jndi.JNDIInvoker;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import javax.transaction.TransactionManager;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
-
-// import org.apache.geode.internal.jta.CacheUtils;
/**
- *
+ *
* This test check the graceful removal of all the resource (DataSources , TransactionManager and
* UserTransaction and its associated thread) before we reconnect to the distributed syatem.
*/
@@ -74,4 +75,3 @@ public class RestartJUnitTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
index 7d62e64..4965058 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
@@ -241,7 +241,7 @@ public class BasicI18nJUnitTest {
/**
* Get all of the StringId instances via reflection.
- *
+ *
* @return a set of all StringId declarations within the product
*/
private Set<StringId> getAllStringIds() {
@@ -270,7 +270,7 @@ public class BasicI18nJUnitTest {
/**
* Lists all of the classes that define StringId instances
- *
+ *
* @return a set of all classes that contain StringId declarations
*/
private Set<String> getStringIdDefiningClasses() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index f9c3045..c2d9897 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for CompositeOutputStream.
- *
+ *
* @since GemFire 7.0
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
index 4c7cdfc..e3c12a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
index 6e96b65..675a9be 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.jndi;
import static org.junit.Assert.*;
import java.util.Hashtable;
+
import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.ContextNotEmptyException;
@@ -68,7 +69,7 @@ public class ContextJUnitTest {
/**
* Removes all entries from the specified context, including subcontexts.
- *
+ *
* @param context context to clear
*/
private void clearContext(Context context) throws NamingException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
index 979c124..2e44f2c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
@@ -14,22 +14,9 @@
*/
package org.apache.geode.internal.jta;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
-import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertNotNull;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
import java.io.*;
import java.sql.Connection;
import java.sql.SQLException;
@@ -37,8 +24,23 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.Random;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertNotNull;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.util.test.TestUtil;
@Category(IntegrationTest.class)
public class BlockingTimeOutJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java b/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
index 0f19b47..936e542 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
@@ -20,27 +20,28 @@
package org.apache.geode.internal.jta;
-import org.apache.geode.CancelException;
-import org.apache.geode.LogWriter;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.util.test.TestUtil;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.util.test.TestUtil;
/**
- *
+ *
*/
public class CacheUtils {
public static DistributedSystem ds;
@@ -213,4 +214,3 @@ public class CacheUtils {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java
index a83a6b7..835fb7e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java
@@ -23,6 +23,10 @@ import java.util.concurrent.TimeoutException;
import javax.transaction.Status;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.GemFireException;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -41,9 +45,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category({DistributedTest.class})
public class ClientServerJTADUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
index 1725c79..ffe8f95 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
@@ -14,27 +14,29 @@
*/
package org.apache.geode.internal.jta;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import javax.transaction.UserTransaction;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import javax.transaction.UserTransaction;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.util.test.TestUtil;
/**
* This test case is to test the following test scenarios: 1) Get Simple DS outside transaction,
@@ -425,75 +427,75 @@ public class DataSourceJTAJUnitTest {
/*
* public static void testInsertsOnTwoXAdsRollback () { Host host = Host.getHost (0); VM vm0 =
* host.getVM (0); vm0.invoke (DataSourceJTAJUnitTest.class, "Scenario3"); }
- *
+ *
* public static void Scenario3 () throws Exception { Region currRegion=null; Cache cache; int
* tblIDFld; String tblNameFld; String tblName; String tableName=null; boolean to_continue = true;
* final int XA_INSERTS_BEFORE=3; final int XA_INSERTS_AFTER=2;
- *
+ *
* //call to init method try { tableName = CacheUtils.init("JTATest"); //System.out.println
* ("Table name: " + tableName); tblName = tableName;
- *
+ *
* if (tableName == null || tableName.equals ("")) { to_continue = false; fail
* (" table name not created, Aborting test..."); } } catch (Exception e) { to_continue = false;
* fail (" Aborting test at set up...[" + e + "]"); }
- *
+ *
* System.out.println("init for testscenario 3 Successful!");
- *
+ *
* //test task cache = CacheUtils.getCache (); tblName = tableName; currRegion =
* cache.getRegion("/root"); tblIDFld = 1; tblNameFld = "test3"; JTAUtils jtaObj = new JTAUtils
* (cache, currRegion);
- *
+ *
* //to delete all rows inserted in creatTable () of CacheUtils class //deleteRows method of
* JTAUtils class is used. int rowsDeleted = jtaObj.deleteRows(tblName);
- *
+ *
* //initialize cache and get user transaction Context ctx = cache.getJNDIContext();
* UserTransaction ta = null; Connection xaConnBeforeTxn = null; Connection xaConnAfterTxn = null;
* try { ta = (UserTransaction)ctx.lookup("java:/UserTransaction");
- *
+ *
* } catch (NamingException e) { fail (" fail in user txn lookup " + e); }
- *
+ *
* try{
- *
+ *
* //get the XADataSource before the transaction begins DataSource
* xads=(DataSource)ctx.lookup("java:/XAPooledDataSource");
* System.out.println("XA data source obtained outside transaction");
- *
+ *
* //Begin the user transaction ta.begin(); System.out.println("Transaction begun successfully");
- *
+ *
* //Obtain XAPooledDataSource DataSource da = (DataSource)ctx.lookup("java:/XAPooledDataSource");
* System.out.println("XA data source obtained within transaction");
- *
+ *
* //obtain connection from SimpleDataSource and XAPooledDataSource xaConnAfterTxn =
* da.getConnection(); System.out.println("Done with xaConnAfterTxn"); xaConnBeforeTxn =
* xads.getConnection(); //xaConnAfterTxn = da.getConnection();
* System.out.println("Done with xaConnBeforeTxn");
- *
+ *
* Statement stmtBefore = xaConnBeforeTxn.createStatement(); Statement stmtAfter =
* xaConnAfterTxn.createStatement(); System.out.println("Done with both the statements");
- *
+ *
* //perform inserts and updates using both XA DataSources //String sqlSTR = "insert into " +
* tblName + " values (" + tblIDFld + "," + "'" + tblNameFld + "'" + ")" ;
- *
+ *
* String sqlSTR;
- *
+ *
* //insert XA_INSERTS rows into timestamped table for (int i=0; i<XA_INSERTS_BEFORE;i++){
* tblIDFld=tblIDFld+i; sqlSTR = "insert into " + tblName + " values (" + tblIDFld + "," + "'" +
* tblNameFld + "'" + ")" ; stmtBefore.executeUpdate(sqlSTR); }
* System.out.println("Done with inserts by stmtBefore");
- *
+ *
* //insert SM_INSERTS rows into timestamped table for (int j=0; j<XA_INSERTS_AFTER;j++){
* tblIDFld=tblIDFld+j+5; sqlSTR = "insert into " + tblName + " values (" + tblIDFld + "," + "'" +
* tblNameFld + "'" + ")" ; stmtAfter.executeUpdate(sqlSTR); }
* System.out.println("Done with inserts by stmtAfter");
- *
+ *
* //close both the XA statements stmtBefore.close(); stmtAfter.close();
* System.out.println("Closed both the statements");
- *
- *
+ *
+ *
* //close the connections xaConnBeforeTxn.close(); xaConnAfterTxn.close();
* System.out.println("Closed both the connections");
- *
- *
+ *
+ *
* //rollback the transaction ta.rollback ();
* System.out.println("Rows are rolled back in the database"); } catch (SQLException e) {
* e.printStackTrace(); } catch (Exception e){ fail (" failed " + e); } finally { if
@@ -501,29 +503,29 @@ public class DataSourceJTAJUnitTest {
* xaConnBeforeTxn.close(); xaConnAfterTxn.close();
* System.out.println("Closed both the statements"); } catch (Exception e) { e.printStackTrace();
* } } } //get the number of rows in time stamped table //using getRows method of JTAUtils
- *
+ *
* try{ int num_rows = jtaObj.getRows(tblName);
* System.out.println("\nNumber of rows in Table under tests are: " +num_rows);
- *
+ *
* //determine what got commited and what not
- *
+ *
* switch (num_rows) { case 0:
* System.out.println("Both XA DataSource transactions got rolled back!!"); break;
- *
+ *
* case XA_INSERTS_BEFORE: System.out.println(
* "Only XA DataSource transactions got committed...which was obtained before txn!" ); break;
- *
+ *
* case XA_INSERTS_AFTER:
* System.out.println("Only XA DataSource transactions within txn got committed!" ); break;
- *
+ *
* default: System.out.println("Looks like that things are messed up...look into it");
- *
+ *
* }
- *
+ *
* } catch (SQLException sqle){ sqle.printStackTrace(); }
- *
+ *
* System.out.println("test task for testScenario3 Succeessful");
- *
+ *
* //destroying table try { System.out.println ("Destroying table: " + tblName);
* CacheUtils.destroyTable(tblName); System.out.println ("Closing cache...");
* System.out.println("destroyTable for testscenario 3 Successful!"); } catch (Exception e) { fail
@@ -869,81 +871,81 @@ public class DataSourceJTAJUnitTest {
/*
* public static void testXAResourceBtoCommit () { Host host = Host.getHost (0); VM vm0 =
* host.getVM (0); vm0.invoke (DataSourceJTAJUnitTest.class, "Scenario6"); }
- *
+ *
* public static void Scenario6 () throws Exception { Region currRegion=null; Cache cache; int
* tblIDFld; String tblNameFld; String tblName; String tableName=null; boolean to_continue = true;
* final int XA_INSERTS=3;
- *
+ *
* //call to init method try { tableName = CacheUtils.init("JTATest"); //System.out.println
* ("Table name: " + tableName); tblName = tableName;
- *
+ *
* if (tableName == null || tableName.equals ("")) { to_continue = false; fail
* (" table name not created, Aborting test..."); } } catch (Exception e) { to_continue = false;
* fail (" Aborting test at set up...[" + e + "]"); }
- *
+ *
* System.out.println("init for testscenario 6 Successful!");
- *
+ *
* //test task cache = CacheUtils.getCache (); tblName = tableName; currRegion =
* cache.getRegion("/root"); tblIDFld = 1; tblNameFld = "test6"; JTAUtils jtaObj = new JTAUtils
* (cache, currRegion);
- *
+ *
* //to delete all rows inserted in creatTable () of CacheUtils class //deleteRows method of
* JTAUtils class is used. int rowsDeleted = jtaObj.deleteRows(tblName);
- *
+ *
* //initialize cache and get user transaction Context ctx = cache.getJNDIContext();
* UserTransaction ta = null; Connection xaCon1=null,xaCon2=null,xaCon3=null; try { ta =
* (UserTransaction)ctx.lookup("java:/UserTransaction");
- *
+ *
* } catch (NamingException e) { fail (" fail in user txn lookup " + e); }
- *
+ *
* try{
- *
+ *
* //Begin the user transaction ta.begin();
- *
+ *
* //Operation with first XA Resource DataSource da1 =
* (DataSource)ctx.lookup("java:/XAPooledDataSource"); xaCon1 = da1.getConnection(); Statement
* stmt1 = xaCon1.createStatement(); String sqlSTR; for (int i=0; i<XA_INSERTS;i++){
* tblIDFld=tblIDFld+i; sqlSTR = "insert into " + tblName + " values (" + tblIDFld + "," + "'" +
* tblNameFld + "'" + ")" ; stmt1.executeUpdate(sqlSTR); } stmt1.close(); xaCon1.close();
- *
+ *
* //Operation with second XA Resource DataSource da2 =
* (DataSource)ctx.lookup("java:/XAPooledDataSource"); xaCon2 = da2.getConnection(); Statement
* stmt2 = xaCon2.createStatement(); for (int i=0; i<XA_INSERTS;i++){ tblIDFld=tblIDFld+i+5;
* sqlSTR = "insert into " + tblName + " values (" + tblIDFld + "," + "'" + tblNameFld + "'" + ")"
* ; stmt2.executeUpdate(sqlSTR); } stmt2.close(); xaCon2.close();
- *
+ *
* //Operation with third XA Resource DataSource da3 =
* (DataSource)ctx.lookup("java:/XAPooledDataSource"); xaCon3 = da3.getConnection(); Statement
* stmt3 = xaCon3.createStatement(); for (int i=0; i<XA_INSERTS;i++){ tblIDFld=tblIDFld+ 10;
* sqlSTR = "insert into " + tblName + " values (" + tblIDFld + "," + "'" + tblNameFld + "'" + ")"
* ; stmt3.executeUpdate(sqlSTR); } Thread.sleep(22*1000); //stmt3.close(); //xaCon3.close();
- *
+ *
* //commit the transaction ta.commit ();
* System.out.println("Rows are rolled back in the database");
- *
+ *
* } catch (SQLException e) { e.printStackTrace(); } catch (Exception e){ fail (" failed " + e); }
* finally { if (xaCon1!=null || xaCon2!=null || xaCon3!=null) { try { //close the connections
* xaCon1.close(); xaCon2.close(); xaCon3.close(); } catch (Exception e) { e.printStackTrace(); }
* } } //get the number of rows in time stamped table //using getRows method of JTAUtils
- *
+ *
* try{ int num_rows = jtaObj.getRows(tblName);
* System.out.println("\nNumber of rows in Table under tests are: " +num_rows);
- *
+ *
* //determine what got commited and what not
- *
+ *
* switch (num_rows) { case 0: System.out.println("Nothing is committed to database"); break;
- *
+ *
* case 3*XA_INSERTS: System.out.println(
* "All inserts successfully are committed to database...this is NOT EXPECTED" ); break;
- *
+ *
* default: System.out.println("Looks like that things are messed up...look into it");
- *
+ *
* }
- *
+ *
* } catch (SQLException sqle){ sqle.printStackTrace(); }
- *
+ *
* System.out.println("test task for testScenario6 Succeessful");
- *
+ *
* //destroying table try { System.out.println ("Destroying table: " + tblName);
* CacheUtils.destroyTable(tblName); System.out.println ("Closing cache...");
* System.out.println("destroyTable for testscenario 6 Successful!"); } catch (Exception e) { fail
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
index 5082857..3efce68 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
@@ -18,6 +18,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.Properties;
+
import javax.transaction.NotSupportedException;
import javax.transaction.Status;
import javax.transaction.SystemException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
index 0c6c625..f83fff8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
+
import javax.naming.Context;
import javax.transaction.RollbackException;
import javax.transaction.Status;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java b/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
index 74f91e7..1bfc7d1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
@@ -24,25 +24,14 @@ package org.apache.geode.internal.jta;
*
*/
-// import java.io.*;
+import java.sql.*;
import java.util.*;
-// import java.net.*;
-import org.apache.geode.cache.*;
-// import org.apache.geode.distributed.*;
-// import org.apache.geode.util.concurrent.locks.*;
-// import java.util.Hashtable;
-// import javax.naming.InitialContext;
+
import javax.naming.Context;
-import java.sql.*;
-import javax.sql.*;
-// import javax.transaction.*;
-// import java.lang.Exception.*;
-// import java.lang.RuntimeException;
-// import java.sql.SQLException.*;
import javax.naming.NamingException;
-// import javax.naming.NoInitialContextException;
-// import javax.transaction.SystemException;
-// import org.apache.geode.internal.jta.CacheUtils;
+import javax.sql.*;
+
+import org.apache.geode.cache.*;
public class JTAUtils {
@@ -143,7 +132,7 @@ public class JTAUtils {
/**
* Gets the value of the key entry into the current region. Returns the value and prints the pair
* with help of printEntry() to stdout
- *
+ *
* @see Region#put Modified to return string value
*/
@@ -345,5 +334,3 @@ public class JTAUtils {
} // end of class
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
index 07cdc6c..7f41d9b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
@@ -14,24 +14,25 @@
*/
package org.apache.geode.internal.jta;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Moved some non-DUnit tests over from org/apache/geode/internal/jta/dunit/JTADUnitTest
- *
+ *
*/
@Category(IntegrationTest.class)
public class JtaIntegrationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
index 2666ed5..947af8b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
@@ -15,8 +15,8 @@
package org.apache.geode.internal.jta;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.Collection;
@@ -26,6 +26,17 @@ import java.util.Map;
import javax.naming.Context;
import javax.transaction.UserTransaction;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -37,17 +48,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
index 3261236..c11f8ab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
@@ -14,21 +14,23 @@
*/
/*
* Test TransactionImpl methods not tested by UserTransactionImpl
- *
+ *
*/
package org.apache.geode.internal.jta;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.*;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Properties;
import javax.transaction.Synchronization;
import javax.transaction.UserTransaction;
-import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertTrue;
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
index 99a27f1..f46a7b3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
@@ -14,23 +14,25 @@
*/
package org.apache.geode.internal.jta;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.*;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
import javax.transaction.*;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test TransactionManagerImpl methods not tested by UserTransactionImplTest
- *
+ *
*/
@Category(IntegrationTest.class)
public class TransactionManagerImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
index 1b9c831..991ff01 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
@@ -29,6 +29,7 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Properties;
import java.util.Random;
+
import javax.naming.Context;
import javax.sql.DataSource;
import javax.transaction.UserTransaction;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
index 71ccce3..d02dab4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
@@ -14,21 +14,23 @@
*/
package org.apache.geode.internal.jta;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+
+import javax.transaction.Status;
+import javax.transaction.Transaction;
+import javax.transaction.UserTransaction;
+
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import javax.transaction.Status;
-import javax.transaction.Transaction;
-import javax.transaction.UserTransaction;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java
index f9e55d0..fc9daac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java
@@ -61,7 +61,7 @@ public class CommitThread implements Runnable {
static int keyFld = 0;
- synchronized public static int getUniqueKey() {
+ public static synchronized int getUniqueKey() {
keyFld = keyFld + 5;
return keyFld;
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
index def1115..84febc0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.sql.SQLException;
import java.util.Properties;
+
import javax.naming.Context;
import javax.sql.DataSource;
import javax.transaction.UserTransaction;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
index 681a6b1..a534818 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -28,6 +28,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.sql.DataSource;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 0486da1..5b3fbad 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -28,6 +28,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.sql.DataSource;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index 4da4c09..3a49093 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -28,6 +28,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.sql.DataSource;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
index 238fa14..5c8a217 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
@@ -61,7 +61,7 @@ public class RollbackThread implements Runnable {
static int keyFld = 0;
- synchronized public static int getUniqueKey() {
+ public static synchronized int getUniqueKey() {
keyFld = keyFld + 5;
return keyFld;
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 20b49e0..d25b84c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -28,6 +28,7 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Properties;
+
import javax.naming.Context;
import javax.sql.DataSource;
import javax.transaction.UserTransaction;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 4ba536f..c35f3ae 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -28,6 +28,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.sql.DataSource;
@@ -335,9 +336,9 @@ public class TxnManagerMultiThreadDUnitTest extends JUnit4DistributedTestCase {
* DistributedSystem. This method calls the destroyTable method of this class.
*/
/*
- *
+ *
* public static void calldestroyTable (String tableName){
- *
+ *
* //the sleep below is given to give the time to threads to start and perform before destroyTable
* is called. try { Thread.sleep(20*1000); } catch (InterruptedException ie) {
* ie.printStackTrace(); } try { String tblName = tableName; getLogWriter().fine
@@ -450,27 +451,27 @@ public class TxnManagerMultiThreadDUnitTest extends JUnit4DistributedTestCase {
* AsyncInvocation asyncObj1 = vm0.invokeAsync(TxnManagerMultiThreadDUnitTest.class,
* "callCommitandBlockingTimeOutThreads"); try { asyncObj1.join (); } catch (InterruptedException
* e) { fail ("Current thread experienced Interrupted Exception !"); }
- *
+ *
* //vm0.invoke(() -> TxnManagerMultiThreadDUnitTest.getNumberOfRows());
- *
+ *
* }//end of test3Commit2Rollback
- *
+ *
*/
/*
* public static void callCommitandBlockingTimeOutThreads(){
- *
+ *
* getLogWriter().fine("This is callCommitandBlockingTimeOutThreads method"); try{ CommitThread
* ct1 = new CommitThread ("ct1"); CommitThread ct2 = new CommitThread ("ct2"); CommitThread ct3 =
* new CommitThread ("ct3"); BlockingTimeOutThread bto1 = new BlockingTimeOutThread ("bto1");
* BlockingTimeOutThread bto2 = new BlockingTimeOutThread ("bto2"); } catch (Exception e){
* fail("Failed in Commit and Blocking Time Out Threads" + e); e.printStackTrace(); }
- *
+ *
* //make thread to sleep for more than blocking time out just to avoid call to destroyTable
* method //This will help to have db in place and try commit after blocking time out is passed by
* thread try { Thread.sleep(25*1000); } catch (InterruptedException ie) { ie.printStackTrace(); }
- *
+ *
* }//end of callCommitandRollbackThreads
- *
+ *
*/
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
index 477054c..9b76ea3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -25,6 +25,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.NamingException;
import javax.transaction.NotSupportedException;
@@ -277,4 +278,3 @@ public class TxnTimeOutDUnitTest extends JUnit4DistributedTestCase {
return sb.toString();
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
index 67d12de..a4f0d8b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
@@ -62,7 +62,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* in the form: 1 => name1, 2 => name2, 3 => name3...as the values of ID and name fields
* respectively. Test # 15 & 16 has the dependency to run on CloudScape database only due to
* variations in DDL.
- *
+ *
*/
@Category(IntegrationTest.class)
public class CacheJUnitTest {
@@ -945,7 +945,7 @@ public class CacheJUnitTest {
Statement stmt = null;
/*
* try { ta = (UserTransaction)ctx.lookup("java:/UserTransaction");
- *
+ *
* } catch (NamingException e) { fail ("user txn lookup failed: " + e.getMessage ()); }
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
index 3394811..e4ebf5f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
@@ -98,7 +98,7 @@ public class TestXACacheLoader implements CacheLoader {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.cache.CacheCallback#close()
*/
public void close() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
index cc83faa..d937ab9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
@@ -19,18 +19,19 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Calendar;
+import java.util.Date;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Calendar;
-import java.util.Date;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ClassUtilsJUnitTest class is a test suite with test cases to test the contract and
* functionality of the ClassUtils class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.lang.ClassUtils
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
index fa04ca3..9c4b80e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The InOutParameterJUnitTest class is a test suite with test cases to test the contract and
* functionality of the InOutParameter class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.lang.InOutParameter
* @see org.junit.Test
* @since GemFire 6.8
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index 46ee1f4..4ea9ec8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The ObjectUtilsJUnitTest class is a test suite of test cases for testing the contract and
* functionality of the ObjectUtils class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.lang.ObjectUtils
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
index 503356a..bedb750 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
@@ -18,22 +18,23 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
/**
* The StringUtilsJUnitTest is a test suite containing test cases for testing the contract and
* functionality of the StringUtils class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.lang.StringUtils
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperJUnitTest.java
index 53f5655..40fc74f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperJUnitTest.java
@@ -16,10 +16,11 @@ package org.apache.geode.internal.lang;
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class SystemPropertyHelperJUnitTest {
String restoreSetOperationTransactionBehavior = "restoreSetOperationTransactionBehavior";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index 5e669b3..f38fe00 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The SystemUtilsJUnitTest class is a test suite of test cases for testing the contract and
* functionality of the SystemUtils class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.lang.SystemUtils
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
index 8641309..8f72f22 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.lang;
-import static org.assertj.core.api.Assertions.*;
import static com.googlecode.catchexception.CatchException.*;
import static com.googlecode.catchexception.CatchException.caughtException;
+import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
index 635979b..271b5d6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.internal.logging;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.logging.log4j.FastLogger;
-import org.apache.geode.internal.logging.log4j.LogWriterLogger;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Properties;
+import java.util.Scanner;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -33,18 +34,18 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Properties;
-import java.util.Scanner;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.logging.log4j.FastLogger;
+import org.apache.geode.internal.logging.log4j.LogWriterLogger;
+import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Connects DistributedSystem and tests logging behavior at a high level.
- *
+ *
*/
@Category(IntegrationTest.class)
public class DistributedSystemLogFileJUnitTest {
@@ -1293,7 +1294,7 @@ public class DistributedSystemLogFileJUnitTest {
* tests scenario where security log has not been set but a level has been set to a less granular
* level than that of the regular log. Verifies that the correct logs for security show up in the
* regular log as expected
- *
+ *
* @throws Exception
*/
@Test
@@ -1460,7 +1461,7 @@ public class DistributedSystemLogFileJUnitTest {
* tests scenario where security log has not been set but a level has been set to a more granular
* level than that of the regular log. Verifies that the correct logs for security show up in the
* regular log as expected
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
index 44d2480..d6e8391 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for LogService and how it configures and uses log4j2
- *
+ *
*/
@Category(IntegrationTest.class)
public class LogServiceIntegrationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
index 527a6ae..58dffb5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* UnitTest for ConfigLocator which is used to find the Log4J 2 configuration file.
- *
+ *
* @since GemFire 8.2
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
index 6ae06d8..906387b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
@@ -41,9 +41,9 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests FastLogger isDebugEnabled and isTraceEnabled with various configurations.
- *
+ *
* For filters see https://logging.apache.org/log4j/2.0/manual/filters.html
- *
+ *
*/
@Category(IntegrationTest.class)
public class FastLoggerIntegrationJUnitTest {
@@ -289,7 +289,7 @@ public class FastLoggerIntegrationJUnitTest {
/**
* Verifies FastLogger isDelegating if Level is DEBUG or TRACE.
- *
+ *
* @param level the log Level
* @param expectIsDelegating true if expecting FastLogger.isDelegating to be true
*/
@@ -328,7 +328,7 @@ public class FastLoggerIntegrationJUnitTest {
/**
* Verifies FastLogger isDelegating if there is a Logger Filter.
- *
+ *
* @param level the log Level
* @param expectIsDelegating true if expecting FastLogger.isDelegating to be true
*/
@@ -379,7 +379,7 @@ public class FastLoggerIntegrationJUnitTest {
/**
* Verifies FastLogger isDelegating if there is a Context-wide Filter.
- *
+ *
* @param level the log Level
* @param expectIsDelegating true if expecting FastLogger.isDelegating to be true
*/
@@ -420,7 +420,7 @@ public class FastLoggerIntegrationJUnitTest {
/**
* Verifies FastLogger isDelegating if there is a Appender Filter.
- *
+ *
* @param level the log Level
* @param expectIsDelegating true if expecting FastLogger.isDelegating to be true
*/
@@ -471,7 +471,7 @@ public class FastLoggerIntegrationJUnitTest {
/**
* Verifies FastLogger isDelegating if there is a AppenderRef Filter.
- *
+ *
* @param level the log Level
* @param expectIsDelegating true if expecting FastLogger.isDelegating to be true
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
index c8002d2..48a7290 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for FastLogger when using the default log4j2 config for GemFire.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FastLoggerWithDefaultConfigJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
index 24cb6d8..dfcff11 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
@@ -16,11 +16,14 @@ package org.apache.geode.internal.logging.log4j;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+
import org.apache.commons.io.FileUtils;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.PerformanceTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -29,12 +32,10 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.PerformanceTest;
@Category(PerformanceTest.class)
@Ignore("Tests have no assertions")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
index bc16400..7ead149 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
@@ -18,12 +18,13 @@ package org.apache.geode.internal.logging.log4j;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.logging.log4j.Level;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LogLevelTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
index 31bdd95..f39eb23 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
@@ -16,11 +16,14 @@ package org.apache.geode.internal.logging.log4j;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+
import org.apache.commons.io.FileUtils;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.PerformanceTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
@@ -28,12 +31,10 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.PerformanceTest;
@Category(PerformanceTest.class)
@Ignore("Tests have no assertions")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index 8cd7c31..b4d9276 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.internal.logging.log4j.custom;
-import org.apache.geode.LogWriter;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.Configurator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.util.Properties;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
@@ -34,12 +35,12 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.File;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.*;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.Configurator;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests with custom log4j2 configuration.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
index da7b22b..ec44385 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
@@ -24,7 +24,6 @@ import java.net.InetAddress;
import java.net.Socket;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -35,6 +34,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ClientSocketFactory;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/DummySocketCreator.java b/geode-core/src/test/java/org/apache/geode/internal/net/DummySocketCreator.java
index 2c5ff92..6928b6f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/DummySocketCreator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/DummySocketCreator.java
@@ -14,13 +14,14 @@
*/
package org.apache.geode.internal.net;
-import org.apache.geode.internal.admin.SSLConfig;
-
import java.io.IOException;
import java.net.Socket;
import java.util.List;
+
import javax.net.ssl.SSLException;
+import org.apache.geode.internal.admin.SSLConfig;
+
public class DummySocketCreator extends SocketCreator {
private List<Integer> socketSoTimeouts;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index cd7585c..6eaf44e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -35,6 +35,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_SERVI
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
+import java.security.KeyStore;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
@@ -51,8 +52,6 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import java.security.KeyStore;
-
@Category({UnitTest.class, MembershipTest.class})
public class SSLConfigurationFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index a9bcab1..4ef57b2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -23,23 +23,6 @@ import static org.apache.geode.internal.security.SecurableCommunicationChannel.C
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
-import org.apache.commons.io.FileUtils;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.MembershipTest;
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ErrorCollector;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
import java.io.File;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -55,12 +38,30 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.commons.io.FileUtils;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ErrorCollector;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
+
/**
* Integration tests for SocketCreatorFactory with SSL.
* <p>
* <p>
* Renamed from {@code JSSESocketJUnitTest}.
- *
+ *
* @see ClientSocketFactoryIntegrationTest
*/
@Category({IntegrationTest.class, MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
index a8b1d48..e70ad61 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
@@ -14,13 +14,6 @@
*/
package org.apache.geode.internal.net;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.net.Socket;
import java.util.ArrayList;
import java.util.Iterator;
@@ -30,6 +23,14 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* Tests the default SocketCloser.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
index 9242a97..9334e9e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
@@ -21,13 +21,13 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
index b258ee1..2fcd7f6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.internal.net;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class SocketCreatorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
index cacb493..3bbf05f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The SocketUtilsJUnitTest class is a test suite of test cases testing the contract and
* functionality of the SocketUtils utility class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.net.SocketUtils
* @see org.jmock.Expectations
* @see org.jmock.Mockery
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
index 1945895..6edb59f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
@@ -14,23 +14,24 @@
*/
package org.apache.geode.internal.offheap;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static com.googlecode.catchexception.CatchException.catchException;
+import static com.googlecode.catchexception.CatchException.caughtException;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReferenceArray;
-
-import static com.googlecode.catchexception.CatchException.catchException;
-import static com.googlecode.catchexception.CatchException.caughtException;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class FreeListManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
index a4953a7..4bd0180 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.offheap;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.experimental.categories.Category;
@Category(IntegrationTest.class)
public class FreeListOffHeapRegionJUnitTest extends OffHeapRegionBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
index c1c57a2..5a1a539 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal.offheap;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Properties;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -27,16 +38,6 @@ import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapStringKey
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapStringKey2;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapUUIDKey;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.UUID;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
@Category(IntegrationTest.class)
public class InlineKeyJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
index db8bd86..9ef58ad 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
@@ -14,12 +14,8 @@
*/
package org.apache.geode.internal.offheap;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Collections;
import java.util.LinkedList;
@@ -29,8 +25,13 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
@@ -107,7 +108,7 @@ public class MemoryAllocatorFillPatternIntegrationTest {
* This test hammers a MemoryAllocatorImpl with multiple threads exercising the fill validation of
* tiny Chunks for one minute. This, of course, exercises many aspects of the MemoryAllocatorImpl
* and its helper classes.
- *
+ *
* @throws Exception
*/
@Test
@@ -129,7 +130,7 @@ public class MemoryAllocatorFillPatternIntegrationTest {
* This test hammers a MemoryAllocatorImpl with multiple threads exercising the fill validation of
* huge Chunks for one minute. This, of course, exercises many aspects of the MemoryAllocatorImpl
* and its helper classes.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
index bb6491b..4611b46 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.internal.offheap;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static com.googlecode.catchexception.CatchException.catchException;
+import static com.googlecode.catchexception.CatchException.caughtException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.googlecode.catchexception.CatchException.catchException;
-import static com.googlecode.catchexception.CatchException.caughtException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
@@ -78,7 +79,7 @@ public class MemoryAllocatorFillPatternJUnitTest {
/**
* This tests the fill pattern for a single tiny Chunk allocation.
- *
+ *
* @throws Exception
*/
@Test
@@ -88,7 +89,7 @@ public class MemoryAllocatorFillPatternJUnitTest {
/**
* This tests the fill pattern for a single huge Chunk allocation.
- *
+ *
* @throws Exception
*/
@Test
@@ -143,7 +144,7 @@ public class MemoryAllocatorFillPatternJUnitTest {
/**
* This tests that fill validation is working properly on newly created fragments after a
* defragmentation.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
index 0c874e3..3800f20 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.internal.offheap;
-import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.ByteBuffer;
+
import org.assertj.core.api.JUnitSoftAssertions;
import org.junit.After;
import org.junit.Before;
@@ -30,12 +31,12 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.nio.ByteBuffer;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.DSCODE;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.offheap.MemoryBlock.State;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class MemoryBlockNodeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOffHeapMemoryStats.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOffHeapMemoryStats.java
index e744212..0831444 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOffHeapMemoryStats.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOffHeapMemoryStats.java
@@ -18,7 +18,7 @@ import org.apache.geode.Statistics;
/**
* Null implementation of OffHeapMemoryStats for testing.
- *
+ *
*/
public class NullOffHeapMemoryStats implements OffHeapMemoryStats {
private boolean isClosed;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOutOfOffHeapMemoryListener.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOutOfOffHeapMemoryListener.java
index 3b8b5df..0f9a9f1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOutOfOffHeapMemoryListener.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/NullOutOfOffHeapMemoryListener.java
@@ -18,7 +18,7 @@ import org.apache.geode.OutOfOffHeapMemoryException;
/**
* Null implementation of NullOutOfOffHeapMemoryListener for testing.
- *
+ *
*/
public class NullOutOfOffHeapMemoryListener implements OutOfOffHeapMemoryListener {
private boolean isClosed;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
index 0712f91..af52e59 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.offheap;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
-import static org.hamcrest.CoreMatchers.*;
import java.nio.ByteBuffer;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
index 15d0e63..eb9dd23 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
@@ -14,27 +14,28 @@
*/
package org.apache.geode.internal.offheap;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.query.*;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
/**
* Test off-heap regions with indexes.
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
index 52d71b0..8bc91ff 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
@@ -14,6 +14,22 @@
*/
package org.apache.geode.internal.offheap;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Test;
+
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EntryEvent;
@@ -32,26 +48,11 @@ import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Basic test of regions that use off heap storage. Subclasses exist for the different types of
* offheap store.
- *
+ *
*
*/
public abstract class OffHeapRegionBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index f7b7335..2c38312 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -35,13 +35,13 @@ import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.cache.CachePerfStats;
-import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.VMCachedDeserializable;
+import org.apache.geode.internal.cache.entries.DiskEntry;
+import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
index f12f198..29e7f2c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.internal.offheap;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.distributed.DistributedSystem;
@@ -23,20 +32,12 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.statistics.LocalStatisticsFactory;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
@Category(UnitTest.class)
public class OffHeapStorageJUnitTest {
- private final static long MEGABYTE = 1024 * 1024;
- private final static long GIGABYTE = 1024 * 1024 * 1024;
+ private static final long MEGABYTE = 1024 * 1024;
+ private static final long GIGABYTE = 1024 * 1024 * 1024;
@Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
index 0e4ce21..f401e98 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
@@ -14,6 +14,20 @@
*/
package org.apache.geode.internal.offheap;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -25,23 +39,10 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
/**
* Basic integration tests for validating the off-heap implementation.
- *
+ *
*/
@Category(IntegrationTest.class)
public class OffHeapValidationJUnitTest {
@@ -229,7 +230,7 @@ public class OffHeapValidationJUnitTest {
/**
* Returns -1 if c1 is missing an element in c2, 1 if c2 is missing an element in c1, or 0 is they
* contain the exact same elements.
- *
+ *
* @throws NullPointerException if either c1 or c2 is null
*/
private static int joint(Collection<?> c1, Collection<?> c2) {
@@ -255,7 +256,7 @@ public class OffHeapValidationJUnitTest {
/**
* Returns -1 if m1 is missing a key in m2, 1 if m2 is missing a key in m1, or 0 is they contain
* the exact same keys.
- *
+ *
* @throws NullPointerException if either c1 or c2 is null
*/
private static int joint(Map<?, ?> m1, Map<?, ?> m2) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
index d73ab6a..6949ebb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.offheap;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.experimental.categories.Category;
@Category(IntegrationTest.class)
public class OldFreeListOffHeapRegionJUnitTest extends OffHeapRegionBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
index 1be036a..2089629 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.internal.offheap;
import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
import java.util.ArrayList;
import java.util.List;
@@ -27,9 +28,6 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemOutRule;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-
-import static org.mockito.Mockito.*;
-
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
index bdbb7aa..993db0c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.internal.offheap;
import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
import java.util.Collections;
import java.util.List;
@@ -24,24 +25,21 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-
-import org.apache.geode.test.junit.categories.UnitTest;
-
import org.mockito.Mockito;
-import static org.mockito.Mockito.*;
-
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.*;
+import org.apache.geode.test.junit.categories.UnitTest;
+
/*
* This test simply verifies the static class delegates properly to the impl
- *
+ *
* PowerMock used in this test to inject mocked impl into static class The PowerMockRule bootstraps
* PowerMock without the need for the @RunWith(PowerMockRunner.class) annotation, which was
* interfering with jacoco
- *
+ *
*/
@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
index 7a6e613..966e96d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.internal.offheap;
-import org.apache.geode.cache.*;
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.*;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class TxReleasesOffHeapOnCloseJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java
index deefa41..2581efa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Two-process functional tests for {@link LocalProcessLauncher}.
- *
+ *
* @since GemFire 7.0
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
index 9c845b8..2d7f0f6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
index 584f185..6377038 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for {@link PidFile}.
- *
+ *
* @since GemFire 8.2
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
index 72d93cd..40d4d0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.internal.security;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category({UnitTest.class, SecurityTest.class})
public class CallbackInstantiatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
index bac79ec..0819b6e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.internal.security;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LegacySecurityServiceTest {
private LegacySecurityService service;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
index fc4447b..320ed76 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
@@ -23,12 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.CacheConfig;
-import org.apache.geode.security.PostProcessor;
-import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.security.TestPostProcessor;
-import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Properties;
+
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.mgt.SecurityManager;
import org.junit.After;
@@ -36,7 +32,12 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
+import org.apache.geode.internal.cache.CacheConfig;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.security.TestPostProcessor;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, SecurityTest.class})
public class SecurityServiceFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
index 4b7bbfc..94fadde 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
@@ -20,9 +20,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Properties;
+
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.mgt.DefaultSecurityManager;
import org.junit.After;
@@ -30,7 +29,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
+import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, SecurityTest.class})
public class SecurityServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
index 72c4742..0ad1342 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.internal.size;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.*;
+
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.*;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class ObjectTraverserJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
index 1538862..0335028 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
@@ -19,12 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.util.concurrent.TimeoutException;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -35,8 +32,12 @@ import org.junit.rules.TestName;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import java.io.File;
-import java.util.concurrent.TimeoutException;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class FileSizeLimitIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
index 848597b..18e88a7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
@@ -91,7 +91,7 @@ public class GemFireStatSamplerIntegrationTest extends StatSamplerTestCase {
/**
* Tests the majority of getters and the basic functionality of the sampler.
- *
+ *
* This test is skipped when running on Windows 7 because ProcessStats is not created for this OS.
* See #45395.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
index 718f744..66265f8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.*;
import java.io.File;
import java.util.List;
-import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -30,6 +29,7 @@ import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.statistics.TestSampleHandler.Info;
import org.apache.geode.internal.statistics.TestSampleHandler.ResourceInstanceInfo;
import org.apache.geode.internal.statistics.TestSampleHandler.ResourceTypeInfo;
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SampleCollector}.
- *
+ *
* @since GemFire 7.0
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
index ae052c1..c8b8c95 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
@@ -20,12 +20,10 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.geode.CancelCriterion;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.internal.stats50.VMStats50;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.List;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -35,13 +33,16 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.List;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.stats50.VMStats50;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for {@link SimpleStatSampler}.
- *
+ *
* @since GemFire 7.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
index 7a265d6..69617be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
@@ -17,8 +17,10 @@ package org.apache.geode.internal.statistics;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import java.io.File;
+import java.net.URL;
+
import org.apache.commons.io.FileUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -26,8 +28,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.net.URL;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class StatArchiveWithMissingResourceTypeRegressionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
index ff0a9f8..3fb0282 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
@@ -1599,7 +1599,7 @@ public class StatArchiveWriterReaderIntegrationTest {
* [KEEP] alternative method for getting an expected golden file: Class clazz = getClass();
* assertNotNull(clazz); URL url =
* clazz.getResource("StatArchiveWriterReaderIntegrationTest.gfs.expected"); assertNotNull(url);
- *
+ *
* File expected; try { expected = new File(url.toURI()); } catch(URISyntaxException e) { expected
* = new File(url.getPath()); } assertTrue(expected.exists());
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
index 84dc959..a9fa34e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.internal.statistics;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class StatArchiveWriterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
index 782944a..9348436 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
@@ -19,19 +19,20 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.util.StopWatch;
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* Unit tests for {@link StatMonitorHandler}.
- *
+ *
* @since GemFire 7.0
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
index a08fa43..bb2dd0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
@@ -18,18 +18,19 @@ import static org.apache.geode.internal.statistics.StatMonitorHandler.ENABLE_MON
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.statistics.StatMonitorHandler.StatMonitorNotifier;
-import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Collections;
+import java.util.List;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
-import java.util.Collections;
-import java.util.List;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.statistics.StatMonitorHandler.StatMonitorNotifier;
+import org.apache.geode.internal.util.StopWatch;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Extracted tests from StatMonitorHandlerTest that require enableMonitorThread
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
index 62dc0af..2d9a915 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.statistics;
-import static org.awaitility.Awaitility.*;
import static java.util.concurrent.TimeUnit.*;
+import static org.awaitility.Awaitility.*;
import static org.junit.Assert.*;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java
index 4e83d17..2598066 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.util.StopWatch;
/**
* Integration TestCase for StatSampler.
- *
+ *
* @since GemFire 7.0
*/
public abstract class StatSamplerTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
index 1254ec1..75b4f28 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeoutException;
-import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -40,6 +39,7 @@ import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
index 50311ce..bdf1fe0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.statistics;
-import static org.awaitility.Awaitility.*;
+import static java.util.concurrent.TimeUnit.*;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.test.dunit.Assert.*;
import static org.apache.geode.test.dunit.Host.*;
import static org.apache.geode.test.dunit.Invoke.*;
-import static java.util.concurrent.TimeUnit.*;
+import static org.awaitility.Awaitility.*;
import java.io.File;
import java.io.FileFilter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
index 4c35d3c..7c05252 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
@@ -20,18 +20,18 @@ import static org.mockito.Mockito.*;
import java.io.File;
import java.util.List;
-import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for the StatisticsMonitor class. No disk IO.
- *
+ *
* @since GemFire 7.0
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
index 70b9b15..f320914 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
@@ -19,14 +19,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
-import org.apache.geode.internal.statistics.StatisticsNotification.Type;
-import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.lib.concurrent.Synchroniser;
@@ -38,16 +37,18 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
+import org.apache.geode.internal.statistics.StatisticsNotification.Type;
+import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration test for the SampleCollector class.
- *
+ *
* @since GemFire 7.0
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
index 80a0ce4..35ce9d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.internal.stats50;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
@@ -21,16 +32,6 @@ import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
/**
*
@@ -41,7 +42,7 @@ public class AtomicStatsJUnitTest {
/**
* Test for bug 41340. Do two gets at the same time of a dirty stat, and make sure we get the
* correct value for the stat.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
index aeeb60f..43dfe15 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
@@ -20,7 +20,6 @@ import java.io.InputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
-import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -30,6 +29,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.internal.net.SocketCloser;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
index 0f5a7b9..78e557e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
@@ -15,20 +15,21 @@
package org.apache.geode.internal.tcp;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.net.Socket;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.net.Socket;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
index ca141b4..6b9ac24 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
@@ -18,13 +18,14 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.distributed.internal.DistributionMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class ConnectionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
index e6f586e..e6e23d8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
@@ -17,13 +17,13 @@ package org.apache.geode.internal.util;
import static org.apache.geode.internal.util.ArrayUtils.*;
import static org.assertj.core.api.Assertions.*;
+import java.util.List;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import java.util.List;
-
import org.apache.geode.test.junit.categories.UnitTest;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
index ec49583..35c5c3c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
@@ -317,4 +317,3 @@ public class BlobHelperWithThreadContextClassLoaderTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
index c760597..73c6a0e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
@@ -23,11 +23,6 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -44,11 +39,17 @@ import java.util.Properties;
import java.util.Set;
import java.util.Vector;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* The CollectionUtilsJUnitTest class is a test suite of test cases testing the contract and
* functionality of the CollectionUtils class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.util.CollectionUtils
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
index b85c732..45ddaa4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
@@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*;
import java.io.IOException;
-import org.apache.geode.test.junit.categories.UnitTest;
-
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
@@ -29,8 +29,7 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index c21bfb8..5e462a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test class for testing the contract and functionality of the IOUtils class.
* <p/>
- *
+ *
* @see org.apache.geode.internal.util.IOUtils
* @see org.jmock.Expectations
* @see org.jmock.Mockery
@@ -70,7 +70,7 @@ public class IOUtilsJUnitTest {
/**
* Gets a fully-qualified path anchored at root.
* <p/>
- *
+ *
* @param pathElements a String array containing the elements of the path.
* @return a fully-qualified pathname as a String value.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
index d9611fe..197b2ed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
@@ -16,18 +16,19 @@ package org.apache.geode.internal.util.concurrent;
import static org.junit.Assert.fail;
-import org.apache.geode.CancelCriterion;
-import org.apache.geode.distributed.DistributedSystemDisconnectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link FutureResult}.
- *
+ *
*/
@Category(UnitTest.class)
public class FutureResultJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
index cee6c8a..c41d305 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* @test
- *
+ *
* @synopsis Exercise multithreaded maps, byt default ConcurrentHashMap Multithreaded hash table
* test. Each thread does a random walk though elements of "key" array. On each iteration, it checks
* if table includes key. If absent, with probablility pinsert it inserts it, and if present, with
@@ -215,4 +215,3 @@ public class CountedMapLoopsJUnitTest extends JSR166TestCase { // TODO: reformat
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
index ea268b0..b3a712f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
@@ -641,4 +641,3 @@ public class IntMapCheckJUnitTest extends JSR166TestCase { // TODO: reformat
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
index c36cbf0..1a00d52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
@@ -165,9 +165,9 @@ class LoopHelpers {
* Unsynchronized version of java.util.Random algorithm.
*/
public static class SimpleRandom {
- private final static long multiplier = 0x5DEECE66DL;
- private final static long addend = 0xBL;
- private final static long mask = (1L << 48) - 1;
+ private static final long multiplier = 0x5DEECE66DL;
+ private static final long addend = 0xBL;
+ private static final long mask = (1L << 48) - 1;
static final AtomicLong seq = new AtomicLong(-715159705);
private long seed;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
index 73673d1..59138b8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
@@ -656,4 +656,3 @@ public class MapCheckJUnitTest extends JSR166TestCase { // TODO: reformat
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
index e4ca48e..dfba6f1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* @test
- *
+ *
* @synopsis Exercise multithreaded maps, by default ConcurrentHashMap. Each thread does a random
* walk though elements of "key" array. On each iteration, it checks if table includes key. If
* absent, with probablility pinsert it inserts it, and if present, with probablility premove it
@@ -219,4 +219,3 @@ public class MapLoopsJUnitTest extends JSR166TestCase { // TODO: reformat
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
index 92ee056..bdd38ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
@@ -14,7 +14,7 @@
*/
/*
* @test
- *
+ *
* @synopsis Exercise multithreaded maps, by default ConcurrentHashMap. Each thread does a random
* walk though elements of "key" array. On each iteration, it checks if table includes key. If
* absent, with probablility pinsert it inserts it, and if present, with probablility premove it
@@ -229,4 +229,3 @@ public class StringMapLoopsJUnitTest extends JSR166TestCase { // TODO: reformat
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/management/DLockManagementDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/DLockManagementDUnitTest.java
index ef5ace1..c0ff093 100644
--- a/geode-core/src/test/java/org/apache/geode/management/DLockManagementDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/DLockManagementDUnitTest.java
@@ -302,4 +302,3 @@ public class DLockManagementDUnitTest implements Serializable {
return Awaitility.await().atMost(MAX_WAIT_MILLIS, MILLISECONDS);
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/management/JMXMBeanDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/JMXMBeanDUnitTest.java
index 85453ed..ecbdadf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/JMXMBeanDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/JMXMBeanDUnitTest.java
@@ -58,8 +58,8 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.dunit.rules.CleanupDUnitVMsRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.util.test.TestUtil;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java b/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
index ae9f0c1..fe50ad4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
@@ -45,7 +45,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain MemberMXBean proxy reference for a particular Member
- *
+ *
* @param member
* @return a reference to MemberMXBean
* @throws Exception
@@ -85,7 +85,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain CacheServerMXBean proxy reference for a particular Member
- *
+ *
* @param member
* @return a reference to CacheServerMXBean
* @throws Exception
@@ -131,7 +131,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain LockServiceMXBean proxy reference for a particular lock service on a
* Member
- *
+ *
* @param member
* @return a reference to LockServiceMXBean
* @throws Exception
@@ -176,7 +176,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain RegionMXBean proxy reference for a particular region on a member
- *
+ *
* @param member
* @return a reference to RegionMXBean
* @throws Exception
@@ -224,7 +224,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain GatewaySenderMXBean proxy reference for a particular sender id on a
* member
- *
+ *
* @param member distributed member
* @param gatwaySenderId sender id
* @return a reference to GatewaySenderMXBean
@@ -272,7 +272,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain AsyncEventQueueMXBean proxy reference for a particular queue id on a
* member
- *
+ *
* @param member distributed member
* @param queueId Queue id
* @return a reference to AsyncEventQueueMXBean
@@ -319,7 +319,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain GatewayReceiverMXBean proxy reference for a member
- *
+ *
* @param member distributed member
* @return a reference to GatewayReceiverMXBean
* @throws Exception
@@ -365,7 +365,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain DistributedRegionMXBean proxy reference for a particular region
- *
+ *
* @param regionName name of the region
* @return a reference to DistributedRegionMXBean
* @throws Exception
@@ -401,7 +401,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain DistributedRegionMXBean proxy reference for a particular region
- *
+ *
* @param lockServiceName name of the lock service
* @return a reference to DistributedLockServiceMXBean
* @throws Exception
@@ -435,7 +435,7 @@ public class MBeanUtil {
/**
* Utility Method to obtain GatewayReceiverMXBean proxy reference for a member
- *
+ *
* @param member distributed member
* @return a reference to GatewayReceiverMXBean
* @throws Exception
diff --git a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
index a254f9a..d50ee3e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
@@ -848,7 +848,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
/**
* Waits to receive MBean notifications.
- *
+ *
* @param vm a virtual machine.
* @param wait how long to wait for in millis.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
index 4a6aafe..058c024 100644
--- a/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
@@ -81,7 +81,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Distributed tests for {@link DistributedSystemMXBean#queryData(String, String, int)}.
* </p>
- *
+ *
* <pre>
* Test Basic Json Strings for Partitioned Regions
* Test Basic Json Strings for Replicated Regions
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
index 00980d0..ea246bc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.management.internal.beans.AsyncEventQueueMBeanBridge;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- *
+ *
*
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
index f8670b6..9808d18 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.management.bean.stats;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
@@ -25,19 +36,9 @@ import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
- *
+ *
* @since GemFire 1.4
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
index 8c60cd1..8c67d3f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.management.bean.stats;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import io.codearte.catchexception.shade.mockito.Mockito;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -26,8 +27,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.management.internal.beans.GatewaySenderMBeanBridge;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import io.codearte.catchexception.shade.mockito.Mockito;
-
/**
*/
@Category(IntegrationTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/MBeanStatsTestCase.java
index fe07183..b4f9246 100755
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/MBeanStatsTestCase.java
@@ -15,22 +15,22 @@
package org.apache.geode.management.bean.stats;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.NanoTimer;
-import org.junit.After;
-import org.junit.Before;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertNotNull;
/**
* Base test case for the management.bean.stats tests.
- *
+ *
* @since GemFire 7.0
*/
public abstract class MBeanStatsTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
index 22174d5..dd9e19c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Implementing RegionMXBean to ensure test coverage
- *
+ *
*/
@Category(IntegrationTest.class)
public class RegionStatsJUnitTest extends MBeanStatsTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
index dce8528..dcb125b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
@@ -17,12 +17,13 @@ package org.apache.geode.management.internal;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom;
-import org.apache.geode.test.junit.categories.UnitTest;
+import javax.management.openmbean.CompositeData;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import javax.management.openmbean.CompositeData;
+import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class CompositeBuilderViaFromTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
index 828f56f..a241acb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
@@ -17,12 +17,13 @@ package org.apache.geode.management.internal;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
+import javax.management.openmbean.CompositeData;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import javax.management.openmbean.CompositeData;
+import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class CompositeBuilderViaProxyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
index 2dea75b..75929a6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.management.internal;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class IdentityConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
index 9ab2fbf..183364e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* The JettyHelperJUnitTest class is a test suite of test cases testing the contract and
* functionality of the JettyHelper class. Does not start Jetty.
- *
+ *
* @see org.apache.geode.management.internal.JettyHelper
* @see org.jmock.Mockery
* @see org.junit.Assert
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
index 60fb859..2c34ddd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
@@ -31,8 +31,8 @@ import org.apache.geode.admin.internal.FinishBackupRequest;
import org.apache.geode.admin.internal.PrepareBackupRequest;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.locks.DLockService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.BackupManager;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptorJUnitTest.java
index 82fd4a6..1bf470f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/AbstractCliAroundInterceptorJUnitTest.java
@@ -17,14 +17,14 @@ package org.apache.geode.management.internal.cli;
import static org.apache.geode.internal.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import java.nio.file.Path;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.UnitTest;
-import java.nio.file.Path;
-
/**
* AbstractCliAroundInterceptor Tester.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
index 827eb9c..1dfd61d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.*;
import java.util.Set;
-import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -28,6 +27,7 @@ import org.apache.geode.management.internal.cli.domain.Impl1;
import org.apache.geode.management.internal.cli.domain.Impl12;
import org.apache.geode.management.internal.cli.domain.Interface1;
import org.apache.geode.management.internal.cli.domain.Interface2;
+import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
index cde0b23..8133471 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
@@ -113,7 +113,7 @@ public class CommandManagerJUnitTest {
/**
* Tests {@link CommandManager#loadPluginCommands()}.
- *
+ *
* @since GemFire 8.1
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
index a96c30e..53af36c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
@@ -16,14 +16,15 @@ package org.apache.geode.management.internal.cli;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* GfshParserJUnitTest - Includes tests to check the parsing and auto-completion capabilities of
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java
index e9fbd75..3fc8267 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java
@@ -25,12 +25,10 @@ import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.concurrent.LinkedBlockingQueue;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -39,9 +37,12 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* TODO : Add more tests for error-catch, different type of results etc
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
index 20ef3be..9649ab5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
@@ -15,11 +15,7 @@
package org.apache.geode.management.internal.cli;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.util.Properties;
import org.junit.After;
import org.junit.BeforeClass;
@@ -28,7 +24,11 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class NetstatDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java
index e0c38f1..2ca9af0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.management.internal.cli;
-import org.apache.geode.management.internal.cli.result.TableBuilder;
-import org.apache.geode.management.internal.cli.result.TableBuilder.Row;
-import org.apache.geode.management.internal.cli.result.TableBuilder.RowGroup;
-import org.apache.geode.management.internal.cli.result.TableBuilder.Table;
-import org.apache.geode.management.internal.cli.result.TableBuilderHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.junit.Assert.*;
+import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+import java.util.Arrays;
+import java.util.List;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -30,12 +31,12 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.powermock.api.mockito.PowerMockito.when;
+import org.apache.geode.management.internal.cli.result.TableBuilder;
+import org.apache.geode.management.internal.cli.result.TableBuilder.Row;
+import org.apache.geode.management.internal.cli.result.TableBuilder.RowGroup;
+import org.apache.geode.management.internal.cli.result.TableBuilder.Table;
+import org.apache.geode.management.internal.cli.result.TableBuilderHelper;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Testing TableBuilder and TableBuilderHelper using mocks for Gfsh
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java
index 21444e2..07d9f35 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java
@@ -42,11 +42,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.wan.GatewaySenderFactory;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
index 20314fa..5714829 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
@@ -23,6 +23,19 @@ import static org.apache.geode.distributed.ConfigurationProperties.NAME;
import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.Rule;
+import org.springframework.shell.core.CommandMarker;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.ManagementService;
@@ -37,18 +50,6 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-import org.junit.Rule;
-import org.springframework.shell.core.CommandMarker;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* Base class for all the CLI/gfsh command dunit tests.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
index 7bf5f99..f4e6635 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
@@ -15,20 +15,21 @@
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.JarFileRule;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.JarFileRule;
+import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(DistributedTest.class)
public class ConcurrentDeployDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
index a8d0dc3..084d5ff 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
@@ -44,8 +44,8 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.shell.OperationInvoker;
-import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.rules.GfshParserRule;
@Category(UnitTest.class)
public class ConnectCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
index 6a500af..c2a03bf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
@@ -34,10 +34,10 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
index e46d931..ed8de9e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
@@ -37,13 +37,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
index ea9d4b7..34402a5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
@@ -27,17 +27,17 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
/**
* Unit tests for DeployCommand, UndeployCommand, ListDeployedCommand
- *
+ *
* @since GemFire 7.0
*/
@SuppressWarnings("serial")
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandJUnitTest.java
index 6238dc0..094ff4f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandJUnitTest.java
@@ -21,10 +21,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class DescribeConfigCommandJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
index ca89d0d..cfd2780 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
@@ -23,10 +23,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class DescribeMembersCommandDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
index 9339f65..8d36d19 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
@@ -35,9 +35,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ExportDataIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
index 7cb9dc3..9c5d030 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
@@ -22,6 +22,16 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Matchers;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionException;
@@ -35,15 +45,6 @@ import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.BytesToString;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.Matchers;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
@Category(UnitTest.class)
public class ExportLogsCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
index ec86a2d..43adca6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
@@ -54,11 +54,11 @@ import org.apache.geode.management.internal.cli.functions.ExportLogsFunction;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.configuration.utils.ZipUtils;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.Member;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.Member;
@Category(DistributedTest.class)
public class ExportLogsDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
index 28d74d9..c798ee0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
@@ -27,9 +27,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ExportLogsIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
index f99b278..d7e6095 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
@@ -45,10 +45,10 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ExportLogsStatsDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsTestSuite.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsTestSuite.java
index b1f3ed7..94fb7f0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsTestSuite.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsTestSuite.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunctionTest;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunctionFileTest;
+import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunctionTest;
import org.apache.geode.management.internal.cli.util.LogExporterIntegrationTest;
import org.apache.geode.management.internal.cli.util.LogExporterTest;
import org.apache.geode.management.internal.cli.util.LogSizerTest;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
/**
* All of the JUnit, DUnit and Integration tests for gfsh command export logs.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
index 8e0a469..ad5ea93 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
@@ -38,10 +38,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ExportLogsWithMemberGroupDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index 03286bd..9b3af7f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -20,6 +20,16 @@ import static org.apache.geode.internal.cache.functions.TestFunction.TEST_FUNCTI
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.assertj.core.util.Strings;
+import org.json.JSONArray;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
@@ -36,16 +46,6 @@ import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.assertj.core.util.Strings;
-import org.json.JSONArray;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
@Category(DistributedTest.class)
public class FunctionCommandsDUnitTest {
private MemberVM server1;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 2e9bafe..3b242fc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -135,7 +135,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
private static final String carTemplate =
"\"('attributes':?map,'make':'?make','model':'?model','colors':?list,'attributeSet':?set)\"";
- final static int COUNT = 5;
+ static final int COUNT = 5;
public String getMemberId() {
InternalCache cache = getCache();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
index fa7d7dc..3436cde 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
@@ -22,9 +22,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class GfshCommandIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
index 627e8e7..5dfbc83 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
@@ -35,9 +35,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ImportDataIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
index cce69c5..965dafb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
@@ -269,4 +269,3 @@ public class IndexCommandsIntegrationTest {
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
index 68199e3..15d83c2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
@@ -48,10 +48,10 @@ import org.apache.geode.management.internal.cli.domain.Stock;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class IndexCommandsShareConfigurationDUnitTest {
@@ -171,4 +171,3 @@ public class IndexCommandsShareConfigurationDUnitTest {
return gfsh.getGfshOutput().contains(indexName);
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index 664a886..c56124c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -52,11 +52,11 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.cli.util.RegionAttributesNames;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ListAndDescribeRegionDUnitTest implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 5048722..959d50c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -17,6 +17,11 @@ package org.apache.geode.management.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
@@ -28,11 +33,6 @@ import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
@Category(DistributedTest.class)
public class ListIndexCommandDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
index 82b1ecd..d874c41 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The ListIndexCommandJUnitTest class is a test suite of test cases testing the contract and
* functionality of the ListIndexCommand class.
* </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.ClearDefinedIndexesCommand
* @see org.apache.geode.management.internal.cli.commands.CreateDefinedIndexesCommand
* @see org.apache.geode.management.internal.cli.commands.CreateIndexCommand
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
index b3d5f9d..9dbbc30 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
@@ -26,10 +26,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ListMembersCommandDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java
index 6049714..bafd47f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java
@@ -39,9 +39,9 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.shell.Gfsh;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
@RunWith(Parameterized.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
index d1476cb..70991c1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -56,11 +56,11 @@ import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index e3818d0..5b8c14c 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -37,14 +37,14 @@ import org.apache.geode.distributed.internal.deadlock.GemFireDeadlockDetectorDUn
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.concurrent.FileBasedCountDownLatch;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
/**
* Distributed tests for show deadlock command in {@link ShowDeadlockCommand}.
- *
+ *
* @see GemFireDeadlockDetectorDUnitTest
*/
@Category(DistributedTest.class)
@@ -149,4 +149,3 @@ public class ShowDeadlockDUnitTest {
}
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandJUnitTest.java
index 1ca7ce1..e3c91b8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -18,13 +18,14 @@ package org.apache.geode.management.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.spy;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class ShowMetricsCommandJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 67c6c3d..a155731 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,6 +20,16 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
+import java.io.File;
+
+import javax.management.ObjectName;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
@@ -33,16 +43,6 @@ import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-
-import javax.management.ObjectName;
-
@Category(DistributedTest.class)
public class ShowMetricsDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
index bdda1c0..f0f4a69 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
@@ -34,10 +34,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ShowMissingDiskStoresDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ToUpperResultCollector.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ToUpperResultCollector.java
index 28ec5f3..307d2e0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ToUpperResultCollector.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ToUpperResultCollector.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.cache.execute.FunctionException;
-import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.distributed.DistributedMember;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.geode.cache.execute.FunctionException;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.DistributedMember;
+
public class ToUpperResultCollector implements ResultCollector {
private List<Object> results = new ArrayList<>();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
index ed3f0e4..83f58e7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
@@ -26,13 +26,13 @@ import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class GfshStatusCommandsIntegrationTest {
- final private static String LOCATOR_NAME = "locator1";
+ private static final String LOCATOR_NAME = "locator1";
@Rule
public LocatorStarterRule locator =
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
index 32dc93c..7a393db 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
@@ -16,11 +16,12 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.junit.Assert.assertEquals;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class StartJConsoleCommandTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
index 44f27d7..1a92246 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
@@ -18,14 +18,15 @@ package org.apache.geode.management.internal.cli.converters;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.logging.log4j.Level;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.springframework.shell.core.Completion;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LogLevelConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
index b2d65f0..940c3e7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
@@ -14,20 +14,21 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import org.apache.geode.cache.*;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.management.internal.cli.domain.DataCommandResult;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.List;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.apache.geode.cache.*;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.management.internal.cli.domain.DataCommandResult;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* TODO: Add additional tests for all methods in DataCommandFunction.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
index 64cc18a..e3c0bf5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
@@ -17,6 +17,12 @@ package org.apache.geode.management.internal.cli.functions;
import static org.apache.geode.management.internal.cli.domain.DataCommandResult.MISSING_VALUE;
import static org.assertj.core.api.Assertions.assertThat;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.InternalCache;
@@ -30,13 +36,8 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
public class DataCommandFunctionWithPDXJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java
index f511f02..9192533 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java
@@ -33,8 +33,8 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
public class ExportLogsFunctionIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java
index a35dfa9..5ce0b25 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java
@@ -22,6 +22,12 @@ import java.io.Serializable;
import java.util.List;
import java.util.Objects;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -30,12 +36,6 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.domain.DataCommandResult;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
@Category(IntegrationTest.class)
public class Geode3544JUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index bb54d12..35a440b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The ListDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of the
* ListDiskStoresFunction.
* </p>
- *
+ *
* @see org.apache.geode.internal.cache.DiskStoreImpl
* @see org.apache.geode.management.internal.cli.domain.DiskStoreDetails
* @see org.apache.geode.management.internal.cli.functions.ListDiskStoresFunction
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index 69e07a1..450ec4c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -58,7 +58,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* functionality of the ListIndexFunction GemFire function.
* </p>
* </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.functions.ListIndexFunction
* @see org.jmock.Expectations
* @see org.jmock.Mockery
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
index 235ae39..77c929f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.CacheClosedException;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
@@ -41,6 +40,7 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
+import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java
index 87ad7d2..2231f33 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java
@@ -19,11 +19,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.management.internal.cli.functions.ExportLogsFunction.Args;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.io.FileUtils;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -32,11 +34,10 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.management.internal.cli.functions.ExportLogsFunction.Args;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class SizeExportLogsFunctionFileTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java
index 709c806..6a6579e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java
@@ -42,8 +42,8 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.management.ManagementException;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
public class SizeExportLogsFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
index 3dc61b6..50b31ec 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
@@ -17,12 +17,13 @@ package org.apache.geode.management.internal.cli.help;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.management.internal.cli.GfshParser;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.management.internal.cli.GfshParser;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class HelpBlockUnitTest {
private HelpBlock firstBlock, secondBlock, thirdBlock;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
index 58d09f0..5786e8a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
@@ -15,12 +15,14 @@
package org.apache.geode.management.internal.cli.help;
+import static org.apache.geode.management.internal.cli.GfshParser.LINE_SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.apache.geode.management.internal.cli.GfshParser.LINE_SEPARATOR;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,8 +31,7 @@ import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class HelperUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
index 59fb1fb..f5202a6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
@@ -19,11 +19,13 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.apache.geode.test.junit.categories.UnitTest;
+
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category({UnitTest.class})
public class CommandResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
index 744bcc6..585b2a3 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
@@ -16,6 +16,8 @@ package org.apache.geode.management.internal.cli.shell;
import static org.junit.Assert.*;
+import java.io.File;
+
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -26,8 +28,6 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import java.io.File;
-
@Category(IntegrationTest.class)
public class GfshConfigInitFileJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java
index a563c65..f918cc2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java
@@ -17,7 +17,11 @@ package org.apache.geode.management.internal.cli.shell;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.util.List;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -25,10 +29,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.util.List;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class GfshHistoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
index 751d22b..80bfe62 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.management.internal.cli.shell;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.LIST_MEMBER;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.GROUP;
+import static org.apache.geode.management.internal.cli.i18n.CliStrings.LIST_MEMBER;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.NO_MEMBERS_FOUND_MESSAGE;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
@Category(IntegrationTest.class)
public class GfshMultilineCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
index addc263..b27b75d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
@@ -16,11 +16,12 @@ package org.apache.geode.management.internal.cli.util;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class BytesToStringTest {
private static long KB = 1024;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
index 27becc5..38d3f0d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
@@ -19,11 +19,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ExportLogsCacheWriterUnitTest {
private ExportLogsCacheWriter writer = new ExportLogsCacheWriter();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
index 55d6d54..41d002a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
@@ -16,11 +16,12 @@ package org.apache.geode.management.internal.cli.util;
import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.DistributionLocator;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class HostUtilsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
index 9d0c7fc..d18c626 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
@@ -17,13 +17,14 @@ package org.apache.geode.management.internal.cli.util;
import static org.junit.Assert.assertEquals;
-import org.apache.geode.GemFireException;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Stack;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Stack;
+import org.apache.geode.GemFireException;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class JdkToolTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java
index 2a38a77..1d0ef08 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java
@@ -35,8 +35,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.functions.ExportLogsFunctionIntegrationTest;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
public class LogExporterIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java
index 83f0b44..3d4e68e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java
@@ -22,15 +22,6 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.commons.io.FileUtils;
-import org.apache.geode.management.internal.configuration.utils.ZipUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -44,6 +35,16 @@ import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.apache.commons.io.FileUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.management.internal.configuration.utils.ZipUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class LogExporterTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
index becc26d..b71059e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
@@ -23,11 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.logging.log4j.Level;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.io.File;
import java.nio.file.FileSystem;
import java.nio.file.Path;
@@ -36,6 +31,12 @@ import java.nio.file.attribute.FileTime;
import java.nio.file.spi.FileSystemProvider;
import java.time.LocalDateTime;
+import org.apache.logging.log4j.Level;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LogFilterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
index 9487ba7..0417bb7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
@@ -19,11 +19,12 @@ package org.apache.geode.management.internal.cli.util;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.logging.log4j.Level;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LogLevelExtractorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
index f0b7f96..e71eb38 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
@@ -19,9 +19,10 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.geode.management.internal.cli.functions.ExportLogsFunction;
-import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -30,9 +31,9 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
+import org.apache.geode.management.internal.cli.functions.ExportLogsFunction;
+import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LogSizerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
index a4f25ea..6d8da39 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
@@ -24,9 +24,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ClusterConfigDeployJarDUnitTest extends ClusterConfigTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
index 74f1f2f..82e7282 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
@@ -34,13 +34,13 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.query.Index;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
index 76a4175..28fe168 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
@@ -37,10 +37,10 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ClusterConfigImportDUnitTest extends ClusterConfigTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
index 98a6bd8..c1ee9e7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
@@ -27,8 +27,8 @@ import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Rule;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.management.internal.configuration.utils.ZipUtils;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
index 37a42c5..8312c31 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
@@ -36,11 +36,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.utils.ZipUtils;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category({DistributedTest.class, SecurityTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceDUnitTest.java
index 74fb1418..b190779 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceDUnitTest.java
@@ -14,6 +14,20 @@
*/
package org.apache.geode.management.internal.configuration;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Host.getHost;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.RegionFactory;
@@ -35,19 +49,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Host.getHost;
-import static org.apache.geode.test.dunit.Wait.waitForCriterion;
/**
* Tests the starting up of shared configuration, installation of
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
index 10d949e..748d91b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
@@ -28,8 +28,20 @@ import static org.apache.geode.test.dunit.Host.getHost;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Arrays;
+import java.util.Properties;
+
import org.awaitility.Awaitility;
import org.awaitility.core.ConditionFactory;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
@@ -39,17 +51,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.util.test.TestUtil;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.Arrays;
-import java.util.Properties;
@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1165
public class ClusterConfigurationServiceUsingDirDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/EventTestCacheWriter.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/EventTestCacheWriter.java
index 27459c9..6b4cade 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/EventTestCacheWriter.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/EventTestCacheWriter.java
@@ -16,14 +16,14 @@
package org.apache.geode.management.internal.configuration;
+import java.io.Serializable;
+
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.util.CacheWriterAdapter;
-import java.io.Serializable;
-
public class EventTestCacheWriter extends CacheWriterAdapter implements Serializable {
public static boolean hasResult = false;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
index 9d435bc..c214246 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
@@ -30,10 +30,10 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ImportClusterConfigDistributedTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
index 81f8869..168ba25 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -21,6 +21,7 @@ import java.io.InputStreamReader;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
+
import javax.xml.XMLConstants;
import org.junit.Test;
@@ -58,7 +59,7 @@ public class CacheElementJUnitTest {
/**
* Asserts that Cache type is defined as a embedded ComplexType under an Element named "cache" for
* version 8.1.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -76,7 +77,7 @@ public class CacheElementJUnitTest {
* latest version. If this assertion fails it likely means that cache type is defined as a named
* ComplexType or reference. Update code in CacheElement.buildElementMapCacheType to account for
* this.
- *
+ *
* @since GemFire 8.1
*/
@Test
@@ -93,7 +94,7 @@ public class CacheElementJUnitTest {
* As of 8.1 the cache type requires that certain elements be listed in sequence. This test
* verifies that {@link CacheElement#buildElementMap(Document)} produces a mapping in the correct
* order. If we change to use choice for all elements then we can abandon this mapping.
- *
+ *
* @since GemFire 8.1
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index d7204fb..79cf8c8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -14,14 +14,17 @@
*/
package org.apache.geode.management.internal.configuration.utils;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.internal.ClusterConfigurationService;
-import org.apache.geode.internal.cache.extension.Extension;
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
+
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -33,22 +36,21 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.internal.cache.extension.Extension;
+import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit tests for {@link XmlUtils#addNewNode(Document, XmlEntity)} and
* {@link XmlUtils#deleteNode(Document, XmlEntity)}. Simulates the
* {@link ClusterConfigurationService} method of extracting {@link XmlEntity} from the new config
* and applying it to the current shared config.
- *
+ *
*
* @since GemFire 8.1
*/
@@ -87,7 +89,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with {@link CacheXml} element with a
* <code>name</code> attribute, <code>region</code>. It should be added after other
* <code>region</code> elements.
- *
+ *
* @throws Exception
* @throws XPathExpressionException
* @since GemFire 8.1
@@ -140,7 +142,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with {@link CacheXml} element that does
* not have a name or id attribute, <code>jndi-bindings</code>. It should be added between
* <code>pdx</code> and <code>region</code> elements.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -177,7 +179,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* have a name or id attribute. It should be added to the end of the config xml. Attempts a name
* collision with test:region, it should not collide with the similarly named cache:region
* element.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -217,7 +219,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with {@link CacheXml} element with a
* <code>name</code> attribute, <code>region</code>. It should replace existing
* <code>region</code> element with same <code>name</code>.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -252,7 +254,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
/**
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with {@link CacheXml} element that does
* not have a name or id attribute, <code>pdx</code>. It should replace <code>pdx</code> element.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -287,7 +289,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with an {@link Extension} that does not
* have a name or id attribute, <code>test:cache</code>. It should replace the existing
* <code>test:cache</code> element.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -324,7 +326,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#deleteNode(Document, XmlEntity)} with {@link CacheXml} element with a
* <code>name</code> attribute, <code>region</code>. It should remove existing <code>region</code>
* element with same <code>name</code>.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -354,7 +356,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with {@link CacheXml} element that does
* not have a name or id attribute, <code>pdx</code>. It should remove the existing
* <code>pdx</code> element.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
@@ -383,7 +385,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
* Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with an {@link Extension} that does not
* have a name or id attribute, <code>test:cache</code>. It should remove the existing
* <code>test:cache</code> element.
- *
+ *
* @throws Exception
* @since GemFire 8.1
*/
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index 4993e5f..6001626 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link XmlUtils}. See Also {@link XmlUtilsAddNewNodeJUnitTest} for tests related
* to {@link XmlUtils#addNewNode(Document, XmlEntity)}
- *
+ *
* @since GemFire 8.1
*/
@Category(UnitTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
index 59f7ed2..4a1f0a0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -14,15 +14,10 @@
*/
package org.apache.geode.management.internal.pulse;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
@@ -37,11 +32,15 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This is for testing running functions
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class TestFunctionsDUnitTest extends ManagementTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java
index fc267fc..bee0afc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.management.internal.pulse;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.ManagementService;
@@ -30,10 +26,13 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is for testing heap size from Mbean
- *
+ *
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java
index 731fd6b..a07f7a6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.management.internal.pulse;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.ManagementService;
@@ -29,10 +25,13 @@ import org.apache.geode.management.ManagementTestBase;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is for testing locators from MBean
- *
+ *
*/
@Category(DistributedTest.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java
index 89346fe..61d9b88 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java
@@ -17,18 +17,19 @@ package org.apache.geode.management.internal.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.junit.rules.ConnectionConfiguration;
-import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ConnectionConfiguration;
+import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
@Category({IntegrationTest.class, SecurityTest.class})
public class AccessControlMBeanJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java
index eebc721..d98ba68 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java
@@ -24,10 +24,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.CacheServerMXBean;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class CacheServerMBeanAuthenticationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java
index 885e54a..8d9ae30 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java
@@ -26,11 +26,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.CacheServerMXBean;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class CacheServerMBeanAuthorizationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java
index 0961768..235440e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java
@@ -24,11 +24,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.management.CacheServerMXBean;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class CacheServerMBeanWithShiroIniIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java
index c082e2a..03a78ba 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java
@@ -29,11 +29,11 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class CliCommandsSecurityTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java
index 8d1e7e7..9ace4a1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java
@@ -28,11 +28,11 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class DataCommandsSecurityTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
index e1b9808..9568647 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
@@ -30,11 +30,11 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class DeployCommandsSecurityTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java
index 2efdd11..9215de5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java
@@ -25,11 +25,11 @@ import org.junit.rules.RuleChain;
import org.apache.geode.management.DiskStoreMXBean;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class DiskStoreMXBeanSecurityJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java
index 502b4c5..1711917 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java
@@ -28,11 +28,11 @@ import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({DistributedTest.class, SecurityTest.class})
public class DistributedSystemMXBeanSecurityTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java
index 7dc9069..be9d368 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java
@@ -31,11 +31,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.GatewayReceiverMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class GatewayReceiverMBeanSecurityTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java
index 3a3337a..35cb467 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java
@@ -32,11 +32,11 @@ import org.apache.geode.management.GatewaySenderMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.internal.beans.GatewaySenderMBean;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class GatewaySenderMBeanSecurityTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
index 53d7676..f09a2e4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
@@ -27,11 +27,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.security.TestPostProcessor;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class GfshCommandsPostProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
index 37db998..a771eef 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
@@ -18,13 +18,14 @@ package org.apache.geode.management.internal.security;
import static org.junit.Assert.assertEquals;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
@Category(IntegrationTest.class)
public class JavaRmiServerNameTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java
index 1c9d9af..b3683f2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java
@@ -30,11 +30,11 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.management.LockServiceMXBean;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class LockServiceMBeanAuthorizationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java
index bb7251c..58ff1ad 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java
@@ -40,11 +40,11 @@ import org.apache.geode.management.ManagementService;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class MBeanSecurityJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java
index 5be8d9a..a51103f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java
@@ -32,11 +32,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.ManagerMXBean;
import org.apache.geode.management.internal.beans.ManagerMBean;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class ManagerMBeanAuthorizationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java
index 5323110..7cb0d6f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java
@@ -26,11 +26,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
@Category({IntegrationTest.class, SecurityTest.class})
public class MemberMBeanSecurityJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
index aeed6f3..c33da97 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
@@ -39,13 +39,13 @@ import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.Member;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType;
+import org.apache.geode.test.junit.rules.Member;
@Category({DistributedTest.class, SecurityTest.class})
public class MultiUserDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java
index c47432b..1a7753a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java
@@ -17,12 +17,13 @@ package org.apache.geode.management.internal.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
/**
* Integration tests for SecurityService using shiro-ini.json.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java
index 75e9d27..3880bb5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java
@@ -17,18 +17,19 @@ package org.apache.geode.management.internal.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
/**
* Integration tests for SecurityService using shiro.ini
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
index c855af1..39fb532 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
@@ -14,21 +14,11 @@
*/
package org.apache.geode.management.internal.unsafe;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.ManagementService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
-import javax.management.*;
-import javax.management.remote.*;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -43,10 +33,22 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import javax.management.*;
+import javax.management.remote.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.management.ManagementService;
+import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test ReadOnly operations are accesible from RMI Connector with readOnly user
diff --git a/geode-core/src/test/java/org/apache/geode/management/model/Item.java b/geode-core/src/test/java/org/apache/geode/management/model/Item.java
index d8120cf..208b6bc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/model/Item.java
+++ b/geode-core/src/test/java/org/apache/geode/management/model/Item.java
@@ -68,7 +68,7 @@ public class Item implements Serializable {
}
/**
- *
+ *
*/
public Item() {}
diff --git a/geode-core/src/test/java/org/apache/geode/management/model/Order.java b/geode-core/src/test/java/org/apache/geode/management/model/Order.java
index 5eeaec6..5c51e1c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/model/Order.java
+++ b/geode-core/src/test/java/org/apache/geode/management/model/Order.java
@@ -62,7 +62,7 @@ public class Order implements Serializable {
}
/**
- *
+ *
*/
public Order() {
this.items = new ArrayList<Item>();
diff --git a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java
index c08ae1e..9f813a0 100644
--- a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java
@@ -29,6 +29,10 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+import net.spy.memcached.BinaryConnectionFactory;
+import net.spy.memcached.ConnectionFactoryBuilder;
+import net.spy.memcached.FailureMode;
+import net.spy.memcached.MemcachedClient;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheLoader;
@@ -43,11 +47,6 @@ import org.apache.geode.internal.memcached.KeyWrapper;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import net.spy.memcached.BinaryConnectionFactory;
-import net.spy.memcached.ConnectionFactoryBuilder;
-import net.spy.memcached.FailureMode;
-import net.spy.memcached.MemcachedClient;
-
/**
* Test for binary protocol
*/
diff --git a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
index c18ad6c..4760eeb 100644
--- a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
@@ -14,18 +14,8 @@
*/
package org.apache.geode.memcached;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import net.spy.memcached.CASResponse;
-import net.spy.memcached.CASValue;
-import net.spy.memcached.MemcachedClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.net.InetAddress;
@@ -37,8 +27,19 @@ import java.util.concurrent.Future;
import java.util.logging.Logger;
import java.util.logging.StreamHandler;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import net.spy.memcached.CASResponse;
+import net.spy.memcached.CASValue;
+import net.spy.memcached.MemcachedClient;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class GemcachedDevelopmentJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
index 81086bd..41c1b33 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
@@ -14,6 +14,24 @@
*/
package org.apache.geode.pdx;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.*;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.SerializationException;
import org.apache.geode.cache.CacheFactory;
@@ -27,23 +45,6 @@ import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.*;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
@Category({IntegrationTest.class, SerializationTest.class})
public class AutoSerializableJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
index bd1d7cb..f35ac41 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
@@ -26,8 +26,6 @@ import java.nio.IntBuffer;
import java.nio.LongBuffer;
import java.nio.ShortBuffer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -35,6 +33,8 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
@Category({IntegrationTest.class, SerializationTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
index e1a6062..b67cc48 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -70,6 +69,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
@Category({DistributedTest.class, SerializationTest.class})
public class ClientsWithVersioningRetryDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
index d7d74fa..211ccc7 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
@@ -23,8 +23,6 @@ import java.util.List;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.SerializationTest;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.After;
@@ -43,7 +41,9 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
+import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
@Category({IntegrationTest.class, SerializationTest.class})
public class JSONFormatterJUnitTest {
@@ -324,5 +324,3 @@ public class JSONFormatterJUnitTest {
}
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
index 396eb1d..ae64bf2 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
@@ -392,10 +392,10 @@ public class JSONPdxClientServerDUnitTest extends JUnit4CacheTestCase {
assertEquals("Pdx are not equal; json filename " + jd.getFileName(), pdx, pdx2);
}
- protected final static int INT_TAB = '\t';
- protected final static int INT_LF = '\n';
- protected final static int INT_CR = '\r';
- protected final static int INT_SPACE = 0x0020;
+ protected static final int INT_TAB = '\t';
+ protected static final int INT_LF = '\n';
+ protected static final int INT_CR = '\r';
+ protected static final int INT_SPACE = 0x0020;
public String jsonParse(String jsonSting) {
@@ -682,5 +682,3 @@ public class JSONPdxClientServerDUnitTest extends JUnit4CacheTestCase {
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/NestedPdx.java b/geode-core/src/test/java/org/apache/geode/pdx/NestedPdx.java
index 836bf7f..1fba323 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/NestedPdx.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/NestedPdx.java
@@ -106,4 +106,3 @@ public class NestedPdx implements PdxSerializable {
+ ", myString2=" + myString2 + ", myFloat=" + myFloat + "]";
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
index 9c88a87..e173991 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
@@ -20,8 +20,8 @@ import java.nio.ByteBuffer;
import org.junit.experimental.categories.Category;
-import org.apache.geode.internal.offheap.OffHeapStoredObject;
import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
+import org.apache.geode.internal.offheap.OffHeapStoredObject;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
index b72f57e..70c6a5a 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
@@ -18,12 +18,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.experimental.categories.Category;
-import org.apache.geode.internal.offheap.OffHeapStoredObject;
+import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
import org.apache.geode.internal.offheap.NullOffHeapMemoryStats;
import org.apache.geode.internal.offheap.NullOutOfOffHeapMemoryListener;
-import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
-import org.apache.geode.internal.offheap.StoredObject;
+import org.apache.geode.internal.offheap.OffHeapStoredObject;
import org.apache.geode.internal.offheap.SlabImpl;
+import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.internal.tcp.ByteBufferInputStream.OffHeapByteSource;
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
index 2753554..b5a9de4 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
@@ -14,20 +14,14 @@
*/
package org.apache.geode.pdx;
-import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.List;
import java.util.Properties;
import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
@@ -44,6 +38,10 @@ import org.apache.geode.internal.Version;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
@Category({DistributedTest.class, SerializationTest.class})
public class PDXAsyncEventQueueDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
index 114039d..8d0a2bb 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
@@ -20,7 +20,19 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.ToDataException;
import org.apache.geode.cache.Cache;
@@ -45,17 +57,6 @@ import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
/**
*
@@ -385,7 +386,7 @@ public class PdxAttributesJUnitTest {
/**
* Test that loner VMs lazily determine if they are a client or a peer.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index 6fcdf4c..37d5da0 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -21,6 +21,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -52,13 +60,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.Properties;
@Category({DistributedTest.class, SerializationTest.class})
public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
index 52c0083..f323419 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
@@ -14,18 +14,13 @@
*/
package org.apache.geode.pdx;
-import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.IOException;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.SerializationException;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheLoader;
@@ -53,12 +48,16 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
/**
* A test to ensure that we do not deserialize PDX objects when we shouldn't
- *
+ *
* This test is trying to cover all of the possible access paths.
- *
+ *
*
*/
@Category({DistributedTest.class, SerializationTest.class})
@@ -120,15 +119,15 @@ public class PdxDeserializationDUnitTest extends JUnit4CacheTestCase {
/**
* This test creates the following topology
- *
+ *
* vm0 a peer accessor for both a PR and a replicate region vm1 a peer data store for a replicate
* region and a PR vm2 a client of vm0 vm3 a client vm1
- *
+ *
* The test then performs all region operations in operationVM, while deserialization is prevented
* in disallowDeserializationVM.
- *
+ *
* If an operation causes a deserialization in the disallow VM, this test will fail.
- *
+ *
* @param operationVM
* @param disallowDeserializationVM
*/
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
index 55e5fb9..df7002e 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
@@ -14,6 +14,17 @@
*/
package org.apache.geode.pdx;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.*;
+import java.util.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheFactory;
@@ -26,16 +37,6 @@ import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.pdx.internal.*;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
@Category({IntegrationTest.class, SerializationTest.class})
public class PdxInstanceFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
index 1c6671c..5e3f76a 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
@@ -14,19 +14,8 @@
*/
package org.apache.geode.pdx;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
-import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@@ -36,8 +25,20 @@ import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
import java.util.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
+import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
/**
*
@@ -399,7 +400,7 @@ public class PdxInstanceJUnitTest {
- static abstract class TestPdx implements PdxSerializable {
+ abstract static class TestPdx implements PdxSerializable {
public void fromData(PdxReader in) {}
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
index 1008702..71e8895 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
@@ -19,6 +19,14 @@ import static org.apache.geode.internal.Assert.fail;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheEvent;
@@ -48,13 +56,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
@Category({DistributedTest.class, SerializationTest.class})
public class PdxSerializableDUnitTest extends JUnit4CacheTestCase {
@@ -448,7 +449,7 @@ public class PdxSerializableDUnitTest extends JUnit4CacheTestCase {
assertEquals(ANOBJECT, r.get(1));
}
- static private class MyTestTransactionListener implements TransactionWriter, TransactionListener {
+ private static class MyTestTransactionListener implements TransactionWriter, TransactionListener {
private MyTestTransactionListener() {
}
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index d1502cd..d83bf60 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -21,6 +21,30 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.CopyHelper;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -47,29 +71,6 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.ByteBuffer;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
@Category({IntegrationTest.class, SerializationTest.class})
public class PdxSerializableJUnitTest {
@@ -1407,7 +1408,7 @@ public class PdxSerializableJUnitTest {
/**
* Init fields using base as appropriate, but does not initialize aQueryObject field.
- *
+ *
* @param base The base value for all fields. Fields are all set to a value using base as
* appropriate.
* @param useNulls If true, fill in nulls for those fields that can be set to null (to test null
@@ -1494,7 +1495,7 @@ public class PdxSerializableJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -1725,7 +1726,7 @@ public class PdxSerializableJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.pdx.PdxSerializable#toData(org.apache.geode. pdx.PdxWriter)
*/
public void toData(PdxWriter out) {
@@ -1734,7 +1735,7 @@ public class PdxSerializableJUnitTest {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.geode.pdx.PdxSerializable#fromData(org.apache.geode .pdx.PdxReader)
*/
public void fromData(PdxReader in) {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
index c80a3f8..3790e60 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,6 +33,7 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
@Category({IntegrationTest.class, SerializationTest.class})
public class PdxStringJUnitTest {
@@ -160,7 +160,7 @@ public class PdxStringJUnitTest {
/**
* this test verifies that pdxstream with pdxType.Object tyep for string and checks whether we
* create PdxString or not
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
index 0edfa28..2799c2c 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
@@ -14,21 +14,16 @@
*/
package org.apache.geode.pdx;
-import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Collection;
import com.examples.snapshot.MyObjectPdx;
import com.examples.snapshot.MyObjectPdx.MyEnumPdx;
import com.examples.snapshot.MyPdxSerializer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -46,6 +41,10 @@ import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
@Category({DistributedTest.class, SerializationTest.class})
public class PdxTypeExportDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/TestObjectForJSONFormatter.java b/geode-core/src/test/java/org/apache/geode/pdx/TestObjectForJSONFormatter.java
index 5d85d66..364dff6 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/TestObjectForJSONFormatter.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/TestObjectForJSONFormatter.java
@@ -1016,5 +1016,3 @@ public class TestObjectForJSONFormatter implements PdxSerializable {
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
index e3ebcf7..2b5ee07 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
@@ -14,14 +14,12 @@
*/
package org.apache.geode.redis;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.Random;
-import org.apache.geode.redis.GeodeRedisServer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,11 +27,13 @@ import org.junit.experimental.categories.Category;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.exceptions.JedisDataException;
-import java.io.IOException;
-import java.util.Random;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class AuthJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java b/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
index 759ee35..760eb59 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.redis;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertFalse;
-import org.apache.geode.redis.GeodeRedisServer;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -29,9 +25,13 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertFalse;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ConcurrentStartTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
index 5a8ce35..f797f2e 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
@@ -14,13 +14,12 @@
*/
package org.apache.geode.redis;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
-import org.apache.geode.redis.GeodeRedisServer;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -28,11 +27,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import redis.clients.jedis.Jedis;
-import java.io.IOException;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class HashesJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
index c8e8d0c..8398765 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
@@ -14,12 +14,14 @@
*/
package org.apache.geode.redis;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
-import org.apache.geode.redis.GeodeRedisServer;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -27,13 +29,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import redis.clients.jedis.Jedis;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ListsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java b/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
index fcef010..db82c01 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.redis;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
@Category(IntegrationTest.class)
public class RedisServerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
index aaa7724..2122570 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
@@ -20,23 +20,24 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import redis.clients.jedis.Jedis;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class SetsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
index 633cb3d..7cbf210 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.redis;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
-import org.apache.geode.redis.GeodeRedisServer;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -28,12 +29,11 @@ import org.junit.experimental.categories.Category;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.Tuple;
-import java.io.IOException;
-import java.util.*;
-import java.util.Map.Entry;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class SortedSetsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java b/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
index 6d11a71..a3c5868 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.redis;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
-import org.apache.geode.redis.GeodeRedisServer;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -27,11 +27,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import redis.clients.jedis.Jedis;
-import java.io.IOException;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class StringsJunitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
index 74761bb..618e279 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.redis.internal.executor;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.regex.Pattern;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.regex.Pattern;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class AbstractScanExecutorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java b/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
index 94e0be5..db67374 100644
--- a/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
@@ -19,6 +19,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.InternalCache;
@@ -27,12 +34,6 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.templates.DummyAuthenticator;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
public class CacheFactoryWithSecurityObjectTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
index fef1d97..0035750 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
@@ -17,17 +17,18 @@ package org.apache.geode.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientAuthDUnitTest extends JUnit4DistributedTestCase {
@@ -58,5 +59,3 @@ public class ClientAuthDUnitTest extends JUnit4DistributedTestCase {
});
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
index 7a8e322..276272e 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,23 +17,23 @@ package org.apache.geode.security;
import java.util.Collection;
import java.util.List;
-import org.apache.geode.test.dunit.standalone.VersionManager;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.apache.geode.test.dunit.standalone.VersionManager;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+
/**
* Test for authentication from client to server. This tests for both valid and invalid
* credentials/modules. It also checks for authentication success/failure in case of failover and
* for the notification channel.
- *
+ *
* @since GemFire 5.5
*/
@Category({DistributedTest.class, SecurityTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java
index 417bb50..d466396 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java
@@ -15,9 +15,9 @@
package org.apache.geode.security;
import static org.apache.geode.internal.AvailablePort.*;
+import static org.apache.geode.security.ClientAuthenticationTestUtils.*;
import static org.apache.geode.security.ClientAuthenticationTestUtils.createCacheClient;
import static org.apache.geode.security.ClientAuthenticationTestUtils.createCacheServer;
-import static org.apache.geode.security.ClientAuthenticationTestUtils.*;
import static org.apache.geode.security.SecurityTestUtils.*;
import static org.apache.geode.security.SecurityTestUtils.createCacheClient;
import static org.apache.geode.test.dunit.IgnoredException.*;
@@ -28,6 +28,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
+
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java
index e42f889..d5b6e8a 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java
@@ -26,13 +26,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.internal.AvailablePortHelper;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.apache.geode.cache.operations.OperationContext.OperationCode;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.security.generator.AuthzCredentialGenerator;
import org.apache.geode.security.generator.CredentialGenerator;
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
index 6ebdd91..eaf80db 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
@@ -53,8 +53,8 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.internal.AvailablePort.*;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.security.generator.AuthzCredentialGenerator;
import org.apache.geode.security.generator.AuthzCredentialGenerator.ClassCode;
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java
index e866938..fc2c25d 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java
@@ -19,6 +19,11 @@ import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -26,13 +31,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientContainsKeyAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java
index 66bdacf..e83aa4a 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java
@@ -17,22 +17,22 @@ package org.apache.geode.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.junit.Assert.*;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientDestroyInvalidateAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java
index 19231b3..db81c8f 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java
@@ -17,6 +17,10 @@ package org.apache.geode.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -24,12 +28,9 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientDestroyRegionAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java
index a9fd0ac..fe18ad3 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java
@@ -36,9 +36,9 @@ import org.apache.geode.management.internal.security.TestFunctions.WriteFunction
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientExecuteFunctionAuthDUnitTest extends JUnit4DistributedTestCase {
@@ -105,5 +105,3 @@ public class ClientExecuteFunctionAuthDUnitTest extends JUnit4DistributedTestCas
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java
index f6e04c0..12dc2d3 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java
@@ -38,9 +38,9 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientExecuteRegionFunctionAuthDUnitTest extends JUnit4DistributedTestCase {
@@ -84,5 +84,3 @@ public class ClientExecuteRegionFunctionAuthDUnitTest extends JUnit4DistributedT
});
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java
index a3566bb..9b5f566 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java
@@ -20,21 +20,22 @@ import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
import static org.jgroups.util.Util.assertEquals;
+import java.util.Arrays;
+import java.util.Map;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Arrays;
-import java.util.Map;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientGetAllAuthDUnitTest extends JUnit4DistributedTestCase {
@@ -72,5 +73,3 @@ public class ClientGetAllAuthDUnitTest extends JUnit4DistributedTestCase {
});
}
}
-
-
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java
index 0560973..9309353 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java
@@ -19,6 +19,11 @@ import static org.apache.geode.security.SecurityTestUtil.assertNotAuthorized;
import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -27,13 +32,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientGetEntryAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java
index b813e49..c312294 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java
@@ -20,6 +20,17 @@ import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
import static org.junit.Assert.assertEquals;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -27,19 +38,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientGetPutAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java
index 8ad2b51..7aae67d 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java
@@ -19,6 +19,10 @@ import static org.apache.geode.security.SecurityTestUtil.assertNotAuthorized;
import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -26,12 +30,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientRegionClearAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java
index 21da780..bc48411 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java
@@ -19,6 +19,13 @@ import static org.apache.geode.security.SecurityTestUtil.assertNotAuthorized;
import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -27,15 +34,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientRegisterInterestAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java
index 2269ba2..ce58aaa 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java
@@ -20,6 +20,12 @@ import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
import static org.junit.Assert.assertFalse;
+import java.util.Arrays;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -27,14 +33,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Arrays;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientRemoveAllAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java
index a3e4c91..62fa205 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java
@@ -18,6 +18,10 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANA
import static org.apache.geode.security.SecurityTestUtil.createClientCache;
import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -25,12 +29,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientUnregisterInterestAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index 339e45d..15398f9 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -33,9 +33,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClusterConfigWithoutSecurityDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
index 5eaadac..b04c361 100644
--- a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
@@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.*;
import java.io.NotSerializableException;
import java.io.Serializable;
+
import javax.naming.NamingException;
import org.apache.commons.lang.SerializationUtils;
diff --git a/geode-core/src/test/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java
index 46ff2b2..d332149 100644
--- a/geode-core/src/test/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java
@@ -23,6 +23,15 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -32,17 +41,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class NoShowValue1PostProcessorDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
index 8517b90..91d2f4e 100644
--- a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.*;
import java.io.NotSerializableException;
import java.io.Serializable;
import java.security.Principal;
+
import javax.naming.NamingException;
import org.apache.commons.lang.SerializationUtils;
diff --git a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
index 4c473a5..cfcc23f 100644
--- a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
@@ -51,7 +51,7 @@ import org.apache.geode.test.junit.categories.SecurityTest;
/**
* Tests peer to peer authentication in Gemfire
- *
+ *
* @since GemFire 5.5
*/
@Category({DistributedTest.class, SecurityTest.class})
@@ -315,7 +315,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase {
/**
* The strategy is to test view change reject by having two different authenticators on different
* VMs.
- *
+ *
* Here locator will accept the credentials from peer2 but the first peer will reject them due to
* different authenticator. Hence the number of members reported by the first peer should be only
* two while others will report as three.
@@ -429,7 +429,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase {
/**
* The strategy is to test credential size greater than UDP datagram size.
- *
+ *
* Here locator will accept the credentials from peer2 and the large credential from the first
* peer. Number of members in the DS should be four
*/
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java
index 8b99dd9..7e19194 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java
@@ -16,12 +16,12 @@ package org.apache.geode.security;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.pdx.SimpleClass;
-import org.apache.geode.pdx.internal.PdxInstanceImpl;
-
import java.util.Arrays;
import java.util.Properties;
+import org.apache.geode.pdx.SimpleClass;
+import org.apache.geode.pdx.internal.PdxInstanceImpl;
+
public class PDXPostProcessor implements PostProcessor {
private static final byte[] BYTES = {1, 0};
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
index 284a19d..1e051d7 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
@@ -47,10 +47,10 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@Category({DistributedTest.class, SecurityTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
index 69eba53..6264b04 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
@@ -29,9 +29,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.templates.DummyAuthenticator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class PeerAuthenticatorDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
index 6999835..9233bdc 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
@@ -20,18 +20,19 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER
import static org.apache.geode.test.dunit.Host.getHost;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import java.util.Properties;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.security.templates.DummyAuthenticator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class PeerSecurityWithEmbeddedLocatorDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/PostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PostProcessorDUnitTest.java
index 9f17c48..49839ff 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PostProcessorDUnitTest.java
@@ -21,6 +21,15 @@ import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -34,17 +43,9 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class PostProcessorDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index a8927d4..92eb608 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -24,19 +24,20 @@ import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class SecurityClusterConfigDUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java
index 8727406..b0ab1ad 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java
@@ -29,6 +29,14 @@ import static org.apache.geode.test.dunit.Host.getHost;
import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.security.IntegratedSecurityService;
@@ -38,13 +46,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.Properties;
@Category({DistributedTest.class, SecurityTest.class})
public class SecurityManagerLifecycleDistributedTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
index f00b03a..fff53a9 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
@@ -19,18 +19,19 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
public class SecurityManagerLifecycleIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
index bb22588..eef1301 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
@@ -19,16 +19,17 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Properties;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.security.ResourcePermission.Target;
+
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-
-import java.util.Properties;
+import org.apache.geode.security.ResourcePermission.Target;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category({UnitTest.class, SecurityTest.class})
public class SimpleSecurityManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/TestSecurityManager.java b/geode-core/src/test/java/org/apache/geode/security/TestSecurityManager.java
index e7fbf8f..0034d87 100644
--- a/geode-core/src/test/java/org/apache/geode/security/TestSecurityManager.java
+++ b/geode-core/src/test/java/org/apache/geode/security/TestSecurityManager.java
@@ -14,14 +14,6 @@
*/
package org.apache.geode.security;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.IOUtils;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.shiro.authz.Permission;
-import org.apache.geode.security.ResourcePermission.Operation;
-import org.apache.geode.security.ResourcePermission.Resource;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
@@ -36,6 +28,15 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.shiro.authz.Permission;
+
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.security.ResourcePermission.Operation;
+import org.apache.geode.security.ResourcePermission.Resource;
+
/**
* This class provides a sample implementation of {@link SecurityManager} for authentication and
* authorization initialized from data provided as JSON.
@@ -53,7 +54,7 @@ import java.util.stream.StreamSupport;
*
* <p>
* The format of the JSON for configuration is as follows:
- *
+ *
* <pre>
* <code>
* {
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
index 3a61bfc..c97939b 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
@@ -34,7 +34,7 @@ import org.apache.geode.security.templates.XmlAuthorization;
* Encapsulates obtaining authorized and unauthorized credentials for a given operation in a region.
* Implementations will be for different kinds of authorization scheme and authentication scheme
* combos.
- *
+ *
* @since GemFire 5.5
*/
public abstract class AuthzCredentialGenerator {
@@ -56,9 +56,9 @@ public abstract class AuthzCredentialGenerator {
* A factory method to create a new instance of an {@link AuthzCredentialGenerator} for the given
* {@link ClassCode}. Caller is supposed to invoke {@link AuthzCredentialGenerator#init}
* immediately after obtaining the instance.
- *
+ *
* @param classCode the {@code ClassCode} of the {@code AuthzCredentialGenerator} implementation
- *
+ *
* @return an instance of {@code AuthzCredentialGenerator} for the given class code
*/
public static AuthzCredentialGenerator create(final ClassCode classCode) {
@@ -74,10 +74,10 @@ public abstract class AuthzCredentialGenerator {
/**
* Initialize the authorized credential generator.
- *
+ *
* @param generator an instance of {@link CredentialGenerator} of the credential implementation
* for which to obtain authorized/unauthorized credentials.
- *
+ *
* @return false when the given {@link CredentialGenerator} is incompatible with this
* authorization module.
*/
@@ -92,7 +92,7 @@ public abstract class AuthzCredentialGenerator {
}
/**
- *
+ *
* @return A set of extra properties that should be added to Gemfire system properties when not
* null.
*/
@@ -122,7 +122,7 @@ public abstract class AuthzCredentialGenerator {
/**
* The {@link ClassCode} of the particular implementation.
- *
+ *
* @return the {@code ClassCode}
*/
public abstract ClassCode classCode();
@@ -130,7 +130,7 @@ public abstract class AuthzCredentialGenerator {
/**
* The name of the {@link AccessControl} factory function that should be used as the authorization
* module on the server side.
- *
+ *
* @return name of the {@code AccessControl} factory function
*/
public abstract String getAuthorizationCallback();
@@ -138,13 +138,13 @@ public abstract class AuthzCredentialGenerator {
/**
* Get a set of credentials generated using the given index allowed to perform the given
* {@link OperationCode}s for the given regions.
- *
+ *
* @param opCodes the list of {@link OperationCode}s of the operations requiring authorization;
* should not be null
* @param regionNames list of the region names requiring authorization; a value of null indicates
* all regions
* @param index used to generate multiple such credentials by passing different values for this
- *
+ *
* @return the set of credentials authorized to perform the given operation in the given regions
*/
public Properties getAllowedCredentials(final OperationCode[] opCodes, final String[] regionNames,
@@ -169,13 +169,13 @@ public abstract class AuthzCredentialGenerator {
* Get a set of credentials generated using the given index not allowed to perform the given
* {@link OperationCode}s for the given regions. The credentials are required to be valid for
* authentication.
- *
+ *
* @param opCodes the {@link OperationCode}s of the operations requiring authorization failure;
* should not be null
* @param regionNames list of the region names requiring authorization failure; a value of null
* indicates all regions
* @param index used to generate multiple such credentials by passing different values for this
- *
+ *
* @return the set of credentials that are not authorized to perform the given operation in the
* given region
*/
@@ -209,16 +209,16 @@ public abstract class AuthzCredentialGenerator {
* principals for values of {@code index} from 0 through (n-1) where {@code n} is the value
* returned by this method. It is recommended that the principals so returned be unique for
* efficiency.
- *
+ *
* This will be used by {@link #getAllowedCredentials} to step through different principals and
* obtain a set of valid credentials.
- *
+ *
* Required to be implemented by concrete classes that implement this abstract class.
- *
+ *
* @param opCodes the {@link OperationCode}s of the operations requiring authorization
* @param regionNames list of the region names requiring authorization; a value of null indicates
* all regions
- *
+ *
* @return the number of principals allowed to perform the given operation in the given region
*/
protected abstract int getNumPrincipalTries(final OperationCode[] opCodes,
@@ -227,14 +227,14 @@ public abstract class AuthzCredentialGenerator {
/**
* Get a {@link Principal} generated using the given index allowed to perform the given
* {@link OperationCode}s for the given region.
- *
+ *
* Required to be implemented by concrete classes that implement this abstract class.
- *
+ *
* @param opCodes the {@link OperationCode}s of the operations requiring authorization
* @param regionNames list of the region names requiring authorization; a value of null indicates
* all regions
* @param index used to generate multiple such principals by passing different values for this
- *
+ *
* @return the {@link Principal} authorized to perform the given operation in the given region
*/
protected abstract Principal getAllowedPrincipal(final OperationCode[] opCodes,
@@ -243,14 +243,14 @@ public abstract class AuthzCredentialGenerator {
/**
* Get a {@link Principal} generated using the given index not allowed to perform the given
* {@link OperationCode}s for the given region.
- *
+ *
* Required to be implemented by concrete classes that implement this abstract class.
- *
+ *
* @param opCodes the {@link OperationCode}s of the operations requiring authorization failure
* @param regionNames list of the region names requiring authorization failure; a value of null
* indicates all regions
* @param index used to generate multiple such principals by passing different values for this
- *
+ *
* @return a {@link Principal} not authorized to perform the given operation in the given region
*/
protected abstract Principal getDisallowedPrincipal(final OperationCode[] opCodes,
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
index 0ab4252..86dac81 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
@@ -34,7 +34,7 @@ import org.apache.geode.security.templates.PKCSAuthenticator;
/**
* Encapsulates obtaining valid and invalid credentials. Implementations will be for different kinds
* of authentication schemes.
- *
+ *
* @since GemFire 5.5
*/
public abstract class CredentialGenerator {
@@ -57,9 +57,9 @@ public abstract class CredentialGenerator {
* A factory method to create a new instance of an {@link CredentialGenerator} for the given
* {@link ClassCode}. Caller is supposed to invoke {@link CredentialGenerator#init} immediately
* after obtaining the instance.
- *
+ *
* @param classCode the {@code ClassCode} of the {@code CredentialGenerator} implementation
- *
+ *
* @return an instance of {@code CredentialGenerator} for the given class code
*/
public static CredentialGenerator create(final ClassCode classCode) {
@@ -106,7 +106,7 @@ public abstract class CredentialGenerator {
/**
* The {@link ClassCode} of this particular implementation.
- *
+ *
* @return the {@code ClassCode}
*/
public abstract ClassCode classCode();
@@ -114,7 +114,7 @@ public abstract class CredentialGenerator {
/**
* The name of the {@link AuthInitialize} factory function that should be used in conjunction with
* the credentials generated by this generator.
- *
+ *
* @return name of the {@code AuthInitialize} factory function
*/
public abstract String getAuthInit();
@@ -122,7 +122,7 @@ public abstract class CredentialGenerator {
/**
* The name of the {@link Authenticator} factory function that should be used in conjunction with
* the credentials generated by this generator.
- *
+ *
* @return name of the {@code Authenticator} factory function
*/
public abstract String getAuthenticator();
@@ -134,7 +134,7 @@ public abstract class CredentialGenerator {
/**
* Get a set of valid credentials for the given {@link Principal}.
- *
+ *
* @return credentials for the given {@code Principal} or null if none possible.
*/
public abstract Properties getValidCredentials(final Principal principal);
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
index 85cd7c7..804ba32 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.security.generator;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.security.Principal;
+import java.util.Properties;
+import java.util.Random;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.logging.LogService;
@@ -21,13 +29,6 @@ import org.apache.geode.security.templates.LdapUserAuthenticator;
import org.apache.geode.security.templates.UserPasswordAuthInit;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.util.test.TestUtil;
-import org.apache.logging.log4j.Logger;
-
-import java.security.Principal;
-import java.util.Properties;
-import java.util.Random;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
public class LdapUserCredentialGenerator extends CredentialGenerator {
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
index 6126b9b..58f50a9 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
@@ -14,16 +14,17 @@
*/
package org.apache.geode.security.generator;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.logging.log4j.Logger;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.io.File;
import java.io.IOException;
import java.security.Principal;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.security.AuthenticationFailedException;
public class SSLCredentialGenerator extends CredentialGenerator {
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java b/geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
index ef43787..4ffb7c1 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
@@ -14,21 +14,21 @@
*/
package org.apache.geode.security.generator;
+import java.util.Iterator;
+import java.util.Properties;
+
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.security.AuthInitialize;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.templates.UserPasswordAuthInit;
-import java.util.Iterator;
-import java.util.Properties;
-
/**
* An {@link AuthInitialize} implementation that obtains the user name and password as the
* credentials from the given set of properties. If keep-extra-props property exits, it will copy
* rest of the properties provided in getCredential props argument will also be copied as new
* credentials.
- *
+ *
* @since GemFire 5.5
*/
public class UserPasswordWithExtraPropsAuthInit extends UserPasswordAuthInit {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/DummyAuthorization.java b/geode-core/src/test/java/org/apache/geode/security/templates/DummyAuthorization.java
index ea72bd4..6c3c6fe 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/DummyAuthorization.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/DummyAuthorization.java
@@ -29,7 +29,7 @@ import org.apache.geode.security.NotAuthorizedException;
/**
* A dummy implementation of the {@code AccessControl} interface that allows authorization depending
* on the format of the {@code Principal} string.
- *
+ *
* @since GemFire 5.5
*/
public class DummyAuthorization implements AccessControl {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/FunctionSecurityPrmsHolder.java b/geode-core/src/test/java/org/apache/geode/security/templates/FunctionSecurityPrmsHolder.java
index 2453051..3b2e8db 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/FunctionSecurityPrmsHolder.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/FunctionSecurityPrmsHolder.java
@@ -19,7 +19,7 @@ import java.util.Set;
/**
* This is a sample class for objects which hold information of the authorized function names and
* authorized value for the {@code optimizeForWrite}.
- *
+ *
* @since GemFire 6.0
*/
public class FunctionSecurityPrmsHolder {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/LdapUserAuthenticator.java b/geode-core/src/test/java/org/apache/geode/security/templates/LdapUserAuthenticator.java
index cebba74..1dc982b 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/LdapUserAuthenticator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/LdapUserAuthenticator.java
@@ -16,6 +16,7 @@ package org.apache.geode.security.templates;
import java.security.Principal;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthInit.java b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthInit.java
index 08a885f..46f68c1 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthInit.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthInit.java
@@ -33,11 +33,11 @@ import org.apache.geode.security.AuthenticationFailedException;
/**
* An {@link AuthInitialize} implementation that obtains the digital signature for use with PKCS
* scheme on server from the given set of properties.
- *
+ *
* To use this class the {@code security-client-auth-init} property should be set to the fully
* qualified name the static {@code create} function viz.
* {@code org.apache.geode.security.templates.PKCSAuthInit.create}
- *
+ *
* @since GemFire 5.5
*/
public class PKCSAuthInit implements AuthInitialize {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/UserPasswordAuthInit.java b/geode-core/src/test/java/org/apache/geode/security/templates/UserPasswordAuthInit.java
index 26afaa2..798e7fe 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/UserPasswordAuthInit.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/UserPasswordAuthInit.java
@@ -24,11 +24,11 @@ import org.apache.geode.security.AuthenticationFailedException;
/**
* An {@link AuthInitialize} implementation that obtains the user name and password as the
* credentials from the given set of properties.
- *
+ *
* To use this class the {@code security-client-auth-init} property should be set to the fully
* qualified name the static {@code create} method viz.
* {@code org.apache.geode.security.templates.UserPasswordAuthInit.create}
- *
+ *
* @since GemFire 5.5
*/
public class UserPasswordAuthInit implements AuthInitialize {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipal.java b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipal.java
index c9aa41f..ff4458e 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipal.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipal.java
@@ -19,7 +19,7 @@ import java.security.Principal;
/**
* An implementation of {@link Principal} class for a simple user name.
- *
+ *
* @since GemFire 5.5
*/
public class UsernamePrincipal implements Principal, Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/XmlAuthorization.java b/geode-core/src/test/java/org/apache/geode/security/templates/XmlAuthorization.java
index f9f1f75..2ad2adc 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/XmlAuthorization.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/XmlAuthorization.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -50,18 +51,18 @@ import org.apache.geode.security.NotAuthorizedException;
/**
* An implementation of the {@link AccessControl} interface that allows authorization using the
* permissions as specified in the given XML file.
- *
+ *
* The format of the XML file is specified in <a href="authz5_5.dtd"/>. It implements a role-based
* authorization at the operation level for each region. Each principal name may be associated with
* a set of roles. The name of the principal is obtained using the {@link Principal#getName()}
* method and no other information of the principal is utilized. Each role can be provided
* permissions to execute operations for each region.
- *
+ *
* The top-level element in the XML is "acl" tag that contains the "role" and "permission" tags. The
* "role" tag contains the list of users that have been given that role. The name of the role is
* specified in the "role" attribute and the users are contained in the "user" tags insided the
* "role" tag.
- *
+ *
* The "permissions" tag contains the list of operations allowed for a particular region. The role
* name is specified as the "role" attribute, the list of comma separated region names as the
* optional "regions" attribute and the operation names are contained in the "operation" tags inside
@@ -69,7 +70,7 @@ import org.apache.geode.security.NotAuthorizedException;
* REGISTER_INTEREST, UNREGISTER_INTEREST, CONTAINS_KEY, KEY_SET, QUERY, EXECUTE_CQ, STOP_CQ,
* CLOSE_CQ, REGION_CLEAR, REGION_CREATE, REGION_DESTROY. These correspond to the operations in the
* {@link OperationCode} enumeration with the same name.
- *
+ *
* When no region name is specified then the operation is allowed for all regions in the cache. Any
* permissions specified for regions using the "regions" attribute override these permissions. This
* allows users to provide generic permissions without any region name, and override for specific
@@ -79,15 +80,15 @@ import org.apache.geode.security.NotAuthorizedException;
* {@link OperationCode#QUERY} operation is permitted when either the {@code QUERY} permission is
* provided at the cache-level for the user or when {@code QUERY} permission is provided for all the
* regions that are part of the query string.
- *
+ *
* Any roles specified in the "user" tag that do not have a specified permission set using the
* "permission" tags are ignored. When no {@link Principal} is associated with the current
* connection, then empty user name is used to search for the roles so an empty user name can be
* used to specify roles of unauthenticated clients (i.e. {@code Everyone}).
- *
+ *
* This sample implementation is useful only for pre-operation checks and should not be used for
* post-operation authorization since it does nothing useful for post-operation case.
- *
+ *
* @since GemFire 5.5
*/
public class XmlAuthorization implements AccessControl {
@@ -210,18 +211,18 @@ public class XmlAuthorization implements AccessControl {
/**
* Initialize the {@code XmlAuthorization} callback for a client having the given principal.
- *
+ *
* This method caches the full XML authorization file the first time it is invoked and caches all
* the permissions for the provided {@code principal} to speed up lookup the
* {@code authorizeOperation} calls. The permissions for the principal are maintained as a
* {@link Map} of region name to the {@link HashSet} of operations allowed for that region. A
* global entry with region name as empty string is also made for permissions provided for all the
* regions.
- *
+ *
* @param principal the principal associated with the authenticated client
* @param cache reference to the cache object
* @param remoteMember the {@link DistributedMember} object for the remote authenticated client
- *
+ *
* @throws NotAuthorizedException if some exception condition happens during the initialization
* while reading the XML; in such a case all subsequent client operations will throw
* {@code NotAuthorizedException}
@@ -267,15 +268,15 @@ public class XmlAuthorization implements AccessControl {
/**
* Return true if the given operation is allowed for the cache/region.
- *
+ *
* This looks up the cached permissions of the principal in the map for the provided region name.
* If none are found then the global permissions with empty region name are looked up. The
* operation is allowed if it is found this permission list.
- *
+ *
* @param regionName When null then it indicates a cache-level operation, else the name of the
* region for the operation.
* @param context the data required by the operation
- *
+ *
* @return true if the operation is authorized and false otherwise
*/
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/XmlErrorHandler.java b/geode-core/src/test/java/org/apache/geode/security/templates/XmlErrorHandler.java
index 2b3d1e7..d8de6c5 100755
--- a/geode-core/src/test/java/org/apache/geode/security/templates/XmlErrorHandler.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/XmlErrorHandler.java
@@ -24,10 +24,10 @@ import org.apache.geode.internal.logging.LogService;
/**
* Implementation of {@link ErrorHandler} interface to handle validation errors while XML parsing.
- *
+ *
* This throws back exceptions raised for {@code error} and {@code fatalError} cases while a
* {@link LogWriter#warning(String)} level logging is done for the {@code warning} case.
- *
+ *
* @since GemFire 5.5
*/
public class XmlErrorHandler implements ErrorHandler {
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/LineMapper.java b/geode-core/src/test/java/org/apache/geode/sequence/LineMapper.java
index 6e4d27e..b0462c9 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/LineMapper.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/LineMapper.java
@@ -17,7 +17,7 @@ package org.apache.geode.sequence;
/**
* An interface for mapping a lifeline name to a shorter version of the same line. This could also
* consolodate multiple lifelines onto a single line.
- *
+ *
* The most common case for this is that a lifeline represents a VM that is restarted several times.
* Eg time, the line name changes, but we want to put all of the states for that "logical" vm on the
* same line.
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java b/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java
index f18d00c..59181b6 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java
@@ -14,13 +14,6 @@
*/
package org.apache.geode.sequence;
-import org.apache.geode.internal.sequencelog.model.GraphID;
-import org.apache.geode.internal.sequencelog.model.GraphSet;
-
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -28,6 +21,13 @@ import java.util.*;
import java.util.List;
import java.util.regex.Pattern;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.apache.geode.internal.sequencelog.model.GraphID;
+import org.apache.geode.internal.sequencelog.model.GraphSet;
+
/**
* Created by IntelliJ IDEA. User: dsmith Date: Dec 9, 2010 Time: 3:34:38 PM To change this template
* use File | Settings | File Templates.
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java b/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
index 00c76e4..81a70d4 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.sequence;
-import javax.swing.*;
import java.awt.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
@@ -25,6 +24,8 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.swing.*;
+
/**
* Created by IntelliJ IDEA. User: dsmith Date: Oct 29, 2010 Time: 4:18:40 PM To change this
* template use File | Settings | File Templates.
@@ -32,7 +33,7 @@ import java.util.regex.Pattern;
public class SequenceDiagram extends JPanel {
/**
- *
+ *
*/
private static final Color HIGHLIGHT_COLOR = Color.RED;
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java b/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java
index d910dde..c9c43b2 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.sequence;
-import javax.swing.*;
import java.awt.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
+import javax.swing.*;
+
/**
* Created by IntelliJ IDEA. User: dan Date: Oct 28, 2010 Time: 10:29:23 PM To change this template
* use File | Settings | File Templates.
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java b/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java
index 92856a9..fc68a31 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.sequence;
+import static java.lang.Math.random;
+
import java.awt.*;
import java.util.HashMap;
import java.util.Map;
-import static java.lang.Math.random;
-
/**
* Created by IntelliJ IDEA. User: dsmith Date: Nov 12, 2010 Time: 5:05:49 PM To change this
* template use File | Settings | File Templates.
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java b/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java
index c3b9761..fd9bc6e 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.sequence;
-import javax.swing.*;
import java.awt.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import javax.swing.*;
+
/**
* Created by IntelliJ IDEA. User: dsmith Date: Oct 29, 2010 Time: 5:24:54 PM To change this
* template use File | Settings | File Templates.
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java b/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java
index 9a4c5ec..8be669b 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.sequence;
-import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
+import javax.swing.*;
+
/**
* Created by IntelliJ IDEA. User: dan Date: Oct 28, 2010 Time: 10:30:40 PM To change this template
* use File | Settings | File Templates.
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java
index ac6f46b..7ad24b0 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java
@@ -30,7 +30,7 @@ import org.assertj.core.api.Assertions;
* </pre>
*
* Extracted from DistributedTestCase.
- *
+ *
* @see java.lang.AssertionError
*
* @deprecated Please use AssertJ {@link Assertions} instead.
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java
index b273591..ec02d4b 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java
@@ -19,6 +19,7 @@ import java.rmi.Remote;
import java.rmi.RemoteException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+
import org.apache.geode.test.dunit.internal.InternalBlackboard;
import org.apache.geode.test.dunit.internal.InternalBlackboardImpl;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DebuggerUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DebuggerUtils.java
index 37c6fea..59a657a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/DebuggerUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DebuggerUtils.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.util.DebuggerSupport;
* </pre>
*
* Extracted from DistributedTestCase.
- *
+ *
* @see org.apache.geode.internal.util.DebuggerSupport
*/
public class DebuggerUtils {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
index 44513be..0eb3a94 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
@@ -17,6 +17,11 @@ package org.apache.geode.test.dunit;
import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
import static org.junit.Assert.assertEquals;
+import java.io.File;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -24,11 +29,6 @@ import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHel
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
/**
* {@code DistributedTestUtils} provides static utility methods that affect the runtime environment
* or artifacts generated by a DistributedTest.
@@ -54,7 +54,7 @@ public class DistributedTestUtils {
/**
* Fetches the GemFireDescription for this test and adds its DistributedSystem properties to the
* provided props parameter.
- *
+ *
* @param properties the properties to add hydra's test properties to
*/
public static void addHydraProperties(final Properties properties) {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/IgnoredException.java b/geode-core/src/test/java/org/apache/geode/test/dunit/IgnoredException.java
index a874345..2fbbd5a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/IgnoredException.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/IgnoredException.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.logging.LogService;
* remove <code>IgnoredException</code>s. Each <code>IgnoredException</code> allows you to specify a
* suspect string that will be ignored by the <code>GrepLogs</code> utility which is run after each
* <code>DistributedTest</code> test method.
- *
+ *
* These methods can be used directly: <code>IgnoredException.addIgnoredException(...)</code>,
* however, they are intended to be referenced through static import:
*
@@ -43,15 +43,15 @@ import org.apache.geode.internal.logging.LogService;
* <code>IgnoredException</code> immediately after. Note that
* <code>DistributedTestCase.tearDown()</code> will automatically remove all current
* <code>IgnoredException</code>s by invoking <code>removeAllIgnoredExceptions</code>.
- *
+ *
* A suspect string is typically an Exception class and/or message string.
*
* The <code>GrepLogs</code> utility is part of Hydra which is not included in Apache Geode. The
* Hydra class which consumes logs and reports suspect strings is
* <code>batterytest.greplogs.GrepLogs</code>.
- *
+ *
* Extracted from DistributedTestCase.
- *
+ *
* @since GemFire 5.7bugfix
*/
@SuppressWarnings("serial")
@@ -139,7 +139,7 @@ public class IgnoredException implements Serializable {
* Log in all VMs, in both the test logger and the GemFire logger the ignored exception string to
* prevent grep logs from complaining. The suspect string is used by the GrepLogs utility and so
* can contain regular expression characters.
- *
+ *
* @since GemFire 5.7bugfix
* @param suspectString the exception string to expect
* @param vm the VM on which to log the expected exception or null for all VMs
@@ -189,10 +189,10 @@ public class IgnoredException implements Serializable {
* Log in all VMs, in both the test logger and the GemFire logger the ignored exception string to
* prevent grep logs from complaining. The suspect string is used by the GrepLogs utility and so
* can contain regular expression characters.
- *
+ *
* If you do not remove the ignored exception, it will be removed at the end of your test case
* automatically.
- *
+ *
* @since GemFire 5.7bugfix
* @param suspectString the exception string to expect
* @return an IgnoredException instance for removal
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
index 93c6fdd..34d4665 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
@@ -21,7 +21,7 @@ import java.util.Map;
* <code>Invoke</code> provides static utility methods that allow a <code>DistributedTest</code> to
* invoke a <code>SerializableRunnable</code> or <code>SerializableCallable</code> in a remote test
* <code>VM</code>.
- *
+ *
* These methods can be used directly: <code>Invoke.invokeInEveryVM(...)</code>, however, they are
* intended to be referenced through static import:
*
@@ -156,7 +156,7 @@ public class Invoke {
* Invokes a <code>SerializableRunnable</code> in every VM that DUnit knows about. If
* <code>run()</code> throws an assertion failure, its execution is repeated, until no assertion
* failure occurs or <code>repeatTimeoutMs</code> milliseconds have passed.
- *
+ *
* @deprecated Please use {@link org.awaitility.Awaitility} with
* {@link #invokeInEveryVM(SerializableCallableIF)} instead.
*/
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
index aaba6bb..f0e9acc 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
@@ -31,10 +31,10 @@ class Jitter {
protected Jitter() {}
/**
- * Returns an adjusted interval from <code>minimum()</code to
+ * Returns an adjusted interval from <code>minimum()</code to
* <code>intervalMillis</code> milliseconds. If jittering is disabled then the value returned will
* be equal to intervalMillis.
- *
+ *
* @param intervalMillis
* @return adjust milliseconds to use as interval for WaitCriteria polling
*/
@@ -57,11 +57,11 @@ class Jitter {
/**
* If jittering is enabled then returns a jittered interval up to a maximum of
* <code>intervalMillis</code> milliseconds, inclusive.
- *
+ *
* If jittering is disabled then returns <code>intervalMillis</code>.
- *
+ *
* The result is bounded by 50 ms as a minimum and 5000 ms as a maximum.
- *
+ *
* @param ms total amount of time to wait
* @return randomized interval we should wait
*/
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
index 32a0915..74fc208 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
@@ -16,6 +16,10 @@ package org.apache.geode.test.dunit;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import java.util.Properties;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
@@ -24,14 +28,11 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LogWriterFactory;
import org.apache.geode.internal.logging.ManagerLogWriter;
import org.apache.geode.internal.logging.log4j.LogWriterLogger;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Properties;
/**
* <code>LogWriterUtils</code> provides static utility methods to access a <code>LogWriter</code>
* within a test.
- *
+ *
* These methods can be used directly: <code>LogWriterUtils.getLogWriter(...)</code>, however, they
* are intended to be referenced through static import:
*
@@ -42,7 +43,7 @@ import java.util.Properties;
* </pre>
*
* Extracted from DistributedTestCase.
- *
+ *
* @deprecated Please use a <code>Logger</code> from {@link LogService#getLogger()} instead.
*/
@Deprecated
@@ -55,7 +56,7 @@ public class LogWriterUtils {
/**
* Returns a <code>LogWriter</code> for logging information
- *
+ *
* @deprecated Please use a <code>Logger</code> from {@link LogService#getLogger()} instead.
*/
public static InternalLogWriter getLogWriter() {
@@ -67,7 +68,7 @@ public class LogWriterUtils {
* connect to DistributedSystem, thus providing early access to the LogWriter before connecting.
* This call does not connect to the DistributedSystem. It simply creates and returns the
* LogWriter that will eventually be used by the DistributedSystem that connects using config.
- *
+ *
* @param properties the DistributedSystem config properties to add LogWriter to
* @return early access to the DistributedSystem LogWriter
* @deprecated Please use a <code>Logger</code> from {@link LogService#getLogger()} instead.
@@ -92,7 +93,7 @@ public class LogWriterUtils {
/**
* This finds the log level configured for the test run. It should be used when creating a new
* distributed system if you want to specify a log level.
- *
+ *
* @return the dunit log-level setting
*/
public static String getDUnitLogLevel() {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/NetworkUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/NetworkUtils.java
index ab6bd25..244354c 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/NetworkUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/NetworkUtils.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.test.dunit;
+import java.net.UnknownHostException;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.net.SocketCreator;
-import java.net.UnknownHostException;
-
/**
* <code>NetworkUtils</code> provides static utility methods to perform network DNS lookups or
* similar actions.
- *
+ *
* These methods can be used directly: <code>NetworkUtils.getIPLiteral()</code>, however, they are
* intended to be referenced through static import:
*
@@ -41,7 +41,7 @@ public class NetworkUtils {
/**
* Get the IP literal name for the current host. Use this instead of "localhost" to avoid IPv6
* name resolution bugs in the JDK/machine config. This method honors java.net.preferIPvAddresses
- *
+ *
* @return an IP literal which honors java.net.preferIPvAddresses
*/
public static String getIPLiteral() {
@@ -54,7 +54,7 @@ public class NetworkUtils {
/**
* Get the host name to use for a server cache in client/server dunit testing.
- *
+ *
* @param host the dunit Host to get a machine host name for
* @return the host name
*/
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallable.java b/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallable.java
index 29b083a..389f8cb 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallable.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallable.java
@@ -39,7 +39,7 @@ import java.util.concurrent.Callable;
* assertIndexDetailsEquals(value, vm1.invoke(putMethod));
* }
* </PRE>
- *
+ *
*/
public abstract class SerializableCallable<T> implements SerializableCallableIF<T> {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java b/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
index 775584f..1db3ab8 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
@@ -18,7 +18,7 @@ package org.apache.geode.test.dunit;
* Defines an asynchronous criterion with an optional method to fail early before timeout.
*
* Extracted from DistributedTestCase.
- *
+ *
* @deprecated Use {@link org.awaitility.Awaitility} instead.
*/
public interface StoppableWaitCriterion extends WaitCriterion {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
index ac90cbc..8bac15e 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* <code>ThreadUtils</code> provides static utility methods to perform thread related actions such
* as dumping thread stacks.
- *
+ *
* These methods can be used directly: <code>ThreadUtils.dumpAllStacks()</code>, however, they are
* intended to be referenced through static import:
*
@@ -45,7 +45,7 @@ public class ThreadUtils {
/**
* Print stack dumps for all vms.
- *
+ *
* @since GemFire 5.0
*/
public static void dumpAllStacks() {
@@ -63,7 +63,7 @@ public class ThreadUtils {
/**
* Print a stack dump for this vm.
- *
+ *
* @since GemFire 5.0
*/
public static void dumpStack() {
@@ -72,7 +72,7 @@ public class ThreadUtils {
/**
* Print stack dumps for all vms on the given host.
- *
+ *
* @since GemFire 5.0
*/
public static void dumpStack(final Host host) {
@@ -83,7 +83,7 @@ public class ThreadUtils {
/**
* Print a stack dump for the given vm.
- *
+ *
* @since GemFire 5.0
*/
public static void dumpStack(final VM vm) {
@@ -112,7 +112,7 @@ public class ThreadUtils {
/**
* Wait for a thread to join.
- *
+ *
* @param thread thread to wait on
* @param timeoutMilliseconds maximum time to wait
* @throws AssertionError if the thread does not terminate
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
index 2b1e622..f1e371b 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
@@ -22,8 +22,8 @@ import java.rmi.RemoteException;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
-import org.awaitility.Awaitility;
import hydra.MethExecutorResult;
+import org.awaitility.Awaitility;
import org.apache.geode.internal.process.ProcessUtils;
import org.apache.geode.test.dunit.standalone.BounceResult;
@@ -121,7 +121,7 @@ public class VM implements Serializable {
/**
* Returns the version of Geode used in this VM.
- *
+ *
* @see VersionManager#CURRENT_VERSION
* @see Host#getVM(String, int)
*/
@@ -337,7 +337,7 @@ public class VM implements Serializable {
* until it either succeeds, or repeatTimeoutMs has passed. The AssertionError is thrown back to
* the sender of this method if {@code run} has not completed successfully before repeatTimeoutMs
* has passed.
- *
+ *
* @deprecated Please use {@link Awaitility} to await condition and then
* {@link #invoke(SerializableCallableIF)} instead.
*/
@@ -399,7 +399,7 @@ public class VM implements Serializable {
* synchronized but attempts to invoke methods on a bouncing {@code VM} will cause test failure.
* Tests using bounce should be placed at the end of the DUnit test suite, since an exception here
* will cause all tests using the unsuccessfully bounced {@code VM} to fail.
- *
+ *
* This method is currently not supported by the standalone DUnit runner.
*
* @throws RMIException if an exception occurs while bouncing this {@code VM}, for example a
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
index a2ff978..a5ddff7 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* <code>Wait</code> provides static utility methods to wait for some asynchronous action with
* intermittent polling.
- *
+ *
* These methods can be used directly: <code>Wait.waitForCriterion(...)</code>, however, they are
* intended to be referenced through static import:
*
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.LogService;
*
* <p>
* Examples of using Awaitility:
- *
+ *
* <pre>
*
* import static org.awaitility.Awaitility.*;
@@ -77,7 +77,7 @@ import org.apache.geode.internal.logging.LogService;
*
* <p>
* Example of detailed conversion to Awaitility:
- *
+ *
* <pre>
* From:
*
@@ -122,7 +122,7 @@ public class Wait {
/**
* Pause for a default interval (250 milliseconds).
- *
+ *
* @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static void pause() {
@@ -132,7 +132,7 @@ public class Wait {
/**
* Pause for the specified milliseconds. Make sure system clock has advanced by the specified
* number of millis before returning.
- *
+ *
* @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static void pause(final int milliseconds) {
@@ -155,7 +155,7 @@ public class Wait {
/**
* Wait until given criterion is met
- *
+ *
* @param waitCriterion criterion to wait on
* @param timeoutMillis total time to wait, in milliseconds
* @param pollingInterval pause interval between waits
@@ -206,7 +206,7 @@ public class Wait {
/**
* Blocks until the clock used for expiration moves forward.
- *
+ *
* @param cacheTimeMillisSource region that provides cacheTimeMillis
* @return the last time stamp observed
* @deprecated Please use {@link org.awaitility.Awaitility} instead.
@@ -218,7 +218,7 @@ public class Wait {
/**
* Blocks until the clock used for expiration moves forward.
- *
+ *
* @param cacheTimeMillisSource region that provides cacheTimeMillis
* @param baseTime the timestamp that the clock must exceed
* @return the last time stamp observed
@@ -237,7 +237,7 @@ public class Wait {
/**
* Wait on a mutex. This is done in a loop in order to address the "spurious wakeup" "feature" in
* Java.
- *
+ *
* @param waitCriterion condition to test
* @param mutex object to lock and wait on
* @param milliseconds total amount of time to wait
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 3f11f82..d0fe3d5 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -50,8 +50,8 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.test.dunit.Assert;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java
index 629f578..f3ad977 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java
@@ -33,4 +33,3 @@ public class DistributedTestCaseExampleTest extends DistributedTestCase {
assertThat(system.isConnected()).isTrue();
}
}
-
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
index c8d71da..1c1425e 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
@@ -20,14 +20,15 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class DUnitBlackboardDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
index feeae15..c83e296 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.test.dunit.internal;
-import org.apache.geode.test.dunit.standalone.DUnitLauncher;
-
import java.rmi.Naming;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
@@ -26,6 +24,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.apache.geode.test.dunit.standalone.DUnitLauncher;
+
public class InternalBlackboardImpl extends UnicastRemoteObject implements InternalBlackboard {
public static InternalBlackboard blackboard;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
index 359cdd9..0011fe9 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
@@ -17,11 +17,12 @@ package org.apache.geode.test.dunit.rules;
import static org.apache.geode.test.dunit.Host.getHost;
import static org.apache.geode.test.dunit.Host.getHostCount;
-import org.apache.geode.test.dunit.VM;
+import java.io.Serializable;
+
import org.junit.After;
import org.junit.rules.ExternalResource;
-import java.io.Serializable;
+import org.apache.geode.test.dunit.VM;
public class CleanupDUnitVMsRule extends ExternalResource implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
index 45184be..400a38d 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
@@ -128,7 +128,7 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
/**
* Starts a locator instance with the given configuration properties inside
* {@code getHost(0).getVM(index)}.
- *
+ *
* @return VM locator vm
*/
public MemberVM startLocatorVM(int index, Properties specifiedProperties) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
index 1a5d4a5..2ba751b 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
@@ -21,8 +21,8 @@ import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.rules.LocatorStarterRule;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(UnitTest.class)
public class MemberStarterRuleTest {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
index a1045f8..442e354 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
@@ -39,7 +39,7 @@ public class ChildVM {
stopMainLoop = true;
}
- private final static Logger logger = LogService.getLogger();
+ private static final Logger logger = LogService.getLogger();
public static void main(String[] args) throws Throwable {
try {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
index 6a1fa4f..8407eb8 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
@@ -459,7 +459,7 @@ public class DUnitLauncher {
private static class DUnitHost extends Host {
private static final long serialVersionUID = -8034165624503666383L;
- private transient final VM debuggingVM;
+ private final transient VM debuggingVM;
private transient ProcessManager processManager;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index 9a0ce86..bef0ef2 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -17,12 +17,6 @@ package org.apache.geode.test.dunit.standalone;
import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
-import org.apache.commons.io.FileUtils;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -42,6 +36,13 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.io.FileUtils;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.VM;
+
/**
*
*/
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
index 6b934a3..6cf7bd0 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.test.dunit.standalone;
-import org.apache.geode.test.dunit.Host;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -28,12 +26,14 @@ import java.util.Optional;
import java.util.Properties;
import java.util.function.BiConsumer;
+import org.apache.geode.test.dunit.Host;
+
/**
* VersionManager loads the class-paths for all of the releases of Geode configured for
* backward-compatibility testing in the geode-core build.gradle file.
* <p>
* Tests may use these versions in launching VMs to run older clients or servers.
- *
+ *
* @see Host#getVM(String, int)
*/
public class VersionManager {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
index 7e89dfc..94027e6 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.test.dunit.standalone;
import static org.apache.geode.internal.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class VersionManagerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDUnitTest.java
index acad6f6..2364340 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDUnitTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.test.dunit.tests;
-import static org.apache.geode.test.dunit.Invoke.*;
import static com.googlecode.catchexception.CatchException.*;
import static com.googlecode.catchexception.throwable.CatchThrowable.*;
+import static org.apache.geode.test.dunit.Invoke.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4BasicDUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4BasicDUnitTest.java
index 3a35c7b..d5edae7 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4BasicDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4BasicDUnitTest.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.test.dunit.tests;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Invoke.*;
import static com.googlecode.catchexception.CatchException.*;
import static com.googlecode.catchexception.throwable.CatchThrowable.*;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Invoke.*;
import static org.hamcrest.Matchers.*;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
index 4b75bcd..df6c35d 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.test.dunit.tests;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.test.dunit.Assert.*;
import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+
/**
* Verifies that overriding {@code getDistributedSystemProperties} results in
* {@code disconnectAllFromDS} during tear down.
diff --git a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
index 5a86fa7..cd75a04 100644
--- a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
+++ b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
@@ -38,18 +38,18 @@ import org.apache.geode.internal.security.SecurityService;
/**
* Factory methods for fake objects for use in test.
- *
+ *
* These fakes are essentially mock objects with some limited functionality. For example the fake
* cache can return a fake distributed system.
- *
+ *
* All of the fakes returned by this class are Mockito.mocks, so they can be modified by using
* Mockito stubbing, ie
- *
+ *
* <pre>
* cache = Fakes.cache(); Mockito.when(cache.getName()).thenReturn(...)
- *
+ *
* <pre>
- *
+ *
* Please help extend this class by adding other commonly used objects to this collection of fakes.
*/
public class Fakes {
@@ -126,7 +126,7 @@ public class Fakes {
/**
* Add real map behavior to a mock region. Useful for tests where you want to mock region that
* just behaves like a map.
- *
+ *
* @param mock the mockito mock to add behavior too.
*/
public static void addMapBehavior(Region mock) {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java
index 732dc43..d0cd0c2 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that test output containing an unexpected error message will fail with that error
* message as the failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithErrorInOutputJUnitTest extends FailWithProblemInOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
index 91283d6..6c76028 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
@@ -19,13 +19,13 @@ import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.process.ProcessWrapper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.process.ProcessWrapper;
/**
* Verifies that test output containing an unexpected extra line will fail with that line as the
* failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithExtraLineInOutputJUnitTest extends FailOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
index 6e6d309..1126ff5 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.process.ProcessWrapper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.process.ProcessWrapper;
/**
* Verifies that test output missing an expected line (at the end of the golden file) will fail with
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
index 4adffcd..ec4a42a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.process.ProcessWrapper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.process.ProcessWrapper;
/**
* Verifies that test output missing an expected line (at the middle of the golden file) will fail
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java
index 716f6aa..2946e01 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java
@@ -22,7 +22,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that test output containing an unexpected ERROR message will fail with that ERROR
* message as the failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithLoggerErrorInOutputJUnitTest extends FailWithProblemInOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java
index 0357878..48a191a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java
@@ -22,7 +22,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that test output containing an unexpected FATAL message will fail with that FATAL
* message as the failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithLoggerFatalInOutputJUnitTest extends FailWithProblemInOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java
index 65c7e86..a074d0e 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java
@@ -22,7 +22,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that test output containing an unexpected WARN message will fail with that WARN message
* as the failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithLoggerWarnInOutputJUnitTest extends FailWithProblemInOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
index 47362fd..85573de 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.process.ProcessWrapper;
/**
* Abstract test case for tests verifying that test output with a log message of
* warning/error/severe will cause expected failures.
- *
+ *
*/
public abstract class FailWithProblemInOutputTestCase extends FailOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java
index 7a1c526..786bca6 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that test output containing an unexpected severe message will fail with that severe
* message as the failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithSevereInOutputJUnitTest extends FailWithProblemInOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java
index 2c09c91..d99d997 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that test output containing an unexpected warning message will fail with that warning
* message as the failure message.
- *
+ *
*/
@Category(IntegrationTest.class)
public class FailWithWarningInOutputJUnitTest extends FailWithProblemInOutputTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java
index 6579ebf..2a67d77 100644
--- a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.process.OutputFormatter;
/**
* Compares test output to golden text file.
- *
+ *
* @since GemFire 4.1.1
*/
public abstract class GoldenComparator {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenStringComparator.java b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenStringComparator.java
index e808c46..744e27d 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenStringComparator.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenStringComparator.java
@@ -21,7 +21,7 @@ import java.io.StringReader;
/**
* Custom GoldenComparator which returns the string of the golden file name as the output for simple
* unit testing of the quickstart testing framework.
- *
+ *
*/
public class GoldenStringComparator extends RegexGoldenComparator {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
index 4b73faa..af8b814 100644
--- a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
@@ -15,19 +15,19 @@
package org.apache.geode.test.golden;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.process.ProcessWrapper;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.junit.After;
-import org.junit.Before;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.test.process.ProcessWrapper;
/**
* Test framework for launching processes and comparing output to expected golden output.
@@ -68,7 +68,7 @@ public abstract class GoldenTestCase {
/**
* Override this for additional set up.
- *
+ *
* @throws Exception
*/
public void subSetUp() throws Exception {
@@ -77,7 +77,7 @@ public abstract class GoldenTestCase {
/**
* Override this for additional tear down after destroying all processes and printing output.
- *
+ *
* @throws Exception
*/
public void subTearDown() throws Exception {
@@ -104,7 +104,7 @@ public abstract class GoldenTestCase {
/**
* Returns an array of expected problem strings. Without overriding this, any line with warning,
* error or severe will cause the test to fail. By default, null is returned.
- *
+ *
* (see PartitionedRegionTest which expects a WARNING log message)
*/
protected String[] expectedProblemLines() {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
index e3374f4..3f4ed6b 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
@@ -23,13 +23,13 @@ import java.io.InputStreamReader;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.process.ProcessWrapper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.process.ProcessWrapper;
/**
* Basic unit testing of the golden testing framework. This tests an example which is expected to
* always pass.
- *
+ *
*/
@Category(IntegrationTest.class)
public class PassJUnitTest extends GoldenTestCase implements ExecutableProcess {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java
index 59e7d15..7bdc40e 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that an example test should always pass even if the output contains a error that is
* expected.
- *
+ *
*/
@Category(IntegrationTest.class)
public class PassWithExpectedErrorJUnitTest extends PassWithExpectedProblemTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
index e88a11d..bafaf3b 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
@@ -25,7 +25,7 @@ import org.apache.geode.test.process.ProcessWrapper;
/**
* Abstract test case for golden testing framework. This provides basis for unit tests which involve
* an example that is expected to always pass.
- *
+ *
*/
public abstract class PassWithExpectedProblemTestCase extends GoldenTestCase
implements ExecutableProcess {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java
index 7cf04ca..15630f0 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that an example test should always pass even if the output contains a severe that is
* expected.
- *
+ *
*/
@Category(IntegrationTest.class)
public class PassWithExpectedSevereJUnitTest extends PassWithExpectedProblemTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java
index 6a3c941..037cf23 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that an example test should always pass even if the output contains a warning that is
* expected.
- *
+ *
*/
@Category(IntegrationTest.class)
public class PassWithExpectedWarningJUnitTest extends PassWithExpectedProblemTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/RegexGoldenComparator.java b/geode-core/src/test/java/org/apache/geode/test/golden/RegexGoldenComparator.java
index 4bc1be4..66407e8 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/RegexGoldenComparator.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/RegexGoldenComparator.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
/**
* Compares test output to golden text file using regex pattern matching
- *
+ *
*/
public class RegexGoldenComparator extends GoldenComparator {
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/StringGoldenComparator.java b/geode-core/src/test/java/org/apache/geode/test/golden/StringGoldenComparator.java
index 500d279..386265a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/StringGoldenComparator.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/StringGoldenComparator.java
@@ -16,7 +16,7 @@ package org.apache.geode.test.golden;
/**
* Compares test output to golden text file using string equality
- *
+ *
*/
public class StringGoldenComparator extends GoldenComparator {
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncher.java b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncher.java
index 57cca9a..79b4229 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncher.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncher.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
* Provides a main which delegates to another main for testing after waiting for one input. The
* purpose is to prevent race condition in which a process may send output before the reader has
* started listening for that output.
- *
+ *
*/
public class MainLauncher {
public static void main(String... args) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/ProcessOutputReader.java b/geode-core/src/test/java/org/apache/geode/test/process/ProcessOutputReader.java
index 0bc74ad..200c475 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/ProcessOutputReader.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/ProcessOutputReader.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
* waitFor the process to terminate.
* </p>
* Extracted from ProcessWrapper.
- *
+ *
*/
public class ProcessOutputReader {
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
index 04ef18d..c8150f8 100644
--- a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
@@ -15,9 +15,7 @@
package org.apache.geode.test.process;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
+import static org.junit.Assert.fail;
import java.io.File;
import java.io.PrintStream;
@@ -29,7 +27,9 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
-import static org.junit.Assert.fail;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.internal.logging.LogService;
/**
* Wraps spawned {@link java.lang.Process} to capture output and provide interaction with the
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
index 9bd6698..dde4118 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for ProcessWrapper.
- *
+ *
*/
@Category(IntegrationTest.class)
public class ProcessWrapperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java b/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java
index 9d40417..fe4624e 100755
--- a/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java
@@ -72,7 +72,7 @@ import org.junit.Before;
* as many exception-testing methods as there are exceptions the method can throw. Sometimes there
* are multiple tests per JSR166 method when the different "normal" behaviors differ significantly.
* And sometimes testcases cover multiple methods when they cannot be tested in isolation.</li>
- *
+ *
* <li>The documentation style for testcases is to provide as javadoc a simple sentence or two
* describing the property that the testcase method purports to test. The javadocs do not say
* anything about how the property is tested. To find out, read the code.</li>
diff --git a/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java b/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
index 92fd2c5..88a9e3c 100644
--- a/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
@@ -14,24 +14,24 @@
*/
package org.apache.geode.util.test;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
-
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.SystemUtils;
+
public class TestUtil {
/**
* Return the path to a named resource. This finds the resource on the classpath using the rules
* of class.getResource. For a relative path it will look in the same package as the class, for an
* absolute path it will start from the base package.
- *
+ *
* Best practice is to put the resource in the same package as your test class and load it with
* this method.
- *
+ *
* @param clazz the class to look relative too
* @param name the name of the resource, eg "cache.xml"
*/
diff --git a/geode-core/src/test/java/org/apache/persistence/admin/Logger.java b/geode-core/src/test/java/org/apache/persistence/admin/Logger.java
index dfea6d6..e1a7968 100644
--- a/geode-core/src/test/java/org/apache/persistence/admin/Logger.java
+++ b/geode-core/src/test/java/org/apache/persistence/admin/Logger.java
@@ -14,9 +14,9 @@
*/
package org.apache.persistence.admin;
-import java.util.*;
import java.io.PrintWriter;
import java.text.*;
+import java.util.*;
/**
* Provides single point for all log messages to written to. Currently this class only supports
@@ -63,7 +63,7 @@ public class Logger {
timeFormatter = sdf;
}
- static private void formatText(PrintWriter writer, String target, int maxLength,
+ private static void formatText(PrintWriter writer, String target, int maxLength,
int initialLength) {
BreakIterator boundary = BreakIterator.getLineInstance();
boundary.setText(target);
@@ -118,20 +118,20 @@ public class Logger {
/**
* Gets a String representation of the current time.
- *
+ *
* @return a String representation of the current time.
*/
- static public String getTimeStamp() {
+ public static String getTimeStamp() {
return formatDate(new Date());
}
/**
* Convert a Date to a timestamp String.
- *
+ *
* @param d a Date to format as a timestamp String.
* @return a String representation of the current time.
*/
- static public String formatDate(Date d) {
+ public static String formatDate(Date d) {
if (timeFormatter == null) {
try {
// very simple format that shows millisecond resolution
@@ -161,61 +161,61 @@ public class Logger {
/**
* Logs a message to the static log destination.
- *
+ *
* @param msg the actual message to log
*/
- static public void put(String msg) {
+ public static void put(String msg) {
put(msg, (Throwable) null);
}
/**
* Logs a message to the specified log destination.
- *
+ *
* @param log the <code>PrintWriter</code> that the message will be written to.
* @param msg the actual message to log
*/
- static public void put(PrintWriter log, String msg) {
+ public static void put(PrintWriter log, String msg) {
put(log, msg, (Throwable) null);
}
/**
* Logs an exception to the static log destination.
- *
+ *
* @param exception the actual Exception to log
*/
- static public void put(Throwable exception) {
+ public static void put(Throwable exception) {
put((String) null, exception);
}
/**
* Logs an exception to the specified log destination.
- *
+ *
* @param log the <code>PrintWriter</code> that the message will be written to.
* @param exception the actual Exception to log
*/
- static public void put(PrintWriter log, Throwable exception) {
+ public static void put(PrintWriter log, Throwable exception) {
put(log, (String) null, exception);
}
/**
* Logs a message and an exception to the static log destination.
- *
+ *
* @param msg the actual message to log
* @param exception the actual Exception to log
*/
- static public void put(String msg, Throwable exception) {
+ public static void put(String msg, Throwable exception) {
put(logWriter, msg, exception);
}
/**
* Logs a message and an exception to the specified log destination.
- *
+ *
* @param log the <code>PrintWriter</code> that the message will be written to. If null then the
* default stdout writer is used.
* @param msg the actual message to log
* @param exception the actual Exception to log
*/
- static public void put(PrintWriter log, String msg, Throwable exception) {
+ public static void put(PrintWriter log, String msg, Throwable exception) {
java.io.StringWriter sw = new java.io.StringWriter();
String header;
PrintWriter pw = new PrintWriter(sw);
diff --git a/geode-core/src/test/java/org/apache/persistence/logging/Logger.java b/geode-core/src/test/java/org/apache/persistence/logging/Logger.java
index 0c341df..e3f60b2 100644
--- a/geode-core/src/test/java/org/apache/persistence/logging/Logger.java
+++ b/geode-core/src/test/java/org/apache/persistence/logging/Logger.java
@@ -62,7 +62,7 @@ public class Logger {
/**
* Returns the logger with the given name
*/
- public synchronized static Logger getLogger(String name) {
+ public static synchronized Logger getLogger(String name) {
Logger logger = (Logger) loggers.get(name);
if (logger == null) {
logger = new Logger(name);
diff --git a/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java b/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java
index 638a490..aa38a08 100644
--- a/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java
+++ b/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java
@@ -15,7 +15,6 @@
package org.apache.persistence.logging;
import java.io.*;
-// import java.text.*;
import java.util.*;
/**
diff --git a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
index 4756c38..6ddc134 100755
--- a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
+++ b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
@@ -46,7 +46,7 @@ public class NewPortfolio implements Serializable {
/**
* Constructor to randomly populate the portfolio.
- *
+ *
* @param name
* @param id
*/
@@ -140,7 +140,7 @@ public class NewPortfolio implements Serializable {
/**
* To provide random values to populate a position.
- *
+ *
* @return
*/
protected Properties getProps() {
@@ -242,5 +242,3 @@ public class NewPortfolio implements Serializable {
}
}
-
-
diff --git a/geode-core/src/test/java/parReg/query/unittest/Position.java b/geode-core/src/test/java/parReg/query/unittest/Position.java
index 623ab15..7ee10d0 100755
--- a/geode-core/src/test/java/parReg/query/unittest/Position.java
+++ b/geode-core/src/test/java/parReg/query/unittest/Position.java
@@ -14,8 +14,9 @@
*/
package parReg.query.unittest;
-import java.util.*;
import java.io.Serializable;
+import java.util.*;
+
import org.apache.geode.cache.Declarable;
/**
@@ -155,5 +156,3 @@ public class Position implements Declarable, Serializable, Comparable {
}
}
}
-
-
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CloseCQOp.java b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CloseCQOp.java
index c7a3134..c6d0049 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CloseCQOp.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CloseCQOp.java
@@ -16,20 +16,20 @@ package org.apache.geode.cache.client.internal;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.ConnectionStats;
-import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.cache.client.internal.CreateCQOp.CreateCQOpImpl;
+import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.internal.cache.tier.MessageType;
/**
* Close a continuous query on the server
- *
+ *
* @since GemFire 5.7
*/
public class CloseCQOp {
/**
* Close a continuous query on the given server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param cqName name of the CQ to close
*/
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQOp.java b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQOp.java
index 7f6f42e..393f164 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQOp.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQOp.java
@@ -14,29 +14,29 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
-import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.Connection;
import org.apache.geode.cache.client.internal.ConnectionStats;
import org.apache.geode.cache.client.internal.ExecutablePool;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.security.NotAuthorizedException;
/**
* Creates a CQ on a server
- *
+ *
* @since GemFire 5.7
*/
public class CreateCQOp {
/**
* Create a continuous query on the server using connections from the given pool to communicate
* with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param cqName name of the CQ to create
* @param queryStr string OQL statement to be executed
@@ -53,7 +53,7 @@ public class CreateCQOp {
/**
* Create a continuous query on the server using a specific connections from the given pool.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param conn the actual connection to use
* @param cqName name of the CQ to create
@@ -132,7 +132,7 @@ public class CreateCQOp {
/**
* This constructor is for our subclasses
- *
+ *
* @throws org.apache.geode.SerializationException if serialization fails
*/
protected CreateCQOpImpl(int msgType, int numParts) {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQWithIROp.java b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQWithIROp.java
index 0af21fb..b166162 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQWithIROp.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/CreateCQWithIROp.java
@@ -24,14 +24,14 @@ import org.apache.geode.internal.cache.tier.MessageType;
/**
* Creates a CQ and fetches initial results on a server
- *
+ *
* @since GemFire 5.7
*/
public class CreateCQWithIROp {
/**
* Create a continuous query on the server using connections from the given pool to communicate
* with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param cqName name of the CQ to create
* @param queryStr string OQL statement to be executed
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
index 814931c..abb7106 100755
--- a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
@@ -21,8 +21,8 @@ import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.ConnectionStats;
-import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.cache.client.internal.CreateCQOp.CreateCQOpImpl;
+import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
@@ -31,14 +31,14 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
/**
* Retrieves all durable cqs for a client from a server
- *
+ *
* @since GemFire 7.0
*/
public class GetDurableCQsOp {
/**
* Retrieves all durable continuous queries on the server using connections from the given pool to
* communicate with the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
*/
public static List<String> execute(ExecutablePool pool) {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/ServerCQProxyImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/ServerCQProxyImpl.java
index bb7f2d0..9412d85 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/ServerCQProxyImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/ServerCQProxyImpl.java
@@ -22,13 +22,13 @@ import org.apache.geode.cache.query.internal.cq.ClientCQ;
/**
* Used to send CQ operations from a client to a server
- *
+ *
* @since GemFire 5.7
*/
public class ServerCQProxyImpl extends ServerProxy {
/**
* Creates a server CQ proxy for the given pool name.
- *
+ *
* @param pool the pool that this proxy will use to communicate with servers
*/
public ServerCQProxyImpl(InternalPool pool) {
@@ -37,7 +37,7 @@ public class ServerCQProxyImpl extends ServerProxy {
/**
* Creates a server CQ proxy given using the same pool as that of the given server proxy.
- *
+ *
* @param sp server proxy whose pool we are to use
*/
public ServerCQProxyImpl(ServerProxy sp) {
@@ -46,7 +46,7 @@ public class ServerCQProxyImpl extends ServerProxy {
/**
* Create a continuous query on the given pool
- *
+ *
* @param cq the CQ to create on the server
*/
public Object create(ClientCQ cq) {
@@ -59,7 +59,7 @@ public class ServerCQProxyImpl extends ServerProxy {
/**
* Create a continuous query on the given server
- *
+ *
* @param conn the connection to use
* @param cqName name of the CQ to create
* @param queryStr string OQL statement to be executed
@@ -76,7 +76,7 @@ public class ServerCQProxyImpl extends ServerProxy {
/**
* Create a continuous query on the given server and return the initial query results.
- *
+ *
* @param cq the CQ to create on the server
*/
public SelectResults createWithIR(ClientCQ cq) {
@@ -89,7 +89,7 @@ public class ServerCQProxyImpl extends ServerProxy {
/**
* Does a CQ stop on all relevant servers
- *
+ *
* @param cq the CQ to stop on the server
*/
public void stop(ClientCQ cq) {
@@ -99,7 +99,7 @@ public class ServerCQProxyImpl extends ServerProxy {
/**
* Does a CQ close on all relevant servers
- *
+ *
* @param cq the CQ to close on the server
*/
public void close(ClientCQ cq) {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/StopCQOp.java b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/StopCQOp.java
index 76e2575..7125453 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/StopCQOp.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/StopCQOp.java
@@ -16,20 +16,20 @@ package org.apache.geode.cache.client.internal;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.ConnectionStats;
-import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.cache.client.internal.CreateCQOp.CreateCQOpImpl;
+import org.apache.geode.cache.client.internal.ExecutablePool;
import org.apache.geode.internal.cache.tier.MessageType;
/**
* Does a region query on a server
- *
+ *
* @since GemFire 5.7
*/
public class StopCQOp {
/**
* Stop a continuous query on the server using connections from the given pool to communicate with
* the server.
- *
+ *
* @param pool the pool to use to communicate with the server.
* @param cqName name of the CQ to stop
*/
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
index 111bf84..5409999 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
@@ -366,7 +366,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
* This executes the CQ first on the redundant server and then on the primary server. This is
* required to keep the redundancy behavior in accordance with the HAQueue expectation (wherein
* the events are delivered only from the primary).
- *
+ *
* @param executeWithInitialResults boolean
* @return Object SelectResults in case of executeWithInitialResults
*/
@@ -479,7 +479,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
/**
* Check to see if shutdown in progress.
- *
+ *
* @return true if shutdown in progress else false.
*/
private boolean shutdownInProgress() {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesMutatorImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesMutatorImpl.java
index 9fdb67e..6790e54 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesMutatorImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesMutatorImpl.java
@@ -28,7 +28,7 @@ public class CqAttributesMutatorImpl implements CqAttributesMutator {
/**
* Adds a cq listener to the end of the list of cq listeners on this CqQuery.
- *
+ *
* @param aListener the user defined cq listener to add to the CqQuery.
* @throws IllegalArgumentException if <code>aListener</code> is null
*/
@@ -44,7 +44,7 @@ public class CqAttributesMutatorImpl implements CqAttributesMutator {
* specified listener has not been added. If the specified listener has been added then
* {@link org.apache.geode.cache.CacheCallback#close} will be called on it; otherwise does
* nothing.
- *
+ *
* @param aListener the cq listener to remove from the CqQuery.
* @throws IllegalArgumentException if <code>aListener</code> is null
*/
@@ -58,7 +58,7 @@ public class CqAttributesMutatorImpl implements CqAttributesMutator {
/**
* Removes all cq listeners, calling on each of them, and then adds each listener in the specified
* array.
- *
+ *
* @param newListeners a possibly null or empty array of listeners to add to this CqQuery.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
*/
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
index 02e865b..723afad 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
@@ -23,8 +23,8 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Implementing class for <code>Conflatable</code> interface. Objects of this class will be add to
* the queue
- *
- *
+ *
+ *
*/
public class CqConflatable implements Conflatable, Serializable {
private static final long serialVersionUID = -7215022132135862557L;
@@ -50,7 +50,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Constructor
- *
+ *
* @param key - The key for this entry
* @param value - The value for this entry
* @param eventId - eventID object for this entry
@@ -68,7 +68,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Returns whether the object should be conflated
- *
+ *
* @return whether the object should be conflated
*/
public boolean shouldBeConflated() {
@@ -77,7 +77,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Returns the name of the region for this <code>Conflatable</code>
- *
+ *
* @return the name of the region for this <code>Conflatable</code>
*/
public String getRegionToConflate() {
@@ -86,7 +86,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Returns the key for this <code>Conflatable</code>
- *
+ *
* @return the key for this <code>Conflatable</code>
*/
public Object getKeyToConflate() {
@@ -95,7 +95,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Returns the value for this <code>Conflatable</code>
- *
+ *
* @return the value for this <code>Conflatable</code>
*/
public Object getValueToConflate() {
@@ -104,7 +104,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Sets the latest value for this <code>Conflatable</code>
- *
+ *
* @param value The latest value
*/
public void setLatestValue(Object value) {
@@ -114,7 +114,7 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* Return this event's identifier
- *
+ *
* @return this event's identifier
*/
public EventID getEventId() {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqEventImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqEventImpl.java
index ad5f4b0..7b14479 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqEventImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqEventImpl.java
@@ -78,7 +78,7 @@ public class CqEventImpl implements CqEvent {
/**
* Get the key relating to the event.
- *
+ *
* @return Object key.
*/
public Object getKey() {
@@ -149,4 +149,3 @@ public class CqEventImpl implements CqEvent {
return buffer.toString();
}
}
-
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqListenerImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqListenerImpl.java
index 5e9b9e0..6a2d361 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqListenerImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqListenerImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache.query.internal.cq;
-import org.apache.geode.cache.query.CqListener;
import org.apache.geode.cache.query.CqEvent;
+import org.apache.geode.cache.query.CqListener;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
index f680b63..6d8656d 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
@@ -36,12 +36,12 @@ import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.QueryExecutionContext;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.i18n.StringId;
/**
* Represents the CqQuery object. Implements CqQuery API and CqAttributeMutator.
@@ -248,7 +248,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return the query after replacing region names with parameters
- *
+ *
* @return the Query for the query string
*/
@Override
@@ -281,7 +281,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return the state of this query. Should not modify this state without first locking it.
- *
+ *
* @return STOPPED RUNNING or CLOSED
*/
@Override
@@ -313,7 +313,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Update CQ stats
- *
+ *
* @param cqEvent object
*/
void updateStats(CqEvent cqEvent) {
@@ -322,7 +322,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return true if the CQ is in running state
- *
+ *
* @return true if running, false otherwise
*/
@Override
@@ -332,7 +332,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return true if the CQ is in stopped state
- *
+ *
* @return true if stopped, false otherwise
*/
@Override
@@ -342,7 +342,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return true if the CQ is closed
- *
+ *
* @return true if closed, false otherwise
*/
@Override
@@ -352,7 +352,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return true if the CQ is in closing state.
- *
+ *
* @return true if close in progress, false otherwise
*/
public boolean isClosing() {
@@ -361,7 +361,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Return true if the CQ is durable
- *
+ *
* @return true if durable, false otherwise
*/
@Override
@@ -371,7 +371,7 @@ public abstract class CqQueryImpl implements InternalCqQuery {
/**
* Returns a reference to VSD stats of the CQ
- *
+ *
* @return VSD stats of the CQ
*/
@Override
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index ea4f128..e1ceb58 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -111,7 +111,7 @@ public class CqServiceImpl implements CqService {
/**
* Manages CQ objects. uses serverCqName as key and CqQueryImpl as value
- *
+ *
* GuardedBy cqQueryMapLock
*/
private volatile HashMap<String, CqQueryImpl> cqQueryMap = new HashMap<>();
@@ -252,7 +252,7 @@ public class CqServiceImpl implements CqService {
/**
* Executes the given CqQuery, if the CqQuery for that name is not there it registers the one and
* executes. This is called on the Server.
- *
+ *
* @param manageEmptyRegions whether to update the 6.1 emptyRegions map held in the CCN
* @param regionDataPolicy the data policy of the region associated with the query. This is only
* needed if manageEmptyRegions is true.
@@ -820,7 +820,7 @@ public class CqServiceImpl implements CqService {
/**
* Is the CQ service in a cache server environment
- *
+ *
* @return true if cache server, false otherwise
*/
public boolean isServer() {
@@ -890,9 +890,9 @@ public class CqServiceImpl implements CqService {
/**
* Checks if CQ with the given name already exists.
- *
+ *
* @param cqName name of the CQ.
- *
+ *
* @return true if exists else false.
*/
private synchronized boolean isCqExists(String cqName) {
@@ -1533,7 +1533,7 @@ public class CqServiceImpl implements CqService {
/**
* Get the VSD ststs for CQ Service. There is one CQ Service per cache
- *
+ *
* @return reference to VSD stats object for the CQ service
*/
public CqServiceVsdStats getCqServiceVsdStats() {
@@ -1586,7 +1586,7 @@ public class CqServiceImpl implements CqService {
/**
* Returns the matching CQ map.
- *
+ *
* @return HashMap matchingCqMap
*/
public Map<String, HashSet<String>> getMatchingCqMap() {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
index a675162..da46d39 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceStatisticsImpl.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.cache.query.internal.cq;
-import org.apache.geode.cache.query.CqServiceStatistics;
import org.apache.geode.cache.query.CqQuery;
+import org.apache.geode.cache.query.CqServiceStatistics;
import org.apache.geode.cache.query.internal.DefaultQueryService;
/**
@@ -29,7 +29,7 @@ public class CqServiceStatisticsImpl implements CqServiceStatistics {
/**
* Constructor for CqStatisticsImpl
- *
+ *
* @param cqs - CqService
*/
CqServiceStatisticsImpl(CqServiceImpl cqs) {
@@ -46,7 +46,7 @@ public class CqServiceStatisticsImpl implements CqServiceStatistics {
/**
* Returns number of CQs created.
- *
+ *
* @return long number of cqs created.
*/
@Override
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
index 5dc7bb0..1688de7 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceVsdStats.java
@@ -25,16 +25,16 @@ import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.internal.DefaultQueryService;
import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.internal.cache.FilterProfile;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* This class tracks GemFire statistics related to CqService. Specifically the following statistics
* are tracked: Number of CQs created Number of active CQs Number of CQs suspended or stopped Number
* of CQs closed Number of CQs on a client
- *
+ *
* @since GemFire 5.5
*/
public class CqServiceVsdStats {
@@ -146,7 +146,7 @@ public class CqServiceVsdStats {
/**
* Constructor.
- *
+ *
* @param factory The <code>StatisticsFactory</code> which creates the <code>Statistics</code>
* instance
*/
@@ -163,7 +163,7 @@ public class CqServiceVsdStats {
/**
* Returns the current value of the "numCqsCreated" stat.
- *
+ *
* @return the current value of the "numCqsCreated" stat
*/
long getNumCqsCreated() {
@@ -179,7 +179,7 @@ public class CqServiceVsdStats {
/**
* Returns the current value of the "numCqsActive" stat.
- *
+ *
* @return the current value of the "numCqsActive" stat
*/
long getNumCqsActive() {
@@ -202,7 +202,7 @@ public class CqServiceVsdStats {
/**
* Returns the current value of the "numCqsStopped" stat.
- *
+ *
* @return the current value of the "numCqsStopped" stat
*/
long getNumCqsStopped() {
@@ -225,7 +225,7 @@ public class CqServiceVsdStats {
/**
* Returns the current value of the "numCqsClosed" stat.
- *
+ *
* @return the current value of the "numCqsClosed" stat
*/
long getNumCqsClosed() {
@@ -241,7 +241,7 @@ public class CqServiceVsdStats {
/**
* Returns the current value of the "numCqsOnClient" stat.
- *
+ *
* @return the current value of the "numCqsOnClient" stat
*/
long getNumCqsOnClient() {
@@ -264,7 +264,7 @@ public class CqServiceVsdStats {
/**
* Returns the current value of the "numClientsWithCqs" stat.
- *
+ *
* @return the current value of the "numClientsWithCqs" stat
*/
public long getNumClientsWithCqs() {
@@ -295,7 +295,7 @@ public class CqServiceVsdStats {
/**
* End CQ Query Execution Time.
- *
+ *
* @param start long time value.
*/
void endCqQueryExecution(long start) {
@@ -307,7 +307,7 @@ public class CqServiceVsdStats {
/**
* Returns the total time spent executing the CQ Queries.
- *
+ *
* @return long time spent.
*/
public long getCqQueryExecutionTime() {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqStatisticsImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqStatisticsImpl.java
index 31ca05d..3fbbc56 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqStatisticsImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqStatisticsImpl.java
@@ -18,7 +18,7 @@ import org.apache.geode.cache.query.CqStatistics;
/**
* Provides statistical information about a CqQuery.
- *
+ *
* @since GemFire 5.5
*/
public class CqStatisticsImpl implements CqStatistics {
@@ -31,7 +31,7 @@ public class CqStatisticsImpl implements CqStatistics {
/**
* Constructor for CqStatisticsImpl
- *
+ *
* @param cq - CqQuery reference to the CqQueryImpl object
*/
public CqStatisticsImpl(CqQueryImpl cq) {
@@ -40,7 +40,7 @@ public class CqStatisticsImpl implements CqStatistics {
/**
* Returns the number of Insert events for this CQ.
- *
+ *
* @return the number of insert events
*/
public long numInserts() {
@@ -49,7 +49,7 @@ public class CqStatisticsImpl implements CqStatistics {
/**
* Returns number of Delete events for this CQ.
- *
+ *
* @return the number of delete events
*/
public long numDeletes() {
@@ -58,7 +58,7 @@ public class CqStatisticsImpl implements CqStatistics {
/**
* Returns number of Update events for this CQ.
- *
+ *
* @return the number of update events
*/
public long numUpdates() {
@@ -67,7 +67,7 @@ public class CqStatisticsImpl implements CqStatistics {
/**
* Returns the total number of events for this CQ.
- *
+ *
* @return the total number of insert, update, and delete events
*/
public long numEvents() {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
index 2f13fac..83e6bb8 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
@@ -261,7 +261,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* For Test use only.
- *
+ *
* @return CQ Results Cache.
*/
public Set<Object> getCqResultKeyCache() {
@@ -278,7 +278,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
* Returns parameterized query used by the server. This method replaces Region name with $1 and if
* type is not specified in the query, looks for type from cqattributes and appends into the
* query.
- *
+ *
* @return String modified query.
*/
private Query constructServerSideQuery() throws QueryException {
@@ -299,7 +299,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* Returns if the passed key is part of the CQs result set. This method needs to be called once
* the CQ result key caching is completed (cqResultsCacheInitialized is true).
- *
+ *
* @return true if key is in the Results Cache.
*/
public boolean isPartOfCqResult(Object key) {
@@ -394,7 +394,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* Returns the size of the CQ Result key cache.
- *
+ *
* @return size of CQ Result key cache.
*/
public int getCqResultKeysSize() {
@@ -481,7 +481,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
/**
* Get CacheClientNotifier of this CqQuery.
- *
+ *
* @return CacheClientNotifier
*/
public CacheClientNotifier getCacheClientNotifier() {
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
index 04e32f8..49702d7 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.operations.ExecuteCQOperationContext;
import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.Query;
@@ -35,10 +40,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.util.Set;
public class ExecuteCQ extends BaseCQCommand {
protected static final Logger logger = LogService.getLogger();
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
index cc8c197..2cca736 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashSet;
import java.util.concurrent.CountDownLatch;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.DataPolicy;
@@ -40,10 +36,10 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.cq.CqQueryImpl;
-import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.cache30.CertifiableTestCacheListener;
+import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -56,6 +52,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the ContiunousQuery mechanism in GemFire. This includes the test with different
@@ -90,7 +89,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
* Tests with client acting as feeder/publisher and registering cq. Added wrt bug 37161. In case
* of InterestList the events are not sent back to the client if its the originator, this is not
* true for cq.
- *
+ *
* @throws Exception
*/
@Test
@@ -128,7 +127,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Fail over/HA with redundancy level set.
- *
+ *
* @throws Exception
*/
@Test
@@ -253,7 +252,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Tests propogation of invalidates and destorys to the clients. Bug 37242.
- *
+ *
* @throws Exception
*/
@Test
@@ -322,7 +321,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Tests make sure that the second client doesnt get more events then there should be. This will
* test the fix for bug 37295.
- *
+ *
*/
@Test
public void testCQWithMultipleClients() throws Exception {
@@ -382,7 +381,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ when region is populated with net load.
- *
+ *
* @throws Exception
*/
@Test
@@ -435,7 +434,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ when entries are evicted from region.
- *
+ *
* @throws Exception
*/
@Test
@@ -508,7 +507,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ with ConnectionPool.
- *
+ *
* @throws Exception
*/
@Test
@@ -570,7 +569,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ with BridgeClient.
- *
+ *
* @throws Exception
*/
@Test
@@ -629,7 +628,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ with ConnectionPool.
- *
+ *
* @throws Exception
*/
@Test
@@ -687,7 +686,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ with establishCallBackConnection.
- *
+ *
* @throws Exception
*/
@Test
@@ -755,7 +754,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
/**
* Test for: Region destroy, calls close on the server. Region clear triggers cqEvent with query
* op region clear. Region invalidate triggers cqEvent with query op region invalidate.
- *
+ *
* @throws Exception
*/
@Test
@@ -837,7 +836,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
* executeWithInitialResults there may be possibility that the region changes during that time may
* not be reflected in the query result set thus making the query data and region data
* inconsistent.
- *
+ *
* @throws Exception
*/
@Test
@@ -973,7 +972,7 @@ public class CqDataDUnitTest extends JUnit4CacheTestCase {
* The second execution will block until TC1 is completed (based on how executeWithInitialResults
* is implemented) A third thread will be awaken and release the latch in the testhook for TC1 to
* complete.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index 630dbfe..d412b52 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index c5f8909..faa5097 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
index e69761e..e2255f6 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -14,22 +14,16 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
@@ -39,10 +33,10 @@ import org.apache.geode.cache.query.CqListener;
import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.DefaultQueryService;
-import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
-import org.apache.geode.cache.query.internal.cq.ServerCQImpl;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
+import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
+import org.apache.geode.cache.query.internal.cq.ServerCQImpl;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.AvailablePortHelper;
@@ -54,6 +48,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -83,7 +80,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Tests the cq performance.
- *
+ *
* @throws Exception
*/
@Ignore("perf")
@@ -194,7 +191,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Test for maintaining keys for update optimization.
- *
+ *
* @throws Exception
*/
@Test
@@ -416,7 +413,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Test for common CQs. To test the changes relating to, executing CQ only once for all similar
* CQs.
- *
+ *
* @throws Exception
*/
@Category(FlakyTest.class) // GEODE-1164: random ports, thread sleeps, time sensitive, eats
@@ -519,7 +516,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Test for common CQs. To test the changes relating to, executing CQ only once for all similar
* CQs.
- *
+ *
* @throws Exception
*/
@Test
@@ -676,7 +673,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Fail over.
- *
+ *
* @throws Exception
*/
@Test
@@ -837,7 +834,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Fail over.
- *
+ *
* @throws Exception
*/
@Test
@@ -891,7 +888,7 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
/**
* Performance test for Matching CQ optimization changes.
- *
+ *
* @throws Exception
*/
@Ignore("perf")
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 0d9fdad..c05d531 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -14,22 +14,16 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
@@ -39,10 +33,10 @@ import org.apache.geode.cache.query.CqListener;
import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.DefaultQueryService;
-import org.apache.geode.cache.query.internal.cq.ServerCQImpl;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
+import org.apache.geode.cache.query.internal.cq.ServerCQImpl;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.AvailablePortHelper;
@@ -54,6 +48,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the ContiunousQuery mechanism in GemFire. This includes the test with diffetent
@@ -83,7 +80,7 @@ public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests the cq performance.
- *
+ *
* @throws Exception
*/
@Ignore("perf")
@@ -194,7 +191,7 @@ public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Test for maintaining keys for update optimization.
- *
+ *
* @throws Exception
*/
@Test
@@ -416,7 +413,7 @@ public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Test for common CQs. To test the changes relating to, executing CQ only once for all similar
* CQs.
- *
+ *
* @throws Exception
*/
@Test
@@ -531,7 +528,7 @@ public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Test for common CQs. To test the changes relating to, executing CQ only once for all similar
* CQs.
- *
+ *
* @throws Exception
*/
@Test
@@ -692,7 +689,7 @@ public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Fail over.
- *
+ *
* @throws Exception
*/
@Test
@@ -865,7 +862,7 @@ public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Performance test for Matching CQ optimization changes.
- *
+ *
* @throws Exception
*/
@Ignore("perf")
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
index ef5449a..711316b 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -97,19 +97,19 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
public final String[] regions = new String[] {"regionA", "regionB"};
- private final static int CREATE = 0;
- private final static int UPDATE = 1;
- private final static int DESTROY = 2;
- private final static int INVALIDATE = 3;
- private final static int CLOSE = 4;
- private final static int REGION_CLEAR = 5;
- private final static int REGION_INVALIDATE = 6;
+ private static final int CREATE = 0;
+ private static final int UPDATE = 1;
+ private static final int DESTROY = 2;
+ private static final int INVALIDATE = 3;
+ private static final int CLOSE = 4;
+ private static final int REGION_CLEAR = 5;
+ private static final int REGION_INVALIDATE = 6;
- static public final String KEY = "key-";
+ public static final String KEY = "key-";
- static private final String WAIT_PROPERTY = "CqQueryTest.maxWaitTime";
+ private static final String WAIT_PROPERTY = "CqQueryTest.maxWaitTime";
- static private final int WAIT_DEFAULT = (20 * 1000);
+ private static final int WAIT_DEFAULT = (20 * 1000);
public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
@@ -758,7 +758,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Execute/register CQ as running.
- *
+ *
* @param initialResults true if initialResults are requested
* @param expectedResultsSize if >= 0, validate results against this size
* @param expectedErr if not null, an error we expect
@@ -1645,7 +1645,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for InterestList and CQ registered from same clients.
- *
+ *
* @throws Exception
*/
@Test
@@ -1805,7 +1805,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ register and UnRegister.
- *
+ *
* @throws Exception
*/
@Test
@@ -1879,7 +1879,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Attributes Mutator functions
- *
+ *
* @throws Exception
*/
@Test
@@ -1952,7 +1952,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ register and UnRegister.
- *
+ *
* @throws Exception
*/
@Test
@@ -2367,19 +2367,19 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/*
* compare values... Disabled since we don't currently maintain results on the client
- *
+ *
* validateCQ(client, "testCQResultSet_1", 2, noTest, noTest, noTest); Portfolio[] values = new
* Portfolio[] {new Portfolio(2), new Portfolio(4)}; Hashtable t = new Hashtable(); String[]
* keys = new String[] {"key-2", "key-4"}; t.put(keys[0], values[0]); t.put(keys[1], values[1]);
- *
+ *
* compareValues(client, "testCQResultSet_1", t);
- *
+ *
* deleteValues(server, regions[1], 3); t.remove("key-4"); pause(2 * 1000);
- *
+ *
* try { compareValues(client, "testCQResultSet_1", t);
* fail("Should have thrown Exception. The value should not be present in cq results region"); }
* catch (Exception ex) { // @todo check for specific exception type }
- *
+ *
*/
// Close.
@@ -2547,7 +2547,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for stopping and restarting CQs.
- *
+ *
* @throws Exception
*/
@Test
@@ -2667,7 +2667,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for Complex queries.
- *
+ *
* @throws Exception
*/
@Test
@@ -2710,7 +2710,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Fail over.
- *
+ *
* @throws Exception
*/
@Test
@@ -2798,7 +2798,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Fail over/HA with redundancy level set.
- *
+ *
* @throws Exception
*/
@Test
@@ -2897,7 +2897,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Test without CQs. This was added after an exception encountered with CQService, when there was
* no CQService intiated.
- *
+ *
* @throws Exception
*/
@Test
@@ -3069,7 +3069,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Tests execution of queries with NULL in where clause like where ID = NULL etc.
- *
+ *
* @throws Exception
*/
@Test
@@ -3117,7 +3117,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Tests execution of queries with NULL in where clause like where ID = NULL etc.
- *
+ *
* @throws Exception
*/
@Test
@@ -3218,7 +3218,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
}
/**
- *
+ *
*/
@Test
public void testCQWhereCondOnShort() throws Exception {
@@ -3251,7 +3251,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
}
/**
- *
+ *
*/
@Test
public void testCQEquals() throws Exception {
@@ -3306,7 +3306,7 @@ public class CqQueryDUnitTest extends JUnit4CacheTestCase {
}
/**
- *
+ *
*/
@Test
public void testCQEqualsWithIndex() throws Exception {
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index 10c3d68..d7e6868 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Region;
@@ -33,6 +29,9 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 7e1dc03..c002cb2 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -100,19 +100,19 @@ public class CqQueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
public final String[] regions = new String[] {"regionA", "regionB"};
- private final static int CREATE = 0;
- private final static int UPDATE = 1;
- private final static int DESTROY = 2;
- private final static int INVALIDATE = 3;
- private final static int CLOSE = 4;
- private final static int REGION_CLEAR = 5;
- private final static int REGION_INVALIDATE = 6;
+ private static final int CREATE = 0;
+ private static final int UPDATE = 1;
+ private static final int DESTROY = 2;
+ private static final int INVALIDATE = 3;
+ private static final int CLOSE = 4;
+ private static final int REGION_CLEAR = 5;
+ private static final int REGION_INVALIDATE = 6;
- static public final String KEY = "key-";
+ public static final String KEY = "key-";
- static private final String WAIT_PROPERTY = "CqQueryTest.maxWaitTime";
+ private static final String WAIT_PROPERTY = "CqQueryTest.maxWaitTime";
- static private final int WAIT_DEFAULT = (20 * 1000);
+ private static final int WAIT_DEFAULT = (20 * 1000);
public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
@@ -230,7 +230,7 @@ public class CqQueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Create a bridge server with partitioned region.
- *
+ *
* @param server VM where to create the bridge server.
* @param port bridge server port.
* @param isAccessor if true the under lying partitioned region will not host data on this vm.
@@ -632,7 +632,7 @@ public class CqQueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Execute/register CQ as running.
- *
+ *
* @param initialResults true if initialResults are requested
* @param expectedResultsSize if >= 0, validate results against this size
* @param expectedErr if not null, an error we expect
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index 6720ecf..ec661c4 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,18 +14,17 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 8c03ee5..d5830bb 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -14,20 +14,15 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.data.Portfolio;
@@ -47,6 +42,10 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the ContinuousQuery mechanism in GemFire.
@@ -126,7 +125,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set.
- *
+ *
* @throws Exception
*/
@Test
@@ -181,7 +180,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set with Compact Range Index.
- *
+ *
* @throws Exception
*/
@Test
@@ -226,7 +225,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set with Range Index.
- *
+ *
* @throws Exception
*/
@Test
@@ -285,7 +284,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set.
- *
+ *
* @throws Exception
*/
@Test
@@ -342,7 +341,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set with Compact Range Index.
- *
+ *
* @throws Exception
*/
@Test
@@ -391,7 +390,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set with Range Index.
- *
+ *
* @throws Exception
*/
@Test
@@ -464,7 +463,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set.
- *
+ *
* @throws Exception
*/
@Test
@@ -586,7 +585,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set.
- *
+ *
* @throws Exception
*/
@Test
@@ -713,7 +712,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set.
- *
+ *
* @throws Exception
*/
@Test
@@ -809,7 +808,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Set caching for destroy events.
- *
+ *
* @throws Exception
*/
@Test
@@ -928,7 +927,7 @@ public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Tests CQ Result Caching with CQ Failover.
- *
+ *
* @throws Exception
*/
@Category(FlakyTest.class) // GEODE-1251
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index c3194bd..d764e7e 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,27 +14,23 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.DefaultQueryService;
+import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
import org.apache.geode.cache.query.internal.cq.ServerCQImpl;
-import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.dunit.Assert;
@@ -45,6 +41,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest {
@@ -74,7 +73,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs
/**
* Tests CQ Result Caching with CQ Failover. When EXECUTE_QUERY_DURING_INIT is false and new
* server calls execute during HA the results cache is not initialized.
- *
+ *
* @throws Exception
*/
@Override
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
index 53f1968..cbf08f5 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -135,4 +135,3 @@ public class CqStateDUnitTest extends HelperTestCase {
}
}
-
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
index f4cd706..07dd192 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -237,7 +237,7 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ and CQ Service Statistics
- *
+ *
* @throws Exception
*/
@Test
@@ -317,7 +317,7 @@ public class CqStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Service Statistics
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index 53efb90..b6e0fae 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index c03bb8b..68bfe65 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -242,11 +242,11 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
});
}
- private final static int PAUSE = 8 * 1000; // 5 * 1000
+ private static final int PAUSE = 8 * 1000; // 5 * 1000
/**
* Test for CQ and CQ Service Statistics
- *
+ *
* @throws Exception
*/
@Test
@@ -335,7 +335,7 @@ public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Test for CQ Service Statistics
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java
index 444dcde..9371b8c 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java
@@ -48,14 +48,14 @@ public class CqTimeTestListener implements CqListener {
protected volatile boolean eventClose = false;
- final public Set destroys = Collections.synchronizedSet(new HashSet());
- final public Set creates = Collections.synchronizedSet(new HashSet());
- final public Set invalidates = Collections.synchronizedSet(new HashSet());
- final public Set updates = Collections.synchronizedSet(new HashSet());
+ public final Set destroys = Collections.synchronizedSet(new HashSet());
+ public final Set creates = Collections.synchronizedSet(new HashSet());
+ public final Set invalidates = Collections.synchronizedSet(new HashSet());
+ public final Set updates = Collections.synchronizedSet(new HashSet());
- static private final String WAIT_PROPERTY = "CQueryTestListener.maxWaitTime";
+ private static final String WAIT_PROPERTY = "CQueryTestListener.maxWaitTime";
- static private final int WAIT_DEFAULT = (20 * 1000);
+ private static final int WAIT_DEFAULT = (20 * 1000);
public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();;
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index d291762..8189114 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -59,7 +59,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for Partitioned Region and CQs
- *
+ *
* @since GemFire 5.5
*/
@Category(DistributedTest.class)
@@ -1109,7 +1109,7 @@ public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* create accessor vm if the given accessor parameter variable is true.
- *
+ *
* @param server VM to create bridge server.
* @param accessor boolean if true creates an accessor bridge server.
*/
@@ -1119,7 +1119,7 @@ public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* create server with partitioned region with redundant copies.
- *
+ *
* @param server VM where to create the bridge server.
* @param accessor boolean if true create partitioned region with local max memory zero.
* @param redundantCopies number of redundant copies for a partitioned region.
@@ -1130,7 +1130,7 @@ public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Create a bridge server with partitioned region.
- *
+ *
* @param server VM where to create the bridge server.
* @param port bridge server port.
* @param isAccessor if true the under lying partitioned region will not host data on this vm.
@@ -1170,7 +1170,7 @@ public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
/**
* Create a bridge server with partitioned region.
- *
+ *
* @param server VM where to create the bridge server.
* @param port bridge server port.
* @param isAccessor if true the under lying partitioned region will not host data on this vm.
@@ -1400,5 +1400,3 @@ public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
});
}
}
-
-
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index 0a6947d..64b5b83 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Region;
@@ -32,6 +28,9 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index 2a63f0c..5c8cba4 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -21,6 +21,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -51,12 +54,10 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Test class for Partitioned Region and CQs
- *
+ *
* @since GemFire 5.5
*/
@Category(DistributedTest.class)
@@ -66,9 +67,9 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
super();
}
- static public final String[] regions = new String[] {"regionA", "regionB"};
+ public static final String[] regions = new String[] {"regionA", "regionB"};
- static public final String KEY = "key-";
+ public static final String KEY = "key-";
private final CqQueryUsingPoolDUnitTest cqHelper = new CqQueryUsingPoolDUnitTest();
@@ -179,11 +180,11 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
// invalidate some entries.
/*
* final int numInvalidates = 5;
- *
+ *
* server2.invoke(new CacheSerializableRunnable("Invalidate values") { public void run2() throws
* CacheException { Region region1 = getRootRegion().getSubregion(regions[0]); for (int i =
* numInvalidates; i <= (numInvalidates+4); i++) { region1.invalidate(KEY+i); } } });
- *
+ *
* cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+(numInvalidates+4));
*/
// cqHelper.validateCQ(client, "testCQEvents_0",
@@ -595,7 +596,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* test cqs with invalidates on bridge server not hosting datastores.
- *
+ *
*/
@Test
public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
@@ -775,7 +776,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* test cqs on multiple partitioned region hosted by bridge servers.
- *
+ *
*/
@Test
public void testPRCqWithMultipleRegionsOnServer() throws Exception {
@@ -894,7 +895,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* tests multiple cqs on partitioned region on bridge servers with profile update for not
* requiring old values.
- *
+ *
*/
@Test
public void testPRWithCQsAndProfileUpdates() throws Exception {
@@ -1015,7 +1016,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
* "ize of requires old value at server1 before closing cqs : " + requiresOldValue.size());
* assertTrue("The size of requiresOldValue shoule be zero on server1", (0 ==
* requiresOldValue.size())); } });
- *
+ *
* server2.invoke(new CacheSerializableRunnable("Check requires old value") { public void run2()
* { Cache cc = getCache(); PartitionedRegion region1 = (PartitionedRegion)cc
* .getRegion("/root/regionA"); Set requiresOldValue = region1.getRegionAdvisor()
@@ -1037,8 +1038,8 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
* "size of requires old value set at the end server1 : " + requiresOldValue.size());
* assertTrue("The size of requiresOldValue shoule be zero on server1", (0 ==
* requiresOldValue.size())); } });
- *
- *
+ *
+ *
* server2.invoke(new CacheSerializableRunnable("Check requires old value") { public void run2()
* { Cache cc = getCache(); PartitionedRegion region1 = (PartitionedRegion)cc
* .getRegion("/root/regionA"); Set requiresOldValue = region1.getRegionAdvisor()
@@ -1060,7 +1061,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
* executeWithInitialResults there may be possibility that the region changes during that time may
* not be reflected in the query result set thus making the query data and region data
* inconsistent.
- *
+ *
* @throws Exception
*/
@Category(FlakyTest.class) // GEODE-1181, 1253: random ports, eats exceptions (fixed some), async
@@ -1605,7 +1606,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* create accessor vm if the given accessor parameter variable is true.
- *
+ *
* @param server VM to create bridge server.
* @param accessor boolean if true creates an accessor bridge server.
*/
@@ -1615,7 +1616,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* create server with partitioned region with redundant copies.
- *
+ *
* @param server VM where to create the bridge server.
* @param accessor boolean if true create partitioned region with local max memory zero.
* @param redundantCopies number of redundant copies for a partitioned region.
@@ -1626,7 +1627,7 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* Create a bridge server with partitioned region.
- *
+ *
* @param server VM where to create the bridge server.
* @param port bridge server port.
* @param isAccessor if true the under lying partitioned region will not host data on this vm.
@@ -1871,5 +1872,3 @@ public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
}
-
-
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index 4fa8d72..af0cec9 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,18 +14,17 @@
*/
package org.apache.geode.cache.query.cq.dunit;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
index 2d888cf..7b2e99c 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -14,20 +14,14 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Region;
@@ -43,7 +37,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.cq.dunit.CqQueryTestListener;
import org.apache.geode.cache.query.dunit.PdxQueryCQTestBase.TestObject;
+import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.cache30.ClientServerTestCase;
+import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
@@ -51,8 +47,11 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.cache30.CacheSerializableRunnable;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
@Category({DistributedTest.class, SerializationTest.class, ClientSubscriptionTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index 9eb6360..0f1699e 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -14,21 +14,16 @@
*/
package org.apache.geode.cache.query.dunit;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -47,6 +42,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache30.CacheSerializableRunnable;
+import org.apache.geode.cache30.CacheTestCase;
+import org.apache.geode.cache30.CertifiableTestCacheListener;
import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
@@ -55,15 +53,16 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
-import org.apache.geode.cache30.CertifiableTestCacheListener;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests register interest behavior on client at startup given that client has already
* created a Index on region on which it registers interest. Then client run a query on region in
* local cache (Not on server) using the Index.
- *
+ *
*
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
@@ -81,8 +80,8 @@ public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
// append where
// cond.
- static public final String KEY = "key-";
- static public final String REGULAR_EXPRESSION = ".*1+?.*";
+ public static final String KEY = "key-";
+ public static final String REGULAR_EXPRESSION = ".*1+?.*";
private static final String ROOT = "root";
@@ -141,7 +140,7 @@ public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
/**
* Tests overlap keys between client region and server region to verify the server region values
* are synched with client region on register interest.
- *
+ *
* @throws Exception
*/
@Test
@@ -283,7 +282,7 @@ public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
/**
* This test tests the RegionClearedException Path in AbsractRegionMap while doing
* initialImagePut() during registerInterest on client.
- *
+ *
* @throws Exception
*/
@Test
@@ -626,7 +625,7 @@ public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
/**
* Creates Init Values. start specifies the start index from which key no would start.
- *
+ *
* @param vm
* @param regionName
* @param size
@@ -706,7 +705,7 @@ public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
/**
* Validates a query result with client region values if region is not null, otherwise verifies
* the size only.
- *
+ *
* @param vm
* @param query
* @param resultSize
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
index 9332388..1e0e6a0 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -15,10 +15,17 @@
package org.apache.geode.cache.query.dunit;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
import java.io.File;
import java.io.IOException;
import java.util.Properties;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -63,16 +70,9 @@ import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
/**
* Tests for QueryMonitoring service.
- *
+ *
* @since GemFire 6.0
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
@@ -884,7 +884,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
/**
* The following CQ test is added to make sure testMaxQueryExecutionTime is reset and is not
* affecting other query related tests.
- *
+ *
* @throws Exception
*/
@Test
@@ -1181,4 +1181,3 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
}
}
-
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java
index 7dc366e..781ad8e 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.cache.query.internal.cq;
import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class CqServiceUnitTest {
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
index 061f4d1..ca9e2ae 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import com.examples.snapshot.MyObject;
import com.examples.snapshot.MyPdxSerializer;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -49,6 +48,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
index 4ba17e0..4221659 100755
--- a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.codeAnalysis;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
index dc84a34..d31937d 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -22,8 +22,6 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -68,7 +66,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
/**
* Tests the PR delta propagation functionality.
@@ -76,7 +76,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, SerializationTest.class, ClientSubscriptionTest.class})
public class PRDeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
- private final static Compressor compressor = SnappyCompressor.getDefaultInstance();
+ private static final Compressor compressor = SnappyCompressor.getDefaultInstance();
protected static Cache cache = null;
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
index 7a76e4e..88dc6d2 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
@@ -32,8 +32,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -94,12 +92,14 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests putAll for c/s. Also tests removeAll
- *
+ *
* @since GemFire 5.0.23
*/
@Category({DistributedTest.class, ClientServerTest.class, ClientSubscriptionTest.class})
@@ -374,7 +374,7 @@ public class PutAllCSDUnitTest extends ClientServerTestCase {
* ads = AdminDistributedSystemFactory.getDistributedSystem(config); ads.connect();
* DistributedMember distributedMember = system.getDistributedMember(); SystemMember member =
* ads.lookupSystemMember(distributedMember);
- *
+ *
* StatisticResource[] resources = member.getStats(); for (int i=0; i<resources.length; i++) {
* System.out.println("GGG:"+resources[i].getType()); if
* (resources[i].getType().equals("CacheServerClientStats")) { Statistic[] stats =
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
index 38fd245..aecd692 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -21,6 +21,13 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.cache.CacheListener;
@@ -68,19 +75,13 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class RemoteCQTransactionDUnitTest extends JUnit4CacheTestCase {
- final protected String CUSTOMER = "custRegion";
- final protected String ORDER = "orderRegion";
- final protected String D_REFERENCE = "distrReference";
+ protected final String CUSTOMER = "custRegion";
+ protected final String ORDER = "orderRegion";
+ protected final String D_REFERENCE = "distrReference";
final CustId expectedCustId = new CustId(6);
final Customer expectedCustomer = new Customer("customer6", "address6");
@@ -394,7 +395,7 @@ public class RemoteCQTransactionDUnitTest extends JUnit4CacheTestCase {
}
}
- static abstract class CacheCallback {
+ abstract static class CacheCallback {
protected boolean isAccessor;
protected Exception ex = null;
@@ -517,7 +518,7 @@ public class RemoteCQTransactionDUnitTest extends JUnit4CacheTestCase {
public void close() {}
}
- static abstract class txCallback {
+ abstract static class txCallback {
protected boolean isAccessor;
protected Exception ex = null;
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
index 2b44a8e..11826c9 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -67,6 +66,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -75,13 +75,13 @@ import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class CQListGIIDUnitTest extends JUnit4DistributedTestCase {
- private final static int CREATE = 0;
- private final static int UPDATE = 1;
- private final static int DESTROY = 2;
- private final static int INVALIDATE = 3;
- private final static int CLOSE = 4;
- private final static int REGION_CLEAR = 5;
- private final static int REGION_INVALIDATE = 6;
+ private static final int CREATE = 0;
+ private static final int UPDATE = 1;
+ private static final int DESTROY = 2;
+ private static final int INVALIDATE = 3;
+ private static final int CLOSE = 4;
+ private static final int REGION_CLEAR = 5;
+ private static final int REGION_INVALIDATE = 6;
protected static Cache cache = null;
@@ -252,7 +252,7 @@ public class CQListGIIDUnitTest extends JUnit4DistributedTestCase {
/**
* A helper for creating a subregion, potentially using a package protected method to do so.
- *
+ *
* @param root the parent region
* @param name the name of the subregion to create
* @param attrs the attributes used to create the subregion
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
index 76177ed..af9e2ce 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
@@ -14,6 +14,23 @@
*/
package org.apache.geode.internal.cache.ha;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.AvailablePort.SOCKET;
+import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Host.getHost;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.query.*;
@@ -35,22 +52,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.apache.geode.internal.AvailablePort.SOCKET;
-import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Host.getHost;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
-import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
-import static org.apache.geode.test.dunit.Wait.waitForCriterion;
/**
* This Dunit test is to verify that when the dispatcher of CS dispatches the Event , the peer's
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
index 37aeaa4..655baf2 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
@@ -19,8 +19,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import io.codearte.catchexception.shade.mockito.Mockito;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -28,10 +26,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.cache.query.CqAttributesFactory;
-import org.apache.geode.cache.query.CqListener;
-import org.apache.geode.cache.query.CqQuery;
-import org.apache.geode.cache.server.CacheServer;
+import io.codearte.catchexception.shade.mockito.Mockito;
import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,6 +38,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.PoolImpl;
+import org.apache.geode.cache.query.CqAttributesFactory;
+import org.apache.geode.cache.query.CqListener;
+import org.apache.geode.cache.query.CqQuery;
+import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.LocalRegion;
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 20d057a..d83d027 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -21,6 +21,14 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DeltaTestImpl;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
@@ -57,17 +65,10 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Properties;
/**
* Test client to server flow for delta propogation
- *
+ *
* @since GemFire 6.1
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class, SerializationTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index af31a9b..a375ee8 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -20,6 +20,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import java.util.List;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DeltaTestImpl;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -53,11 +59,6 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.List;
-import java.util.Properties;
@Category({DistributedTest.class, ClientSubscriptionTest.class, SerializationTest.class})
public class DeltaPropagationWithCQDUnitTest extends JUnit4DistributedTestCase {
@@ -352,4 +353,3 @@ public class DeltaPropagationWithCQDUnitTest extends JUnit4DistributedTestCase {
}
}
}
-
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 89e7546..aa7cf94 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -22,6 +22,12 @@ import static org.apache.geode.test.dunit.Assert.assertNotNull;
import static org.apache.geode.test.dunit.Assert.assertTrue;
import static org.apache.geode.test.dunit.Assert.fail;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -49,11 +55,6 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Iterator;
-import java.util.Properties;
/**
* This tests the flag setting for region ( DataPolicy as Empty ) for Delta propogation for a client
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
index 29584ac..925e76c 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -16,11 +16,12 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.junit.Assert.assertNotNull;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
/**
* Class <code>DurableClientCrashDUnitTest</code> tests durable client functionality when clients
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
index a425f34..5b2f1d1 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
/**
* Class <code>DurableClientCrashDUnitTest</code> tests durable client functionality when clients
* are disconnected from servers.
- *
+ *
* @since GemFire 5.2
*/
@Category({DistributedTest.class, ClientSubscriptionTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 0a45494..85c4f6b 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -27,6 +27,11 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.ClientSession;
import org.apache.geode.cache.InterestResultPolicy;
@@ -65,11 +70,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.awaitility.Awaitility;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
@@ -2501,7 +2501,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
/**
* Test functionality to close the cq and drain all events from the ha queue from the server This
* draining should not affect events that still have register interest
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
index 6d94a17..df2646e 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -1608,10 +1608,10 @@ public class DurableClientTestCase extends JUnit4DistributedTestCase {
* String result = ""; if(ClientHealthMonitor._instance != null &&
* ClientHealthMonitor._instance.getCleanupProxyIdTable() != null) result =
* ClientHealthMonitor._instance.getCleanupProxyIdTable().toString();
- *
- *
+ *
+ *
* CacheClientProxy ccp = getClientProxy();
- *
+ *
* if(ccp != null) result += " ccp: " + ccp.toString();
*/
return getAllClientProxyState() + " CHM state: "
@@ -1658,7 +1658,7 @@ public class DurableClientTestCase extends JUnit4DistributedTestCase {
/**
* Returns the durable client proxy's HARegionQueue region name. This method is accessed via
* reflection on a server VM.
- *
+ *
* @return the durable client proxy's HARegionQueue region name
*/
protected static String getHARegionQueueName() {
@@ -1688,7 +1688,7 @@ public class DurableClientTestCase extends JUnit4DistributedTestCase {
* messages map is <b> static<b> map, which has region queue names for keys and MapWrappers (an
* protected class) as values. All this is testing is to see that this queue has an entry in the
* dispatchedMessages map, which means it got at least one periodic ack.
- *
+ *
* @return true if there was an ack
*/
protected static boolean checkForAck(CacheClientProxy proxy) {
@@ -1913,15 +1913,15 @@ public class DurableClientTestCase extends JUnit4DistributedTestCase {
/*
* @param vm
- *
+ *
* @param cqName
- *
+ *
* @param numEvents
- *
+ *
* @param numEventsToWaitFor most times will be the same as numEvents, but there are times where
* we want to wait for an event we know is not coming just to be sure an event actually isnt
* received
- *
+ *
* @param secondsToWait
*/
protected void checkCqListenerEvents(VM vm, final String cqName, final int numEvents,
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index a6512a6..2f0b3f0 100644
--- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -279,7 +279,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
/**
* Close the cq from the client-side
- *
+ *
* @param cqName , Name of the cq which is to be close.
*/
private void closeCq(final String cqName) {
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
index 048a4b5..a45b083 100644
--- a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.management.internal.pulse;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.cq.dunit.CqQueryDUnitTest;
import org.apache.geode.internal.AvailablePortHelper;
@@ -33,10 +29,13 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is for testing continuous query.
- *
+ *
*/
@Category(DistributedTest.class)
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
index 8acfbc7..c713397 100644
--- a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.management.internal.pulse;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.cq.dunit.CqQueryDUnitTest;
import org.apache.geode.internal.AvailablePortHelper;
@@ -33,11 +29,14 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is for testing Number of clients and can be extended for relevant test addition
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
index 3d8f771..256bb00 100644
--- a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.management.internal.pulse;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.cq.dunit.CqQueryDUnitTest;
import org.apache.geode.internal.AvailablePortHelper;
@@ -32,10 +28,13 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is for testing server count details from MBean
- *
+ *
*/
@Category(DistributedTest.class)
diff --git a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
index 0005223..bed11f7 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
@@ -22,6 +22,17 @@ import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
@@ -38,20 +49,10 @@ import org.apache.geode.pdx.SimpleClass;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.awaitility.Awaitility;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
@Category({DistributedTest.class, SecurityTest.class})
@RunWith(Parameterized.class)
diff --git a/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java b/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
index cd3c198..bc674ea 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
@@ -51,9 +51,9 @@ import org.apache.geode.security.templates.UserPasswordAuthInit;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class CQPostProcessorDunitTest extends JUnit4DistributedTestCase {
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
index 83358ea..f6c9115 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
@@ -35,10 +35,10 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* Tests for authorization from client to server. This tests for authorization of all operations
* with both valid and invalid credentials/modules with pre-operation callbacks. It also checks for
* authorization in case of failover.
- *
+ *
* This is the second part of the test which had become long enough to occasionally go beyond the
* 10min limit.
- *
+ *
* @since GemFire 5.5
*/
@Category({DistributedTest.class, SecurityTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
index a8ab8f9..3dd1bdb 100755
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
@@ -17,6 +17,14 @@ package org.apache.geode.security;
import static org.apache.geode.security.SecurityTestUtils.closeCache;
import static org.apache.geode.security.SecurityTestUtils.getLocatorPort;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.Instantiator;
import org.apache.geode.cache.operations.OperationContext.OperationCode;
@@ -32,26 +40,19 @@ import org.apache.geode.security.templates.UserPasswordAuthInit;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
/**
* Tests for authorization callback that modify objects and callbacks from client to server.
- *
+ *
* The scheme of these tests is thus: A user name terminating in integer 'i' can get values
* terminating with 'i', '2*i', '3*i' and so on. So 'gemfire1' can get 'value1', 'value2', ...;
* 'gemfire2' can get 'value2', 'value4', ... and so on. On the server side this is done by adding
* the index 'i' to the object in the pre-processing phase, and checked by comparing against the
* user name index during the post-processing phase.
- *
+ *
* This enables testing of object and callback modification both in pre-processing and
* post-processing phases.
- *
+ *
* @since GemFire 5.5
*/
@Category({DistributedTest.class, SecurityTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientCQAuthDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientCQAuthDUnitTest.java
index 63696f3..4a788d6 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientCQAuthDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientCQAuthDUnitTest.java
@@ -35,9 +35,9 @@ import org.apache.geode.cache.query.CqQuery;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientCQAuthDUnitTest {
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
index 9985bda..17b85d9 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Random;
-import org.apache.geode.internal.AvailablePortHelper;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -46,6 +45,7 @@ import org.apache.geode.cache.query.cq.dunit.CqQueryTestListener;
import org.apache.geode.cache.query.internal.cq.ClientCQImpl;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.security.generator.AuthzCredentialGenerator;
import org.apache.geode.security.generator.CredentialGenerator;
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
index fc5dcdd..ad430d7 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.categories.SecurityTest;
/**
* Tests for authorization from client to server. This tests for authorization with post-process
* callbacks in case return values of operations and for notifications along-with failover.
- *
+ *
* @since GemFire 5.5
*/
@Category({DistributedTest.class, SecurityTest.class})
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java
index a18a4c6..e1f95bf 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java
@@ -31,9 +31,9 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientQueryAuthDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-cq/src/test/java/org/apache/geode/security/MultiUserAPIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/MultiUserAPIDUnitTest.java
index 1243f16..1d905de 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/MultiUserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/MultiUserAPIDUnitTest.java
@@ -14,6 +14,19 @@
*/
package org.apache.geode.security;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.execute.FunctionService;
@@ -28,17 +41,6 @@ import org.apache.geode.security.generator.CredentialGenerator;
import org.apache.geode.security.generator.DummyCredentialGenerator;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-import java.io.IOException;
-import java.util.Properties;
-
-import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
-import static org.apache.geode.test.dunit.Assert.fail;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
@Category({DistributedTest.class, SecurityTest.class})
public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase {
diff --git a/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
index d9e09e6..8b29059 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Random;
-import org.apache.geode.internal.AvailablePortHelper;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -42,6 +41,7 @@ import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.cq.dunit.CqQueryTestListener;
import org.apache.geode.cache.query.internal.cq.ClientCQImpl;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.security.generator.AuthzCredentialGenerator;
import org.apache.geode.security.generator.CredentialGenerator;
diff --git a/geode-json/src/main/java/org/json/JSONArray.java b/geode-json/src/main/java/org/json/JSONArray.java
index c961139..e7ca694 100755
--- a/geode-json/src/main/java/org/json/JSONArray.java
+++ b/geode-json/src/main/java/org/json/JSONArray.java
@@ -664,7 +664,7 @@ public class JSONArray {
* separator}. This array's string values are quoted and have their special characters escaped.
* For example, the array containing the strings '12" pizza', 'taco' and 'soda' joined on '+'
* returns this:
- *
+ *
* <pre>
* "12\" pizza" + "taco" + "soda"
* </pre>
@@ -688,7 +688,7 @@ public class JSONArray {
/**
* Encodes this array as a compact JSON string, such as:
- *
+ *
* <pre>
* [94043,90210]
* </pre>
@@ -708,7 +708,7 @@ public class JSONArray {
/**
* Encodes this array as a human readable JSON string for debugging, such as:
- *
+ *
* <pre>
* [
* 94043,
diff --git a/geode-json/src/main/java/org/json/JSONException.java b/geode-json/src/main/java/org/json/JSONException.java
index 83fb4b8..7a2af82 100755
--- a/geode-json/src/main/java/org/json/JSONException.java
+++ b/geode-json/src/main/java/org/json/JSONException.java
@@ -30,7 +30,7 @@ package org.json;
* <p>
* Although this is a checked exception, it is rarely recoverable. Most callers should simply wrap
* this exception in an unchecked exception and rethrow:
- *
+ *
* <pre>
* public JSONArray toJSONObject() {
* try {
diff --git a/geode-json/src/main/java/org/json/JSONObject.java b/geode-json/src/main/java/org/json/JSONObject.java
index 07a024c..3b595d7 100755
--- a/geode-json/src/main/java/org/json/JSONObject.java
+++ b/geode-json/src/main/java/org/json/JSONObject.java
@@ -128,7 +128,7 @@ public class JSONObject {
/**
* Creates a new {@code JSONObject} by copying all name/value mappings from the given map.
- *
+ *
* @param copyFrom a map whose keys are of type {@link String} and whose values are of supported
* types.
* @throws NullPointerException if any of the map's keys are null.
@@ -152,7 +152,7 @@ public class JSONObject {
/**
* Creates a new {@code JSONObject} with name/value mappings from the next object in the tokener.
- *
+ *
* @param readFrom a tokener whose nextValue() method will yield a {@code JSONObject}.
* @throws JSONException if the parse fails or doesn't yield a {@code JSONObject}.
*/
@@ -171,7 +171,7 @@ public class JSONObject {
/**
* Creates a new {@code JSONObject} with name/value mappings from the JSON string.
- *
+ *
* @param json a JSON-encoded string containing an object.
* @throws JSONException if the parse fails or doesn't yield a {@code JSONObject}.
*/
@@ -182,7 +182,7 @@ public class JSONObject {
/**
* Creates a new {@code JSONObject} by copying mappings for the listed names from the given
* object. Names that aren't present in {@code copyFrom} will be skipped.
- *
+ *
* @param copyFrom The source object.
* @param names The names of the fields to copy.
* @throws JSONException On internal errors. Shouldn't happen.
@@ -199,7 +199,7 @@ public class JSONObject {
/**
* Creates a json object from a bean
- *
+ *
* @param bean the bean to create the json object from
* @throws JSONException If there is an exception while reading the bean
*/
@@ -266,7 +266,7 @@ public class JSONObject {
/**
* Returns the number of name/value mappings in this object.
- *
+ *
* @return the length of this.
*/
public int length() {
@@ -276,7 +276,7 @@ public class JSONObject {
/**
* Maps {@code name} to {@code value}, clobbering any existing name/value mapping with the same
* name.
- *
+ *
* @param name The name of the value to insert.
* @param value The value to insert.
* @return this object.
@@ -290,7 +290,7 @@ public class JSONObject {
/**
* Maps {@code name} to {@code value}, clobbering any existing name/value mapping with the same
* name.
- *
+ *
* @param name The name for the new value.
* @param value a finite value. May not be {@link Double#isNaN() NaNs} or
* {@link Double#isInfinite() infinities}.
@@ -305,7 +305,7 @@ public class JSONObject {
/**
* Maps {@code name} to {@code value}, clobbering any existing name/value mapping with the same
* name.
- *
+ *
* @param name The name for the new value.
* @param value The new value.
* @return this object.
@@ -319,7 +319,7 @@ public class JSONObject {
/**
* Maps {@code name} to {@code value}, clobbering any existing name/value mapping with the same
* name.
- *
+ *
* @param name The name of the new value.
* @param value The new value to insert.
* @return this object.
@@ -333,7 +333,7 @@ public class JSONObject {
/**
* Maps {@code name} to {@code value}, clobbering any existing name/value mapping with the same
* name. If the value is {@code null}, any existing mapping for {@code name} is removed.
- *
+ *
* @param name The name of the new value.
* @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long, Double,
* {@link #NULL}, or {@code null}. May not be {@link Double#isNaN() NaNs} or
@@ -357,7 +357,7 @@ public class JSONObject {
/**
* Equivalent to {@code put(name, value)} when both parameters are non-null; does nothing
* otherwise.
- *
+ *
* @param name The name of the value to insert.
* @param value The value to insert.
* @return this object.
@@ -381,7 +381,7 @@ public class JSONObject {
* for {@code name} will <b>always</b> be a {@link JSONArray}. Using {@code accumulate} will
* result in either a {@link JSONArray} or a mapping whose type is the type of {@code value}
* depending on the number of calls to it.
- *
+ *
* @param name The name of the field to change.
* @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long, Double,
* {@link #NULL} or null. May not be {@link Double#isNaN() NaNs} or
@@ -413,7 +413,7 @@ public class JSONObject {
* Appends values to the array mapped to {@code name}. A new {@link JSONArray} mapping for
* {@code name} will be inserted if no mapping exists. If the existing mapping for {@code name} is
* not a {@link JSONArray}, a {@link JSONException} will be thrown.
- *
+ *
* @param name The name of the array to which the value should be appended.
* @param value The value to append.
* @return this object.
@@ -448,7 +448,7 @@ public class JSONObject {
/**
* Removes the named mapping if it exists; does nothing otherwise.
- *
+ *
* @param name The name of the mapping to remove.
* @return the value previously mapped by {@code name}, or null if there was no such mapping.
*/
@@ -459,7 +459,7 @@ public class JSONObject {
/**
* Returns true if this object has no mapping for {@code name} or if it has a mapping whose value
* is {@link #NULL}.
- *
+ *
* @param name The name of the value to check on.
* @return true if the field doesn't exist or is null.
*/
@@ -470,7 +470,7 @@ public class JSONObject {
/**
* Returns true if this object has a mapping for {@code name}. The mapping may be {@link #NULL}.
- *
+ *
* @param name The name of the value to check on.
* @return true if this object has a field named {@code name}
*/
@@ -480,7 +480,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name}, or throws if no such mapping exists.
- *
+ *
* @param name The name of the value to get.
* @return The value.
* @throws JSONException if no such mapping exists.
@@ -495,7 +495,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name}, or null if no such mapping exists.
- *
+ *
* @param name The name of the value to get.
* @return The value.
*/
@@ -506,7 +506,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a boolean or can be coerced to a
* boolean, or throws otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The selected value if it exists.
* @throws JSONException if the mapping doesn't exist or cannot be coerced to a boolean.
@@ -523,7 +523,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a boolean or can be coerced to a
* boolean, or false otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The selected value if it exists.
*/
@@ -534,7 +534,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a boolean or can be coerced to a
* boolean, or {@code fallback} otherwise.
- *
+ *
* @param name The name of the field we want.
* @param fallback The value to return if the field isn't there.
* @return The selected value or the fallback.
@@ -548,7 +548,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a double or can be coerced to a
* double, or throws otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The selected value if it exists.
* @throws JSONException if the mapping doesn't exist or cannot be coerced to a double.
@@ -565,7 +565,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a double or can be coerced to a
* double, or {@code NaN} otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The selected value if it exists.
*/
@@ -576,7 +576,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a double or can be coerced to a
* double, or {@code fallback} otherwise.
- *
+ *
* @param name The name of the field we want.
* @param fallback The value to return if the field isn't there.
* @return The selected value or the fallback.
@@ -590,7 +590,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is an int or can be coerced to an
* int, or throws otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The selected value if it exists.
* @throws JSONException if the mapping doesn't exist or cannot be coerced to an int.
@@ -607,7 +607,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is an int or can be coerced to an
* int, or 0 otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The selected value if it exists.
*/
@@ -618,7 +618,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is an int or can be coerced to an
* int, or {@code fallback} otherwise.
- *
+ *
* @param name The name of the field we want.
* @param fallback The value to return if the field isn't there.
* @return The selected value or the fallback.
@@ -634,7 +634,7 @@ public class JSONObject {
* long, or throws otherwise. Note that JSON represents numbers as doubles,
*
* so this is <a href="#lossy">lossy</a>; use strings to transfer numbers via JSON without loss.
- *
+ *
* @param name The name of the field that we want.
* @return The value of the field.
* @throws JSONException if the mapping doesn't exist or cannot be coerced to a long.
@@ -652,7 +652,7 @@ public class JSONObject {
* Returns the value mapped by {@code name} if it exists and is a long or can be coerced to a
* long, or 0 otherwise. Note that JSON represents numbers as doubles, so this is
* <a href="#lossy">lossy</a>; use strings to transfer numbers via JSON.
- *
+ *
* @param name The name of the field we want.
* @return The selected value.
*/
@@ -664,7 +664,7 @@ public class JSONObject {
* Returns the value mapped by {@code name} if it exists and is a long or can be coerced to a
* long, or {@code fallback} otherwise. Note that JSON represents numbers as doubles, so this is
* <a href="#lossy">lossy</a>; use strings to transfer numbers via JSON.
- *
+ *
* @param name The name of the field we want.
* @param fallback The value to return if the field isn't there.
* @return The selected value or the fallback.
@@ -678,7 +678,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists, coercing it if necessary, or throws if
* no such mapping exists.
- *
+ *
* @param name The name of the field we want.
* @return The value of the field.
* @throws JSONException if no such mapping exists.
@@ -695,7 +695,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists, coercing it if necessary, or the empty
* string if no such mapping exists.
- *
+ *
* @param name The name of the field we want.
* @return The value of the field.
*/
@@ -706,7 +706,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists, coercing it if necessary, or
* {@code fallback} if no such mapping exists.
- *
+ *
* @param name The name of the field that we want.
* @param fallback The value to return if the field doesn't exist.
* @return The value of the field or fallback.
@@ -720,7 +720,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a {@code
* JSONArray}, or throws otherwise.
- *
+ *
* @param name The field we want to get.
* @return The value of the field (if it is a JSONArray.
* @throws JSONException if the mapping doesn't exist or is not a {@code JSONArray}.
@@ -737,7 +737,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a {@code
* JSONArray}, or null otherwise.
- *
+ *
* @param name The name of the field we want.
* @return The value of the specified field (assuming it is a JSNOArray
*/
@@ -749,7 +749,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a {@code
* JSONObject}, or throws otherwise.
- *
+ *
* @param name The name of the field that we want.
* @return a specified field value (if it is a JSONObject)
* @throws JSONException if the mapping doesn't exist or is not a {@code JSONObject}.
@@ -766,7 +766,7 @@ public class JSONObject {
/**
* Returns the value mapped by {@code name} if it exists and is a {@code
* JSONObject}, or null otherwise.
- *
+ *
* @param name The name of the value we want.
* @return The specified value.
*/
@@ -778,7 +778,7 @@ public class JSONObject {
/**
* Returns an array with the values corresponding to {@code names}. The array contains null for
* names that aren't mapped. This method returns null if {@code names} is either null or empty.
- *
+ *
* @param names The names of the fields that we want the values for.
* @return The selected values.
* @throws JSONException On internal errors. Shouldn't happen.
@@ -804,7 +804,7 @@ public class JSONObject {
* {@link Iterator#remove() remove}, which will remove the corresponding mapping from this object.
* If this object is modified after the iterator is returned, the iterator's behavior is
* undefined. The order of the keys is undefined.
- *
+ *
* @return an iterator over the keys.
*/
public Iterator<String> keys() {
@@ -817,7 +817,7 @@ public class JSONObject {
* object and set iterator behaviour is undefined if this object is modified after it is returned.
*
* See {@link #keys()}.
- *
+ *
* @return The names in this object.
*/
public Set<String> keySet() {
@@ -827,7 +827,7 @@ public class JSONObject {
/**
* Returns an array containing the string names in this object. This method returns null if this
* object contains no mappings.
- *
+ *
* @return the names.
*/
public JSONArray names() {
@@ -837,7 +837,7 @@ public class JSONObject {
/**
* Encodes this object as a compact JSON string, such as:
- *
+ *
* <pre>
* {"query":"Pizza","locations":[94043,90210]}
* </pre>
@@ -855,7 +855,7 @@ public class JSONObject {
/**
* Encodes this object as a human readable JSON string for debugging, such as:
- *
+ *
* <pre>
* {
* "query": "Pizza",
@@ -865,7 +865,7 @@ public class JSONObject {
* ]
* }
* </pre>
- *
+ *
* @param indentSpaces the number of spaces to indent for each level of nesting.
* @return The string containing the pretty form of this.
* @throws JSONException On internal errors. Shouldn't happen.
@@ -886,7 +886,7 @@ public class JSONObject {
/**
* Encodes the number as a JSON string.
- *
+ *
* @param number a finite value. May not be {@link Double#isNaN() NaNs} or
* {@link Double#isInfinite() infinities}.
* @return The encoded number in string form.
@@ -916,7 +916,7 @@ public class JSONObject {
/**
* Encodes {@code data} as a JSON string. This applies quotes and any necessary character
* escaping.
- *
+ *
* @param data the string to encode. Null will be interpreted as an empty string.
* @return the quoted string.
*/
@@ -947,7 +947,7 @@ public class JSONObject {
* a {@code java} package, returns the result of {@code toString}. If the object is some other
* kind of object then it is assumed to be a bean and is converted to a JSONObject. If wrapping
* fails, returns null.
- *
+ *
* @param o The object to wrap.
* @return The wrapped (if necessary) form of the object {$code o}
*/
diff --git a/geode-json/src/main/java/org/json/JSONString.java b/geode-json/src/main/java/org/json/JSONString.java
index 4a09d89..8759eda 100755
--- a/geode-json/src/main/java/org/json/JSONString.java
+++ b/geode-json/src/main/java/org/json/JSONString.java
@@ -10,7 +10,7 @@ package org.json;
public interface JSONString {
/**
* The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
- *
+ *
* @return A strictly syntactically correct JSON text.
*/
public String toJSONString();
diff --git a/geode-json/src/main/java/org/json/JSONStringer.java b/geode-json/src/main/java/org/json/JSONStringer.java
index 43224a5..c88f188 100755
--- a/geode-json/src/main/java/org/json/JSONStringer.java
+++ b/geode-json/src/main/java/org/json/JSONStringer.java
@@ -23,7 +23,7 @@ import java.util.List;
/**
* Implements {@link JSONObject#toString} and {@link JSONArray#toString}. Most application
* developers should use those methods directly and disregard this API. For example:
- *
+ *
* <pre>
* JSONObject object = ...
* String json = object.toString();
diff --git a/geode-json/src/main/java/org/json/JSONTokener.java b/geode-json/src/main/java/org/json/JSONTokener.java
index 21c9fb0..702010c 100755
--- a/geode-json/src/main/java/org/json/JSONTokener.java
+++ b/geode-json/src/main/java/org/json/JSONTokener.java
@@ -23,7 +23,7 @@ import java.io.Reader;
* Parses a JSON (<a href="http://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>) encoded string into
* the corresponding object. Most clients of this class will use only need the
* {@link #JSONTokener(String) constructor} and {@link #nextValue} method. Example usage:
- *
+ *
* <pre>
* String json = "{" + " \"query\": \"Pizza\", " + " \"locations\": [ 94043, 90210 ] " + "}";
*
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java b/geode-junit/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java
index aae21a4..a3291e7 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java
@@ -40,7 +40,7 @@ import javax.tools.ToolProvider;
/**
* Test framework utility class to programmatically create classes, JARs and ClassLoaders that
* include the classes.
- *
+ *
* @since GemFire 7.0
*/
@SuppressWarnings("serial")
@@ -51,7 +51,7 @@ public class ClassBuilder implements Serializable {
/**
* Write a JAR with an empty class using the given class name. The className may have a package
* separated by /. For example: my/package/myclass
- *
+ *
* @param className Name of the class to create
* @param outputFile Where to write the JAR file
* @throws IOException If there is a problem creating the output stream for the JAR file.
@@ -63,7 +63,7 @@ public class ClassBuilder implements Serializable {
/**
* Write a JAR with a class of the given name with the provided content. The className may have a
* package separated by /. For example: my/package/myclass
- *
+ *
* @param className Name of the class to create
* @param content Content of the created class
* @param outputFile Where to write the JAR file
@@ -79,7 +79,7 @@ public class ClassBuilder implements Serializable {
/**
* Create a JAR with an empty class using the given class name. The className may have a package
* separated by /. For example: my/package/myclass
- *
+ *
* @param className Name of the class to create
* @return The JAR file contents
* @throws IOException If there is a problem creating the output stream for the JAR file.
@@ -90,7 +90,7 @@ public class ClassBuilder implements Serializable {
/**
* Create a JAR using the given file contents and with the given file name.
- *
+ *
* @param fileName Name of the file to create
* @param content Content of the created file
* @return The JAR file content
@@ -113,7 +113,7 @@ public class ClassBuilder implements Serializable {
/**
* Create a JAR using the given class contents and with the given class name.
- *
+ *
* @param className Name of the class to create
* @param content Content of the created class
* @return The JAR file content
@@ -129,7 +129,7 @@ public class ClassBuilder implements Serializable {
/**
* Write a JAR with a class of the given name with the provided content. The className may have a
* package separated by /. For example: my/package/myclass
- *
+ *
* @param className Name of the class to create
* @param content Content of the created class
* @param outStream Stream to write the JAR to
@@ -157,7 +157,7 @@ public class ClassBuilder implements Serializable {
/**
* Creates a ClassLoader that contains an empty class with the given name using the given content.
* The className may have a package separated by /. For example: my/package/myclass
- *
+ *
* @param className Name of the class to create
* @param content Content of the created class
* @return The class loader
@@ -174,7 +174,7 @@ public class ClassBuilder implements Serializable {
/**
* Compile the provided class. The className may have a package separated by /. For example:
* my/package/myclass
- *
+ *
* @param className Name of the class to compile.
* @param classCode Plain text contents of the class
* @return The byte contents of the compiled class.
@@ -208,7 +208,7 @@ public class ClassBuilder implements Serializable {
/***
* Add to the ClassPath used when compiling.
- *
+ *
* @param path Path to add
* @return The complete, new ClassPath
*/
@@ -219,7 +219,7 @@ public class ClassBuilder implements Serializable {
/**
* Get the current ClassPath used when compiling.
- *
+ *
* @return The ClassPath used when compiling.
*/
public String getClassPath() {
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java
index 3d4767f..dfdcd9f 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java
@@ -24,6 +24,7 @@ import org.junit.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
+
import org.apache.geode.test.junit.ConditionalIgnore;
import org.apache.geode.test.junit.IgnoreCondition;
import org.apache.geode.test.junit.support.IgnoreConditionEvaluationException;
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java
index 9fae776..4718be2 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java
@@ -24,8 +24,9 @@ import org.junit.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
-import org.apache.geode.test.junit.IgnoreUntil;
+
import org.apache.geode.test.junit.IgnoreCondition;
+import org.apache.geode.test.junit.IgnoreUntil;
import org.apache.geode.test.junit.support.IgnoreConditionEvaluationException;
/**
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java
index f5ac000..711177d 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java
@@ -19,6 +19,7 @@ import java.io.Serializable;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
+
import org.apache.geode.test.junit.Repeat;
/**
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java
index 3497ef1..8d78ed6 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java
@@ -24,7 +24,7 @@ import org.junit.rules.ExternalResource;
* or fails).
* <p>
* Let's assume the locale {@code US}. Now run the test
- *
+ *
* <pre>
* public void YourTest {
* @Rule
@@ -37,7 +37,7 @@ import org.junit.rules.ExternalResource;
* }
* }
* </pre>
- *
+ *
* After running the test, the locale will set to {@code US} again.
*/
public class RestoreLocaleRule extends ExternalResource {
@@ -51,7 +51,7 @@ public class RestoreLocaleRule extends ExternalResource {
* the test is set to the specified locale. Specify {@code consumer} if you need to modify the
* Locale associated with it. {@code consumer} will be run using the original {@code Locale} after
* the test.
- *
+ *
* @param initLocale Initial locale at test run
* @param consumer Changing Locale associated with
*/
@@ -63,7 +63,7 @@ public class RestoreLocaleRule extends ExternalResource {
/**
* Creates a {@code RestoreLocale} rule that restores locale. The initial locale at the time of
* the test is set to the specified locale.
- *
+ *
* @param initLocale Initial locale at test run
*/
public RestoreLocaleRule(Locale initLocale) {
@@ -74,7 +74,7 @@ public class RestoreLocaleRule extends ExternalResource {
* Creates a {@code RestoreLocale} rule that restores locale. Specify {@code consumer} if you need
* to modify the Locale associated with it. {@code consumer} will be run using the original
* {@code Locale} after the test.
- *
+ *
* @param consumer Changing Locale associated with
*/
public RestoreLocaleRule(Consumer<Locale> consumer) {
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java
index 306f9cb..d8ee07d 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java
@@ -27,11 +27,11 @@ import org.apache.geode.test.junit.Retry;
* </p>
* RetryRule can be used globally for all tests in a test case by specifying a retryCount when
* instantiating it:
- *
+ *
* <pre>
* {@literal @}Rule
* public final RetryRule retryRule = new RetryRule(3);
- *
+ *
* {@literal @}Test
* public void shouldBeRetriedUntilPasses() {
* ...
@@ -42,11 +42,11 @@ import org.apache.geode.test.junit.Retry;
* </p>
* RetryRule can be used locally for specific tests by annotating the test method with
* {@literal @}Rule and specifying a retryCount for that test:
- *
+ *
* <pre>
* {@literal @}Rule
* public final RetryRule retryRule = new RetryRule();
- *
+ *
* {@literal @}Test
* {@literal @}Retry(3)
* public void shouldBeRetriedUntilPasses() {
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RuleList.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RuleList.java
index 5d94a16..fb38888 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RuleList.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RuleList.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.test.junit.rules;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
/**
* The {@code RuleList} rule enables ordering of TestRules.
*
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
index b1be14f..0462ed6 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
@@ -33,7 +33,7 @@ import org.junit.rules.ExternalResource;
*
* <p>
* Example of usage:
- *
+ *
* <pre>
* public static class HasTemporaryFile {
* @Rule
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java
index c7c326a..feb478b 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java
@@ -32,7 +32,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableExternalResour
*
* <p>
* UseJacksonForJsonPathRule can be used in tests that need to use json-path-assert:
- *
+ *
* <pre>
* {@literal @}ClassRule
* public static UseJacksonForJsonPathRule useJacksonForJsonPathRule = new UseJacksonForJsonPathRule();
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java
index afd34d6..0adbfaa 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java
@@ -63,7 +63,7 @@ public class GfshScript {
* Will cause the thread that executes {@link GfshScript#awaitIfNecessary} to wait, if necessary,
* until the subprocess executing this Gfsh script has terminated, or the specified waiting time
* elapses.
- *
+ *
* @throws RuntimeException if the current thread is interrupted while waiting.
* @throws AssertionError if the specified waiting time elapses before the process exits.
*/
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
index 5557f1b..69566b8 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.test.junit.rules.serializable;
-import org.junit.rules.ErrorCollector;
-
import java.io.Serializable;
+import org.junit.rules.ErrorCollector;
+
public class SerializableErrorCollector extends ErrorCollector implements Serializable {
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java
index 84e479e3..7fc7451 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.test.junit.rules.serializable;
-import org.apache.geode.test.junit.rules.RuleList;
-import org.junit.rules.TestRule;
-
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.List;
+import org.junit.rules.TestRule;
+
+import org.apache.geode.test.junit.rules.RuleList;
+
/**
* Serializable version of {@link RuleList}.
*/
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
index 3a88fcb..3d55336 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
@@ -17,13 +17,13 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.apache.geode.test.junit.rules.serializable.FieldSerializationUtils.*;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.*;
-import org.junit.rules.TemporaryFolder;
-
import java.io.File;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.Serializable;
+import org.junit.rules.TemporaryFolder;
+
/**
* Serializable subclass of {@link org.junit.rules.TemporaryFolder TemporaryFolder}. Instance
* variables of TemporaryFolder are serialized by reflection.
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java
index 721e3dc..437ca17 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java
@@ -17,13 +17,13 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.apache.geode.test.junit.rules.serializable.FieldSerializationUtils.*;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTestName.*;
-import org.junit.rules.TestName;
-import org.junit.runner.Description;
-
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.Serializable;
+import org.junit.rules.TestName;
+import org.junit.runner.Description;
+
/**
* Serializable subclass of {@link org.junit.rules.TestName TestName}. All instance variables of
* {@code TestName} are serialized by reflection.
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java
index 7f2feb9..e6c044e 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java
@@ -17,13 +17,13 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.apache.geode.test.junit.rules.serializable.FieldSerializationUtils.*;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTimeout.*;
-import org.junit.rules.Timeout;
-
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.concurrent.TimeUnit;
+import org.junit.rules.Timeout;
+
/**
* Serializable subclass of {@link org.junit.rules.Timeout Timeout}. All instance variables of
* {@code Timeout} are serialized by reflection.
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java b/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java
index 52407ec..ef62077 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java
@@ -27,7 +27,7 @@ public class SuiteBlockRunner extends BlockJUnit4ClassRunner {
/**
* Creates a BlockJUnit4ClassRunner to run {@code testClass}
- *
+ *
* @param testClass the test class
* @throws InitializationError if the test class is malformed.
*/
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java b/geode-junit/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java
index a50075f..4cfa043 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java
@@ -15,6 +15,7 @@
package org.apache.geode.test.junit.support;
import org.junit.runner.Description;
+
import org.apache.geode.test.junit.IgnoreCondition;
/**
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
index 2aec8b2..5f790b1 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
@@ -26,8 +26,8 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link ExpectedTimeoutRule}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
index bf33bb7..5a106c8 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
@@ -26,8 +26,8 @@ import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.IgnoreUntil;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link IgnoreUntilRule}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
index cea3a9c..dba40f3 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
@@ -26,8 +26,8 @@ import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.Repeat;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RepeatRule}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
index 8c6c6a5..d96a20c 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
@@ -31,8 +31,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.Result;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RestoreLocaleRule}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
index 56a5154..9efc086 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
@@ -27,13 +27,13 @@ import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RetryRule} involving global scope (ie rule affects all tests in the test
* class) with failures due to an {@code Error}.
- *
+ *
* @see org.apache.geode.test.junit.rules.RetryRule
*/
@Category(UnitTest.class)
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
index ad77a03..5731368 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
@@ -26,13 +26,13 @@ import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RetryRule} involving global scope (ie rule affects all tests in the test
* class) with failures due to an {@code Exception}.
- *
+ *
* @see org.apache.geode.test.junit.rules.RetryRule
*/
@Category(UnitTest.class)
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
index b90b378..d26b8d4 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
@@ -27,8 +27,8 @@ import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RetryRule} involving local scope (ie rule affects only the test methods
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
index ae66b4a..d13915d 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
@@ -26,8 +26,8 @@ import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RetryRule} involving local scope (ie rule affects only the test methods
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
index 0d8e3b5..4f1ca87 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
@@ -16,8 +16,8 @@ package org.apache.geode.test.junit.rules;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.runners.TestRunner;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -26,7 +26,8 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.ExternalResource;
import org.junit.runner.Result;
-import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RuleList}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
index 814378b..ef747a4 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
@@ -26,8 +26,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.Result;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.runners.TestRunner;
@Category(IntegrationTest.class)
public class TemporaryFileRuleTest {
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
index a02a4b6..e5f9a8f 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
@@ -16,13 +16,14 @@ package org.apache.geode.test.junit.rules.examples;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.geode.test.junit.rules.RetryRule;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.rules.RetryRule;
+
/**
* Example usage of {@link RetryRule} with global scope.
*/
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
index 756c6a2..b80a219 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
@@ -16,8 +16,6 @@ package org.apache.geode.test.junit.rules.examples;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.geode.test.junit.runners.TestRunner;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -27,6 +25,9 @@ import org.junit.runner.Description;
import org.junit.runner.Result;
import org.junit.runners.model.Statement;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.runners.TestRunner;
+
/**
* Example usage of a rule as both a method {@literal @}Rule and a {@literal @}ClassRule.
*/
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
index fdbbae5..138c398 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
@@ -16,15 +16,16 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExternalResource;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableExternalResource}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
index 9715b62..def96eb 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
@@ -16,14 +16,15 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.Serializable;
+
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
-import java.io.Serializable;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableRuleList}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
index db659c9..ae02974 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
@@ -18,17 +18,18 @@ import static org.apache.geode.test.junit.rules.serializable.FieldSerializationU
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.*;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.File;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
import org.apache.commons.lang.SerializationUtils;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import java.io.File;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTemporaryFolder}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
index 758f8b9..19bd04d 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
@@ -18,16 +18,17 @@ import static org.apache.geode.test.junit.rules.serializable.FieldsOfTestName.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.runner.Description;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTestName}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
index fe6a328..0871a83 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
@@ -16,15 +16,16 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestWatcher;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTestWatcher}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
index 7facad4..ace51c6 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
@@ -18,16 +18,17 @@ import static org.apache.geode.test.junit.rules.serializable.FieldSerializationU
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTimeout.*;
import static org.assertj.core.api.Assertions.*;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTimeout}.
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
index c600d07..5574c33 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
@@ -14,7 +14,15 @@
*/
package org.apache.geode.test.junit.runners;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.Description;
@@ -30,14 +38,7 @@ import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParametersFactory;
import org.junit.runners.parameterized.TestWithParameters;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class CategoryWithParameterizedRunnerFactoryTest {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java
index 9f3664e..f94f631 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -23,34 +23,35 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.Document;
+
import org.apache.geode.cache.lucene.internal.repository.serializer.SerializerUtil;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.logging.log4j.Logger;
-import org.apache.lucene.document.Document;
/**
* A built-in {@link LuceneSerializer} to parse user's nested object into a flat format, i.e. a
* single document. Each nested object will become a set of fields, with field name in format of
* contacts.name, contacts.homepage.title.
- *
+ *
* Here is a example of usage:
- *
+ *
* User needs to explicitly setLuceneSerializer with an instance of this class, and specify nested
* objects' indexed fields in following format:
- *
+ *
* luceneService.createIndexFactory().setLuceneSerializer(new FlatFormatSerializer())
* .addField("name").addField("contacts.name").addField("contacts.email", new KeywordAnalyzer())
* .addField("contacts.address").addField("contacts.homepage.content") .create(INDEX_NAME,
* REGION_NAME);
- *
+ *
* Region region = createRegion(REGION_NAME, RegionShortcut.PARTITION);
- *
+ *
* When querying, use the same dot-separated index field name, such as contacts.homepage.content
- *
+ *
* LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME,
* "contacts.homepage.content:Hello*", "name");
- *
+ *
* results = query.findPages();
*/
public class FlatFormatSerializer implements LuceneSerializer {
@@ -62,7 +63,7 @@ public class FlatFormatSerializer implements LuceneSerializer {
/**
* Recursively serialize each indexed field's value into a field of lucene document. The field
* name will be in the same format as its indexed, such as contacts.homepage.content
- *
+ *
* @param index lucene index
* @param value user object to be serialized into index
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java
index d11b15b..b054ee4 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.cache.lucene;
-import org.apache.lucene.analysis.Analyzer;
-
import java.util.Map;
+import org.apache.lucene.analysis.Analyzer;
+
/**
* A factory for creating a lucene index on the current member. Obtain a factory from
* {@link LuceneService#createIndexFactory()}.
@@ -29,7 +29,7 @@ public interface LuceneIndexFactory {
/**
* Add a field to be indexed
- *
+ *
* @param name A field of the object to index. Only fields listed here will be stored in the
* index. Fields should map to PDX fieldNames if the object is serialized with PDX, or to
* java fields on the object otherwise. The special field name
@@ -40,7 +40,7 @@ public interface LuceneIndexFactory {
/**
* Set the list of fields to be indexed.
- *
+ *
* @param fields Fields of the object to index. Only fields listed here will be stored in the
* index. Fields should map to PDX fieldNames if the object is serialized with PDX, or to
* java fields on the object otherwise. The special field name
@@ -64,7 +64,7 @@ public interface LuceneIndexFactory {
/**
* Set the list of fields to be indexed.
- *
+ *
* @param fieldMap Fields of the object to index, with the analyzer to be used for each field.
* Only fields listed here will be stored in the index. Fields should map to PDX fieldNames
* if the object is serialized with PDX, or to java fields on the object otherwise. The
@@ -75,7 +75,7 @@ public interface LuceneIndexFactory {
/**
* Create the index on this member.
- *
+ *
* @param indexName name of the index.
* @param regionPath The region to index. The entries added to this region will be indexes.
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java
index 0c2895c..e09b66c 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.cache.lucene;
-import org.apache.geode.cache.query.Query;
import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
+import org.apache.geode.cache.query.Query;
+
/**
* Factory for configuring a Lucene query. Use this factory to set parameters of the query such as
* page size, result limit, and query expression. To get an instance of this factory call
@@ -90,7 +91,7 @@ public interface LuceneQueryFactory {
* Here's an example of using this method to create a range query on an integer field called
* "age."
* </p>
- *
+ *
* <pre>
* {@code
* LuceneQuery query = factory.create("index", "region", index -> IntPoint.newRangeQuery("age", 20, 30))
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java
index 2f8a1ed..fa49d96 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -18,9 +18,10 @@ package org.apache.geode.cache.lucene;
import java.io.DataOutput;
import java.io.Serializable;
-import org.apache.geode.DataSerializer;
import org.apache.lucene.search.Query;
+import org.apache.geode.DataSerializer;
+
/**
* <p>
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java
index dfb8162..e6dbc66 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache.lucene;
/**
* An interface which stores a single result obtained by executing a Lucene query.
- *
+ *
*/
public interface LuceneResultStruct<K, V> {
@@ -46,4 +46,3 @@ public interface LuceneResultStruct<K, V> {
*/
public float getScore();
}
-
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneSerializer.java
index 286cbc8..2d5da2e 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneSerializer.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,15 +17,15 @@ package org.apache.geode.cache.lucene;
import java.util.Collection;
-import org.apache.geode.cache.Declarable;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.geode.annotations.Experimental;
+import org.apache.geode.cache.Declarable;
/**
* An interface for writing the fields of an object into a lucene document
- *
+ *
* @param <T> The type of object supported by this lucene serializer
*/
public interface LuceneSerializer<T> extends Declarable {
@@ -36,7 +36,7 @@ public interface LuceneSerializer<T> extends Declarable {
* Added fields should be marked with {@link org.apache.lucene.document.Field.Store#NO}. These
* fields are only used for searches. When doing a query, geode will return the value from the
* region, not any fields that are stored on the returned Documents.
- *
+ *
* @param index lucene index
* @param value user object to be serialized into index
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
index 31447f1..3a197cc 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.cache.lucene;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.GemFireCache;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.GemFireCache;
/**
*
@@ -38,7 +39,7 @@ import java.util.concurrent.TimeUnit;
* Lucene index with the java API. The Lucene index should be created on each member that has the
* region that is being indexed.
* </p>
- *
+ *
* <pre>
* {
* @code
@@ -54,7 +55,7 @@ import java.util.concurrent.TimeUnit;
* being tokenized with the KeywordAnalyzer so it is treated as a single word. The default analyzer
* if none is specified is the {@link StandardAnalyzer}.
* </p>
- *
+ *
*
* Indexes should be created on all peers that host the region being indexed. Clients do not need to
* define the index, they can directly execute queries using this service.
@@ -91,7 +92,7 @@ import java.util.concurrent.TimeUnit;
* Currently, only partitioned regions are supported. Creating an index on a region with
* {@link DataPolicy#REPLICATE} will fail.
* </p>
- *
+ *
*/
public interface LuceneService {
@@ -124,7 +125,7 @@ public interface LuceneService {
/**
* Get the Lucene index object specified by region name and index name
- *
+ *
* @param indexName index name
* @param regionPath region name
* @return LuceneIndex object
@@ -133,7 +134,7 @@ public interface LuceneService {
/**
* get all the Lucene indexes.
- *
+ *
* @return all index objects in a Collection
*/
public Collection<LuceneIndex> getAllIndexes();
@@ -161,13 +162,13 @@ public interface LuceneService {
* This method is an expensive operation, so using it before every query is highly discouraged.
*
* @param indexName index name
- *
+ *
* @param regionPath region name
- *
+ *
* @param timeout max wait time
- *
+ *
* @param unit Time unit associated with the max wait time
- *
+ *
* @return true if entries are flushed within timeout, false if the timeout has elapsed
*/
public boolean waitUntilFlushed(String indexName, String regionPath, long timeout, TimeUnit unit)
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneServiceProvider.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneServiceProvider.java
index 3334e73..1113703 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneServiceProvider.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneServiceProvider.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java
index d6ffb0f..d96cda1 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -48,7 +48,7 @@ public interface PageableLuceneQueryResults<K, V> extends Iterator<List<LuceneRe
/**
* Get the next page of results.
- *
+ *
* @return a page of results, or null if there are no more pages
*/
public List<LuceneResultStruct<K, V>> next();
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
index c95e666..ca8ebb7 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
@@ -25,9 +25,9 @@ import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.lucene.LuceneIndexDestroyedException;
+import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
-import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -37,11 +37,11 @@ public abstract class AbstractPartitionedRepositoryManager implements Repository
/**
* map of the parent bucket region to the index repository
- *
+ *
* This is based on the BucketRegion in case a bucket is rebalanced, we don't want to return a
* stale index repository. If a bucket moves off of this node and comes back, it will have a new
* BucketRegion object.
- *
+ *
* It is weak so that the old BucketRegion will be garbage collected.
*/
protected final ConcurrentHashMap<Integer, IndexRepository> indexRepositories =
@@ -52,7 +52,7 @@ public abstract class AbstractPartitionedRepositoryManager implements Repository
protected final LuceneSerializer serializer;
protected final LuceneIndexImpl index;
protected volatile boolean closed;
- final private CountDownLatch isDataRegionReady = new CountDownLatch(1);
+ private final CountDownLatch isDataRegionReady = new CountDownLatch(1);
public AbstractPartitionedRepositoryManager(LuceneIndexImpl index, LuceneSerializer serializer) {
this.index = index;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java
index 0c2c1c7..aba5f57 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.cache.lucene.LuceneIndex;
+import java.util.Map;
+
import org.apache.lucene.analysis.Analyzer;
-import java.util.Map;
+import org.apache.geode.cache.lucene.LuceneIndex;
public interface IndexListener {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListenerAdapter.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListenerAdapter.java
index a93e285..58f680e 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListenerAdapter.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListenerAdapter.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.cache.lucene.LuceneIndex;
+import java.util.Map;
+
import org.apache.lucene.analysis.Analyzer;
-import java.util.Map;
+import org.apache.geode.cache.lucene.LuceneIndex;
public class IndexListenerAdapter implements IndexListener {
@Override
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
index 08ffaa9..b825940 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
@@ -17,20 +17,20 @@ package org.apache.geode.cache.lucene.internal;
import java.io.IOException;
import java.util.Map;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+
+import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
import org.apache.geode.cache.lucene.internal.partition.BucketTargetingMap;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
-import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
public class IndexRepositoryFactory {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java
index c28fcdc..6eae4f4 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneService.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneService.java
index 9e1e244..60a59b1 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneService.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneService.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
index 3506e0e..e625974 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.cache.lucene.internal;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.store.AlreadyClosedException;
+
import org.apache.geode.cache.partition.PartitionListenerAdapter;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.internal.cache.PrimaryBucketException;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-import org.apache.lucene.store.AlreadyClosedException;
public class LuceneBucketListener extends PartitionListenerAdapter {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
index ac5c971..395a9b4 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,22 +20,23 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.geode.cache.EntryDestroyedException;
-import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.CacheClosedException;
+import org.apache.lucene.store.AlreadyClosedException;
+
import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
-import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
+import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.cache.BucketNotFoundException;
+import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.PrimaryBucketException;
import org.apache.geode.internal.logging.LogService;
-import org.apache.lucene.store.AlreadyClosedException;
/**
* An Async event queue listener that writes all of the events in batches to Lucene
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
index e88045d..d022ba1 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.cache.lucene.internal;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.*;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.lucene.LuceneSerializer;
@@ -22,13 +30,6 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataSerializable;
import org.apache.geode.internal.cache.CacheServiceProfile;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.*;
public class LuceneIndexCreationProfile implements CacheServiceProfile, VersionedDataSerializable {
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 429da38..1e37d11 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
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.cache.lucene.LuceneIndexFactory;
-import org.apache.geode.cache.lucene.LuceneSerializer;
+import java.util.LinkedHashMap;
+import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import org.apache.geode.cache.lucene.LuceneIndexFactory;
+import org.apache.geode.cache.lucene.LuceneSerializer;
public class LuceneIndexFactoryImpl implements org.apache.geode.cache.lucene.LuceneIndexFactory {
private final LuceneServiceImpl service;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index b383210..32530dd 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
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 2110ca5..62c82df 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
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
index e99f3d9..c960daa 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java
index f3e4f10..19ceccc 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
index e84b27e..6039af2 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,6 +20,8 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.TransactionException;
import org.apache.geode.cache.execute.Execution;
@@ -33,14 +35,13 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider;
import org.apache.geode.cache.lucene.LuceneResultStruct;
import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
-import org.apache.geode.cache.lucene.internal.distributed.LuceneQueryFunction;
import org.apache.geode.cache.lucene.internal.distributed.LuceneFunctionContext;
+import org.apache.geode.cache.lucene.internal.distributed.LuceneQueryFunction;
import org.apache.geode.cache.lucene.internal.distributed.TopEntries;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollector;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollectorManager;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesFunctionCollector;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
public static final String LUCENE_QUERY_CANNOT_BE_EXECUTED_WITHIN_A_TRANSACTION =
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
index 7ecd5c2..85229ce 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
index d29f00a..4a92049 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java
index 708ac1e..25a6a78 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
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 985e3ad..ec043cc 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
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -72,8 +72,8 @@ import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
/**
* Implementation of LuceneService to create lucene index and query.
- *
- *
+ *
+ *
* @since GemFire 8.5
*/
public class LuceneServiceImpl implements InternalLuceneService {
@@ -236,7 +236,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
/**
* Finish creating the lucene index after the data region is created .
- *
+ *
* Public because this is called by the Xml parsing code
*/
public void afterDataRegionCreated(LuceneIndexImpl index) {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
index f34966f..2c2e621 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -27,8 +27,8 @@ import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
import org.apache.geode.cache.lucene.LuceneResultStruct;
+import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.cache.lucene.internal.results.LuceneGetPageFunction;
import org.apache.geode.cache.lucene.internal.results.MapResultCollector;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java
index 660003f..5fd942d 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,13 +17,13 @@ package org.apache.geode.cache.lucene.internal;
import java.io.IOException;
-import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.internal.cache.PartitionedRegion;
/**
* Manages index repositories for partitioned regions.
- *
+ *
* This class lazily creates the IndexRepository for each individual bucket. If a Bucket is
* rebalanced, this class will create a new index repository when the bucket returns to this node.
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
index f1f9cd3..c303713 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
@@ -23,9 +23,9 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.NIOFSDirectory;
import org.apache.lucene.store.RAMDirectory;
+import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
-import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManager.java
index a5a3c85..987c8ee 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManager.java
@@ -16,8 +16,8 @@ package org.apache.geode.cache.lucene.internal;
import java.io.IOException;
-import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.PartitionedRegion;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
index 1a88056..3d3f760 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -19,7 +19,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
@@ -31,6 +30,7 @@ import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.cache.lucene.LuceneQueryProvider;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
index 20e5d81..a837064 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
@@ -20,14 +20,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.lucene.analysis.Analyzer;
+
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.LuceneIndexCreationProfile;
import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
-import org.apache.lucene.analysis.Analyzer;
-
public class LuceneIndexDetails extends LuceneFunctionSerializable
implements Comparable<LuceneIndexDetails> {
private static final long serialVersionUID = 1L;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
index 51e5cd8..4153be6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
@@ -43,7 +43,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
/**
* The LuceneCreateIndexFunction class is a function used to create Lucene indexes.
* </p>
- *
+ *
* @see Cache
* @see org.apache.geode.cache.execute.Function
* @see FunctionAdapter
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
index c519cf6..2b0e0f2 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.InternalEntity;
* The LuceneDescribeIndexFunction class is a function used to collect the information on a
* particular lucene index.
* </p>
- *
+ *
* @see Cache
* @see org.apache.geode.cache.execute.Function
* @see FunctionAdapter
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
index f67710c..0732d2b 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.InternalEntity;
* The LuceneListIndexFunction class is a function used to collect the information on all lucene
* indexes in the entire Cache.
* </p>
- *
+ *
* @see Cache
* @see org.apache.geode.cache.execute.Function
* @see FunctionAdapter
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
index 3be7d23..6bc2d92 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.InternalEntity;
* The LuceneSearchIndexFunction class is a function used to collect the information on a particular
* lucene index.
* </p>
- *
+ *
* @see Cache
* @see org.apache.geode.cache.execute.Function
* @see FunctionAdapter
@@ -93,4 +93,3 @@ public class LuceneSearchIndexFunction<K, V> extends FunctionAdapter implements
}
}
}
-
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
index 7cbdd60..910f50f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -18,6 +18,9 @@ package org.apache.geode.cache.lucene.internal.directory;
import java.io.File;
import java.util.Collection;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.index.IndexWriter;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
@@ -33,9 +36,6 @@ import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-import org.apache.lucene.index.IndexWriter;
-
public class DumpDirectoryFiles implements Function, InternalEntity {
private static final long serialVersionUID = 1L;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
index a038526..9da026b 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
index b648ffc..8bdbf4e 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,9 +15,13 @@
package org.apache.geode.cache.lucene.internal.directory;
-import org.apache.geode.cache.lucene.internal.filesystem.File;
-import org.apache.geode.cache.lucene.internal.filesystem.FileSystem;
-import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+
import org.apache.lucene.store.BaseDirectory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
@@ -25,16 +29,13 @@ import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.OutputStreamIndexOutput;
import org.apache.lucene.store.SingleInstanceLockFactory;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
+import org.apache.geode.cache.lucene.internal.filesystem.File;
+import org.apache.geode.cache.lucene.internal.filesystem.FileSystem;
+import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
/**
* An implementation of Directory that stores data in geode regions.
- *
+ *
* Directory is an interface to file/RAM storage for lucene. This class uses the {@link FileSystem}
* class to store the data in the provided geode regions.
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/CollectorManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/CollectorManager.java
index 81f2eae..40195d0 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/CollectorManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/CollectorManager.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -29,7 +29,7 @@ import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
* buckets. And then at search coordinator level for merging results from members. Use of same
* collector in both phases is expected to produce deterministic merge result irrespective of the
* way buckets are distributed.
- *
+ *
* @param <C> Type of IndexResultCollector created by this manager
*/
public interface CollectorManager<C extends IndexResultCollector> {
@@ -48,7 +48,7 @@ public interface CollectorManager<C extends IndexResultCollector> {
*
* @param results - Collection of the results of a Lucene query execution.
* @return IndexResultCollector containing a reduced set of the results of the Lucene query.
- *
+ *
*/
C reduce(Collection<C> results);
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java
index 03726a4..788e101 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/EntryScore.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java
index cf3087f..e28378c 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -76,7 +76,7 @@ public class LuceneFunctionContext<C extends IndexResultCollector>
* On each member, search query is executed on one or more {@link IndexRepository}s. A
* {@link CollectorManager} could be provided to customize the way results from these repositories
* is collected and merged.
- *
+ *
* @return {@link CollectorManager} instance to be used by function
*/
public CollectorManager<C> getCollectorManager() {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
index 19d1fce..0b104a3 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -21,31 +21,31 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
-import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.lucene.LuceneIndexNotFoundException;
-import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
-import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
-import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
-import org.apache.geode.internal.cache.PrimaryBucketException;
-import org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetException;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.search.Query;
+import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
+import org.apache.geode.cache.lucene.LuceneIndexNotFoundException;
import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.cache.lucene.LuceneQueryProvider;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
+import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
+import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
+import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.BucketNotFoundException;
+import org.apache.geode.internal.cache.PrimaryBucketException;
+import org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetException;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.security.ResourcePermission;
@@ -185,4 +185,3 @@ public class LuceneQueryFunction implements Function<LuceneFunctionContext>, Int
return Collections.singleton(read);
}
}
-
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java
index 315d4f4..724f5a8 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntries.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -56,7 +56,7 @@ public class TopEntries<K> implements DataSerializableFixedID {
/**
* Adds an entry to the collection. The new entry must have a lower score than all previous
* entries added to the collection. The new entry will be ignored if the limit is already reached.
- *
+ *
* @param entry
*/
public void addHit(EntryScore<K> entry) {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java
index 783f03c..d9904da 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
index a884a66..325e586 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
index 5dd0d24..b89d758 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -33,7 +33,7 @@ import org.apache.geode.internal.logging.LogService;
* {@link TopEntries} objects will be created by members when a {@link LuceneQuery} is executed on
* the local data hosted by the member. The member executing this logic must have sufficient space
* to hold all the {@link EntryScore} documents returned from the members.
- *
+ *
* <p>
* This class will perform a lazy merge operation. Merge will take place if the merge
* {@link ResultCollector#getResult} is invoked or if the combined result size is more than the
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
index 6a9b22a..c9e10d9 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
index a8f5385..74fa1fe 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java
index d1c972f..b96f3cf 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKey.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
index bd2e241..df86f7c 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -84,7 +84,7 @@ public class File implements DataSerializableFixedID {
/**
* Get an input stream that reads from the beginning the file
- *
+ *
* The input stream is not threadsafe
*/
public SeekableInputStream getInputStream() {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
index 4b7fd75..5b20533 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
index 0c0dbe6..754f3ff 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystem.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystem.java
index 3facef0..fd8d620 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystem.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystem.java
@@ -15,15 +15,16 @@
package org.apache.geode.cache.lucene.internal.filesystem;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.internal.logging.LogService;
+
/**
* A Filesystem like interface that stores file data in geode regions.
*
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/SeekableInputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/SeekableInputStream.java
index 4378683..5db7e56 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/SeekableInputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/SeekableInputStream.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -26,7 +26,7 @@ public abstract class SeekableInputStream extends InputStream {
/**
* Seek to a position in the stream. The position is relative to the beginning of the stream (in
* other words, just before the first byte that was ever read).
- *
+ *
* @param position
* @throws IOException if the seek goes past the end of the stream
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceBridge.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceBridge.java
index eff503a..db9c604 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceBridge.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceBridge.java
@@ -14,18 +14,18 @@
*/
package org.apache.geode.cache.lucene.internal.management;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.lucene.LuceneIndex;
-import org.apache.geode.cache.lucene.LuceneService;
-import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
-import org.apache.geode.cache.lucene.management.LuceneIndexMetrics;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.lucene.LuceneIndex;
+import org.apache.geode.cache.lucene.LuceneService;
+import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
+import org.apache.geode.cache.lucene.management.LuceneIndexMetrics;
+
public class LuceneServiceBridge {
private LuceneService service;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceMBean.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceMBean.java
index 2cfc42e..e1b7a82 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceMBean.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneServiceMBean.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache.lucene.internal.management;
+import javax.management.NotificationBroadcasterSupport;
+
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.management.LuceneIndexMetrics;
import org.apache.geode.cache.lucene.management.LuceneServiceMXBean;
import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
-import javax.management.NotificationBroadcasterSupport;
-
public class LuceneServiceMBean extends NotificationBroadcasterSupport
implements LuceneServiceMXBean, CacheServiceMBeanBase {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
index f40169e..bdd57a3 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.cache.lucene.internal.partition;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.FixedPartitionResolver;
import org.apache.geode.internal.cache.PartitionedRegion;
-import java.util.Map;
-import java.util.Set;
-
/**
* A partition resolver that expects the actual bucket id to be the callback argument of all
* operations. The partition resolver reverse engineers the fixed partition name and bucket number
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
index 0f8015f..9148168 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache.lucene.internal.partition;
+import java.util.AbstractMap;
+import java.util.Set;
+
import org.apache.geode.cache.EntryExistsException;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.BucketRegion;
-import java.util.AbstractMap;
-import java.util.Set;
-
public class BucketTargetingMap<K, V> extends AbstractMap<K, V> {
private final Region<K, V> region;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java
index 7323aa0..a46e95f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,11 +17,11 @@ package org.apache.geode.cache.lucene.internal.repository;
import java.io.IOException;
-import org.apache.geode.cache.Region;
-
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.Query;
+import org.apache.geode.cache.Region;
+
/**
* An Repository interface for the writing data to lucene.
*/
@@ -29,21 +29,21 @@ public interface IndexRepository {
/**
* Create a new entry in the lucene index
- *
+ *
* @throws IOException
*/
void create(Object key, Object value) throws IOException;
/**
* Update the entries in the lucene index
- *
+ *
* @throws IOException
*/
void update(Object key, Object value) throws IOException;
/**
* Delete the entries in the lucene index
- *
+ *
* @throws IOException
*/
void delete(Object key) throws IOException;
@@ -51,18 +51,18 @@ public interface IndexRepository {
/**
* Query the index index repository, passing the results to the collector Only the documents with
* the top scores, up to the limit, will be passed to the collector, in order of score.
- *
+ *
* @param query
* @param limit the maximum number of hits to return
* @param collector the class to aggregate the hits
- *
+ *
* @throws IOException
*/
public void query(Query query, int limit, IndexResultCollector collector) throws IOException;
/**
* Commit the changes to all lucene index
- *
+ *
* @throws IOException
*/
void commit() throws IOException;
@@ -71,7 +71,7 @@ public interface IndexRepository {
/**
* Check to see if this repository is closed due to underlying resources being closed or destroyed
- *
+ *
* @return true if this repository is closed.
*/
public boolean isClosed();
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImpl.java
index 06bf653..6ee40ce 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImpl.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,28 +15,29 @@
package org.apache.geode.cache.lucene.internal.repository;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.IntSupplier;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.*;
+import org.apache.lucene.store.AlreadyClosedException;
+
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.internal.repository.serializer.SerializerUtil;
import org.apache.geode.distributed.DistributedLockService;
+import org.apache.geode.distributed.LockNotHeldException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.*;
-import org.apache.lucene.store.AlreadyClosedException;
-import org.apache.geode.distributed.LockNotHeldException;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.function.IntSupplier;
/**
* A repository that writes to a single lucene index writer
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java
index 05b0eda..5166817 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -43,7 +43,7 @@ public interface IndexResultCollector {
/**
* Collects a corresponding pair of Apache Geode key and Lucene score assigned to the document
* which is returned by execution of a Lucene query. This is stored in the IndexResultCollector.
- *
+ *
* @param key - Apache Geode key of the object stored in the region
* @param score the score of this result document assigned by Lucene
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/RepositoryManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/RepositoryManager.java
index 7f4a6c6..cf69b43 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/RepositoryManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/RepositoryManager.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -33,7 +33,7 @@ public interface RepositoryManager {
/**
* Returns a collection of {@link IndexRepository} instances hosting index data of the input list
* of bucket ids. The bucket needs to be present on this member.
- *
+ *
* @return a collection of {@link IndexRepository} instances
* @throws BucketNotFoundException if any of the requested buckets is not found on this member
*/
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
index 9a15356..caf30bb 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
+
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.LuceneService;
@@ -40,7 +41,7 @@ public class HeterogeneousLuceneSerializer implements LuceneSerializer {
/**
* Mappers for each individual class type that this class has seen.
- *
+ *
* Weak so that entry will be removed if a class is garbage collected.
*/
private Map<Class<?>, LuceneSerializer> mappers =
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
index cb1f0cd..b644548 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,12 +15,12 @@
package org.apache.geode.cache.lucene.internal.repository.serializer;
-import org.apache.logging.log4j.Logger;
-import org.apache.lucene.document.Document;
-
import java.util.Collection;
import java.util.Collections;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.document.Document;
+
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java
index fddcb44..2940471 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java
@@ -17,12 +17,12 @@ package org.apache.geode.cache.lucene.internal.repository.serializer;
import java.util.Collection;
import java.util.Collections;
+import org.apache.lucene.document.Document;
+
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.LuceneService;
-import org.apache.lucene.document.Document;
-
/**
* A LuceneSerializer that can serialize a primitive value (String, int, long, double) by creating a
* document with a special field containing the value
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
index 5b9298b..947b2ad 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -25,6 +25,7 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
+
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
index dde375d..f5f8ec9 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -88,7 +88,7 @@ public class SerializerUtil {
/**
* Add a field to the document.
- *
+ *
* @return true if the field was successfully added
*/
public static boolean addField(Document doc, String field, Object fieldValue) {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunction.java
index ba441a5..07dc1ad 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunction.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,6 +15,14 @@
package org.apache.geode.cache.lucene.internal.results;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
@@ -29,14 +37,6 @@ import org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetE
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.security.ResourcePermission;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
/**
* {@link LuceneGetPageFunction} Returns the values of entries back to the user This behaves
* basically like a getAll, but it does not invoke a cache loader
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/MapResultCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/MapResultCollector.java
index 0a9b110..37161b7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/MapResultCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/MapResultCollector.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.cache.lucene.internal.results;
-import org.apache.geode.cache.execute.FunctionException;
-import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.distributed.DistributedMember;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.apache.geode.cache.execute.FunctionException;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.DistributedMember;
+
public class MapResultCollector implements ResultCollector<List<PageEntry>, Map<Object, Object>> {
private final Map<Object, Object> results = new HashMap<>();
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
index 1845773..294e7e7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache.lucene.internal.results;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.cache.CachedDeserializable;
-import org.apache.geode.internal.offheap.StoredObject;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.offheap.StoredObject;
+
public class PageEntry {
public Object key;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java
index fcacff2..b6885ea 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageResults.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.cache.lucene.internal.results;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+
public class PageResults extends ArrayList<PageEntry> implements DataSerializableFixedID {
public PageResults(final int initialCapacity) {
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 7af43fb..bf171a1 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
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,24 +17,24 @@ package org.apache.geode.cache.lucene.internal.xml;
import java.util.*;
-import org.apache.geode.cache.Declarable;
-import org.apache.geode.cache.lucene.LuceneIndexExistsException;
-import org.apache.geode.cache.lucene.LuceneSerializer;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
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.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;
+import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.extension.Extension;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>> {
private Region region;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
index 8628f43..cb5d8bc 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,20 +17,20 @@ package org.apache.geode.cache.lucene.internal.xml;
import static org.apache.geode.cache.lucene.internal.xml.LuceneXmlConstants.*;
-import org.apache.geode.cache.Declarable;
-import org.apache.geode.cache.lucene.LuceneSerializer;
-import org.apache.geode.internal.cache.xmlcache.*;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.lucene.analysis.Analyzer;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
+import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.LuceneIndex;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.internal.cache.xmlcache.*;
public class LuceneIndexXmlGenerator implements XmlGenerator<Region<?, ?>> {
private static final AttributesImpl EMPTY = new AttributesImpl();
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
index 2e14e49..eff5b2c 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlConstants.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlConstants.java
index 5d9fa6d..c81de7b 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlConstants.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlConstants.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
index e46a46f..95307a4 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -17,15 +17,16 @@ package org.apache.geode.cache.lucene.internal.xml;
import static org.apache.geode.cache.lucene.internal.xml.LuceneXmlConstants.*;
+import org.apache.lucene.analysis.Analyzer;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.xmlcache.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.lucene.analysis.Analyzer;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
public class LuceneXmlParser extends AbstractXmlParser {
private CacheCreation cache;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneIndexMetrics.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneIndexMetrics.java
index 1d7984d..388ec07 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneIndexMetrics.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneIndexMetrics.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.cache.lucene.management;
-import org.apache.geode.cache.lucene.LuceneIndex;
-
import java.beans.ConstructorProperties;
+import org.apache.geode.cache.lucene.LuceneIndex;
+
public class LuceneIndexMetrics {
private final String regionPath;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java
index 9a1510c..854f5c1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java
@@ -20,6 +20,17 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -28,26 +39,16 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.control.HeapMemoryMonitor;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
public class EvictionDUnitTest extends LuceneQueriesAccessorBase {
- protected final static float INITIAL_EVICTION_HEAP_PERCENTAGE = 50.9f;
- protected final static float EVICTION_HEAP_PERCENTAGE_FAKE_NOTIFICATION = 85.0f;
- protected final static int TEST_MAX_MEMORY = 100;
- protected final static int MEMORY_USED_FAKE_NOTIFICATION = 90;
+ protected static final float INITIAL_EVICTION_HEAP_PERCENTAGE = 50.9f;
+ protected static final float EVICTION_HEAP_PERCENTAGE_FAKE_NOTIFICATION = 85.0f;
+ protected static final int TEST_MAX_MEMORY = 100;
+ protected static final int MEMORY_USED_FAKE_NOTIFICATION = 90;
protected RegionTestableType[] getPartitionRedundantOverflowEvictionRegionType() {
return new RegionTestableType[] {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java
index 22c050d..8e4a1da 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java
@@ -20,26 +20,27 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.test.dunit.SerializableRunnableIF;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
import java.util.Collection;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
+
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
public class ExpirationDUnitTest extends LuceneQueriesAccessorBase {
- protected final static int EXTRA_WAIT_TIME_SEC = 15;
+ protected static final int EXTRA_WAIT_TIME_SEC = 15;
protected RegionTestableType[] getPartitionRegionsWithExpirationSet() {
return new RegionTestableType[] {RegionTestableType.PARTITION_WITH_EXPIRATION_DESTROY,
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java
index d6a98cd..cd3ca51 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -21,16 +21,17 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
-import org.apache.geode.cache.lucene.internal.repository.serializer.SerializerTestHelper;
-import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.lucene.internal.repository.serializer.SerializerTestHelper;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class FlatFormatPdxSerializerJunitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java
index 2c0155d..4fc3a49 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -21,16 +21,17 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexableField;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.lucene.FlatFormatSerializer;
import org.apache.geode.cache.lucene.internal.repository.serializer.SerializerTestHelper;
import org.apache.geode.cache.lucene.test.Customer;
import org.apache.geode.cache.lucene.test.Page;
import org.apache.geode.cache.lucene.test.Person;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexableField;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class FlatFormatSerializerJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LocalCacheRule.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LocalCacheRule.java
index bc438a2..83fd5e1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LocalCacheRule.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LocalCacheRule.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -16,10 +16,11 @@ package org.apache.geode.cache.lucene;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.junit.rules.ExternalResource;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.cache.InternalCache;
-import org.junit.rules.ExternalResource;
public class LocalCacheRule extends ExternalResource {
private InternalCache cache;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
index acc237e..8de5ea1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
@@ -40,11 +40,11 @@ import org.apache.geode.management.internal.cli.result.ErrorResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category({DistributedTest.class, SecurityTest.class})
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
index 3d5905e..abf4965 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.cache.lucene;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
@@ -27,11 +29,8 @@ import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
-
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
-
public abstract class LuceneDUnitTest extends JUnit4CacheTestCase {
protected VM dataStore1;
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 948ba14..9328ede 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
@@ -14,12 +14,16 @@
*/
package org.apache.geode.cache.lucene;
-import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
-import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.dunit.SerializableRunnableIF;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.util.test.TestUtil;
+import static junitparams.JUnitParamsRunner.$;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
+import static org.junit.Assert.*;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
import org.apache.lucene.analysis.Analyzer;
@@ -29,15 +33,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
-import static junitparams.JUnitParamsRunner.$;
-import static org.junit.Assert.*;
+import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
+import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.util.test.TestUtil;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
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 1d688fb..00b96e0 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
@@ -30,6 +30,17 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Collectors;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordTokenizer;
+import org.apache.lucene.queryparser.classic.ParseException;
+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.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.ExpirationAttributes;
@@ -50,18 +61,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.core.KeywordTokenizer;
-import org.apache.lucene.queryparser.classic.ParseException;
-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 junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-
/**
* Tests of creating lucene indexes on regions. All tests of index creation use cases should be in
* classes starting with LuceneIndexCreation*. Most tests belong in this class, except for:
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
index 27a0f13..9e2f1cd 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.cache.lucene;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.createIndex;
+import static org.junit.Assert.assertEquals;
+
+import java.util.function.Consumer;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
@@ -21,14 +30,6 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.function.Consumer;
-
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME;
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.createIndex;
-import static org.junit.Assert.assertEquals;
/**
* Tests of lucene index creation that use off heap memory
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
index ef66c0b..453a51d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.cache.lucene;
-import org.apache.geode.test.dunit.SerializableRunnableIF;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import junitparams.JUnitParamsRunner;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
index a93a4e7..b2acc3b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
@@ -14,8 +14,26 @@
*/
package org.apache.geode.cache.lucene;
+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.apache.geode.internal.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.lucene.internal.LuceneIndexForPartitionedRegion;
@@ -32,23 +50,6 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-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.apache.geode.internal.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
index 7d9aed2..854bca7 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
@@ -24,15 +24,11 @@ import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.internal.cache.CachedDeserializable;
-import org.apache.geode.internal.cache.EntrySnapshot;
-import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.pdx.JSONFormatter;
-import org.apache.geode.pdx.PdxInstance;
+import org.apache.lucene.document.Document;
import org.awaitility.Awaitility;
-
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.ExpirationAction;
@@ -47,8 +43,12 @@ import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.cache.query.data.PortfolioPdx;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.EntrySnapshot;
+import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.lucene.document.Document;
@Category(IntegrationTest.class)
public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIntegrationTest.java
index cb36007..a10b414 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIntegrationTest.java
@@ -15,17 +15,17 @@
package org.apache.geode.cache.lucene;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import org.junit.After;
+import org.junit.Before;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.ConfigurationProperties;
-import org.junit.After;
-import org.junit.Before;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-
public class LuceneIntegrationTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java
index 86993da..df9b2ba 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java
@@ -24,6 +24,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.control.RebalanceOperation;
@@ -41,13 +48,6 @@ import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage.Be
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
public class LuceneQueriesAccessorBase extends LuceneDUnitTest {
protected VM accessor;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
index f893134..b4d2e97 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
@@ -16,7 +16,9 @@ package org.apache.geode.cache.lucene;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME;
+import junitparams.JUnitParamsRunner;
import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.ClientCache;
@@ -26,9 +28,6 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
index 7502ba8..20e2a67 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
@@ -17,22 +17,21 @@ package org.apache.geode.cache.lucene;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
import static org.junit.Assert.*;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.internal.LuceneQueryImpl;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
-
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.TermQuery;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
/**
* This test class is intended to contain basic integration tests of the lucene query class that
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java
index cad54bc..4b2c6c1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java
@@ -27,6 +27,10 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.Logger;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.lucene.test.Customer;
@@ -38,9 +42,6 @@ import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(IntegrationTest.class)
public class NestedObjectSeralizerIntegrationTest extends LuceneIntegrationTest {
@@ -648,7 +649,7 @@ public class NestedObjectSeralizerIntegrationTest extends LuceneIntegrationTest
/**
* Getter for property type.S
- *
+ *
* @return Value of property type.
*/
public boolean boolFunction(String strArg) {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java
index 7268258..52d2fba 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java
@@ -20,29 +20,30 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.PartitionedRegionStorageException;
-import org.apache.geode.cache.Region;
-import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.SerializableRunnableIF;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.PartitionedRegionStorageException;
+import org.apache.geode.cache.Region;
+import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
public class PaginationDUnitTest extends LuceneQueriesAccessorBase {
- protected final static int PAGE_SIZE = 2;
- protected final static int FLUSH_WAIT_TIME_MS = 60000;
+ protected static final int PAGE_SIZE = 2;
+ protected static final int FLUSH_WAIT_TIME_MS = 60000;
@Override
protected RegionTestableType[] getListOfRegionTestTypes() {
@@ -151,5 +152,3 @@ public class PaginationDUnitTest extends LuceneQueriesAccessorBase {
}
}
-
-
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
index 163365f..06fd1e1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,20 +20,19 @@ import static org.junit.Assert.*;
import java.util.stream.IntStream;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.test.dunit.SerializableRunnableIF;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test class adds more basic tests of lucene functionality for partitioned regions. These
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java
index 0cb7b43..a6afb20 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java
@@ -21,6 +21,14 @@ import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
@@ -35,16 +43,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
public class RebalanceWithRedundancyDUnitTest extends LuceneQueriesAccessorBase {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index fd42d21..b0db54b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -23,21 +23,20 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.internal.cache.EntrySnapshot;
-
+import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
+import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.internal.cache.BucketNotFoundException;
+import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.logging.log4j.Logger;
/**
* Unit test that async event listener dispatched the events to the appropriate repository.
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
index 5ecca42..da14499 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
@@ -14,14 +14,16 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.CopyHelper;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.lucene.DummyLuceneSerializer;
-import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
-import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static junitparams.JUnitParamsRunner.$;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
@@ -33,16 +35,14 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
-import static junitparams.JUnitParamsRunner.$;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import org.apache.geode.CopyHelper;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.lucene.DummyLuceneSerializer;
+import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
+import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
index 075a751..2096b66 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheListener;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
index 5adf823..ff5d004 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -14,6 +14,20 @@
*/
package org.apache.geode.cache.lucene.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneService;
@@ -26,19 +40,6 @@ import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
@Category(IntegrationTest.class)
public class LuceneIndexRecoveryHAIntegrationTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
index 6541cbd..f3f3a51 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
@@ -19,16 +19,16 @@ import static org.mockito.Mockito.*;
import java.util.function.IntSupplier;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsFactory;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.test.junit.categories.UnitTest;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LuceneIndexStatsJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
index 3f0edad..ae69ae9 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java
index fddd8fb..64d67d1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -23,6 +23,16 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
@@ -38,15 +48,6 @@ import org.apache.geode.cache.lucene.internal.distributed.LuceneQueryFunction;
import org.apache.geode.cache.lucene.internal.distributed.TopEntries;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollector;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
@Category(UnitTest.class)
public class LuceneQueryImplJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java
index b97eac9..27612bb 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java
@@ -18,6 +18,10 @@ import static org.mockito.Mockito.*;
import java.util.concurrent.CopyOnWriteArraySet;
+import org.apache.lucene.analysis.Analyzer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
@@ -28,9 +32,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.lucene.analysis.Analyzer;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class LuceneRegionListenerJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
index 18ebf64..68157d3 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
index 80d9324..bc42c8c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,6 +15,17 @@
package org.apache.geode.cache.lucene.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.client.ClientCache;
@@ -25,16 +36,6 @@ import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.distributed.LuceneQueryFunction;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
@Category(IntegrationTest.class)
public class LuceneServiceImplIntegrationTest {
@@ -110,5 +111,3 @@ public class LuceneServiceImplIntegrationTest {
}
}
-
-
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 c5ca8f8..57186c3 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
@@ -23,11 +23,6 @@ import java.lang.reflect.Field;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.lucene.LuceneIndexFactory;
-import org.apache.geode.cache.lucene.LuceneSerializer;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -35,6 +30,12 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.lucene.LuceneIndexFactory;
+import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class LuceneServiceImplJUnitTest {
@Rule
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
index 3458ff3..26e442f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -31,8 +31,6 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.ResultCollector;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -43,6 +41,8 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.LuceneResultStruct;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index 20d0213..df7deca 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -28,10 +28,6 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.lucene.internal.partition.BucketTargetingMap;
-import org.apache.geode.distributed.internal.locks.DLockService;
-import org.apache.geode.internal.cache.BucketAdvisor;
-import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.junit.After;
@@ -42,18 +38,22 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
+import org.apache.geode.cache.lucene.internal.partition.BucketTargetingMap;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
-import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.distributed.internal.locks.DLockService;
+import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegion.RetryTimeKeeper;
import org.apache.geode.internal.cache.PartitionedRegionDataStore;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
index 26447ca..3b319b4 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java
index 32718ac..97ea71f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.CopyHelper;
-
import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java
index bae9fb3..7032401 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java
@@ -22,15 +22,16 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.lucene.LuceneIndexFactory;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
+
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
+import org.apache.geode.cache.lucene.LuceneIndexFactory;
import org.apache.geode.cache.lucene.internal.InternalLuceneService;
import org.apache.geode.cache.lucene.internal.cli.LuceneIndexInfo;
import org.apache.geode.cache.lucene.internal.repository.serializer.PrimitiveSerializer;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java
index e555026..15bd006 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java
@@ -20,6 +20,13 @@ import static org.mockito.Mockito.*;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.lucene.internal.InternalLuceneService;
@@ -31,13 +38,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-
@Category(UnitTest.class)
public class LuceneDescribeIndexFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java
index ec14481..d00893b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java
@@ -21,6 +21,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
@@ -38,10 +42,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-
@Category(UnitTest.class)
public class LuceneSearchIndexFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
index 9ea3f91..b4d1c2a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
@@ -19,6 +19,13 @@ import static org.mockito.Mockito.*;
import java.io.File;
import java.util.Collections;
+import org.apache.lucene.index.IndexWriter;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
@@ -32,13 +39,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.lucene.index.IndexWriter;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
-
@Category(UnitTest.class)
public class DumpDirectoryFilesJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
index c507268..c88eace 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -21,7 +21,6 @@ import java.nio.file.Path;
import java.util.concurrent.ConcurrentHashMap;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-
import org.apache.lucene.store.BaseDirectoryTestCase;
import org.apache.lucene.store.Directory;
import org.junit.Rule;
@@ -33,7 +32,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* A unit test of the RegionDirectory class that uses the Directory test case from the lucene code
* base.
- *
+ *
* This test is still mocking out the underlying cache, rather than using a real region.
*/
@Category(UnitTest.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
index ef6f44e..72fac3b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
index 876aa83..05a5f4e 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
index ed77ed7..1631fb1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
index 4e5d495..f27d51e 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -23,6 +23,17 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.search.Query;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
@@ -47,17 +58,6 @@ import org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetE
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.search.Query;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
@Category(UnitTest.class)
public class LuceneQueryFunctionJUnitTest {
@@ -362,4 +362,3 @@ public class LuceneQueryFunctionJUnitTest {
query = queryProvider.getQuery(mockIndex);
}
}
-
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
index 5767390..24c266e 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index 1debc99..a839e95 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
index e21ac7f..48a0f60 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
index 508f12c..6765cc2 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,6 +20,11 @@ import static org.mockito.Mockito.*;
import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
import org.apache.geode.cache.execute.ResultSender;
@@ -29,11 +34,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-
@Category(UnitTest.class)
public class WaitUntilFlushedFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
index e28fe48..c6f5720 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java
index 4f4472a..4152ea1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
index 044e78a..6e83812 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -554,7 +554,7 @@ public class FileSystemJUnitTest {
*
* This is essentially like Mockito.spy(), except that it allows the implementation of a default
* answer for all operations.
- *
+ *
* To use, do this Mockito.mock(Interface, new SpyWrapper(Answer, o)
*/
private static class SpyWrapper implements Answer<Object> {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
index c41467d..be00d36 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
@@ -16,16 +16,16 @@ package org.apache.geode.cache.lucene.internal.filesystem;
import static org.mockito.Mockito.*;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsFactory;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.test.junit.categories.UnitTest;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class FileSystemStatsJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
index 5822748..eac5f45 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
@@ -14,6 +14,19 @@
*/
package org.apache.geode.cache.lucene.internal.management;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
+import static org.junit.Assert.*;
+
+import java.io.Serializable;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import javax.management.ObjectName;
+
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.LuceneQuery;
import org.apache.geode.cache.lucene.LuceneQueryException;
@@ -29,18 +42,6 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.management.ObjectName;
-
-import java.io.Serializable;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
-import static org.junit.Assert.*;
@Category(DistributedTest.class)
public class LuceneManagementDUnitTest extends ManagementTestBase {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
index db172ff..1e4ef27 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
@@ -19,23 +19,22 @@ import static org.junit.Assume.assumeTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
import com.pholser.junit.quickcheck.Property;
import com.pholser.junit.quickcheck.generator.InRange;
import com.pholser.junit.quickcheck.generator.Size;
import com.pholser.junit.quickcheck.runner.JUnitQuickcheck;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
@Category(UnitTest.class)
@RunWith(JUnitQuickcheck.class)
public class BucketTargetingFixedResolverTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
index 1dfee40..143b9a6 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
@@ -20,12 +20,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class BucketTargetingMapTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index c564ff3..cb8ba93 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -28,9 +28,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.IntSupplier;
-import org.apache.geode.distributed.DistributedLockService;
-import org.apache.geode.internal.cache.BucketAdvisor;
-import org.apache.geode.internal.cache.BucketRegion;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -54,6 +51,9 @@ import org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import org.apache.geode.cache.lucene.internal.repository.serializer.Type2;
+import org.apache.geode.distributed.DistributedLockService;
+import org.apache.geode.internal.cache.BucketAdvisor;
+import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
index d0b2a91..cdd990c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -147,7 +147,7 @@ public class IndexRepositoryImplPerformanceTest {
/**
* Test our full lucene index implementation
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java
index a741678..1b71f27 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
index e31f14d..21003b1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
index 197be43..e958974 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerTestHelper.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerTestHelper.java
index e475e71..da459db 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerTestHelper.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerTestHelper.java
@@ -20,6 +20,7 @@ import java.util.Collection;
import org.apache.lucene.document.Document;
import org.mockito.Mockito;
+
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type1.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type1.java
index aec7d98..c2d2a29 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type1.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type1.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type2.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type2.java
index 8326b7e..ca6749c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type2.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/Type2.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
index bd9e499..cbec6a7 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
@@ -20,17 +20,18 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collections;
-import java.util.Set;
@Category(UnitTest.class)
public class LuceneGetPageFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
index b82d89a..ceb1ced 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
@@ -18,17 +18,18 @@ package org.apache.geode.cache.lucene.internal.results;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.Arrays;
@Category(UnitTest.class)
public class PageEntryJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
index 778e372..d9e50c3 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
@@ -16,14 +16,15 @@ package org.apache.geode.cache.lucene.internal.results;
import static org.junit.Assert.*;
+import java.io.IOException;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
@Category(UnitTest.class)
public class PageResultsJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
index a6bb291..eef6ed1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,6 +15,20 @@
package org.apache.geode.cache.lucene.internal.xml;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Declarable;
@@ -24,19 +38,6 @@ import org.apache.geode.cache.lucene.test.LuceneDeclarable2TestSerializer;
import org.apache.geode.cache.lucene.test.LuceneTestSerializer;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.nio.charset.Charset;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
-import static org.assertj.core.api.Assertions.*;
@Category(IntegrationTest.class)
public class LuceneIndexXmlGeneratorIntegrationJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
index 878bee2..d7513e8 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -22,10 +22,6 @@ import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import org.apache.geode.cache.lucene.LuceneSerializer;
-import org.apache.geode.cache.lucene.test.LuceneDeclarable2TestSerializer;
-import org.apache.geode.cache.lucene.test.LuceneTestSerializer;
-import org.apache.geode.internal.cache.xmlcache.Declarable2;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
@@ -34,7 +30,11 @@ import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.apache.geode.cache.lucene.LuceneIndex;
+import org.apache.geode.cache.lucene.LuceneSerializer;
+import org.apache.geode.cache.lucene.test.LuceneDeclarable2TestSerializer;
+import org.apache.geode.cache.lucene.test.LuceneTestSerializer;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
+import org.apache.geode.internal.cache.xmlcache.Declarable2;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
index 2d46e5e..e744298 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -15,6 +15,28 @@
package org.apache.geode.cache.lucene.internal.xml;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.core.SimpleAnalyzer;
+import org.apache.lucene.analysis.standard.ClassicAnalyzer;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheXmlException;
@@ -30,27 +52,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
import org.apache.geode.internal.cache.xmlcache.RegionCreation;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.analysis.core.SimpleAnalyzer;
-import org.apache.lucene.analysis.standard.ClassicAnalyzer;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
public class LuceneIndexXmlParserIntegrationJUnitTest {
@@ -203,7 +204,7 @@ public class LuceneIndexXmlParserIntegrationJUnitTest {
/**
* Test that the Index creation objects get appropriately translated into a real index.
- *
+ *
* @throws FileNotFoundException
*/
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
index 15d78ab..9c5911e 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
@@ -4,9 +4,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java
index 6c4fb93..2746567 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java
@@ -19,17 +19,17 @@ import static org.mockito.Mockito.*;
import java.io.IOException;
import java.util.function.Consumer;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+
+import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.IndexRepositoryFactory;
import org.apache.geode.cache.lucene.internal.LuceneIndexForPartitionedRegion;
import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
import org.apache.geode.cache.lucene.internal.PartitionedRepositoryManager;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
-import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.mockito.Mockito;
-import org.mockito.stubbing.Answer;
-
public class IndexRepositorySpy extends IndexRepositoryFactory {
private Consumer<Object> beforeWrite = key -> {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneDeclarable2TestSerializer.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneDeclarable2TestSerializer.java
index 6c5737d..313fccf 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneDeclarable2TestSerializer.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneDeclarable2TestSerializer.java
@@ -14,10 +14,10 @@
*/
package org.apache.geode.cache.lucene.test;
-import org.apache.geode.internal.cache.xmlcache.Declarable2;
-
import java.util.Properties;
+import org.apache.geode.internal.cache.xmlcache.Declarable2;
+
/**
* A Test LuceneSerializer that takes properties during construction (init)
*/
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestSerializer.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestSerializer.java
index 0f2e86c..83132ca 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestSerializer.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestSerializer.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.cache.lucene.test;
+import static org.junit.Assert.assertEquals;
+
+import java.util.*;
+
+import org.apache.lucene.document.Document;
+
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.internal.cache.xmlcache.Declarable2;
-import org.apache.lucene.document.Document;
-
-import java.util.*;
-
-import static org.junit.Assert.assertEquals;
/**
* A Test LuceneSerializer that takes properties during construction (init)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
index 307b649..e3c2001 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
@@ -27,6 +27,10 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
+import org.apache.lucene.document.FloatPoint;
+import org.apache.lucene.document.IntPoint;
+import org.apache.lucene.search.Query;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
@@ -41,18 +45,15 @@ import org.apache.geode.cache.lucene.LuceneIndexFactory;
import org.apache.geode.cache.lucene.LuceneQuery;
import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.cache.lucene.LuceneQueryProvider;
-import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
+import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
import org.apache.geode.cache.lucene.internal.LuceneIndexForPartitionedRegion;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.test.dunit.VM;
-import org.apache.lucene.document.FloatPoint;
-import org.apache.lucene.document.IntPoint;
-import org.apache.lucene.search.Query;
public class LuceneTestUtilities {
public static final String INDEX_NAME = "index";
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/GemFireException.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/GemFireException.java
index 89f2dde..660dfee 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/GemFireException.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/GemFireException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire;
* Since these exceptions are unchecked, this class really <em>ought</em> to be called
* <code>GemFireRuntimeException</code>; however, the current name is retained for compatibility's
* sake.
- *
+ *
* @see org.apache.geode.GemFireCheckedException
* @see org.apache.geode.cache.CacheRuntimeException
* @deprecated use org.apache.geode exceptions, not com.gemstone.gemfire exceptions
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java
index 059cfed..b50efea 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java
@@ -18,11 +18,11 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Exception to indicate that Region is empty for data aware functions.
- *
+ *
* @author skumar
* @since 6.5
* @deprecated please use the org.apache.geode version of this class
- *
+ *
*/
public class EmtpyRegionFunctionException extends FunctionException {
@@ -30,7 +30,7 @@ public class EmtpyRegionFunctionException extends FunctionException {
/**
* Construct an instance of EmtpyRegionFunctionException
- *
+ *
* @param cause a Throwable cause of this exception
*/
public EmtpyRegionFunctionException(Throwable cause) {
@@ -39,7 +39,7 @@ public class EmtpyRegionFunctionException extends FunctionException {
/**
* Construct an instance of EmtpyRegionFunctionException
- *
+ *
* @param msg Exception message
*/
public EmtpyRegionFunctionException(String msg) {
@@ -48,7 +48,7 @@ public class EmtpyRegionFunctionException extends FunctionException {
/**
* Construct an instance of EmtpyRegionFunctionException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
index de8825b..ea2fcf8 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
@@ -18,11 +18,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import com.gemstone.gemfire.GemFireException;
-import org.apache.geode.internal.Assert;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.internal.Assert;
+
+import com.gemstone.gemfire.GemFireException;
/**
* Thrown to indicate an error or exceptional condition during the execution of
@@ -50,14 +51,14 @@ public class FunctionException extends GemFireException {
/**
* Creates new function exception with given error message.
- *
+ *
* @since GemFire 6.5
*/
public FunctionException() {}
/**
* Creates new function exception with given error message.
- *
+ *
* @param msg
* @since GemFire 6.0
*/
@@ -67,7 +68,7 @@ public class FunctionException extends GemFireException {
/**
* Creates new function exception with given error message and optional nested exception.
- *
+ *
* @param msg
* @param cause
* @since GemFire 6.0
@@ -78,7 +79,7 @@ public class FunctionException extends GemFireException {
/**
* Creates new function exception given throwable as a cause and source of error message.
- *
+ *
* @param cause
* @since GemFire 6.0
*/
@@ -88,7 +89,7 @@ public class FunctionException extends GemFireException {
/**
* Adds exceptions thrown from different nodes to a ds
- *
+ *
* @param cause
* @since GemFire 6.5
*/
@@ -99,7 +100,7 @@ public class FunctionException extends GemFireException {
/**
* Returns the list of exceptions thrown from different nodes
- *
+ *
* @since GemFire 6.5
*/
public List<Throwable> getExceptions() {
@@ -111,7 +112,7 @@ public class FunctionException extends GemFireException {
/**
* Adds the list of exceptions provided
- *
+ *
* @since GemFire 6.5
*/
public void addExceptions(Collection<? extends Throwable> ex) {
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
index 974eec0..6407e2f 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
@@ -20,10 +20,10 @@ import org.apache.geode.distributed.DistributedMember;
/**
* Thrown if one of the function execution nodes goes away or cache is closed. Function needs to be
* re-executed if the {@link FunctionException#getCause()} is FunctionInvocationTargetException.
- *
+ *
* @since GemFire 6.0
* @deprecated please use the org.apache.geode version of this class
- *
+ *
*/
public class FunctionInvocationTargetException extends FunctionException {
@@ -33,7 +33,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param cause a Throwable cause of this exception
*/
public FunctionInvocationTargetException(Throwable cause) {
@@ -42,11 +42,11 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param id the DistributedMember id of the source
* @since GemFire 6.5
- *
+ *
*/
public FunctionInvocationTargetException(String msg, DistributedMember id) {
super(msg);
@@ -55,7 +55,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param msg Exception message
*/
public FunctionInvocationTargetException(String msg) {
@@ -64,7 +64,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Construct an instance of FunctionInvocationTargetException
- *
+ *
* @param msg the error message
* @param cause a Throwable cause of this exception
*/
@@ -74,7 +74,7 @@ public class FunctionInvocationTargetException extends FunctionException {
/**
* Method to get the member id of the Exception
- *
+ *
* @return DistributedMember id
* @since GemFire 6.5
*/
diff --git a/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java b/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
index 5104466..4f5580a 100644
--- a/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
+++ b/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
@@ -17,14 +17,15 @@ package com.gemstone.gemfire.cache.execute;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class FunctionExceptionTest {
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java b/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
index 7975fa8..e32df3e 100644
--- a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
+++ b/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
@@ -23,17 +23,17 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.ByteArrayDataInput;
+import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataInputStream;
+import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.OldClientSupportService;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
@@ -45,17 +45,17 @@ import com.gemstone.gemfire.OldClientSupportProvider;
@SuppressWarnings("deprecation")
public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
- static private final List<String> allGeodeThrowableClasses =
+ private static final List<String> allGeodeThrowableClasses =
Arrays.asList(new String[] {"org.apache.geode.cache.execute.EmptyRegionFunctionException",});
- static private final List<String> newArrayClassNames = Arrays.asList(new String[] {
+ private static final List<String> newArrayClassNames = Arrays.asList(new String[] {
"[Lorg.apache.geode.class1", "[[Lorg.apache.geode.class1", "[[[Lorg.apache.geode.class1"});
- static private final List<String> oldArrayClassNames =
+ private static final List<String> oldArrayClassNames =
Arrays.asList(new String[] {"[Lcom.gemstone.gemfire.class1", "[[Lcom.gemstone.gemfire.class1",
"[[[Lcom.gemstone.gemfire.class1"});
- static private final List<String> allNonconformingArrayClassNames = Arrays.asList(
+ private static final List<String> allNonconformingArrayClassNames = Arrays.asList(
new String[] {"[Lmypackage.org.apache.geode.class2", "[[Lmypackage.org.apache.geode.class2"});
private Cache myCache;
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
index 6aef34f..e55a4f6 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
@@ -17,12 +17,6 @@
package org.apache.geode.tools.pulse.internal;
-import org.apache.geode.tools.pulse.internal.controllers.PulseController;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
@@ -30,9 +24,17 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.ResourceBundle;
import java.util.Set;
+
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.tools.pulse.internal.controllers.PulseController;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
+
/**
* This class is used for checking the application running mode i.e. Embedded or not
*
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/ExceptionHandlingAdvice.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/ExceptionHandlingAdvice.java
index c4f147c..85fabcb 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/ExceptionHandlingAdvice.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/ExceptionHandlingAdvice.java
@@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.ResponseStatus;
/**
* For handling IO exception in our controllers
- *
- *
+ *
+ *
*/
@ControllerAdvice
public class ExceptionHandlingAdvice {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
index e609477..2af8b56 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
@@ -17,19 +17,20 @@
package org.apache.geode.tools.pulse.internal.controllers;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.PulseVersion;
-import org.apache.geode.tools.pulse.internal.data.Repository;
-import org.apache.geode.tools.pulse.internal.service.PulseService;
-import org.apache.geode.tools.pulse.internal.service.PulseServiceFactory;
-import org.apache.geode.tools.pulse.internal.service.SystemAlertsService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,18 +38,19 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.PulseVersion;
+import org.apache.geode.tools.pulse.internal.data.Repository;
+import org.apache.geode.tools.pulse.internal.service.PulseService;
+import org.apache.geode.tools.pulse.internal.service.PulseServiceFactory;
+import org.apache.geode.tools.pulse.internal.service.SystemAlertsService;
/**
* Class PulseController
- *
+ *
* This class contains the implementations for all http Ajax requests needs to be served in Pulse.
- *
+ *
* @since GemFire version 7.5
*/
@Controller
@@ -133,7 +135,7 @@ public class PulseController {
/**
* Method isUserLoggedIn Check whether user is logged in or not.
- *
+ *
* @param request
* @return boolean
*/
@@ -262,7 +264,7 @@ public class PulseController {
/**
* This method creates json for list of cluster regions
- *
+ *
* @param cluster
* @return ArrayNode JSON array
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
index 5b552a1..3657adb 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
@@ -17,15 +17,6 @@
package org.apache.geode.tools.pulse.internal.data;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.collections.buffer.CircularFifoBuffer;
-import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -53,8 +44,18 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.management.remote.JMXConnector;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.collections.buffer.CircularFifoBuffer;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
/**
* Class Cluster This class is the Data Model for the data used for the Pulse Web UI.
*
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java
index 70ad293..3a7e7d7 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java
@@ -17,14 +17,6 @@
package org.apache.geode.tools.pulse.internal.data;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -36,10 +28,18 @@ import java.util.Iterator;
import java.util.ResourceBundle;
import java.util.Scanner;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
/**
* Class DataBrowser This class contains Data browser functionalities for managing queries and
* histories.
- *
+ *
* @since GemFire version 7.5.Beta 2013-03-25
*/
public class DataBrowser {
@@ -54,7 +54,7 @@ public class DataBrowser {
/**
* addQueryInHistory method adds user's query into query history file
- *
+ *
* @param userId Logged in User's Id
* @param queryText Query text to execute
*/
@@ -84,7 +84,7 @@ public class DataBrowser {
/**
* deleteQueryById method deletes query from query history file
- *
+ *
* @param userId Logged in user's Unique Id
* @param queryId Unique Id of Query to be deleted
* @return boolean
@@ -115,7 +115,7 @@ public class DataBrowser {
/**
* getQueryHistoryByUserId method reads and lists out the queries from history file
- *
+ *
* @param userId Logged in User's Id
*/
public ArrayNode getQueryHistoryByUserId(String userId) {
@@ -148,7 +148,7 @@ public class DataBrowser {
/**
* generateQueryKey method fetches queries from query history file
- *
+ *
* @return Properties A collection queries in form of key and values
*/
private ObjectNode fetchAllQueriesFromFile() {
@@ -181,7 +181,7 @@ public class DataBrowser {
/**
* generateQueryKey method stores queries in query history file.
- *
+ *
* @return Boolean true is operation is successful, false otherwise
*/
private boolean storeQueriesInFile(ObjectNode queries) {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
index fb837ea..d588ae5 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
@@ -17,16 +17,16 @@
package org.apache.geode.tools.pulse.internal.data;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
import javax.management.remote.JMXConnector;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
/**
* Interface having updateData() function which is getting Override by both MockDataUpdater and
* JMXDataUpdater
- *
+ *
* @since GemFire version 7.0.Beta 2012-09-23
- *
+ *
*/
public interface IClusterUpdater {
boolean updateData();
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
index f9b6825..a6df106 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
@@ -69,7 +69,7 @@ import org.apache.geode.tools.pulse.internal.data.JmxManagerFinder.JmxManagerInf
/**
* Class JMXDataUpdater Class used for creating JMX connection and getting all the required MBeans
- *
+ *
* @since GemFire version 7.0.Beta 2012-09-23
*/
public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
@@ -380,7 +380,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used to get attribute values of Cluster System and map them to cluster vo
- *
+ *
* @param mbeanName Cluster System MBean
*/
private void updateClusterSystem(ObjectName mbeanName) throws IOException {
@@ -533,7 +533,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used to get attribute values of Gateway Receiver and map them to GatewayReceiver inner
* class object
- *
+ *
* @return GatewayReceiver object
*/
private Cluster.GatewayReceiver initGatewayReceiver(ObjectName mbeanName)
@@ -861,7 +861,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* Add member specific region information on the region
- *
+ *
* @param regionObjectName: used to construct the jmx objectname. For region name that has special
* characters in, it will have double quotes around it.
*/
@@ -1034,7 +1034,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used to get attribute values of Cluster Region and map them to cluster region vo
- *
+ *
* @param mbeanName Cluster Region MBean
*/
private void updateClusterRegion(ObjectName mbeanName) throws IOException {
@@ -1403,7 +1403,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used to get attribute values of Cluster Member and map them to cluster member vo
- *
+ *
* @param mbeanName Cluster Member MBean
*/
private void updateClusterMember(ObjectName mbeanName) throws IOException {
@@ -1588,7 +1588,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used to get attribute values of Member Region and map them to Member vo
- *
+ *
* @param mbeanName Member Region MBean
*/
private void updateMemberRegion(ObjectName mbeanName) throws IOException {
@@ -1687,7 +1687,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* Rolling upgrade handled gracefully CompositeData compositeData = (CompositeData)
* (this.mbs.invoke(mbeanName, PulseConstants.MBEAN_OPERATION_LISTREGIONATTRIBUTES, null,
* null));
- *
+ *
* if (compositeData != null) { if
* (compositeData.containsKey(PulseConstants.COMPOSITE_DATA_KEY_SCOPE)) {
* region.setScope((String) compositeData .get(PulseConstants.COMPOSITE_DATA_KEY_SCOPE)); }
@@ -1702,8 +1702,8 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* //logger.
* warning("Some of the Pulse elements are not available currently. There might be a GemFire upgrade going on."
* ); }
- *
- *
+ *
+ *
* // Remove deleted regions from member's regions list for (Iterator<String> it =
* cluster.getDeletedRegions().iterator(); it .hasNext();) { String deletedRegion = it.next();
* if (member.getMemberRegions().get(deletedRegion) != null) {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JmxManagerFinder.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JmxManagerFinder.java
index 3161eb5..70fa9da 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JmxManagerFinder.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JmxManagerFinder.java
@@ -31,12 +31,12 @@ import org.apache.geode.tools.pulse.internal.util.ConnectionUtil;
* This class can be used to connect to a locator and ask it to find a jmx manager. If the locator
* can find a jmx manager that is already running it returns it. Otherwise the locator will attempt
* to start a jmx manager and then return it.
- *
+ *
* This code does not depend on gemfire.jar but in order to do this some of GemFire's internal
* serialization codes and byte sequences have been hard coded into this code.
- *
+ *
* @since GemFire version 7.0.Beta 2012-09-23
- *
+ *
*/
public class JmxManagerFinder {
@@ -46,10 +46,10 @@ public class JmxManagerFinder {
* "Usage: JmxManagerFinder locatorHost locatorPort. Expected two arguments but found " +
* args.length); return; } String locatorHost = args[0]; int locatorPort =
* Integer.parseInt(args[1]);
- *
+ *
* InetAddress addr = InetAddress.getByName(locatorHost); JmxManagerInfo locRes =
* askLocatorForJmxManager(addr, locatorPort, 15000);
- *
+ *
* if (locRes.port == 0) { System.out.println("Locator could not find a jmx manager"); } else {
* System.out.println("Locator on host " + locRes.host + " port " + locRes.port + (locRes.ssl ?
* " ssl" : "")); } }
@@ -63,8 +63,8 @@ public class JmxManagerFinder {
/**
* Describes the location of a jmx manager. If a jmx manager does not exist then port will be 0.
- *
- *
+ *
+ *
*/
public static class JmxManagerInfo {
JmxManagerInfo(String host, int port, boolean ssl) {
@@ -89,7 +89,7 @@ public class JmxManagerFinder {
/**
* Ask a locator to find a jmx manager. The locator will start one if one is not already running.
- *
+ *
* @param addr the host address the locator is listening on
* @param port the port the locator is listening on
* @param timeout the number of milliseconds to wait for a response; 15000 is a reasonable default
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseConfig.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseConfig.java
index 9d07191..f1c6f37 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseConfig.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseConfig.java
@@ -21,11 +21,11 @@ import org.apache.logging.log4j.Level;
/**
* Class PulseConfig
- *
+ *
* PulseConfig is used for configuring Pulse application.
- *
+ *
* @since GemFire 7.0.1
- *
+ *
*/
public class PulseConfig {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseVersion.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseVersion.java
index c615b46..79e9604 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseVersion.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/PulseVersion.java
@@ -21,10 +21,10 @@ import java.util.ResourceBundle;
/**
* Class PulseVersion
- *
+ *
* This class is for holding Pulse Applications Version's details (like version details, build
* details, source details, etc) from properties file
- *
+ *
* @since GemFire version Helios
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
index 9a03349..b6f467e 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
@@ -17,20 +17,20 @@
package org.apache.geode.tools.pulse.internal.data;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
/**
* A Singleton instance of the memory cache for clusters.
- *
+ *
* @since GemFire version 7.0.Beta 2012-09-23
*/
public class Repository {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthentication.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthentication.java
index 62de395..db6dd8d 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthentication.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthentication.java
@@ -17,17 +17,18 @@ package org.apache.geode.tools.pulse.internal.security;
import java.util.ArrayList;
import java.util.Collection;
+
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.SpringSecurityCoreVersion;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+
/**
* Spring security authentication object for GemFire
* <p>
@@ -42,7 +43,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
* to get authentication levels. See @See {@link #populateAuthorities(JMXConnector)}. This sets
* Spring Security Authorities 2.b DataBrowser end-points are required to be authorized against
* Spring Granted Authority
- *
+ *
* @since GemFire version 9.0
*/
public class GemFireAuthentication extends UsernamePasswordAuthenticationToken {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
index 2d3f0b1..6bd77d4 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.tools.pulse.internal.security;
-import org.apache.geode.tools.pulse.internal.data.Repository;
+import java.util.Collection;
+
+import javax.management.remote.JMXConnector;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.security.authentication.AuthenticationProvider;
@@ -24,14 +27,13 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.GrantedAuthority;
-import java.util.Collection;
-import javax.management.remote.JMXConnector;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Spring security AuthenticationProvider for GemFire. It connects to gemfire manager using given
* credentials. Successful connect is treated as successful authentication and web user is
* authenticated
- *
+ *
* @since GemFire version 9.0
*/
public class GemFireAuthenticationProvider implements AuthenticationProvider {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
index 16200c8..5fec88e 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
@@ -14,17 +14,19 @@
*/
package org.apache.geode.tools.pulse.internal.security;
-import org.apache.geode.tools.pulse.internal.data.Repository;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Handler is used to close jmx connection maintained at user-level
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java
index 29d351e..b700b07 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java
@@ -17,23 +17,25 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.text.DecimalFormat;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
-import java.text.DecimalFormat;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterDetailsService
- *
+ *
* This service class has implementation for providing cluster's basic statistical data.
- *
+ *
* @since GemFire version 7.5
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDiskThroughputService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDiskThroughputService.java
index 775e4a0..fb4f0cc 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDiskThroughputService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDiskThroughputService.java
@@ -17,20 +17,21 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterDiskThroughput This class contains implementations for getting cluster's current
* disk throughput details and its trend over time
- *
+ *
* @since GemFire version 7.0.Beta
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterGCPausesService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterGCPausesService.java
index 93f3c3f..f08d330 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterGCPausesService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterGCPausesService.java
@@ -17,23 +17,24 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterGCPausesService
- *
+ *
* This class contains implementations of getting Cluster's GC Pauses (JVM Pauses) Details and its
* trend over the time.
- *
+ *
* @since GemFire version 7.5
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterKeyStatisticsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterKeyStatisticsService.java
index 84605dc..a61c192 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterKeyStatisticsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterKeyStatisticsService.java
@@ -17,22 +17,23 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterKeyStatisticsService
- *
+ *
* This class contains implementations of getting Cluster's current Reads, Writes and queries
* details and their trends over the time.
- *
+ *
* @since GemFire version 7.5
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
index 34a7734..0769bda 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
@@ -17,28 +17,30 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
-import org.apache.geode.tools.pulse.internal.util.TimeUtils;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
+import org.apache.geode.tools.pulse.internal.util.TimeUtils;
/**
* Class ClusterMemberService
- *
+ *
* This class contains implementations of getting Cluster Member's details
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
index 7a1013a..cbd8f25 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
@@ -17,27 +17,29 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterMembersRGraphService
- *
+ *
* This class contains implementations of getting List of Cluster members and their details
- *
+ *
* @since GemFire version 7.5
*/
@Component
@@ -104,7 +106,7 @@ public class ClusterMembersRGraphService implements PulseService {
* function used for getting all members details in format of JSON Object array defined under a
* cluster. This function create json based on the relation of physical host and members related
* to it.
- *
+ *
* @param cluster
* @param host
* @param port
@@ -260,7 +262,7 @@ public class ClusterMembersRGraphService implements PulseService {
/**
* used for getting member node type based on member's current state
- *
+ *
* @param member Member
* @param memberState i.e Severe, Error, Warning or Normal
* @return
@@ -291,7 +293,7 @@ public class ClusterMembersRGraphService implements PulseService {
/**
* function used for getting list of all the alerts and save the member names in respective error,
* warning and severe alert lists
- *
+ *
* @param cluster
*/
private void updateAlertLists(Cluster cluster) {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemoryUsageService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemoryUsageService.java
index 9f7c2d6..a72f367 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemoryUsageService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemoryUsageService.java
@@ -17,22 +17,23 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterMemoryUsageService
- *
+ *
* This class contains implementations of getting Cluster's overall current memory usage details and
* its trend over the time.
- *
+ *
* @since GemFire version 7.5
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
index 57ea397..d00c0f4 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
@@ -17,24 +17,26 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterRegionService
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
index 35cfd5b..027f9ff 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
@@ -17,30 +17,32 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterRegionsService
- *
+ *
* This class contains implementations of getting Cluster's regions details
- *
+ *
* @since GemFire version 7.5
*/
@@ -84,7 +86,7 @@ public class ClusterRegionsService implements PulseService {
/**
* This method is used to get various regions associated with the given cluster and create json
* for each region fields and returns Array List for all the regions associated with given cluster
- *
+ *
* @param cluster
* @return JSONObject Array List
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
index 2287174..5052186 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
@@ -17,27 +17,29 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
-import org.apache.geode.tools.pulse.internal.util.TimeUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
+import org.apache.geode.tools.pulse.internal.util.TimeUtils;
/**
* Class ClusterSelectedRegionService
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
index cba95a0..1cd1296 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
@@ -17,24 +17,25 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Cluster.RegionOnMember;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Cluster.RegionOnMember;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterSelectedRegionsMemberService
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterWANInfoService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterWANInfoService.java
index a3e7746..bb211c9 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterWANInfoService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterWANInfoService.java
@@ -17,23 +17,25 @@
package org.apache.geode.tools.pulse.internal.service;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class ClusterWANInfoService
- *
+ *
* This class contains implementations of getting Cluster's WAN Informations (connected clusters)
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
index 2c66b23..c2b08a8 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
@@ -19,24 +19,25 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberAsynchEventQueuesService
- *
+ *
* This class contains implementations of getting Asynchronous Event Queues details of Cluster
* Member.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java
index 3eed748..7ef80c7 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java
@@ -19,24 +19,25 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
-import org.apache.geode.tools.pulse.internal.util.TimeUtils;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
+import org.apache.geode.tools.pulse.internal.util.TimeUtils;
/**
* Class MemberClientsService
- *
+ *
* This class contains implementations of getting Memeber's Clients.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
index f82727a..52d5662 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
@@ -19,24 +19,26 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import java.text.DecimalFormat;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.text.DecimalFormat;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberDetailsService
- *
+ *
* This class contains implementations of getting Memeber's Statistics.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java
index 644661b..b319e5b 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java
@@ -19,23 +19,24 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberDiskThroughputService
- *
+ *
* This class contains implementations for getting Memeber's current Disk Throughput trends over the
* time.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java
index a967bf1..cd0877b 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java
@@ -19,23 +19,24 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberGCPausesService
- *
+ *
* This class contains implementations of getting Memeber's GC Pauses (JVM Pauses) details and its
* trend over the time.
- *
+ *
* @since GemFire version 7.5
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java
index 2ac5d14..a84e617 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java
@@ -19,27 +19,29 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberGatewayHubService
- *
+ *
* This class contains implementations of getting Gateway Receivers and Senders details of Cluster
* Member.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java
index 15af527..a049694 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java
@@ -19,23 +19,24 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberHeapUsageService
- *
+ *
* This class contains implementations of getting Memeber's current Heap Usage and its trend over
* the time.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java
index 629bac6..c741049 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java
@@ -19,22 +19,23 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberKeyStatisticsService
- *
+ *
* This class contains implementations of getting Member's CPU, Memory and Read Write details
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
index 583f478..bd1bdae 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
@@ -19,26 +19,28 @@ package org.apache.geode.tools.pulse.internal.service;
import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName;
+import java.text.DecimalFormat;
+
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import java.text.DecimalFormat;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MemberRegionsService
- *
+ *
* This class contains implementations of getting Memeber's Regions details.
- *
+ *
* @since GemFire version 7.5
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MembersListService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MembersListService.java
index b536b37..0d982b1 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MembersListService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MembersListService.java
@@ -17,22 +17,23 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class MembersListService
- *
+ *
* This class contains implementations of getting list of Cluster Members.
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseService.java
index d389ebf..563edb7 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseService.java
@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
/**
* Abstract class PulseService
- *
+ *
* This is a base class for all services in pulse.
- *
+ *
* @since GemFire version 7.5
*/
public interface PulseService {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseServiceFactory.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseServiceFactory.java
index 6eeedc3..76b98d6 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseServiceFactory.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseServiceFactory.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
/**
* Class PulseServiceFactory
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseVersionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseVersionService.java
index fa8ccaf..d7401ee 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseVersionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/PulseVersionService.java
@@ -17,21 +17,22 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.controllers.PulseController;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.controllers.PulseController;
/**
* Class PulseVersionService
- *
+ *
* This class contains implementations of getting Pulse Applications Version's details (like version
* details, build details, source details, etc) from properties file
- *
+ *
* @since GemFire version 7.0.Beta
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/QueryStatisticsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/QueryStatisticsService.java
index 6762760..90513c1 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/QueryStatisticsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/QueryStatisticsService.java
@@ -32,9 +32,9 @@ import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class QueryStatisticsService
- *
+ *
* This class returns top N queries based on pagination and filtering criteria if any
- *
+ *
* @since GemFire version 7.5
*/
@Component
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java
index 0403c5e..4e2754b 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java
@@ -17,25 +17,26 @@
package org.apache.geode.tools.pulse.internal.service;
+import javax.servlet.http.HttpServletRequest;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.Repository;
/**
* Class SystemAlertsService
- *
+ *
* This class contains implementations of getting system's alerts details (like errors, warnings and
* severe errors).
- *
+ *
* @since GemFire version 7.5
*/
@@ -77,7 +78,7 @@ public class SystemAlertsService implements PulseService {
/**
* function used for getting all members details in format of JSON Object array defined under a
* cluster
- *
+ *
* @param cluster
* @return JSONObject Array list
*/
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/ConnectionUtil.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/ConnectionUtil.java
index 0e0caba..445df92 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/ConnectionUtil.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/ConnectionUtil.java
@@ -23,7 +23,7 @@ import javax.net.ssl.SSLSocketFactory;
/**
- *
+ *
*
*/
public class ConnectionUtil {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/IPAddressUtil.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/IPAddressUtil.java
index 0c05338..77398ab 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/IPAddressUtil.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/IPAddressUtil.java
@@ -27,8 +27,8 @@ import java.util.regex.PatternSyntaxException;
/**
* Class IPAddressUtil This is utility class for checking whether ip address is versions i.e. IPv4
* or IPv6 address
- *
- *
+ *
+ *
* @since GemFire version 7.0.1
*/
public class IPAddressUtil {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/TimeUtils.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/TimeUtils.java
index 45001d1..701fba3 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/TimeUtils.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/TimeUtils.java
@@ -19,10 +19,10 @@ package org.apache.geode.tools.pulse.internal.util;
/**
* Class TimeUtils
- *
+ *
* This is utility class used for conversions of time.
- *
- *
+ *
+ *
* @since GemFire version 7.0.1
*/
public class TimeUtils {
@@ -30,7 +30,7 @@ public class TimeUtils {
/**
* Method to converts time given in milliseconds to string representation in days, hours, minutes
* and seconds
- *
+ *
* @param longMilliSecs Time in milliseconds.
* @return String
*/
@@ -73,7 +73,7 @@ public class TimeUtils {
/**
* Method to converts time given in seconds to string representation in days, hours, minutes and
* seconds
- *
+ *
* @param longSecs Time in seconds.
* @return String
*/
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
index 58bdbcb..007fc32 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.tools.pulse.controllers;
-import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.contains;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -30,12 +30,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.apache.geode.tools.pulse.internal.controllers.PulseController;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConfig;
-import org.apache.geode.tools.pulse.internal.data.Repository;
-
import org.apache.commons.collections.buffer.CircularFifoBuffer;
import org.junit.Before;
import org.junit.Rule;
@@ -58,6 +52,10 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.tools.pulse.internal.controllers.PulseController;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConfig;
+import org.apache.geode.tools.pulse.internal.data.Repository;
@Category(IntegrationTest.class)
@PrepareForTest(Repository.class)
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java
index 644a991..a7bae00 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java
@@ -16,9 +16,10 @@
package org.apache.geode.tools.pulse.internal;
-import javax.servlet.ServletContextEvent;
import static org.mockito.Mockito.*;
+import javax.servlet.ServletContextEvent;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java
index 62cd974..68a61dc 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java
@@ -16,15 +16,16 @@
package org.apache.geode.tools.pulse.internal.data;
-import static org.mockito.Mockito.*;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.assertj.core.data.Offset;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class JMXDataUpdaterGetDoubleAttributeTest {
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/GemFireDistributedSystem.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/GemFireDistributedSystem.java
index f38879d..e7e4110 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/GemFireDistributedSystem.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/GemFireDistributedSystem.java
@@ -16,21 +16,21 @@
*/
package org.apache.geode.tools.pulse.testbed;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-
/**
- *
+ *
* TODO 0. SystemAlerts 1. Operations like member-up/down/crash, region create/destroy [7.5 scope]
* 2. Read events like member-up/down/crash, region create/destroy [7.5 scope] 3. PropFile Writing
* 4. Link to other remote systems, topology - multi-cluster [7.5]
- *
+ *
*
*/
public class GemFireDistributedSystem {
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
index 7ce9c46..1faf92e 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
@@ -16,8 +16,22 @@
*/
package org.apache.geode.tools.pulse.testbed;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.ResourceBundle;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.internal.data.Cluster.Alert;
import org.apache.geode.tools.pulse.internal.data.Cluster.Client;
@@ -31,19 +45,6 @@ import org.apache.geode.tools.pulse.internal.data.Repository;
import org.apache.geode.tools.pulse.testbed.GemFireDistributedSystem.Locator;
import org.apache.geode.tools.pulse.testbed.GemFireDistributedSystem.Peer;
import org.apache.geode.tools.pulse.testbed.GemFireDistributedSystem.Server;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.ResourceBundle;
public class PropMockDataUpdater implements IClusterUpdater {
private static final int MAX_HOSTS = 40;
@@ -391,16 +392,16 @@ public class PropMockDataUpdater implements IClusterUpdater {
/*
* private String getHostName(long rndSeed) { Random rnd = new Random(rndSeed); String hName =
* null;
- *
+ *
* int index = Math.abs(rnd.nextInt(MAX_HOSTS));
- *
+ *
* ArrayList<String> hostNames = cluster.getHostNames();
- *
+ *
* if (hostNames.size() <= index) { hName = "host" + hostNames.size(); hostNames.add(hName); }
* else { hName = hostNames.get(index); }
- *
+ *
* Map<String, ArrayList<Member>> physicalToMember = cluster.getPhysicalToMember();
- *
+ *
* ArrayList<Member> memberArrList = physicalToMember.get(hName); if (memberArrList != null) { if
* (memberArrList.size() > 4){ hName = getHostName(rndSeed + rnd.nextLong()); } } return hName; }
*/
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
index ad5c080..44b694f 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
@@ -16,15 +16,6 @@ package org.apache.geode.tools.pulse.tests;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.security.SecurityServiceFactory;
-import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator;
-import org.apache.geode.management.internal.security.AccessControlMBean;
-import org.apache.geode.management.internal.security.MBeanServerWrapper;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.Inet4Address;
@@ -35,6 +26,7 @@ import java.rmi.registry.LocateRegistry;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
@@ -45,6 +37,15 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.SecurityServiceFactory;
+import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator;
+import org.apache.geode.management.internal.security.AccessControlMBean;
+import org.apache.geode.management.internal.security.MBeanServerWrapper;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.security.TestSecurityManager;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+
public class Server {
private static final String DEFAULT_HOST = "127.0.0.1"; // "localhost"
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
index 455480f..f1e2c83 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.geode.tools.pulse.tests.junit;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URI;
+import java.util.List;
+import java.util.Properties;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
@@ -36,14 +44,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URI;
-import java.util.List;
-import java.util.Properties;
+import org.apache.geode.test.junit.categories.UITest;
/**
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
index 5c43458..c8b0dfc 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
@@ -27,10 +27,9 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.util.EntityUtils;
-import org.junit.*;
-
import org.json.JSONArray;
import org.json.JSONObject;
+import org.junit.*;
/**
* JUnit Tests for ClusterSelectedRegionService in the back-end server for region detail page
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
index e602b34..d2ca07f 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
@@ -28,9 +28,8 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.util.EntityUtils;
-import org.junit.*;
-
import org.json.JSONObject;
+import org.junit.*;
/**
* JUnit Tests for ClusterSelectedRegionsMemberService in the back-end server for region detail page
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
index da34537..fc06a73 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
@@ -27,10 +27,9 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.util.EntityUtils;
-import org.junit.*;
-
import org.json.JSONArray;
import org.json.JSONObject;
+import org.junit.*;
/**
* JUnit Tests for MemberGatewayHubService in the back-end server for region detail page
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java
index 3728015..e784a46 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java
@@ -16,6 +16,10 @@
package org.apache.geode.tools.pulse.tests.rules;
+import java.io.File;
+import java.io.IOException;
+import java.util.function.Supplier;
+
import org.apache.commons.io.FileUtils;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
@@ -23,10 +27,6 @@ import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.WebDriver;
-import java.io.File;
-import java.io.IOException;
-import java.util.function.Supplier;
-
public class ScreenshotOnFailureRule extends TestWatcher {
private Supplier<WebDriver> webDriverSupplier;
@@ -57,4 +57,3 @@ public class ScreenshotOnFailureRule extends TestWatcher {
}
-
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
index f62bb74..389e3d0 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.tools.pulse.tests.rules;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.awaitility.Awaitility;
+import org.junit.rules.ExternalResource;
+
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.management.internal.JettyHelper;
import org.apache.geode.tools.pulse.internal.data.PulseConstants;
import org.apache.geode.tools.pulse.tests.Server;
-import org.awaitility.Awaitility;
-import org.junit.rules.ExternalResource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
public class ServerRule extends ExternalResource {
private static final String LOCALHOST = "localhost";
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
index 61bf171..3e557d8 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
@@ -18,6 +18,8 @@ package org.apache.geode.tools.pulse.tests.rules;
import static org.junit.Assert.assertNotNull;
+import java.util.concurrent.TimeUnit;
+
import org.apache.commons.lang.StringUtils;
import org.junit.rules.ExternalResource;
import org.openqa.selenium.By;
@@ -28,8 +30,6 @@ import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.WebDriverWait;
-import java.util.concurrent.TimeUnit;
-
public class WebDriverRule extends ExternalResource {
private WebDriver driver;
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
index b72b666b..804d400 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
@@ -18,10 +18,6 @@ package org.apache.geode.tools.pulse.tests.ui;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.categories.UITest;
-import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
-import org.apache.geode.tools.pulse.tests.rules.ServerRule;
-import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
@@ -32,6 +28,11 @@ import org.junit.runners.MethodSorters;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
+import org.apache.geode.test.junit.categories.UITest;
+import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
+import org.apache.geode.tools.pulse.tests.rules.ServerRule;
+import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
+
@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseAnonymousUserTest {
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
index 4a82d1b..9bcd4f7 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
@@ -15,10 +15,6 @@
*/
package org.apache.geode.tools.pulse.tests.ui;
-import org.apache.geode.test.junit.categories.UITest;
-import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
-import org.apache.geode.tools.pulse.tests.rules.ServerRule;
-import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
@@ -27,6 +23,11 @@ import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.WebDriver;
+import org.apache.geode.test.junit.categories.UITest;
+import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
+import org.apache.geode.tools.pulse.tests.rules.ServerRule;
+import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
+
@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseAuthTest extends PulseBase {
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
index b19416c..febf61d 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
@@ -21,16 +21,13 @@
*/
package org.apache.geode.tools.pulse.tests.ui;
+import static org.apache.geode.tools.pulse.tests.ui.PulseTestUtils.*;
import static org.junit.Assert.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.List;
-import org.apache.geode.tools.pulse.tests.DataBrowserResultLoader;
-import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
-import org.apache.geode.tools.pulse.tests.rules.ServerRule;
-import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
@@ -43,9 +40,12 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.apache.geode.test.junit.categories.UITest;
+import org.apache.geode.tools.pulse.tests.DataBrowserResultLoader;
import org.apache.geode.tools.pulse.tests.PulseTestData;
import org.apache.geode.tools.pulse.tests.PulseTestLocators;
-import static org.apache.geode.tools.pulse.tests.ui.PulseTestUtils.*;
+import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
+import org.apache.geode.tools.pulse.tests.rules.ServerRule;
+import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
@Category(UITest.class)
public class PulseAutomatedTest extends PulseBase {
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
index 90c56ce..7cc49b0 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
@@ -67,9 +67,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.tests.JMXProperties;
-import org.apache.geode.tools.pulse.tests.PulseTestLocators;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.List;
+
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -80,11 +83,9 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.List;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.tests.JMXProperties;
+import org.apache.geode.tools.pulse.tests.PulseTestLocators;
/**
* If you try to run the Pulse UI Tests through your IDE without forking enabled, you will see
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
index 03265ef..1788a93 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
@@ -15,10 +15,6 @@
*/
package org.apache.geode.tools.pulse.tests.ui;
-import org.apache.geode.test.junit.categories.UITest;
-import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
-import org.apache.geode.tools.pulse.tests.rules.ServerRule;
-import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
@@ -27,6 +23,11 @@ import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.WebDriver;
+import org.apache.geode.test.junit.categories.UITest;
+import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
+import org.apache.geode.tools.pulse.tests.rules.ServerRule;
+import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
+
@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseNoAuthTest extends PulseBase {
diff --git a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
index 3eced02..7f7db01 100644
--- a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
+++ b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
@@ -26,11 +26,11 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.geode.annotations.Experimental;
import org.apache.logging.log4j.Logger;
import org.springframework.scheduling.support.CronSequenceGenerator;
import org.apache.geode.GemFireConfigException;
+import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Declarable;
import org.apache.geode.cache.GemFireCache;
@@ -51,16 +51,16 @@ import org.apache.geode.internal.logging.LogService;
* most cases, the decision to re-balance is based on the size of the member and a few other
* statistics. {@link AutoBalancer} monitors these statistics and if necessary, triggers a
* re-balancing request. Auto-Balancing is expected to prevent failures and data loss.
- *
+ *
* <P>
* This implementation is based on {@code ConfigInitialization} implementation. By default
* auto-balancing is disabled. A user needs to configure {@link AutoBalancer} during cache
* initialization {@link GemFireCache#getInitializer()}
- *
+ *
* <P>
* In a cluster only one member owns auto-balancing responsibility. This is achieved by grabbing a
* distributed lock. In case of a failure a new member will grab the lock and manage auto balancing.
- *
+ *
* <P>
* {@link AutoBalancer} can be controlled using the following configurations
* <OL>
@@ -81,7 +81,7 @@ public class AutoBalancer implements Declarable {
* <LI>Month
* <LI>Day-of-Week
* <LI>Year (optional field)
- *
+ *
* <P>
* For. e.g. {@code 0 0 * * * ?} for auditing the system every hour
*/
diff --git a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
index 38a8791..ad0f4f5 100755
--- a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
+++ b/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
@@ -14,6 +14,23 @@
*/
package org.apache.geode.cache.util;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.util.AutoBalancer.CacheOperationFacade;
@@ -21,25 +38,9 @@ import org.apache.geode.cache.util.AutoBalancer.GeodeCacheFacade;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.locks.DLockService;
-import org.apache.geode.internal.statistics.HostStatSampler;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.statistics.HostStatSampler;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.*;
/**
* IntegrationTests for AutoBalancer that include usage of Cache, StatSampler and
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
index d7c721d..05a576d 100755
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.cache.client.internal;
+import java.net.SocketTimeoutException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.internal.Version;
@@ -29,12 +35,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventRemoteDispatcher.Ga
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import java.net.SocketTimeoutException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.logging.log4j.Logger;
-
@SuppressWarnings("unchecked")
public class GatewaySenderBatchOp {
@@ -43,7 +43,7 @@ public class GatewaySenderBatchOp {
/**
* Send a list of gateway events to a server to execute using connections from the given pool to
* communicate with the server.
- *
+ *
* @param con the connection to send the message on.
* @param pool the pool to use to communicate with the server.
* @param events list of gateway events
@@ -180,7 +180,7 @@ public class GatewaySenderBatchOp {
/**
* Attempts to read a response to this operation by reading it from the given connection, and
* returning it.
- *
+ *
* @param cnx the connection to read the response from
* @return the result of the operation or <code>null</code> if the operation has no result.
* @throws Exception if the execute failed
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
index c6d283c..dbd7df2 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
@@ -21,7 +21,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
/**
* Used to send operations from a sender to a receiver.
- *
+ *
* @since GemFire 8.1
*/
public class SenderProxy extends ServerProxy {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
index dd3fc84..c6bebf7 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.cache.client.internal.locator.wan;
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
@@ -23,15 +28,11 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.net.*;
import org.apache.geode.internal.tcp.ConnectionException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
/**
* This class represent a runnable task which exchange the locator information with local
* locators(within the site) as well as remote locators (across the site)
- *
+ *
* @since GemFire 7.0
*/
public class LocatorDiscovery {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorHelper.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorHelper.java
index 5b91a4c..188dabc 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorHelper.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorHelper.java
@@ -20,26 +20,26 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener;
+import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
import org.apache.geode.internal.CopyOnWriteHashSet;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
/**
* This is a helper class which helps to add the locator information to the allLocatorInfoMap.
- *
+ *
*
*/
public class LocatorHelper {
- public final static Object locatorObject = new Object();
+ public static final Object locatorObject = new Object();
/**
- *
+ *
* This methods add the given locator to allLocatorInfoMap. It also invokes a locatorlistener to
* inform other locators in allLocatorInfoMap about this newly added locator.
- *
+ *
* @param distributedSystemId
* @param locator
* @param locatorListener
@@ -72,7 +72,7 @@ public class LocatorHelper {
/**
* This methods decides whether the given locator is server locator, if so then add this locator
* in allServerLocatorsInfo map.
- *
+ *
* @param distributedSystemId
* @param locatorListener
* @param locator
@@ -94,7 +94,7 @@ public class LocatorHelper {
/**
* This method adds the map of locatorsinfo sent by other locator to this locator's allLocatorInfo
- *
+ *
* @param locators
* @param locatorListener
*/
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
index 5fe1eda..e227d6e 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.cache.client.internal.locator.wan;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
import org.apache.geode.internal.CopyOnWriteHashSet;
@@ -21,20 +30,12 @@ import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
/**
* An implementation of
* {@link org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener}
- *
- *
+ *
+ *
*/
public class LocatorMembershipListenerImpl implements LocatorMembershipListener {
@@ -67,7 +68,7 @@ public class LocatorMembershipListenerImpl implements LocatorMembershipListener
/**
* When the new locator is added to remote locator metadata, inform all other locators in remote
* locator metadata about the new locator so that they can update their remote locator metadata.
- *
+ *
* @param locator
*/
@@ -153,7 +154,7 @@ public class LocatorMembershipListenerImpl implements LocatorMembershipListener
* not available then added to existing remote locator metadata and LocatorMembershipListener is
* invoked to inform about the this newly added locator to all other locators available in remote
* locator metadata. As a response, remote locator metadata is sent.
- *
+ *
* @param request
*/
private synchronized Object updateAllLocatorInfo(RemoteLocatorJoinRequest request) {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
index d9391e4..b2fe473 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
@@ -26,10 +26,10 @@ import org.apache.geode.internal.admin.remote.DistributionLocatorId;
/**
* Requests remote locators of a remote WAN site
- *
- *
+ *
+ *
* @since GemFire 6.6
- *
+ *
*/
public class RemoteLocatorJoinRequest implements DataSerializableFixedID {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
index 353447e..cdae99f 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
@@ -30,9 +30,9 @@ import org.apache.geode.internal.admin.remote.DistributionLocatorId;
/**
* List of remote locators as a response
- *
- *
- *
+ *
+ *
+ *
*/
public class RemoteLocatorJoinResponse implements DataSerializableFixedID {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
index a51e6c1..904af94 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
/**
- *
+ *
*
*/
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
index 4649eea..cd04142 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
/**
- *
+ *
*/
public class RemoteLocatorPingResponse implements DataSerializableFixedID {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java
index cc1a29b..75209da 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
/**
- *
+ *
*
*/
public class RemoteLocatorRequest implements DataSerializableFixedID {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java
index 3e256ef..a57e69d 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
/**
- *
+ *
*
*/
public class RemoteLocatorResponse implements DataSerializableFixedID {
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
index c15db61..768428e 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
@@ -14,18 +14,19 @@
*/
package org.apache.geode.cache.client.internal.locator.wan;
+import java.util.StringTokenizer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
-import org.apache.logging.log4j.Logger;
-
-import java.util.StringTokenizer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
public class WanLocatorDiscovererImpl implements WanLocatorDiscoverer {
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
index 1dbcc97..190f6d1 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
@@ -29,12 +29,12 @@ import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.CacheServerImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.net.SocketCreator;
/**
* @since GemFire 7.0
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 5bdfd6a..a86f430 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -819,4 +819,3 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
}
}
}
-
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
index 81595d5..320e168 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
@@ -19,8 +19,8 @@ import java.util.Set;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
+import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderEventProcessor;
/**
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
index 54155cc..8739a8f 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
@@ -77,7 +77,7 @@ public class RemoteParallelGatewaySenderEventProcessor extends ParallelGatewaySe
/**
* Returns if corresponding receiver WAN site of this GatewaySender has GemfireVersion > 7.0.1
- *
+ *
* @param disp
* @return true if remote site Gemfire Version is >= 7.0.1
*/
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
index 12d029c..69005e0 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
@@ -16,10 +16,10 @@ package org.apache.geode.internal.cache.wan.serial;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
-import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
import org.apache.geode.internal.logging.LogService;
public class RemoteSerialGatewaySenderEventProcessor extends SerialGatewaySenderEventProcessor {
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
index fb0881c..487f8ea 100644
--- a/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.cache.wan;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.PoolManager;
@@ -27,12 +34,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.List;
-
-import static org.junit.Assert.*;
@Category({DistributedTest.class})
public class GatewayReceiverAutoConnectionSourceDUnitTest extends LocatorTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
index 1775ff7..b895baa 100644
--- a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
@@ -16,6 +16,19 @@ package org.apache.geode.cache.wan;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
@@ -47,19 +60,6 @@ import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.awaitility.Awaitility;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
@Category({DistributedTest.class, BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
index 5098131..2cbac67 100755
--- a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.codeAnalysis;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
@Category(IntegrationTest.class)
public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
index 1b1ed0a..77f1031 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.internal.cache.wan;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.test.fake.Fakes;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class AckReaderThreadJUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
index d548613..fbc34bf 100755
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
@@ -14,19 +14,14 @@
*/
package org.apache.geode.internal.cache.wan;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAction;
@@ -39,6 +34,8 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.ClientServerObserverAdapter;
import org.apache.geode.internal.cache.ClientServerObserverHolder;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.ha.HAContainerRegion;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
import org.apache.geode.internal.logging.LogService;
@@ -47,10 +44,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.ha.HAContainerRegion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.awaitility.Awaitility;
@Category(DistributedTest.class)
public class Simple2CacheServerDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index f3d0358..2aca674 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -42,7 +42,38 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
import org.apache.commons.io.FileUtils;
+import org.awaitility.Awaitility;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
@@ -126,36 +157,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
-import org.awaitility.Awaitility;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
@Category(DistributedTest.class)
public class WANTestBase extends JUnit4DistributedTestCase {
@@ -2568,7 +2569,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
/**
* To be used only for ParallelGatewaySender.
- *
+ *
* @param senderId Id of the ParallelGatewaySender
* @param numQueueEntries Expected number of ParallelGatewaySenderQueue entries
*/
@@ -2598,7 +2599,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
/**
* To be used only for ParallelGatewaySender.
- *
+ *
* @param senderId Id of the ParallelGatewaySender
*/
public static int getPRQLocalSize(String senderId) {
@@ -3321,7 +3322,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
/**
* Test methods for sender operations
- *
+ *
* @param senderId
*/
public static void verifySenderPausedState(String senderId) {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index add6958..3f4d58b 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -51,7 +51,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Normal happy scenario test case. checks that all the dispatchers have successfully dispatched
* something individually.
- *
+ *
* @throws Exception
*/
@Test
@@ -134,7 +134,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Normal happy scenario test case.
- *
+ *
* @throws Exception
*/
@Test
@@ -193,7 +193,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Normal happy scenario test case when bucket division tests boundary cases.
- *
+ *
* @throws Exception
*/
@Test
@@ -251,7 +251,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Initially the GatewayReceiver is not up but later it comes up. We verify that
- *
+ *
* @throws Exception
*/
@Test
@@ -375,7 +375,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
* Local and remote sites are up and running. Local site cache is closed and the site is built
* again. Puts are done to local site. Expected: Remote site should receive all the events put
* after the local site was built back.
- *
+ *
* @throws Exception
*/
@Test
@@ -482,7 +482,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Colocated regions using ConcurrentParallelGatewaySender. Normal scenario
- *
+ *
* @throws Exception
*/
@Test
@@ -534,7 +534,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Colocated regions using ConcurrentParallelGatewaySender. Normal scenario
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
index d09809c..e4f3f5f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index d8e600d..96b63a3 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -14,13 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.internal.cache.wan.WANTestBase;
@@ -28,6 +26,7 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTestBase {
@@ -142,7 +141,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
/**
* Normal scenario in which the sender is paused in between.
- *
+ *
* @throws Exception
*/
@Test
@@ -205,7 +204,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
/**
* Normal scenario in which a paused sender is resumed.
- *
+ *
* @throws Exception
*/
@Test
@@ -283,7 +282,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
* Negative scenario in which a sender that is stopped (and not paused) is resumed. Expected:
* resume is only valid for pause. If a sender which is stopped is resumed, it will not be started
* again.
- *
+ *
* @throws Exception
*/
@Test
@@ -343,7 +342,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
/**
* Normal scenario in which a sender is stopped.
- *
+ *
* @throws Exception
*/
@Test
@@ -504,7 +503,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
* Normal scenario in which a sender is stopped and then started again. Differs from above test
* case in the way that when the sender is starting from stopped state, puts are simultaneously
* happening on the region by another thread.
- *
+ *
* @throws Exception
*/
@Ignore("Bug47553")
@@ -600,7 +599,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
/**
* Normal scenario in which a sender is stopped and then started again on accessor node.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index c86405b..82817dc 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -14,17 +14,14 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
@@ -37,7 +34,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.awaitility.Awaitility;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index ae45d30..6ad8de4 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -14,23 +14,22 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderOperationsDUnitTest;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
index 7d4ea96..ea3cf79 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
index ba8d349..c0a9d87 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
@@ -14,15 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.EntryExistsException;
import org.apache.geode.cache.client.ServerOperationException;
@@ -34,6 +30,10 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* All the test cases are similar to SerialWANPropagationDUnitTest except that the we create
@@ -54,7 +54,7 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
/**
* All the test cases are similar to SerialWANPropagationDUnitTest
- *
+ *
* @throws Exception
*/
@Test
@@ -222,7 +222,7 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
/**
* Two regions configured with the same sender and put is in progress on both the regions. One of
* the two regions is destroyed in the middle.
- *
+ *
* @throws Exception
*/
@Test
@@ -301,7 +301,7 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
/**
* 1 region and sender configured on local site and 1 region and a receiver configured on remote
* site. Puts to the local region are in progress. Remote region is destroyed in the middle.
- *
+ *
* @throws Exception
*/
@Test
@@ -373,7 +373,7 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
* Two regions configured in local with the same sender and put is in progress on both the
* regions. Same two regions are configured on remote site as well. One of the two regions is
* destroyed in the middle on remote site.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
index 3f1c268..524eb94 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
@@ -14,16 +14,10 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
@@ -31,6 +25,9 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index 89ead26..0745bec 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -14,15 +14,13 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import java.util.Set;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.internal.cache.BucketRegion;
@@ -37,8 +35,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-
-import java.util.Set;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
@@ -68,7 +67,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
/**
* Simple scenario. Two regions attach the same PGS
- *
+ *
* @throws Exception Below test is disabled intentionally 1> In this release 8.0, for rolling
* upgrade support queue name is changed to old style 2>Common parallel sender for
* different non colocated regions is not supported in 8.0 so no need to bother about
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
index 44dc453..fe43675 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index d346a17..720c32d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.Map;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache30.CacheSerializableRunnable;
@@ -40,6 +36,9 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
*
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index eba9add..a7cb4aa 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -20,9 +20,8 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.awaitility.Awaitility;
-import org.apache.geode.security.TestSecurityManager;
import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -36,6 +35,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.security.AuthInitialize;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityTestUtils;
+import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.security.generator.CredentialGenerator;
import org.apache.geode.security.generator.DummyCredentialGenerator;
import org.apache.geode.security.templates.UserPasswordAuthInit;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index f2f4472..d526441 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -14,22 +14,22 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.awaitility.Awaitility;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.WANTestBase;
+import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.internal.cache.wan.WANTestBase;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.dunit.Wait;
@Category(DistributedTest.class)
public class PDXNewWanDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index 486adba..1831aa7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -14,13 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Scope;
@@ -28,6 +26,7 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
index e97a65c..1b6f6f2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
@@ -14,13 +14,11 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.DataPolicy;
@@ -33,6 +31,7 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ReplicatedRegion_ParallelWANPropagationDUnitTest extends WANTestBase {
@@ -46,7 +45,7 @@ public class ReplicatedRegion_ParallelWANPropagationDUnitTest extends WANTestBas
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index 43f8cb9..7065b65 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -14,6 +14,18 @@
*/
package org.apache.geode.internal.cache.wan.misc;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.*;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.wan.*;
@@ -28,17 +40,6 @@ import org.apache.geode.internal.cache.wan.InternalGatewaySenderFactory;
import org.apache.geode.internal.cache.wan.MyGatewaySenderEventListener;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
@Category(IntegrationTest.class)
public class WANConfigurationJUnitTest {
@@ -47,9 +48,9 @@ public class WANConfigurationJUnitTest {
/**
* Test to validate that the sender can not be started without configuring locator
- *
+ *
* @throws IOException
- *
+ *
* @throws IOException
*/
@Test
@@ -139,7 +140,7 @@ public class WANConfigurationJUnitTest {
/**
* Test to validate that distributed region can not have the gateway sender with parallel
* distribution policy
- *
+ *
*/
@Ignore("Bug51491")
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
index cba77ec..590d892 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
@@ -30,6 +24,9 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 489dd54..7c13087 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -14,18 +14,8 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
@@ -35,6 +25,10 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.GemFireConfigException;
import org.apache.geode.IncompatibleSystemException;
import org.apache.geode.internal.AvailablePortHelper;
@@ -43,7 +37,12 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class WanAutoDiscoveryDUnitTest extends WANTestBase {
@@ -82,7 +81,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
* causes other below tests to fail. In this test, VM1 is throwing IncompatibleSystemException
* after startInitLocator. I think, after throwing this exception, locator is not stopped properly
* and hence other tests are failing.
- *
+ *
* @throws Exception
*/
@Ignore
@@ -104,7 +103,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
/**
* Test to validate that multiple locators added on LN site and multiple locators on Ny site
* recognizes each other
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 3ff4e10..7ddf93f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -14,19 +14,13 @@
*/
package org.apache.geode.internal.cache.wan.misc;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.Map;
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.wan.GatewayEventFilter;
@@ -43,6 +37,9 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
@@ -99,14 +96,14 @@ public class WanValidationsDUnitTest extends WANTestBase {
/**
* Validate that ParallelGatewaySender can be added to Distributed region
- *
+ *
* @throws Exception
- *
- *
+ *
+ *
* Below test is disabled intentionally Replicated region with Parallel Async Event queue
* is not supported. Test is added for the same
* ReplicatedRegion_ParallelWANPropagationDUnitTest#test_DR_PGS_1Nodes_Put_Receiver
- *
+ *
* We are gone support this configuration in upcoming releases
*/
@@ -231,7 +228,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
/**
* Test to make sure that same parallel gateway sender id can be used by 2 different PRs
- *
+ *
* @throws Exception
*/
@Ignore
@@ -294,7 +291,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
/**
* Validate that if Colocated partitioned region doesn't want to add a PGS even if its parent has
* one then it is fine
- *
+ *
* @throws Exception
*/
@@ -322,7 +319,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
/**
* Validate that if Colocated partitioned region has a subset of PGS then it is fine.
- *
+ *
* @throws Exception
*/
@@ -351,7 +348,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
/**
* Validate that if Colocated partitioned region has a superset of PGS then Exception is thrown.
- *
+ *
* @throws Exception
*/
@@ -1347,7 +1344,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
/**
* Test configuration::
- *
+ *
* Region: Replicated WAN: Serial Number of WAN sites: 2 Region persistence enabled: false Async
* channel persistence enabled: false
*/
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index 011df30..1617e99 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
-
@Category(DistributedTest.class)
public class ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest
extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index 5fe5ad5..d6c74e8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperation_2_DUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperation_2_DUnitTest;
-
@Category(DistributedTest.class)
public class ParallelGatewaySenderOperation_2_OffHeapDUnitTest
extends ParallelGatewaySenderOperation_2_DUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
index 8c4d502..fafda68 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class ParallelGatewaySenderOperationsOffHeapDUnitTest
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
index c9724cc..afafd43 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueueOverflowDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueueOverflowDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class ParallelGatewaySenderQueueOverflowOffHeapDUnitTest
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
index 9785fc6..1c0b4c4 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelWANConflationDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelWANConflationDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class ParallelWANConflationOffHeapDUnitTest extends ParallelWANConflationDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
index 1ff759a..2cdd6eb 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelWANPersistenceEnabledGatewaySenderDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelWANPersistenceEnabledGatewaySenderDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
index 29626da..18e2fe9 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationConcurrentOpsDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationConcurrentOpsDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class ParallelWANPropagationConcurrentOpsOffHeapDUnitTest
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
index 8994a2c..751a434 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class ParallelWANPropagationOffHeapDUnitTest extends ParallelWANPropagationDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
index a2369be..4c357a8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueueDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueueDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class SerialGatewaySenderQueueOffHeapDUnitTest extends SerialGatewaySenderQueueDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
index 8a0360c..1742e1c 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.offheap;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.serial.SerialWANPersistenceEnabledGatewaySenderDUnitTest;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.serial.SerialWANPersistenceEnabledGatewaySenderDUnitTest;
-
@SuppressWarnings("serial")
@Category(DistributedTest.class)
public class SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
index b8a537e..49a392d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
@@ -16,9 +16,8 @@ package org.apache.geode.internal.cache.wan.offheap;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import org.apache.geode.internal.cache.wan.serial.SerialWANPropagationDUnitTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("serial")
@Category(DistributedTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
index b65a16a..146d50c 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
@@ -16,9 +16,8 @@ package org.apache.geode.internal.cache.wan.offheap;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import org.apache.geode.internal.cache.wan.serial.SerialWANPropagation_PartitionedRegionDUnitTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("serial")
@Category(DistributedTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
index 3570ee0..147bad7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ParallelGatewaySenderOperation_2_DUnitTest
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 59ef104..ca81c02 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -17,12 +17,12 @@ package org.apache.geode.internal.cache.wan.parallel;
import static org.apache.geode.internal.cache.tier.sockets.Message.MAX_MESSAGE_SIZE_PROPERTY;
import static org.apache.geode.test.dunit.Assert.*;
-import org.apache.geode.cache.wan.GatewaySender;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireIOException;
+import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.MessageTooLargeException;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index ad50d28..0d0461a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -48,7 +49,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.awaitility.Awaitility;
/**
* DUnit for ParallelSenderQueue overflow operations.
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 5f8225d..a792133 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -14,25 +14,24 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class ParallelWANConflationDUnitTest extends WANTestBase {
@@ -80,7 +79,7 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
* This test is disabled as it is not guaranteed to pass it everytime. This test is related to the
* conflation in batch. yet did find any way to ascertain that the vents in the batch will always
* be conflated.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 4c37e0d..9727787 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -14,19 +14,12 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
import java.io.IOException;
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
@@ -40,6 +33,10 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase {
@@ -1337,7 +1334,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTest
* Create persistent PR and non-persistent GatewaySender. After doing puts, close the local site.
* Rebuild the PR from persistent disk store and create the sender again. Do more puts. Check if
* the remote site receives newly added events.
- *
+ *
* This test can be used as DUnit test for defect #50247 reported by Indian Railways. At present,
* customer is using this configuration and which is not recommended since it can lead to event
* loss of GatewaySender events.
@@ -1518,7 +1515,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTest
/**
* Test for bug 50120 see if we can recover after deleting the parallel gateway sender files and
* not recoverying the sender when we have a persistent PR.
- *
+ *
* @throws Throwable
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index 530dc43..51de450 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -14,22 +14,21 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
@@ -43,7 +42,7 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
/**
* Normal propagation scenario test case for a PR with only one bucket. This has been added for
* bug# 44284.
- *
+ *
* @throws Exception
*/
@Test
@@ -107,7 +106,7 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
/**
* Normal propagation scenario test case for a PR with less number of buckets. Buckets have been
* kept to 10 for this test. This has been added for bug# 44287.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index 6a190ef..9a0a531 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -14,18 +14,12 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.Set;
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryExistsException;
@@ -42,6 +36,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
@@ -136,7 +133,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
/**
* Normal happy scenario test case.
- *
+ *
* @throws Exception
*/
@Test
@@ -237,7 +234,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
/**
* Normal happy scenario test case2.
- *
+ *
* @throws Exception
*/
@Test
@@ -282,7 +279,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
* Local and remote sites are up and running. Local site cache is closed and the site is built
* again. Puts are done to local site. Expected: Remote site should receive all the events put
* after the local site was built back.
- *
+ *
* @throws Exception
*/
@Category(FlakyTest.class)
@@ -409,9 +406,9 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
/**
* Create colocated partitioned regions. Parent region has PGS attached and child region doesn't.
- *
+ *
* Validate that events for parent region reaches remote site.
- *
+ *
* @throws Exception
*/
@@ -803,7 +800,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
/**
* There was a bug that all destroy events were being put into different buckets of sender queue
* against the key 0. Bug# 44304
- *
+ *
* @throws Exception
*/
@Test
@@ -874,7 +871,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
/**
* Normal happy scenario test case. But with Tx operations
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
index fea6f95..724afd7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index e2df453..3b6e860 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import org.awaitility.Awaitility;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -31,9 +23,15 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
@@ -296,7 +294,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase {
/**
* 1 region and sender configured on local site and 1 region and a receiver configured on remote
* site. Puts to the local region are in progress. Remote region is destroyed in the middle.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index c7aec39..acc0bfd 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheTransactionManager;
@@ -31,6 +27,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
// The tests here are to validate changes introduced because a distributed deadlock
// was found that caused issues for a production customer.
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index cf68ed0..3a3fb5e 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -14,21 +14,17 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.awaitility.Awaitility;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Ignore;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
@@ -40,6 +36,7 @@ import org.apache.geode.internal.cache.wan.MyGatewaySenderEventListener2;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
@@ -380,4 +377,3 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
}
}
}
-
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index 941cbc4..76e2743 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -14,18 +14,8 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.Instantiator;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -33,6 +23,12 @@ import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Instantiator;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest;
import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse;
@@ -51,9 +47,12 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index e008627..504a2f8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -43,8 +43,8 @@ import org.apache.geode.cache30.MyGatewayEventFilter1;
import org.apache.geode.cache30.MyGatewayTransportFilter1;
import org.apache.geode.cache30.MyGatewayTransportFilter2;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.RegionQueue;
+import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.IgnoredException;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index 506a15b..3d7ff77 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -14,22 +14,21 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
/**
- *
+ *
*/
@Category(DistributedTest.class)
public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase {
@@ -124,7 +123,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBa
/**
* Enable persistence for region as well as GatewaySender and see if remote site receives all the
* events.
- *
+ *
*/
@Test
public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled() {
@@ -255,7 +254,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBa
/**
* Enable persistence for Region and persistence for GatewaySender. Kill the vm with regions and
* bring that up again. Check if the remote site receives all the event. again?
- *
+ *
*/
@Test
public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
@@ -341,7 +340,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBa
/**
* Enable persistence for Region. No persistence for GatewaySender. Kill the vm with regions and
* bring that up again. Check if the remote site receives all the event. again?
- *
+ *
*/
@Test
public void testPersistentReplicatedRegionWithGatewaySender_Restart() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
index 5f69f69..db861e4 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
@@ -19,14 +19,14 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Map;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.Scope;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryExistsException;
+import org.apache.geode.cache.Scope;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -1016,9 +1016,9 @@ public class SerialWANPropagationDUnitTest extends WANTestBase {
/**
* Local site:: vm4: Primary vm5: Secondary
- *
+ *
* Remote site:: vm2, vm3, vm6, vm7: All hosting receivers
- *
+ *
* vm4 is killed, so vm5 takes primary charge
*
* SUR: disabling due to connection information not available in open source enable this once in
@@ -1092,9 +1092,9 @@ public class SerialWANPropagationDUnitTest extends WANTestBase {
/**
* Local site:: vm4: Primary vm5: Secondary
- *
+ *
* Remote site:: vm2, vm3, vm6, vm7: All hosting receivers
- *
+ *
* vm4 is killed, so vm5 takes primary charge. vm4 brought up. vm5 is killed, so vm4 takes primary
* charge again.
*
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index c9e0270..5c1c71a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -14,23 +14,20 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
index c0d3928..4eed2e8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.CancelException;
@@ -31,6 +25,9 @@ import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
index 03182ed..5fc64f3 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.internal.cache.wan.WANTestBase;
-
@Category(DistributedTest.class)
public class SerialWANPropagationsFeatureDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index aee824d..a8ac978 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -14,25 +14,23 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
-import static org.apache.geode.test.dunit.Wait.*;
import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.apache.geode.test.dunit.Wait.*;
+import static org.junit.Assert.*;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
-import org.awaitility.Awaitility;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class SerialWANStatsDUnitTest extends WANTestBase {
@@ -299,7 +297,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
}
/**
- *
+ *
* Not Disabled - see ticket #52118
*
* NOTE: The test failure is avoided by having a larger number of puts operation so that
@@ -308,14 +306,14 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
*
* In future if this failure reappears, the put operations must be increase or a better fix must
* be found.
- *
+ *
* 1 region and sender configured on local site and 1 region and a receiver configured on remote
* site. Puts to the local region are in progress. Remote region is destroyed in the middle.
*
* Better fix : slowed down the receiver after every create event, So a huge number of puts is not
* required.
*
- *
+ *
* @throws Exception
*/
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java
index 5c8b047..0594dd3 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java
@@ -31,22 +31,22 @@ import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.wan.GatewaySender;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class CreateAndDestroyGatewaySenderCommandsDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
index fdd7109..287f9ea 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
@@ -34,10 +34,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -45,11 +41,15 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
/**
* DUnit tests for 'create gateway-receiver' command.
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java
index fe630fc..21a89e5 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java
@@ -25,9 +25,6 @@ import static org.junit.Assert.fail;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -40,7 +37,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class CreateGatewaySenderCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
index a121397..5166bc7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
@@ -25,9 +25,6 @@ import static org.junit.Assert.fail;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -38,7 +35,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class DestroyGatewaySenderCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
index 3e1f2d9..dd6dfd2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
@@ -31,9 +31,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +41,10 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class PauseGatewaySenderCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
index 2bda947..576c846 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
@@ -33,9 +33,6 @@ import static org.junit.Assert.fail;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -46,7 +43,10 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ResumeGatewaySenderCommandDUnitTest {
@@ -267,13 +267,13 @@ public class ResumeGatewaySenderCommandDUnitTest {
* String group = "SenderGroup1"; Properties props = new Properties(); props.setProperty(GROUPS,
* group); server1 = locatorServerStartupRule.startServerVM(3, props, locator1Port); server2 =
* locatorServerStartupRule.startServerVM(4, props, locator1Port);
- *
+ *
* props.setProperty(GROUPS, "SenderGroup1, SenderGroup2"); server3 =
* locatorServerStartupRule.startServerVM(5, props, locator1Port);
- *
+ *
* props.setProperty(GROUPS, "SenderGroup2"); server4 =
* locatorServerStartupRule.startServerVM(6, props, locator1Port);
- *
+ *
* props.setProperty(GROUPS, "SenderGroup3"); server5 =
* locatorServerStartupRule.startServerVM(7, props, locator1Port);
*/
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
index 5e5195c..109a04a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
@@ -17,8 +17,8 @@ package org.apache.geode.internal.cache.wan.wancommand;
import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS;
-import static org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.getMemberIdCallable;
import static org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.createReceiver;
+import static org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.getMemberIdCallable;
import static org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.verifyReceiverState;
import static org.apache.geode.test.dunit.Assert.assertEquals;
import static org.apache.geode.test.dunit.Assert.assertFalse;
@@ -30,9 +30,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -43,7 +40,10 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class StartGatewayReceiverCommandDUnitTest {
@@ -228,7 +228,7 @@ public class StartGatewayReceiverCommandDUnitTest {
/**
* Test to validate the scenario gateway sender is started when one or more sender members belongs
* to multiple groups
- *
+ *
*/
@Test
public void testStartGatewayReceiver_MultipleGroup() throws Exception {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
index 7c1e0f4..f43f38f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
@@ -30,9 +30,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +41,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class StartGatewaySenderCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
index 760aece..c863fe2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
@@ -30,9 +30,6 @@ import static org.junit.Assert.fail;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +41,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class StatusGatewayReceiverCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
index c3f0d20..d7270400 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
@@ -30,9 +30,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +41,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class StatusGatewaySenderCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
index 23b79bf..edf2aa9 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
@@ -31,9 +31,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +41,10 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class StopGatewayReceiverCommandDUnitTest {
@@ -230,7 +230,7 @@ public class StopGatewayReceiverCommandDUnitTest {
/**
* Test to validate the scenario gateway sender is started when one or more sender members belongs
* to multiple groups
- *
+ *
*/
@Test
public void testStopGatewayReceiver_MultipleGroup() throws Exception {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
index 5a5b77c..f8ad5f8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
@@ -31,9 +31,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -45,7 +42,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class StopGatewaySenderCommandDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
index a69c123..a3699a6 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
@@ -35,6 +35,7 @@ import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
+import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.cache.wan.GatewaySenderFactory;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.DistributedMember;
@@ -46,13 +47,11 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.test.dunit.IgnoredException;
-
public class WANCommandUtils implements Serializable {
public static void createSender(String dsName, int remoteDsId, boolean isParallel,
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 144a88d..39c6393 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -28,9 +28,6 @@ import static org.apache.geode.test.dunit.Wait.pause;
import java.util.List;
import java.util.Properties;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -41,7 +38,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class WanCommandListDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
index 5584150..1e40b0b 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
@@ -46,8 +46,8 @@ import org.apache.geode.test.junit.categories.FlakyTest;
* Tests for WAN artifacts like Sender and Receiver. The purpose of this test is not to check WAN
* functionality , but to verify ManagementServices running properly and reflecting WAN behaviour
* and data properly
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
public class WANManagementDUnitTest extends ManagementTestBase {
@@ -316,7 +316,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* Checks Proxy GatewaySender
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -355,7 +355,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* Checks Proxy GatewayReceiver
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -386,7 +386,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* stops a gateway sender
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -406,7 +406,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* start a gateway sender
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -427,7 +427,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* Checks whether a GatewayReceiverMBean is created or not
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -445,7 +445,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* Checks whether a GatewayReceiverMBean is created or not
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -473,7 +473,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* Checks whether a Async Queue MBean is created or not
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -496,7 +496,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
/**
* Checks Proxy Async Queue
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
index 55e31d2..6c4c0c4 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
@@ -28,10 +28,10 @@ import org.junit.runner.RunWith;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
index c91fc6b..af79331 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
@@ -22,10 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -35,7 +31,10 @@ import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category({DistributedTest.class})
@SuppressWarnings("serial")
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/pulse/TestRemoteClusterDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/pulse/TestRemoteClusterDUnitTest.java
index f806069..b55b792 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -50,8 +50,8 @@ import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This is for testing remote Cluster
- *
- *
+ *
+ *
*/
@Category(DistributedTest.class)
@@ -128,7 +128,7 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
/**
* Checks Proxy GatewaySender
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -166,7 +166,7 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
/**
* stops a gateway sender
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -186,7 +186,7 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
/**
* start a gateway sender
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -206,7 +206,7 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
/**
* Checks whether a GatewayReceiverMBean is created or not
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
@@ -224,7 +224,7 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
/**
* Checks whether a GatewayReceiverMBean is created or not
- *
+ *
* @param vm reference to VM
*/
@SuppressWarnings("serial")
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
index 00623c3..b006e80 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
@@ -14,10 +14,41 @@
*/
package org.apache.geode.rest.internal.web.controllers;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.annotation.PostConstruct;
+
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
import org.apache.geode.SerializationException;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheWriterException;
@@ -50,39 +81,10 @@ import org.apache.geode.rest.internal.web.util.IdentifiableUtils;
import org.apache.geode.rest.internal.web.util.JSONUtils;
import org.apache.geode.rest.internal.web.util.NumberUtils;
import org.apache.geode.rest.internal.web.util.ValidationUtils;
-import org.apache.logging.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.PostConstruct;
/**
* AbstractBaseController class contains common functionalities required for other controllers.
- *
+ *
* @since GemFire 8.0
*/
@SuppressWarnings("unused")
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
index 751e6a0..34f791c 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
@@ -56,7 +56,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
* Handles both ResourceNotFoundExceptions and specifically, RegionNotFoundExceptions, occurring
* when a resource or a Region (a.k.a. resource) does not exist in GemFire.
* <p/>
- *
+ *
* @param e the RuntimeException thrown when the accessed/requested resource does not exist in
* GemFire.
* @return the String message from the RuntimeException.
@@ -72,7 +72,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
* Handles MalformedJsonFoundException, occurring when REST service encounters incorrect or
* malformed JSON document
* <p/>
- *
+ *
* @param e the RuntimeException thrown when malformed JSON is encounterd.
* @return the String message from the RuntimeException.
*/
@@ -87,7 +87,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
* Handles any GemfireRestException thrown by a REST API web service endpoint, HTTP request
* handler method.
* <p/>
- *
+ *
* @param ge the GemfireRestException thrown when it found problem processing REST request.
* @return the String message from the RuntimeException.
*/
@@ -102,7 +102,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
* Handles any DataTypeNotSupportedException thrown by a REST API web service endpoint, HTTP
* request handler method.
* <p/>
- *
+ *
* @param tns the DataTypeNotSupportedException thrown if problem occurs in cache values to JSON
* conversion.
* @return the String message from the RuntimeException.
@@ -118,7 +118,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
* Handles HttpRequestMethodNotSupportedException thrown by a REST API web service when request is
* received with unsupported HTTP method.
* <p/>
- *
+ *
* @param e the HttpRequestMethodNotSupportedException thrown when REST request is received with
* NOT support methods.
* @return the String message from the RuntimeException.
@@ -134,7 +134,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
* Handles an AccessDenied Exception thrown by a REST API web service endpoint, HTTP request
* handler method.
* <p/>
- *
+ *
* @param cause the Exception causing the error.
* @return a ResponseEntity with an appropriate HTTP status code (403 - Forbidden)
*/
@@ -148,7 +148,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
/**
* Handles an NotAuthorized Exception thrown by a GeodeSecurityUtil.
* <p/>
- *
+ *
* @param cause the Exception causing the error.
* @return a ResponseEntity with an appropriate HTTP status code (403 - Forbidden)
*/
@@ -162,7 +162,7 @@ public class BaseControllerAdvice extends AbstractBaseController {
/**
* Handles any Exception thrown by a REST API web service endpoint, HTTP request handler method.
* <p/>
- *
+ *
* @param cause the Exception causing the error.
* @return a ResponseEntity with an appropriate HTTP status code (500 - Internal Server Error) and
* HTTP response body containing the stack trace of the Exception.
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
index 61a1aad..538f1e1 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
@@ -54,7 +54,7 @@ import org.apache.geode.rest.internal.web.util.JSONUtils;
/**
* The FunctionsController class serving REST Requests related to the function execution
- *
+ *
* @see org.springframework.stereotype.Controller
* @since GemFire 8.0
*/
@@ -80,7 +80,7 @@ public class FunctionAccessController extends AbstractBaseController {
/**
* list all registered functions in Gemfire data node
- *
+ *
* @return result as a JSON document.
*/
@RequestMapping(method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
@@ -107,7 +107,7 @@ public class FunctionAccessController extends AbstractBaseController {
/**
* Execute a function on Gemfire data node using REST API call. Arguments to the function are
* passed as JSON string in the request body.
- *
+ *
* @param functionId represents function to be executed
* @param region list of regions on which function to be executed.
* @param members list of nodes on which function to be executed.
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
index 9743078..7fdd07f 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
@@ -69,7 +69,7 @@ public class PdxBasedCrudController extends CommonCrudController {
/**
* Creating entry into the region
- *
+ *
* @param region region name where data will be created
* @param key gemfire region key
* @param json JSON document that is stored against the key
@@ -121,7 +121,7 @@ public class PdxBasedCrudController extends CommonCrudController {
/**
* Read all or fixed number of data in a given Region
- *
+ *
* @param region gemfire region name
* @param limit total number of entries requested
* @return JSON document
@@ -195,7 +195,7 @@ public class PdxBasedCrudController extends CommonCrudController {
/**
* Reading data for set of keys
- *
+ *
* @param region gemfire region name
* @param keys string containing comma seperated keys
* @return JSON document
@@ -271,7 +271,7 @@ public class PdxBasedCrudController extends CommonCrudController {
/**
* Update data for a key or set of keys
- *
+ *
* @param region gemfire data region
* @param keys keys for which update operation is requested
* @param opValue type of update (put, replace, cas etc)
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
index 4ff806f..872aab0 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
@@ -85,7 +85,7 @@ public class QueryAccessController extends AbstractBaseController {
/**
* list all parametrized Queries created in a Gemfire data node
- *
+ *
* @return result as a JSON document.
*/
@RequestMapping(method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
@@ -112,7 +112,7 @@ public class QueryAccessController extends AbstractBaseController {
/**
* Create a named, parametrized Query
- *
+ *
* @param queryId uniquely identify the query
* @param oqlInUrl OQL query string specified in a request URL
* @param oqlInBody OQL query string specified in a request body
@@ -154,7 +154,7 @@ public class QueryAccessController extends AbstractBaseController {
/**
* Run an adhoc Query specified in a query string
- *
+ *
* @param oql OQL query string to be executed
* @return query result as a JSON document
*/
@@ -211,7 +211,7 @@ public class QueryAccessController extends AbstractBaseController {
/**
* Run named parametrized Query with ID
- *
+ *
* @param queryId id of the OQL string
* @param arguments query bind params required while executing query
* @return query result as a JSON document
@@ -295,7 +295,7 @@ public class QueryAccessController extends AbstractBaseController {
/**
* Update named, parametrized Query
- *
+ *
* @param queryId uniquely identify the query
* @param oqlInUrl OQL query string specified in a request URL
* @param oqlInBody OQL query string specified in a request body
@@ -328,7 +328,7 @@ public class QueryAccessController extends AbstractBaseController {
/**
* Delete named, parametrized Query
- *
+ *
* @param queryId uniquely identify the query to be deleted
*/
@RequestMapping(method = RequestMethod.DELETE, value = "/{query}")
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/QueryResultTypes.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/QueryResultTypes.java
index f97a005..d5503aa 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/QueryResultTypes.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/QueryResultTypes.java
@@ -18,7 +18,7 @@ package org.apache.geode.rest.internal.web.controllers.support;
/**
* The QueryResultTypes type describes possible query result types
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
index 03dc0ad..2c03701 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
@@ -15,24 +15,26 @@
package org.apache.geode.rest.internal.web.controllers.support;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializable;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import org.apache.geode.pdx.JSONFormatter;
-import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.rest.internal.web.util.JsonWriter;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializable;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.rest.internal.web.util.JsonWriter;
+
/**
* The RegionData class is a container for data fetched from a GemFire Cache Region.
*
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionEntryData.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionEntryData.java
index dc68149..5bf5b89 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionEntryData.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionEntryData.java
@@ -35,6 +35,9 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializable;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.pdx.JSONFormatter;
@@ -42,13 +45,10 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.rest.internal.web.util.JSONUtils;
import org.apache.geode.rest.internal.web.util.JsonWriter;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
/**
* The RegionData class is a container for data fetched from a GemFire Cache Region.
* <p/>
- *
+ *
* @see com.fasterxml.jackson.databind.JsonSerializable
* @see java.lang.Iterable
* @since GemFire 8.0
@@ -93,4 +93,3 @@ public class RegionEntryData<T> extends RegionData<T> {
}
}
-
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/UpdateOp.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/UpdateOp.java
index 91a0828..69ecbe3 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/UpdateOp.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/UpdateOp.java
@@ -23,4 +23,3 @@ package org.apache.geode.rest.internal.web.controllers.support;
public enum UpdateOp {
CAS, PUT, REPLACE
}
-
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/DataTypeNotSupportedException.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/DataTypeNotSupportedException.java
index 50b133f..c605dac 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/DataTypeNotSupportedException.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/DataTypeNotSupportedException.java
@@ -22,7 +22,7 @@ import org.apache.geode.GemFireException;
* Indicates that error encountered while converting Non-Pdx type values/data into RESTful format,
* i.e JSON
* <p/>
- *
+ *
* @since GemFire 8.1
*/
@@ -30,7 +30,7 @@ public class DataTypeNotSupportedException extends GemFireException {
/**
* Create the exception with the given message.
- *
+ *
* @param message the message of the new exception
*/
public DataTypeNotSupportedException(String message) {
@@ -39,7 +39,7 @@ public class DataTypeNotSupportedException extends GemFireException {
/**
* Create the exception with the given message and cause.
- *
+ *
* @param message the message of the new exception
* @param cause the cause of the new exception
*/
@@ -48,4 +48,3 @@ public class DataTypeNotSupportedException extends GemFireException {
}
}
-
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/GemfireRestException.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/GemfireRestException.java
index bf6ae20..f9bca52 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/GemfireRestException.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/GemfireRestException.java
@@ -20,7 +20,7 @@ import org.apache.geode.GemFireException;
/**
* Indicates that error encountered while processing REST request.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@@ -28,7 +28,7 @@ public class GemfireRestException extends GemFireException {
/**
* Create the exception with the given message.
- *
+ *
* @param message the message of the new exception
*/
public GemfireRestException(String message) {
@@ -37,7 +37,7 @@ public class GemfireRestException extends GemFireException {
/**
* Create the exception with the given message and cause.
- *
+ *
* @param message the message of the new exception
* @param cause the cause of the new exception
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/MalformedJsonException.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/MalformedJsonException.java
index 4011586..bf7050c 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/MalformedJsonException.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/MalformedJsonException.java
@@ -20,7 +20,7 @@ import org.apache.geode.pdx.JSONFormatterException;
/**
* Indicates that incorrect JSON document encountered while processing it.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/RegionNotFoundException.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/RegionNotFoundException.java
index 042b633..88ee003 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/RegionNotFoundException.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/RegionNotFoundException.java
@@ -18,7 +18,7 @@ package org.apache.geode.rest.internal.web.exception;
/**
* Indicates that Region does not found while trying to do some REST operation on that region.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@SuppressWarnings("unused")
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/ResourceNotFoundException.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/ResourceNotFoundException.java
index 61c4828..371c3c5 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/ResourceNotFoundException.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/exception/ResourceNotFoundException.java
@@ -19,7 +19,7 @@ package org.apache.geode.rest.internal.web.exception;
/**
* Indicates that resource (key, value etc) does not found while trying to do REST operation.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
index 2db68c7..1196394 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
/**
* The CustomMappingJackson2HttpMessageConverter class...
- *
+ *
* @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
* @since GemFire 0.0.1
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
index 2f307c9..1f02818 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
@@ -16,12 +16,8 @@
package org.apache.geode.rest.internal.web.security;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.security.SecurityServiceFactory;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.security.GemFireSecurityException;
+import java.util.Properties;
+
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -30,7 +26,12 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.stereotype.Component;
-import java.util.Properties;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.SecurityServiceFactory;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.security.GemFireSecurityException;
@Component
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityService.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityService.java
index 04d74ce..6fde227 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityService.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityService.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.rest.internal.web.security;
+import org.springframework.stereotype.Component;
+
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.security.GemFireSecurityException;
-import org.springframework.stereotype.Component;
-
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
index c938139..1b0f7ff 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.rest.internal.web.swagger.config;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
@@ -27,6 +26,8 @@ import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
@PropertySource({"classpath:swagger.properties"})
@Configuration
@EnableSwagger2
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ArrayUtils.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ArrayUtils.java
index 780cf7e..bda763c 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ArrayUtils.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ArrayUtils.java
@@ -21,7 +21,7 @@ import java.util.Set;
/**
* The ArrayUtils class is an abstract utility class for working with Object arrays.
* <p/>
- *
+ *
* @see java.util.Arrays
* @since GemFire 8.0
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/DateTimeUtils.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/DateTimeUtils.java
index 0b2d0fa..7626581 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/DateTimeUtils.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/DateTimeUtils.java
@@ -22,7 +22,7 @@ import java.util.Date;
/**
* The DateTimeUtils class is a utility class for working with dates and times.
* <p/>
- *
+ *
* @see java.util.Calendar
* @see java.text.DateFormat
* @see java.util.Date
@@ -49,4 +49,3 @@ public abstract class DateTimeUtils {
}
}
-
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/IdentifiableUtils.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/IdentifiableUtils.java
index e681313..14399f0 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/IdentifiableUtils.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/IdentifiableUtils.java
@@ -25,7 +25,7 @@ import org.springframework.util.ObjectUtils;
/**
* The IdentifierUtils class is a utility class for working with Objects having identifiers
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@SuppressWarnings("unused")
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java
index 68a9c3e..62a4485 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java
@@ -15,19 +15,6 @@
package org.apache.geode.rest.internal.web.util;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.internal.StructImpl;
-import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.pdx.internal.EnumInfo;
-import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
-import org.springframework.hateoas.Link;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.util.CollectionUtils;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -39,6 +26,20 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import org.springframework.hateoas.Link;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.util.CollectionUtils;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.StructImpl;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.internal.EnumInfo;
+import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
+
/**
* The JsonWriter class is an utility to write various java types as a JSON string.
* <p/>
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/NumberUtils.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/NumberUtils.java
index 50aab38..0750c36 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/NumberUtils.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/NumberUtils.java
@@ -17,14 +17,12 @@ package org.apache.geode.rest.internal.web.util;
import org.springframework.util.StringUtils;
-import org.springframework.util.StringUtils;
-
import org.apache.geode.internal.lang.ClassUtils;
/**
* The NumberUtils class is a utility class for working with numbers.
* <p/>
- *
+ *
* @see java.lang.Number
* @since GemFire 8.0
*/
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ValidationUtils.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ValidationUtils.java
index 14db6e0..1924694 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ValidationUtils.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/ValidationUtils.java
@@ -18,7 +18,7 @@ package org.apache.geode.rest.internal.web.util;
/**
* The ValidationUtils class is a utility class for performing validations.
* <p/>
- *
+ *
* @since GemFire 8.0
*/
@@ -37,4 +37,3 @@ public abstract class ValidationUtils {
return value;
}
}
-
diff --git a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java
index 7206ed3..c61c405 100644
--- a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java
+++ b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java
@@ -17,11 +17,12 @@ package org.apache.geode.rest.internal.web.controllers;
import static org.junit.Assert.assertEquals;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.geode.rest.internal.web.exception.GemfireRestException;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.rest.internal.web.exception.GemfireRestException;
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* AbstractBaseController Tester.
*/
diff --git a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
index 5f32d13..2bed462 100644
--- a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
+++ b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
@@ -16,10 +16,11 @@ package org.apache.geode.rest.internal.web.controllers.support;
import static org.mockito.Mockito.*;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class RegionDataTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
index d5d83e2..d01629b 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
@@ -38,10 +38,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
index 415bf67..f5ddf62 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
@@ -30,13 +30,13 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
@RunWith(Parameterized.class)
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
index 3166f32..80c60e6 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
@@ -26,12 +26,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.test.compiler.ClassBuilder;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class CommandOverHttpTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
index 5f496f6..1c7cdcb 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
@@ -20,9 +20,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ConnectCommandIntegrationTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
index 4b036a5..0c1744b 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
@@ -67,10 +67,10 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.security.SecurableCommunicationChannels;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.CleanupDUnitVMsRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ConnectCommandWithSSLTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
index b49363b..b0128a4 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
@@ -21,9 +21,9 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ConnectCommandWithSecurityTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
index 8586ad7..c210966 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
@@ -33,10 +33,10 @@ import org.junit.runner.RunWith;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
index ed58418..3b90842 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
@@ -33,10 +33,10 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.management.internal.security.TestFunctions.WriteFunction;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
public class ExecuteFunctionCommandWithSecurityDUnitTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
index 1e8b46f..a8504de 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
@@ -31,10 +31,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
index f7e520d..68527e2 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
@@ -15,11 +15,12 @@
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+
import org.junit.experimental.categories.Category;
-import java.io.File;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(IntegrationTest.class)
public class ExportLogsOverHttpIntegrationTest extends ExportLogsIntegrationTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
index ce2a543..0775259 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
@@ -17,13 +17,6 @@ package org.apache.geode.management.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-
import java.io.File;
import java.util.Arrays;
import java.util.Set;
@@ -31,6 +24,14 @@ import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+
@Category(DistributedTest.class)
public class ExportLogsStatsOverHttpDUnitTest extends ExportLogsStatsDUnitTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
index bf11933..0c15a52 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
@@ -15,10 +15,11 @@
package org.apache.geode.management.internal.cli.commands;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public class ListIndexCommandOverHttpDUnitTest extends ListIndexCommandDUnitTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
index e1e5985..74e9277 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
@@ -17,9 +17,9 @@ package org.apache.geode.management.internal.security;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category({IntegrationTest.class, SecurityTest.class})
public class GfshCommandsOverHttpSecurityTest extends GfshCommandsSecurityTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
index 2b7c984..97f2a96 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
@@ -30,10 +30,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(IntegrationTest.class)
public class LogNoPasswordTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index 4c760e7..52b09e2 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* The LoginHandlerInterceptorJUnitTest class is a test suite of test cases to test the contract and
* functionality of the Spring HandlerInterceptor, LoginHandlerInterceptor class.
- *
+ *
* @see org.jmock.Mockery
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
index a58bcba..cd9c696 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
@@ -18,8 +18,9 @@ package org.apache.geode.management.internal.web.controllers.support;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.verify;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Map;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -28,8 +29,8 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.springframework.mock.web.MockHttpServletRequest;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LoginHandlerInterceptorRequestHeaderJUnitTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java
index 0138c22..7e41edb 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java
@@ -23,17 +23,17 @@ import javax.management.ObjectName;
import javax.management.Query;
import javax.management.QueryExp;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
-
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* The QueryParameterSourceJUnitTest class is a test suite of test cases testing the contract and
* functionality of the QueryParameterSource class.
* <p/>
- *
+ *
* @see org.apache.geode.management.internal.web.domain.QueryParameterSource
* @see org.junit.Assert
* @see org.junit.Test
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
index 329924e..abd4b85 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
@@ -42,7 +42,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The SerializableObjectHttpMessageConverterJUnitTest class is a test suite of test cases testing
* the contract and functionality of the SerializableObjectHttpMessageConverter class.
* <p/>
- *
+ *
* @see org.apache.geode.management.internal.web.http.converter.SerializableObjectHttpMessageConverter
* @see org.jmock.Mockery
* @see org.junit.Assert
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
index 1c02f29..ab11ddd 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
@@ -33,9 +33,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.internal.ManagementConstants;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class HttpOperationInvokerMBeanOperationTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
index d19b5df..1a352ed 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
@@ -36,9 +36,9 @@ import org.apache.geode.management.internal.ManagementConstants;
import org.apache.geode.management.internal.cli.CommandRequest;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class HttpOperationInvokerSecurityTest {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/util/ConvertUtilsJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/util/ConvertUtilsJUnitTest.java
index 862906f..6c09a2e 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/util/ConvertUtilsJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/util/ConvertUtilsJUnitTest.java
@@ -22,21 +22,21 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.management.internal.web.io.MultipartFileAdapter;
-import org.apache.geode.test.junit.categories.UnitTest;
-
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
import org.springframework.web.multipart.MultipartFile;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.management.internal.web.io.MultipartFileAdapter;
+import org.apache.geode.test.junit.categories.UnitTest;
+
/**
* The ConvertUtilsJUnitTest class is a test suite testing the contract and functionality of the
* ConvertUtilsJUnitTest class.
* <p/>
- *
+ *
* @see org.apache.geode.management.internal.web.util.ConvertUtils
* @see org.junit.Assert
* @see org.junit.Test
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].