You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/04 22:58:03 UTC
[63/63] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-1276
Merge remote-tracking branch 'origin/develop' into feature/GEODE-1276
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9bdd0d59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9bdd0d59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9bdd0d59
Branch: refs/heads/feature/GEODE-1276
Commit: 9bdd0d59591fa5c3a18d516ed05c2a20cdcef83c
Parents: d754e70 8dc2d30
Author: Kirk Lund <kl...@pivotal.io>
Authored: Wed May 4 15:24:49 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Wed May 4 15:24:49 2016 -0700
----------------------------------------------------------------------
BUILDING.md | 2 +-
build.gradle | 4 +
.../SessionReplicationIntegrationJUnitTest.java | 30 +-
.../session/junit/PerTestClassLoaderRunner.java | 138 +-
geode-assembly/build.gradle | 5 +-
.../LauncherLifecycleCommandsDUnitTest.java | 3 +
.../SharedConfigurationEndToEndDUnitTest.java | 1 -
.../src/test/resources/expected_jars.txt | 1 +
geode-core/build.gradle | 26 +-
.../gemfire/cache/AttributesFactory.java | 58 -
.../gemfire/cache/AttributesMutator.java | 14 -
.../gemfire/cache/CustomEvictionAttributes.java | 78 -
.../com/gemstone/gemfire/cache/DataPolicy.java | 11 -
.../gemfire/cache/EvictionCriteria.java | 57 -
.../com/gemstone/gemfire/cache/Operation.java | 13 -
.../gemfire/cache/RegionAttributes.java | 23 -
.../gemstone/gemfire/cache/RegionFactory.java | 24 -
.../internal/AsyncEventQueueFactoryImpl.java | 5 -
.../gemfire/cache/hdfs/HDFSIOException.java | 52 -
.../gemstone/gemfire/cache/hdfs/HDFSStore.java | 341 --
.../gemfire/cache/hdfs/HDFSStoreFactory.java | 203 -
.../gemfire/cache/hdfs/HDFSStoreMutator.java | 196 -
.../cache/hdfs/StoreExistsException.java | 32 -
.../cache/hdfs/internal/FailureTracker.java | 96 -
.../cache/hdfs/internal/FlushObserver.java | 53 -
.../hdfs/internal/HDFSBucketRegionQueue.java | 1232 ------
.../cache/hdfs/internal/HDFSEntriesSet.java | 329 --
.../cache/hdfs/internal/HDFSEventListener.java | 179 -
.../hdfs/internal/HDFSEventQueueFilter.java | 73 -
.../hdfs/internal/HDFSGatewayEventImpl.java | 180 -
.../hdfs/internal/HDFSIntegrationUtil.java | 117 -
.../HDFSParallelGatewaySenderQueue.java | 471 ---
.../hdfs/internal/HDFSStoreConfigHolder.java | 559 ---
.../cache/hdfs/internal/HDFSStoreCreation.java | 198 -
.../hdfs/internal/HDFSStoreFactoryImpl.java | 77 -
.../cache/hdfs/internal/HDFSStoreImpl.java | 638 ---
.../hdfs/internal/HDFSStoreMutatorImpl.java | 200 -
.../HDFSWriteOnlyStoreEventListener.java | 184 -
.../hdfs/internal/HoplogListenerForRegion.java | 72 -
.../cache/hdfs/internal/PersistedEventImpl.java | 202 -
.../hdfs/internal/QueuedPersistentEvent.java | 27 -
.../hdfs/internal/SignalledFlushObserver.java | 122 -
.../internal/SortedHDFSQueuePersistedEvent.java | 86 -
.../internal/SortedHoplogPersistedEvent.java | 114 -
.../UnsortedHDFSQueuePersistedEvent.java | 76 -
.../internal/UnsortedHoplogPersistedEvent.java | 92 -
.../hdfs/internal/hoplog/AbstractHoplog.java | 357 --
.../hoplog/AbstractHoplogOrganizer.java | 430 --
.../cache/hdfs/internal/hoplog/BloomFilter.java | 36 -
.../hoplog/CloseTmpHoplogsTimerTask.java | 108 -
.../hdfs/internal/hoplog/CompactionStatus.java | 72 -
.../cache/hdfs/internal/hoplog/FlushStatus.java | 72 -
.../internal/hoplog/HDFSCompactionManager.java | 330 --
.../internal/hoplog/HDFSFlushQueueArgs.java | 93 -
.../internal/hoplog/HDFSFlushQueueFunction.java | 287 --
.../hoplog/HDFSForceCompactionArgs.java | 107 -
.../hoplog/HDFSForceCompactionFunction.java | 129 -
.../HDFSForceCompactionResultCollector.java | 131 -
.../hoplog/HDFSLastCompactionTimeFunction.java | 56 -
.../internal/hoplog/HDFSRegionDirector.java | 480 ---
.../hdfs/internal/hoplog/HDFSStoreDirector.java | 78 -
.../hoplog/HDFSUnsortedHoplogOrganizer.java | 447 ---
.../hdfs/internal/hoplog/HFileSortedOplog.java | 853 ----
.../hoplog/HdfsSortedOplogOrganizer.java | 2004 ----------
.../cache/hdfs/internal/hoplog/Hoplog.java | 263 --
.../hdfs/internal/hoplog/HoplogConfig.java | 74 -
.../hdfs/internal/hoplog/HoplogListener.java | 47 -
.../hdfs/internal/hoplog/HoplogOrganizer.java | 123 -
.../hdfs/internal/hoplog/HoplogSetIterator.java | 166 -
.../hdfs/internal/hoplog/HoplogSetReader.java | 114 -
.../internal/hoplog/SequenceFileHoplog.java | 395 --
.../hoplog/mapred/AbstractGFRecordReader.java | 106 -
.../internal/hoplog/mapred/GFInputFormat.java | 95 -
.../internal/hoplog/mapred/GFOutputFormat.java | 75 -
.../mapreduce/AbstractGFRecordReader.java | 140 -
.../hoplog/mapreduce/GFInputFormat.java | 124 -
.../hdfs/internal/hoplog/mapreduce/GFKey.java | 72 -
.../hoplog/mapreduce/GFOutputFormat.java | 198 -
.../hoplog/mapreduce/HDFSSplitIterator.java | 197 -
.../internal/hoplog/mapreduce/HoplogUtil.java | 463 ---
.../hoplog/mapreduce/RWSplitIterator.java | 48 -
.../hoplog/mapreduce/StreamSplitIterator.java | 46 -
.../org/apache/hadoop/io/SequenceFile.java | 3726 ------------------
.../cache/operations/OperationContext.java | 556 +--
.../query/internal/index/DummyQRegion.java | 3 -
.../cache/query/internal/index/HashIndex.java | 1 -
.../query/internal/index/IndexManager.java | 8 -
.../gemfire/cache/wan/GatewaySender.java | 2 -
.../gemfire/distributed/DistributedSystem.java | 7 +-
.../internal/AbstractDistributionConfig.java | 48 +-
.../distributed/internal/ConfigAttribute.java | 1 -
.../internal/ConfigAttributeChecker.java | 1 -
.../internal/ConfigAttributeDesc.java | 3 -
.../internal/ConfigAttributeGetter.java | 3 -
.../internal/ConfigAttributeSetter.java | 3 -
.../internal/DistributionConfig.java | 7 +
.../internal/DistributionConfigImpl.java | 38 +-
.../internal/InternalDistributedSystem.java | 255 +-
.../distributed/internal/InternalLocator.java | 6 +-
.../membership/InternalDistributedMember.java | 68 +-
.../internal/membership/NetMember.java | 4 +-
.../internal/membership/gms/GMSMember.java | 36 +-
.../internal/membership/gms/ServiceConfig.java | 18 +
.../membership/gms/fd/GMSHealthMonitor.java | 7 +-
.../membership/gms/locator/GMSLocator.java | 2 +-
.../membership/gms/membership/GMSJoinLeave.java | 152 +-
.../gms/messenger/JGroupsMessenger.java | 7 +-
.../gemfire/internal/AbstractConfig.java | 28 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 3 -
.../internal/DataSerializableFixedID.java | 1 -
.../gemfire/internal/HeapDataOutputStream.java | 3 -
.../admin/remote/RemoteRegionAttributes.java | 25 -
.../cache/AbstractBucketRegionQueue.java | 18 +-
.../gemfire/internal/cache/AbstractRegion.java | 147 -
.../internal/cache/AbstractRegionEntry.java | 36 +-
.../internal/cache/AbstractRegionMap.java | 86 +-
.../gemfire/internal/cache/BucketAdvisor.java | 1 -
.../gemfire/internal/cache/BucketRegion.java | 212 +-
.../internal/cache/BucketRegionQueue.java | 6 +-
.../cache/CacheDistributionAdvisor.java | 22 +-
.../gemfire/internal/cache/CachePerfStats.java | 75 -
.../internal/cache/ColocationHelper.java | 3 -
.../cache/CustomEvictionAttributesImpl.java | 35 -
.../gemfire/internal/cache/DiskEntry.java | 1 -
.../gemfire/internal/cache/DistTXState.java | 2 +-
.../cache/DistributedCacheOperation.java | 7 +-
.../cache/DistributedPutAllOperation.java | 33 +-
.../internal/cache/DistributedRegion.java | 42 +-
.../cache/DistributedRemoveAllOperation.java | 19 +-
.../gemfire/internal/cache/EntryEventImpl.java | 55 +-
.../gemfire/internal/cache/EvictorService.java | 284 --
.../gemfire/internal/cache/FilterProfile.java | 13 +-
.../internal/cache/GemFireCacheImpl.java | 119 +-
.../gemfire/internal/cache/HARegion.java | 15 +-
.../internal/cache/HDFSLRURegionMap.java | 111 -
.../gemfire/internal/cache/HDFSRegionMap.java | 32 -
.../internal/cache/HDFSRegionMapDelegate.java | 540 ---
.../internal/cache/HDFSRegionMapImpl.java | 74 -
.../gemfire/internal/cache/InternalCache.java | 4 -
.../internal/cache/InternalDataView.java | 28 +-
.../internal/cache/InternalRegionArguments.java | 16 -
.../gemfire/internal/cache/LocalRegion.java | 288 +-
.../internal/cache/LocalRegionDataView.java | 35 +-
.../internal/cache/NonLocalRegionEntry.java | 20 -
.../gemstone/gemfire/internal/cache/Oplog.java | 14 -
.../gemfire/internal/cache/OverflowOplog.java | 1 -
.../internal/cache/PartitionedRegion.java | 482 +--
.../cache/PartitionedRegionDataStore.java | 49 +-
.../cache/PartitionedRegionDataView.java | 27 +-
.../gemfire/internal/cache/ProxyRegionMap.java | 21 -
.../gemfire/internal/cache/RegionEntry.java | 20 -
.../internal/cache/RegionMapFactory.java | 6 -
.../internal/cache/RemoteDestroyMessage.java | 2 +-
.../internal/cache/RemoteGetMessage.java | 2 +-
.../internal/cache/RemotePutMessage.java | 2 +-
.../gemfire/internal/cache/TXEntry.java | 3 +-
.../gemfire/internal/cache/TXEntryState.java | 14 -
.../gemfire/internal/cache/TXState.java | 38 +-
.../internal/cache/TXStateInterface.java | 10 +-
.../internal/cache/TXStateProxyImpl.java | 30 +-
.../gemfire/internal/cache/TXStateStub.java | 32 +-
.../gemfire/internal/cache/UpdateOperation.java | 3 -
.../cache/UserSpecifiedRegionAttributes.java | 24 +-
.../cache/VMStatsDiskLRURegionEntryHeap.java | 2 +-
.../cache/VMStatsDiskLRURegionEntryOffHeap.java | 2 +-
.../cache/VMStatsDiskRegionEntryHeap.java | 2 +-
.../cache/VMStatsDiskRegionEntryOffHeap.java | 2 +-
.../cache/VMStatsLRURegionEntryHeap.java | 2 +-
.../cache/VMStatsLRURegionEntryOffHeap.java | 2 +-
.../internal/cache/VMStatsRegionEntryHeap.java | 2 +-
.../cache/VMStatsRegionEntryOffHeap.java | 2 +-
.../cache/VMThinDiskLRURegionEntryHeap.java | 2 +-
.../cache/VMThinDiskLRURegionEntryOffHeap.java | 2 +-
.../cache/VMThinDiskRegionEntryHeap.java | 2 +-
.../cache/VMThinDiskRegionEntryOffHeap.java | 2 +-
.../cache/VMThinLRURegionEntryHeap.java | 2 +-
.../cache/VMThinLRURegionEntryOffHeap.java | 2 +-
.../internal/cache/VMThinRegionEntryHeap.java | 2 +-
.../cache/VMThinRegionEntryOffHeap.java | 2 +-
.../internal/cache/ValidatingDiskRegion.java | 13 -
.../VersionedStatsDiskLRURegionEntryHeap.java | 2 +-
...VersionedStatsDiskLRURegionEntryOffHeap.java | 2 +-
.../VersionedStatsDiskRegionEntryHeap.java | 2 +-
.../VersionedStatsDiskRegionEntryOffHeap.java | 2 +-
.../cache/VersionedStatsLRURegionEntryHeap.java | 2 +-
.../VersionedStatsLRURegionEntryOffHeap.java | 2 +-
.../cache/VersionedStatsRegionEntryHeap.java | 2 +-
.../cache/VersionedStatsRegionEntryOffHeap.java | 2 +-
.../VersionedThinDiskLRURegionEntryHeap.java | 2 +-
.../VersionedThinDiskLRURegionEntryOffHeap.java | 2 +-
.../cache/VersionedThinDiskRegionEntryHeap.java | 2 +-
.../VersionedThinDiskRegionEntryOffHeap.java | 2 +-
.../cache/VersionedThinLRURegionEntryHeap.java | 2 +-
.../VersionedThinLRURegionEntryOffHeap.java | 2 +-
.../cache/VersionedThinRegionEntryHeap.java | 2 +-
.../cache/VersionedThinRegionEntryOffHeap.java | 2 +-
.../cache/control/InternalResourceManager.java | 10 -
.../cache/partitioned/DestroyMessage.java | 2 +-
.../partitioned/FetchBulkEntriesMessage.java | 2 +-
.../internal/cache/partitioned/GetMessage.java | 22 +-
.../cache/partitioned/PutAllPRMessage.java | 16 +-
.../internal/cache/partitioned/PutMessage.java | 12 +-
.../persistence/soplog/ByteComparator.java | 55 -
.../persistence/soplog/CursorIterator.java | 81 -
.../soplog/DelegatingSerializedComparator.java | 37 -
.../soplog/HFileStoreStatistics.java | 205 -
.../persistence/soplog/KeyValueIterator.java | 42 -
.../soplog/SortedOplogStatistics.java | 505 ---
.../cache/persistence/soplog/SortedReader.java | 255 --
.../persistence/soplog/TrackedReference.java | 153 -
.../cache/tier/sockets/BaseCommand.java | 11 +-
.../cache/tier/sockets/CacheClientNotifier.java | 36 +-
.../internal/cache/tier/sockets/Message.java | 16 -
.../cache/tier/sockets/command/Destroy65.java | 2 +-
.../cache/tier/sockets/command/Get70.java | 4 +-
.../cache/tier/sockets/command/Request.java | 4 +-
.../internal/cache/tx/ClientTXRegionStub.java | 4 +-
.../cache/tx/DistributedTXRegionStub.java | 14 +-
.../cache/tx/PartitionedTXRegionStub.java | 8 +-
.../gemfire/internal/cache/tx/TXRegionStub.java | 4 +-
.../cache/wan/AbstractGatewaySender.java | 22 +-
.../cache/wan/GatewaySenderAttributes.java | 5 -
.../cache/wan/GatewaySenderEventImpl.java | 5 -
...rentParallelGatewaySenderEventProcessor.java | 3 -
.../ConcurrentParallelGatewaySenderQueue.java | 12 -
.../ParallelGatewaySenderEventProcessor.java | 22 +-
.../parallel/ParallelGatewaySenderQueue.java | 21 +-
.../cache/xmlcache/AsyncEventQueueCreation.java | 9 -
.../internal/cache/xmlcache/CacheCreation.java | 39 +-
.../internal/cache/xmlcache/CacheXml.java | 31 -
.../internal/cache/xmlcache/CacheXmlParser.java | 170 -
.../xmlcache/RegionAttributesCreation.java | 55 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 32 +-
.../internal/i18n/ParentLocalizedStrings.java | 2 +-
.../internal/offheap/AbstractStoredObject.java | 1 -
.../internal/offheap/FreeListManager.java | 7 -
.../internal/offheap/OffHeapStoredObject.java | 6 -
.../internal/offheap/TinyStoredObject.java | 4 -
.../internal/security/AuthorizeRequest.java | 5 -
.../internal/security/GeodeSecurityUtil.java | 167 +
.../security/shiro/CustomAuthRealm.java | 176 +
.../security/shiro/JMXShiroAuthenticator.java | 69 +
.../gemfire/internal/tcp/MsgStreamer.java | 11 -
.../management/AsyncEventQueueMXBean.java | 5 +
.../gemfire/management/CacheServerMXBean.java | 12 +-
.../gemfire/management/DiskStoreMXBean.java | 9 +
.../DistributedLockServiceMXBean.java | 8 +-
.../management/DistributedRegionMXBean.java | 16 +-
.../management/DistributedSystemMXBean.java | 38 +-
.../management/GatewayReceiverMXBean.java | 8 +-
.../gemfire/management/GatewaySenderMXBean.java | 12 +-
.../gemfire/management/LocatorMXBean.java | 5 +
.../gemfire/management/LockServiceMXBean.java | 10 +-
.../gemfire/management/ManagerMXBean.java | 12 +-
.../gemfire/management/MemberMXBean.java | 22 +-
.../gemfire/management/RegionMXBean.java | 14 +-
.../management/internal/ManagementAgent.java | 126 +-
.../internal/SystemManagementService.java | 39 +-
.../internal/beans/DistributedRegionBridge.java | 5 -
.../internal/beans/DistributedRegionMBean.java | 5 -
.../internal/beans/DistributedSystemBridge.java | 19 -
.../internal/beans/DistributedSystemMBean.java | 7 -
.../internal/beans/GatewaySenderMBean.java | 8 +-
.../internal/beans/HDFSRegionBridge.java | 173 -
.../management/internal/beans/MemberMBean.java | 5 -
.../internal/beans/MemberMBeanBridge.java | 44 +-
.../internal/beans/PartitionedRegionBridge.java | 13 +-
.../management/internal/beans/RegionMBean.java | 5 -
.../internal/beans/RegionMBeanBridge.java | 5 -
.../beans/stats/RegionClusterStatsMonitor.java | 7 -
.../management/internal/cli/CommandManager.java | 3 -
.../internal/cli/commands/ClientCommands.java | 50 +-
.../internal/cli/commands/ConfigCommands.java | 44 +-
.../CreateAlterDestroyRegionCommands.java | 42 +-
.../internal/cli/commands/DataCommands.java | 36 +-
.../internal/cli/commands/DeployCommands.java | 21 +-
.../cli/commands/DiskStoreCommands.java | 64 +-
.../cli/commands/DurableClientCommands.java | 45 +-
...ExportImportSharedConfigurationCommands.java | 23 +-
.../internal/cli/commands/FunctionCommands.java | 33 +-
.../internal/cli/commands/GfshHelpCommands.java | 13 +-
.../internal/cli/commands/IndexCommands.java | 39 +-
.../cli/commands/LauncherLifecycleCommands.java | 81 +-
.../internal/cli/commands/MemberCommands.java | 27 +-
.../cli/commands/MiscellaneousCommands.java | 99 +-
.../internal/cli/commands/PDXCommands.java | 33 +-
.../internal/cli/commands/QueueCommands.java | 25 +-
.../internal/cli/commands/RegionCommands.java | 17 +-
.../internal/cli/commands/ShellCommands.java | 106 +-
.../internal/cli/commands/StatusCommands.java | 24 +-
.../internal/cli/commands/WanCommands.java | 336 +-
.../cli/domain/RegionAttributesInfo.java | 21 +-
.../functions/DescribeHDFSStoreFunction.java | 86 -
.../internal/cli/remote/CommandProcessor.java | 24 +-
.../internal/cli/result/ErrorResultData.java | 10 +-
.../internal/cli/result/ResultBuilder.java | 7 +-
.../internal/cli/shell/JmxOperationInvoker.java | 70 +-
.../cli/util/HDFSStoreNotFoundException.java | 47 -
.../cli/util/RegionAttributesNames.java | 4 +-
.../internal/security/AccessControl.java | 51 -
.../internal/security/AccessControlContext.java | 37 -
.../internal/security/AccessControlMBean.java | 41 +
.../internal/security/AccessControlMXBean.java | 6 +-
.../internal/security/CLIOperationContext.java | 138 -
.../internal/security/JMXOperationContext.java | 177 -
.../internal/security/JSONAuthorization.java | 308 --
.../internal/security/MBeanServerWrapper.java | 168 +-
.../security/ManagementInterceptor.java | 271 --
.../management/internal/security/Resource.java | 26 -
.../internal/security/ResourceConstants.java | 91 +-
.../internal/security/ResourceOperation.java | 13 +-
.../security/ResourceOperationContext.java | 221 +-
.../controllers/AbstractCommandsController.java | 82 +-
.../controllers/ConfigCommandsController.java | 20 +-
.../web/controllers/DataCommandsController.java | 26 +-
.../DiskStoreCommandsController.java | 14 +-
.../controllers/FunctionCommandsController.java | 9 +-
.../MiscellaneousCommandsController.java | 8 +-
.../web/controllers/WanCommandsController.java | 2 +-
.../EnvironmentVariablesHandlerInterceptor.java | 92 -
.../support/LoginHandlerInterceptor.java | 122 +
.../support/MemberMXBeanAdapter.java | 5 -
.../web/http/support/SimpleHttpRequester.java | 105 +-
.../web/shell/AbstractHttpOperationInvoker.java | 28 +-
.../web/shell/RestHttpOperationInvoker.java | 26 +-
.../web/shell/SimpleHttpOperationInvoker.java | 11 +-
.../gemfire/pdx/internal/PdxReaderImpl.java | 3 -
.../gemfire/security/AccessControl.java | 16 +-
.../gemfire/security/Authenticator.java | 18 +-
.../geode.apache.org/schema/cache/cache-1.0.xsd | 31 -
.../gemfire/cache/ConnectionPoolDUnitTest.java | 21 -
.../SignalledFlushObserverJUnitTest.java | 97 -
.../SortedListForAsyncQueueJUnitTest.java | 564 ---
.../GetOperationContextImplJUnitTest.java | 1 -
.../com/gemstone/gemfire/cache/query/Utils.java | 38 +
.../dunit/QueryDataInconsistencyDUnitTest.java | 2 -
.../QueryUsingFunctionContextDUnitTest.java | 8 +-
.../QueryREUpdateInProgressJUnitTest.java | 12 +-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 27 +-
...ndexOperationsOnOverflowRegionDUnitTest.java | 97 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 46 +-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 48 +-
...itializeIndexEntryDestroyQueryDUnitTest.java | 96 +-
.../PRBasicIndexCreationDUnitTest.java | 315 +-
.../PRBasicIndexCreationDeadlockDUnitTest.java | 42 +-
.../PRBasicMultiIndexCreationDUnitTest.java | 276 +-
.../partitioned/PRBasicQueryDUnitTest.java | 36 +-
.../PRBasicRemoveIndexDUnitTest.java | 37 +-
.../PRColocatedEquiJoinDUnitTest.java | 106 +-
.../partitioned/PRInvalidQueryDUnitTest.java | 26 +-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 81 +-
.../query/partitioned/PRQueryDUnitHelper.java | 780 +---
.../query/partitioned/PRQueryDUnitTest.java | 87 +-
.../query/partitioned/PRQueryPerfDUnitTest.java | 504 ---
.../PRQueryRegionCloseDUnitTest.java | 28 +-
.../PRQueryRegionDestroyedDUnitTest.java | 36 +-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 48 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 2 +-
.../cache30/ClientMembershipDUnitTest.java | 1016 +++--
.../gemfire/cache30/ReconnectDUnitTest.java | 235 +-
.../gemfire/distributed/LocatorDUnitTest.java | 169 +-
.../internal/DistributionConfigJUnitTest.java | 51 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 7 +-
.../gms/membership/GMSJoinLeaveTestHelper.java | 7 +-
...hreadPoolExecutorWithKeepAliveJUnitTest.java | 10 +-
.../cache/FixedPRSinglehopDUnitTest.java | 16 +
.../extension/mock/MockExtensionCommands.java | 23 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 34 +-
.../cache/wan/AsyncEventQueueTestBase.java | 12 -
.../asyncqueue/AsyncEventListenerDUnitTest.java | 1112 +++---
.../AsyncEventQueueStatsDUnitTest.java | 186 +-
.../ConcurrentAsyncEventQueueDUnitTest.java | 168 +-
.../CommonParallelAsyncEventQueueDUnitTest.java | 8 +-
.../ParallelGatewaySenderQueueJUnitTest.java | 2 +-
.../gemfire/management/QueryDataDUnitTest.java | 6 +-
.../internal/cli/CommandManagerJUnitTest.java | 8 +
.../internal/cli/GfshParserJUnitTest.java | 9 +-
.../management/internal/cli/HeadlessGfsh.java | 2 +-
.../cli/commands/CliCommandTestBase.java | 134 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 26 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 34 +-
.../cli/commands/DeployCommandsDUnitTest.java | 14 +-
.../commands/DiskStoreCommandsDUnitTest.java | 30 +-
.../commands/DiskStoreCommandsJUnitTest.java | 1 +
.../cli/commands/FunctionCommandsDUnitTest.java | 112 +-
.../commands/GemfireDataCommandsDUnitTest.java | 28 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 15 +-
.../cli/commands/IndexCommandsDUnitTest.java | 21 +-
...stAndDescribeDiskStoreCommandsDUnitTest.java | 14 +-
.../ListAndDescribeRegionDUnitTest.java | 13 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 14 +-
.../MiscellaneousCommandsDUnitTest.java | 40 +-
...laneousCommandsExportLogsPart1DUnitTest.java | 15 +-
...laneousCommandsExportLogsPart2DUnitTest.java | 16 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 24 +-
...laneousCommandsExportLogsPart4DUnitTest.java | 15 +-
.../cli/commands/QueueCommandsDUnitTest.java | 16 +-
.../SharedConfigurationCommandsDUnitTest.java | 16 +-
.../cli/commands/ShellCommandsDUnitTest.java | 12 +-
.../cli/commands/ShowMetricsDUnitTest.java | 16 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 14 +-
.../cli/commands/ToUpperResultCollector.java | 65 +
.../cli/commands/UserCommandsDUnitTest.java | 16 +-
.../shell/GfshExecutionStrategyJUnitTest.java | 8 +-
.../domain/CacheElementJUnitTest.java | 1 -
.../security/AccessControlMBeanJUnitTest.java | 58 +
...rDistributedSystemMXBeanIntegrationTest.java | 50 -
...horizeOperationForMBeansIntegrationTest.java | 323 --
...erationForRegionCommandsIntegrationTest.java | 136 -
...CacheServerMBeanAuthenticationJUnitTest.java | 58 +
.../CacheServerMBeanAuthorizationJUnitTest.java | 90 +
.../CacheServerMBeanShiroJUnitTest.java | 93 +
.../security/CliCommandsSecurityTest.java | 83 +
.../security/DataCommandsSecurityTest.java | 83 +
.../DiskStoreMXBeanSecurityJUnitTest.java | 83 +
.../security/ExampleJSONAuthorization.java | 197 +
.../GatewayReceiverMBeanSecurityTest.java | 90 +
.../GatewaySenderMBeanSecurityTest.java | 105 +
.../GeodeSecurityUtilCustomRealmJUnitTest.java | 52 +
.../GeodeSecurityUtilWithIniFileJUnitTest.java | 147 +
.../security/GfshCommandsSecurityTest.java | 165 +
.../security/GfshShellConnectionRule.java | 109 +
.../security/JMXConnectionConfiguration.java | 33 +
.../internal/security/JSONAuthorization.java | 201 +
...JSONAuthorizationDetailsIntegrationTest.java | 163 -
.../JsonAuthorizationCacheStartRule.java | 83 +
.../LockServiceMBeanAuthorizationJUnitTest.java | 90 +
.../security/MBeanSecurityJUnitTest.java | 117 +
.../security/MBeanServerConnectionRule.java | 130 +
.../ManagerMBeanAuthorizationJUnitTest.java | 78 +
.../security/MemberMBeanSecurityJUnitTest.java | 110 +
...tionCodesForDataCommandsIntegrationTest.java | 101 -
...tionCodesForDistributedSystemMXBeanTest.java | 77 -
.../ResourceOperationContextJUnitTest.java | 88 +
.../internal/security/ShiroCacheStartRule.java | 63 +
.../internal/security/TestCommand.java | 227 ++
.../ReadOpFileAccessControllerJUnitTest.java | 19 +-
.../security/ClientAuthorizationDUnitTest.java | 7 +-
.../security/ClientAuthorizationTestCase.java | 20 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 21 +-
.../security/templates/XmlAuthorization.java | 2 +-
.../com/gemstone/gemfire/test/dunit/VM.java | 62 +-
.../internal/JUnit4DistributedTestCase.java | 3 -
.../gemstone/gemfire/util/test/TestUtil.java | 8 +-
.../gemfire/codeAnalysis/excludedClasses.txt | 28 +-
.../sanctionedDataSerializables.txt | 92 +-
.../codeAnalysis/sanctionedSerializables.txt | 29 +-
.../management/internal/security/auth1.json | 28 +-
.../management/internal/security/auth3.json | 55 +-
.../internal/security/cacheServer.json | 188 +
.../management/internal/security/shiro-ini.json | 87 +
.../internal/security/testInheritRole.json | 40 -
.../security/testSimpleUserAndRole.json | 14 -
.../testUserAndRoleRegionServerGroup.json | 16 -
.../internal/security/testUserMultipleRole.json | 20 -
geode-core/src/test/resources/shiro.ini | 40 +
.../cache/query/internal/cq/CqServiceImpl.java | 2 +-
.../cli/commands/ClientCommandsDUnitTest.java | 53 +-
.../DurableClientCommandsDUnitTest.java | 2 +-
.../junit/rules/DescribedExternalResource.java | 63 +
geode-lucene/build.gradle | 4 -
.../gemfire/cache/lucene/LuceneIndex.java | 2 +-
.../LuceneIndexForReplicatedRegion.java | 2 +-
.../cache/lucene/internal/LuceneIndexImpl.java | 14 +-
.../lucene/internal/LuceneServiceImpl.java | 21 +-
.../internal/distributed/CollectorManager.java | 3 +-
.../internal/distributed/LuceneFunction.java | 31 +-
.../distributed/TopEntriesCollectorManager.java | 2 +-
.../TopEntriesFunctionCollector.java | 9 +-
.../internal/xml/LuceneIndexCreation.java | 42 +-
.../internal/xml/LuceneIndexXmlGenerator.java | 5 +
.../lucene/internal/xml/LuceneXmlConstants.java | 1 +
.../lucene/internal/xml/LuceneXmlParser.java | 27 +-
.../geode.apache.org/lucene/lucene-1.0.xsd | 1 +
.../gemfire/cache/lucene/LuceneQueriesBase.java | 148 +
.../lucene/LuceneQueriesIntegrationTest.java | 88 +
.../cache/lucene/LuceneQueriesPRBase.java | 75 +
.../lucene/LuceneQueriesPeerPRDUnitTest.java | 36 +
.../LuceneQueriesPeerPROverflowDUnitTest.java | 41 +
.../distributed/LuceneFunctionJUnitTest.java | 451 +--
.../LuceneFunctionReadPathDUnitTest.java | 238 --
.../TopEntriesFunctionCollectorJUnitTest.java | 35 +-
...neIndexXmlGeneratorIntegrationJUnitTest.java | 10 +-
...uceneIndexXmlParserIntegrationJUnitTest.java | 52 +-
.../xml/LuceneIndexXmlParserJUnitTest.java | 100 +-
...erIntegrationJUnitTest.createIndex.cache.xml | 7 +-
...nJUnitTest.parseIndexWithAnalyzers.cache.xml | 36 +
geode-pulse/build.gradle | 1 +
.../tools/pulse/internal/PulseAppListener.java | 68 +-
.../internal/controllers/PulseController.java | 28 +-
.../tools/pulse/internal/data/Cluster.java | 23 +-
.../pulse/internal/data/JMXDataUpdater.java | 217 +-
.../pulse/internal/data/PulseConstants.java | 15 +-
.../tools/pulse/internal/data/Repository.java | 54 +-
.../pulse/internal/log/PulseLogWriter.java | 4 -
.../security/GemFireAuthentication.java | 91 +
.../security/GemFireAuthenticationProvider.java | 80 +
.../pulse/internal/security/LogoutHandler.java | 55 +
.../internal/service/ClusterRegionService.java | 11 -
.../internal/service/ClusterRegionsService.java | 11 -
.../service/ClusterSelectedRegionService.java | 6 -
geode-pulse/src/main/resources/pulse.properties | 12 +-
.../src/main/webapp/WEB-INF/spring-security.xml | 59 +-
.../scripts/pulsescript/PulseCallbacks.js | 2 -
.../webapp/scripts/pulsescript/clusterDetail.js | 7 +-
.../controllers/PulseControllerJUnitTest.java | 23 +-
.../tools/pulse/testbed/driver/PulseUITest.java | 2 +-
.../pulse/tests/DataBrowserResultLoader.java | 14 +-
.../tools/pulse/tests/PulseAbstractTest.java | 1047 +++++
.../tools/pulse/tests/PulseAuthTest.java | 33 +
.../tools/pulse/tests/PulseAutomatedTest.java | 17 +-
.../tools/pulse/tests/PulseBaseTest.java | 4 +-
.../tools/pulse/tests/PulseNoAuthTest.java | 33 +
.../gemfire/tools/pulse/tests/PulseTest.java | 1039 -----
.../gemfire/tools/pulse/tests/Region.java | 11 +-
.../gemfire/tools/pulse/tests/Server.java | 156 +-
geode-pulse/src/test/resources/pulse-auth.json | 21 +
geode-pulse/src/test/resources/test.properties | 6 +-
geode-rebalancer/build.gradle | 7 -
geode-site/website/content/docs/index.html | 2 +-
geode-site/website/content/releases/index.html | 52 +
.../cache/wan/GatewaySenderFactoryImpl.java | 4 -
.../internal/cache/UpdateVersionDUnitTest.java | 6 +-
.../cache/wan/CacheClientNotifierDUnitTest.java | 106 +-
.../cache/wan/Simple2CacheServerDUnitTest.java | 157 +
.../gemfire/internal/cache/wan/WANTestBase.java | 17 +
.../wan/misc/NewWanAuthenticationDUnitTest.java | 309 ++
.../serial/SerialWANPropogationDUnitTest.java | 4 -
.../wan/wancommand/WANCommandTestBase.java | 104 +-
...anCommandCreateGatewayReceiverDUnitTest.java | 174 +-
.../WanCommandCreateGatewaySenderDUnitTest.java | 192 +-
...WanCommandGatewayReceiverStartDUnitTest.java | 120 +-
.../WanCommandGatewayReceiverStopDUnitTest.java | 120 +-
.../WanCommandGatewaySenderStartDUnitTest.java | 177 +-
.../WanCommandGatewaySenderStopDUnitTest.java | 158 +-
.../wan/wancommand/WanCommandListDUnitTest.java | 135 +-
.../WanCommandPauseResumeDUnitTest.java | 370 +-
.../wancommand/WanCommandStatusDUnitTest.java | 174 +-
.../src/main/webapp/WEB-INF/gemfire-servlet.xml | 2 +-
...entVariablesHandlerInterceptorJUnitTest.java | 267 --
.../LoginHandlerInterceptorJUnitTest.java | 273 ++
gradle.properties | 1 +
gradle/dependency-versions.properties | 1 +
gradle/publish.gradle | 4 +-
gradle/wrapper/gradle-wrapper.jar | Bin 53637 -> 53639 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
settings.gradle | 1 -
547 files changed, 13681 insertions(+), 35913 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
index 1532d2a,2cf8c3c..bc901f4
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
@@@ -16,6 -16,9 +16,8 @@@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+ import static com.gemstone.gemfire.cache.query.Utils.*;
+
-
import java.util.Collection;
import com.gemstone.gemfire.cache.Cache;
@@@ -33,18 -39,18 +38,7 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
--/**
-- *
-- */
--public class PRBasicIndexCreationDUnitTest extends
-- PartitionedRegionDUnitTestCase
--
--{
-- /**
-- * constructor
-- *
-- * @param name
-- */
++public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCase {
public PRBasicIndexCreationDUnitTest(String name) {
super(name);
@@@ -412,42 -400,8 +388,9 @@@
cnt, cntDest));
vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name,
"PrIndexOnStatus", "status",null, ""));
- /*
- vm1.invoke(new CacheSerializableRunnable("IndexCreationOnPosition") {
- public void run2(){
- try {
- Cache cache = getCache();
- QueryService qs = cache.getQueryService();
- Region region = cache.getRegion(name);
- LogWriter logger = cache.getLogger();
- // logger.info("Test Creating index with Name : [ "+indexName+" ] " +
- // "IndexedExpression : [ "+indexedExpression+" ] Alias : [ "+alias+" ] FromClause : [ "+region.getFullPath() + " " + alias+" ] " );
- Index parIndex = qs.createIndex("IndexOnPotionMktValue", IndexType.FUNCTIONAL, "pVal.mktValue"
- ,region.getFullPath()+" pf, pf.positions pVal TYPE Position", "import parReg.\"query\".Position;");
- logger.info(
- "Index creted on partitioned region : " + parIndex);
- logger.info(
- "Number of buckets indexed in the partitioned region locally : "
- + "" + ((PartitionedIndex)parIndex).getNumberOfIndexedBucket()
- + " and remote buckets indexed : "
- + ((PartitionedIndex)parIndex).getNumRemoteBucketsIndexed());
- /*
- * assertIndexDetailsEquals("Max num of buckets in the partiotion regions and
- * the " + "buckets indexed should be equal",
- * ((PartitionedRegion)region).getTotalNumberOfBuckets(),
- * (((PartionedIndex)parIndex).getNumberOfIndexedBucket()+((PartionedIndex)parIndex).getNumRemtoeBucketsIndexed()));
- * should put all the assetion in a seperate function.
- */
- /* }
- catch (Exception ex) {
- fail("Creating Index in this vm failed : ", ex);
- }
-
- }
- });*/
++
vm0.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name));
vm1.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name));
- // vm2.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name));
vm3.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
index 8ce3949,7b93734..fcc5c49
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
@@@ -32,26 -34,26 +34,19 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
--
--public class PRBasicMultiIndexCreationDUnitTest extends
-- PartitionedRegionDUnitTestCase
--
--{
-- /**
-- * constructor
-- *
-- * @param name
-- */
++public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTestCase {
public PRBasicMultiIndexCreationDUnitTest(String name) {
super(name);
}
+
- // int totalNumBuckets = 131;
-
- int queryTestCycle = 10;
+ public void setCacheInVMs(VM... vms) {
+ for (VM vm : vms) {
+ vm.invoke(() -> PRQueryDUnitHelper.setCache(getCache()));
+ }
+ }
+
- PRQueryDUnitHelper PRQHelp = new PRQueryDUnitHelper("");
+ PRQueryDUnitHelper PRQHelp = new PRQueryDUnitHelper();
final String name = "PartionedPortfolios";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
index 45d91c9,84ef866..241aeb6
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
@@@ -16,11 -16,12 +16,9 @@@
*/
package com.gemstone.gemfire.cache.query.partitioned;
- import java.io.BufferedWriter;
+ import static org.junit.Assert.*;
+
-import java.io.BufferedWriter;
import java.io.File;
--import java.io.FileWriter;
--import java.io.IOException;
- import java.io.PrintWriter;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@@ -31,6 -32,6 +29,8 @@@ import java.util.Random
import java.util.Set;
import java.util.concurrent.CountDownLatch;
++import util.TestException;
++
import com.gemstone.gemfire.CancelException;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.AttributesFactory;
@@@ -85,12 -81,12 +80,10 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
+ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+ import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
import com.gemstone.gemfire.util.test.TestUtil;
- import parReg.query.unittest.NewPortfolio;
--import util.TestException;
--
/**
* This is a helper class for the various Partitioned Query DUnit Test Cases
*
@@@ -1334,44 -1230,8 +1230,43 @@@ public class PRQueryDUnitHelper impleme
Collection indexes = qs.getIndexes();
Iterator it = indexes.iterator();
- while(it.hasNext()) {
- //logger.info("Following indexes found : " + it.next());
+ while(it.hasNext()) {
PartitionedIndex ind = (PartitionedIndex)it.next();
+ /*List bucketIndex = ind.getBucketIndexes();
+ int k = 0;
+ logger.info("Total number of bucket index : "+bucketIndex.size());
+ while ( k < bucketIndex.size() ){
+ Index bukInd = (Index)bucketIndex.get(k);
+ logger.info("Buket Index "+bukInd+" usage : "+bukInd.getStatistics().getTotalUses());
+ // if number of quries on pr change in getCacheSerializableRunnableForPRQueryAndCompareResults
+ // literal 6 should change.
+ //Asif : With the optmization of Range Queries a where clause
+ // containing something like ID > 4 AND ID < 9 will be evaluated
+ //using a single index lookup, so accordingly modifying the
+ //assert value from 7 to 6
+ // Anil : With aquiringReadLock during Index.getSizeEstimate(), the
+ // Index usage in case of "ID = 0 OR ID = 1" is increased by 3.
+ int indexUsageWithSizeEstimation = 3;
+ int expectedUse = 6;
+ long indexUse = bukInd.getStatistics().getTotalUses();
+ // Anil : With chnages to use single index for PR query evaluation, once the index
+ // is identified the same index is used on other PR buckets, the sieEstimation is
+ // done only once, which adds additional index use for only one bucket index.
+ if (!(indexUse == expectedUse || indexUse == (expectedUse + indexUsageWithSizeEstimation))){
+ fail ("Index usage is not as expected, expected it to be either " +
+ expectedUse + " or " + (expectedUse + indexUsageWithSizeEstimation) +
+ " it is: " + indexUse);
+ //assertIndexDetailsEquals(6 + indexUsageWithSizeEstimation, bukInd.getStatistics().getTotalUses());
+ }
+ k++;
+ }*/
+ //Shobhit: Now we dont need to check stats per bucket index,
+ //stats are accumulated in single pr index stats.
+
+ // Anil : With aquiringReadLock during Index.getSizeEstimate(), the
+ // Index usage in case of "ID = 0 OR ID = 1" is increased by 3.
+ int indexUsageWithSizeEstimation = 3;
+
logger.info("index uses for "+ind.getNumberOfIndexedBuckets()+" index "+ind.getName()+": "+ind.getStatistics().getTotalUses());
assertEquals(6, ind.getStatistics().getTotalUses());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 3055228,4652e74..8530c0f
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@@ -1611,9 -1539,11 +1539,11 @@@ public class ClientMembershipDUnitTest
totalClientCounts += clientCounts[i];
}
// this assertion fails because the count is 4
- //assertEquals(1, totalClientCounts);
+ //assertIndexDetailsEquals(1, totalClientCounts);
}
+
protected static int testGetNotifiedClients_port;
+
private static int getTestGetNotifiedClients_port() {
return testGetNotifiedClients_port;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index cc6310f,31acc47..8e1031f
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@@ -28,42 -29,30 +29,41 @@@ import java.util.List
import java.util.Map;
import java.util.Properties;
- import org.junit.AfterClass;
+import org.junit.Before;
- import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.internal.ConfigSource;
+ import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
@Category(UnitTest.class)
public class DistributionConfigJUnitTest {
- static Map<String, ConfigAttribute> attributes;
- static Map<String, Method> setters;
- static Map<String, Method> getters;
- static Map<String, Method> isModifiables;
- static Map<String, Method> checkers;
- static String[] attNames;
- DistributionConfigImpl config;
-
- @BeforeClass
- public static void beforeClass() {
+
+ private Map<Class<?>, Class<?>> classMap;
+
+ private Map<String, ConfigAttribute> attributes;
+ private Map<String, Method> setters;
+ private Map<String, Method> getters;
+ private Map<String, Method> checkers;
+ private String[] attNames;
+
+ private DistributionConfigImpl config;
+
+ @Before
+ public void before() {
+ classMap = new HashMap<Class<?>, Class<?>>();
+ classMap.put(boolean.class, Boolean.class);
+ classMap.put(byte.class, Byte.class);
+ classMap.put(short.class, Short.class);
+ classMap.put(char.class, Character.class);
+ classMap.put(int.class, Integer.class);
+ classMap.put(long.class, Long.class);
+ classMap.put(float.class, Float.class);
+ classMap.put(double.class, Double.class);
+
attributes = DistributionConfig.attributes;
setters = DistributionConfig.setters;
getters = DistributionConfig.getters;
@@@ -107,10 -99,9 +107,10 @@@
System.out.println("filelList: " + fileList);
System.out.println();
System.out.println("otherList: " + otherList);
+
assertEquals(boolList.size(), 30);
assertEquals(intList.size(), 33);
- assertEquals(stringList.size(), 69);
+ assertEquals(stringList.size(), 70);
assertEquals(fileList.size(), 5);
assertEquals(otherList.size(), 3);
}
@@@ -309,4 -315,45 +324,32 @@@
assertTrue(config.isAttributeModifiable(DistributionConfig.HTTP_SERVICE_PORT_NAME));
assertTrue(config.isAttributeModifiable("jmx-manager-http-port"));
}
+
+
+ @Test
+ public void testSecurityProps(){
+ Properties props = new Properties();
+ props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, JSONAuthorization.class.getName() + ".create");
+ props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+ props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config");
+ // add another non-security property to verify it won't get put in the security properties
+ props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, 2);
+
+ DistributionConfig config = new DistributionConfigImpl(props);
+ assertEquals(config.getSecurityProps().size(), 3);
+ }
+
+ @Test
+ public void testSecurityPropsWithNoSetter(){
+ Properties props = new Properties();
+ props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, JSONAuthorization.class.getName() + ".create");
+ props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+ props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config");
+ // add another non-security property to verify it won't get put in the security properties
+ props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, 2);
+ props.put("security-username", "testName");
+
+ DistributionConfig config = new DistributionConfigImpl(props);
+ assertEquals(config.getSecurityProps().size(), 4);
+ }
-
- public final static Map<Class<?>, Class<?>> classMap = new HashMap<Class<?>, Class<?>>();
-
- static {
- classMap.put(boolean.class, Boolean.class);
- classMap.put(byte.class, Byte.class);
- classMap.put(short.class, Short.class);
- classMap.put(char.class, Character.class);
- classMap.put(int.class, Integer.class);
- classMap.put(long.class, Long.class);
- classMap.put(float.class, Float.class);
- classMap.put(double.class, Double.class);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
index fb9450b,66decd6..f026a52
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
@@@ -16,14 -16,16 +16,15 @@@
*/
package com.gemstone.gemfire.management.internal.cli;
-import com.gemstone.gemfire.management.cli.CliMetaData;
-import com.gemstone.gemfire.management.cli.ConverterHint;
-import com.gemstone.gemfire.management.cli.Result;
-import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
-import com.gemstone.gemfire.management.internal.cli.parser.Argument;
-import com.gemstone.gemfire.management.internal.cli.parser.AvailabilityTarget;
-import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget;
-import com.gemstone.gemfire.management.internal.cli.parser.Option;
-import com.gemstone.gemfire.management.internal.security.ResourceOperation;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
++import static com.gemstone.gemfire.cache.operations.OperationContext.*;
+import static org.junit.Assert.*;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@@ -35,15 -37,15 +36,16 @@@ import org.springframework.shell.core.a
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;
-import java.util.List;
-import java.util.Map;
-
-import static com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
-import static org.junit.Assert.*;
+import com.gemstone.gemfire.management.cli.CliMetaData;
+import com.gemstone.gemfire.management.cli.ConverterHint;
+import com.gemstone.gemfire.management.cli.Result;
+import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
+import com.gemstone.gemfire.management.internal.cli.parser.Argument;
+import com.gemstone.gemfire.management.internal.cli.parser.AvailabilityTarget;
+import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget;
+import com.gemstone.gemfire.management.internal.cli.parser.Option;
++import com.gemstone.gemfire.management.internal.security.ResourceOperation;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* CommandManagerTest - Includes tests to check the CommandManager functions
@@@ -230,13 -222,12 +232,14 @@@ public class CommandManagerJUnitTest
assertTrue("Should not find unlisted plugin.", !commandManager.getCommands().containsKey("mock plugin command unlisted"));
}
+ /**
+ * class that represents dummy commands
+ */
+ public static class Commands implements CommandMarker {
- // class that represents dummy commands
- static public class Commands implements CommandMarker {
@CliCommand(value = { COMMAND1_NAME, COMMAND1_NAME_ALIAS }, help = COMMAND1_HELP)
@CliMetaData(shellOnly = true, relatedTopic = { "relatedTopicOfCommand1" })
+ @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
public static String command1(
@CliArgument(name = ARGUMENT1_NAME, argumentContext = ARGUMENT1_CONTEXT, help = ARGUMENT1_HELP, mandatory = true)
String argument1,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
index 468039f,d51df2a..c94d8d5
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
@@@ -16,12 -16,18 +16,13 @@@
*/
package com.gemstone.gemfire.management.internal.cli;
-import com.gemstone.gemfire.management.cli.CliMetaData;
-import com.gemstone.gemfire.management.cli.CommandProcessingException;
-import com.gemstone.gemfire.management.cli.ConverterHint;
-import com.gemstone.gemfire.management.cli.Result;
-import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
-import com.gemstone.gemfire.management.internal.cli.converters.StringArrayConverter;
-import com.gemstone.gemfire.management.internal.cli.converters.StringListConverter;
-import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
-import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
-import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
-import com.gemstone.gemfire.management.internal.security.ResourceOperation;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
++import static com.gemstone.gemfire.cache.operations.OperationContext.*;
+import static org.junit.Assert.*;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@@ -36,17 -42,13 +37,18 @@@ import org.springframework.shell.core.a
import org.springframework.shell.core.annotation.CliOption;
import org.springframework.shell.event.ParseResult;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
-import static org.junit.Assert.*;
+import com.gemstone.gemfire.management.cli.CliMetaData;
+import com.gemstone.gemfire.management.cli.CommandProcessingException;
+import com.gemstone.gemfire.management.cli.ConverterHint;
+import com.gemstone.gemfire.management.cli.Result;
+import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
+import com.gemstone.gemfire.management.internal.cli.converters.StringArrayConverter;
+import com.gemstone.gemfire.management.internal.cli.converters.StringListConverter;
+import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
+import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
+import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
++import com.gemstone.gemfire.management.internal.security.ResourceOperation;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
/**
* GfshParserJUnitTest - Includes tests to check the parsing and auto-completion
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
index dde1ba9,4579178..088a6a1
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategyJUnitTest.java
@@@ -16,18 -16,6 +16,19 @@@
*/
package com.gemstone.gemfire.management.internal.cli.shell;
++import static com.gemstone.gemfire.cache.operations.OperationContext.*;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+import org.springframework.shell.event.ParseResult;
+
import com.gemstone.gemfire.management.cli.CliMetaData;
import com.gemstone.gemfire.management.cli.ConverterHint;
import com.gemstone.gemfire.management.cli.Result;
@@@ -35,7 -23,22 +36,8 @@@ import com.gemstone.gemfire.management.
import com.gemstone.gemfire.management.internal.cli.GfshParser;
import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument;
import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
+ import com.gemstone.gemfire.management.internal.security.ResourceOperation;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-import org.springframework.shell.event.ParseResult;
-
-import java.util.List;
-
-import static com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
* GfshExecutionStrategyTest - Includes tests to for GfshExecutionStrategyTest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java
index 90bbd04,be2fa62..acb6c2d
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java
@@@ -31,11 -30,9 +31,14 @@@ import java.io.File
import java.security.Principal;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.UUID;
+import javax.servlet.ServletContextListener;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vmware.gemfire.tools.pulse.internal.PulseAppListener;
+
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.gemstone.gemfire.test.junit.categories.UnitTest;
import com.vmware.gemfire.tools.pulse.internal.controllers.PulseController;
import com.vmware.gemfire.tools.pulse.internal.data.Cluster;
import com.vmware.gemfire.tools.pulse.internal.data.PulseConfig;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/driver/PulseUITest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index 0000000,ef405db..f9d9d35
mode 000000,100644..100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@@ -1,0 -1,274 +1,273 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding 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 the License.
+ */
+ package com.gemstone.gemfire.management.internal.web.controllers.support;
+
+ import static org.junit.Assert.*;
+
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+ import javax.servlet.http.HttpServletRequest;
+
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
+ import edu.umd.cs.mtc.MultithreadedTestCase;
+ import edu.umd.cs.mtc.TestFramework;
-
+ import org.jmock.Expectations;
+ import org.jmock.Mockery;
+ import org.jmock.lib.concurrent.Synchroniser;
+ import org.jmock.lib.legacy.ClassImposteriser;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Test;
+ import org.junit.experimental.categories.Category;
+
++import com.gemstone.gemfire.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
+ * @since 8.0
+ */
+ @Category(UnitTest.class)
+ public class LoginHandlerInterceptorJUnitTest {
+
+ private Mockery mockContext;
+
+ @Before
+ public void setUp() {
+ mockContext = new Mockery();
+ mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
+ }
+
+ @After
+ public void tearDown() {
+ mockContext.assertIsSatisfied();
+ mockContext = null;
+ }
+
- protected String createEnvironmentVariable(final String name) {
++ private String createEnvironmentVariable(final String name) {
+ return (LoginHandlerInterceptor.ENVIRONMENT_VARIABLE_REQUEST_PARAMETER_PREFIX + name);
+ }
+
- protected <T> Enumeration<T> enumeration(final Iterator<T> iterator) {
++ private <T> Enumeration<T> enumeration(final Iterator<T> iterator) {
+ return new Enumeration<T>() {
+ public boolean hasMoreElements() {
+ return iterator.hasNext();
+ }
+ public T nextElement() {
+ return iterator.next();
+ }
+ };
+ }
+
+ @Test
+ public void testPreHandleAfterCompletion() throws Exception {
+ final Map<String, String> requestParameters = new HashMap<>(2);
+ final Map<String, String> requestHeaders = new HashMap<>();
+
+ requestParameters.put("parameter", "one");
+ requestParameters.put(createEnvironmentVariable("variable"), "two");
+
+ final HttpServletRequest mockHttpRequest = mockContext.mock(HttpServletRequest.class, "testPreHandleAfterCompletion.HttpServletRequest");
+
+ mockContext.checking(new Expectations() {{
+ oneOf(mockHttpRequest).getParameterNames();
+ will(returnValue(enumeration(requestParameters.keySet().iterator())));
+ oneOf(mockHttpRequest).getHeaderNames();
+ will(returnValue(enumeration(requestHeaders.keySet().iterator())));
+ oneOf(mockHttpRequest).getParameter(with(equal(createEnvironmentVariable("variable"))));
+ will(returnValue(requestParameters.get(createEnvironmentVariable("variable"))));
+ }});
+
+ LoginHandlerInterceptor handlerInterceptor = new LoginHandlerInterceptor();
+
+ Map<String, String> envBefore = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(envBefore);
+ assertTrue(envBefore.isEmpty());
+ assertTrue(handlerInterceptor.preHandle(mockHttpRequest, null, null));
+
+ Map<String, String> envSet = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(envSet);
+ assertNotSame(envBefore, envSet);
+ assertEquals(1, envSet.size());
+ assertTrue(envSet.containsKey("variable"));
+ assertEquals("two", envSet.get("variable"));
+
+ handlerInterceptor.afterCompletion(mockHttpRequest, null, null, null);
+
+ Map<String, String> envAfter = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(envAfter);
+ assertTrue(envAfter.isEmpty());
+ }
+
+ @Test
+ public void testHandlerInterceptorThreadSafety() throws Throwable {
+ TestFramework.runOnce(new HandlerInterceptorThreadSafetyMultiThreadedTestCase());
+ }
+
- protected final class HandlerInterceptorThreadSafetyMultiThreadedTestCase extends MultithreadedTestCase {
++ private final class HandlerInterceptorThreadSafetyMultiThreadedTestCase extends MultithreadedTestCase {
+
+ private LoginHandlerInterceptor handlerInterceptor;
+
+ private HttpServletRequest mockHttpRequestOne;
+ private HttpServletRequest mockHttpRequestTwo;
+
+ @Override
+ public void initialize() {
+ super.initialize();
+
+ final Map<String, String> requestParametersOne = new HashMap<>(3);
+ final Map<String, String> requestHeaders = new HashMap<>();
+
+ requestParametersOne.put("param", "one");
+ requestParametersOne.put(createEnvironmentVariable("STAGE"), "test");
+ requestParametersOne.put(createEnvironmentVariable("GEMFIRE"), "/path/to/gemfire/700");
+
+ mockHttpRequestOne = mockContext.mock(HttpServletRequest.class, "testHandlerInterceptorThreadSafety.HttpServletRequest.1");
+
+ mockContext.checking(new Expectations() {{
+ oneOf(mockHttpRequestOne).getParameterNames();
+ will(returnValue(enumeration(requestParametersOne.keySet().iterator())));
+ oneOf(mockHttpRequestOne).getHeaderNames();
+ will(returnValue(enumeration(requestHeaders.keySet().iterator())));
+ oneOf(mockHttpRequestOne).getParameter(with(equal(createEnvironmentVariable("STAGE"))));
+ will(returnValue(requestParametersOne.get(createEnvironmentVariable("STAGE"))));
+ oneOf(mockHttpRequestOne).getParameter(with(equal(createEnvironmentVariable("GEMFIRE"))));
+ will(returnValue(requestParametersOne.get(createEnvironmentVariable("GEMFIRE"))));
+ }});
+
+ mockHttpRequestTwo = mockContext.mock(HttpServletRequest.class, "testHandlerInterceptorThreadSafety.HttpServletRequest.2");
+
+ final Map<String, String> requestParametersTwo = new HashMap<>(3);
+
+ requestParametersTwo.put("parameter", "two");
+ requestParametersTwo.put(createEnvironmentVariable("HOST"), "localhost");
+ requestParametersTwo.put(createEnvironmentVariable("GEMFIRE"), "/path/to/gemfire/75");
+
+ mockContext.checking(new Expectations() {{
+ oneOf(mockHttpRequestTwo).getParameterNames();
+ will(returnValue(enumeration(requestParametersTwo.keySet().iterator())));
+ oneOf(mockHttpRequestTwo).getHeaderNames();
+ will(returnValue(enumeration(requestHeaders.keySet().iterator())));
+ oneOf(mockHttpRequestTwo).getParameter(with(equal(createEnvironmentVariable("HOST"))));
+ will(returnValue(requestParametersTwo.get(createEnvironmentVariable("HOST"))));
+ oneOf(mockHttpRequestTwo).getParameter(with(equal(createEnvironmentVariable("GEMFIRE"))));
+ will(returnValue(requestParametersTwo.get(createEnvironmentVariable("GEMFIRE"))));
+ }});
+
+ handlerInterceptor = new LoginHandlerInterceptor();
+ }
+
+ public void thread1() throws Exception {
+ assertTick(0);
+ Thread.currentThread().setName("HTTP Request Processing Thread 1");
+
+ Map<String, String> env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertTrue(env.isEmpty());
+ assertTrue(handlerInterceptor.preHandle(mockHttpRequestOne, null, null));
+
+ env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertEquals(2, env.size());
+ assertFalse(env.containsKey("param"));
+ assertFalse(env.containsKey("parameter"));
+ assertFalse(env.containsKey("HOST"));
+ assertEquals("test", env.get("STAGE"));
+ assertEquals("/path/to/gemfire/700", env.get("GEMFIRE"));
+
+ waitForTick(2);
+
+ env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertEquals(2, env.size());
+ assertFalse(env.containsKey("param"));
+ assertFalse(env.containsKey("parameter"));
+ assertFalse(env.containsKey("HOST"));
+ assertEquals("test", env.get("STAGE"));
+ assertEquals("/path/to/gemfire/700", env.get("GEMFIRE"));
+
+ waitForTick(4);
+
+ env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertEquals(2, env.size());
+ assertFalse(env.containsKey("param"));
+ assertFalse(env.containsKey("parameter"));
+ assertFalse(env.containsKey("HOST"));
+ assertEquals("test", env.get("STAGE"));
+ assertEquals("/path/to/gemfire/700", env.get("GEMFIRE"));
+
+ handlerInterceptor.afterCompletion(mockHttpRequestOne, null, null, null);
+
+ env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertTrue(env.isEmpty());
+ }
+
+ public void thread2() throws Exception {
+ assertTick(0);
+ Thread.currentThread().setName("HTTP Request Processing Thread 2");
+ waitForTick(1);
+
+ Map<String, String> env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertTrue(env.isEmpty());
+ assertTrue(handlerInterceptor.preHandle(mockHttpRequestTwo, null, null));
+
+ env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertEquals(2, env.size());
+ assertFalse(env.containsKey("parameter"));
+ assertFalse(env.containsKey("param"));
+ assertFalse(env.containsKey("STAGE"));
+ assertEquals("localhost", env.get("HOST"));
+ assertEquals("/path/to/gemfire/75", env.get("GEMFIRE"));
+
+ waitForTick(3);
+
+ handlerInterceptor.afterCompletion(mockHttpRequestTwo, null, null, null);
+
+ env = LoginHandlerInterceptor.getEnvironment();
+
+ assertNotNull(env);
+ assertTrue(env.isEmpty());
+ }
+
+ @Override
+ public void finish() {
+ super.finish();
+ handlerInterceptor = null;
+ }
+ }
+
+ }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9bdd0d59/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --cc gradle/dependency-versions.properties
index fe6fd91,b3e004e..f262a0c
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@@ -100,5 -100,6 +100,6 @@@ tempus-fugit.version = 1.
tomcat6.version = 6.0.37
tomcat7.version = 7.0.30
mortbay-jetty-servlet-api.version=2.5-20081211
-selenium.version=2.52.0
+selenium.version=2.53.0
google-gson.version=2.3.1
+ shiro.version=1.2.4