You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by es...@apache.org on 2017/10/05 18:45:34 UTC
[geode] branch feature/GEODE-3679 updated (91251e9 -> 0ce55f3)
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a change to branch feature/GEODE-3679
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 91251e9 Move the method from LocalRegion to DistributedRegion.
add 6e1beb8 GEODE-3715: introduce CacheRule and SharedCountersRule
add 061e07d GEODE-3628: Lucene query only needs DATA:READ
add 75c8a74 GEODE-3715: improve javadocs of DistributedTest rules
add 9614953 GEODE-3647: Fix race condition
add 5cb2a59 Revert "GEODE-3647: Fix race condition"
add 201cc52 Feature/geode 3647 (#852)
add 9fa0e5f GEODE-3673: Refactored Lucene commands test to use new framework
add 666b2b7 GEODE-3441: Use random port in Tomcat8SessionsClientServerDUnitTest
add 02b9646 GEODE-3247:Improve OQL expression execution (#837)
add 09bb75c GEODE-3712: PartitionedRegionQueryEvaluator should shuffle node list
add 1fd61c2 GEODE-3723: Remove Optional<String> from getRequiredPermissions
add af2fe2f GEODE-3723: Correct documentation for getRequiredPermissions
add fbe8bd6 Merge pull request #857 from jdeppe-pivotal/feature/GEODE-3723
add 6dfe0c9 Fix the path error in the Javadoc
add 9e19633 Merge pull request #861 from rupweb/patch-1
add b891fd0 GEODE-3542: Add descriptive error message for gfsh show metrics
add a573831 GEODE-3542: Increase await timeout to 2 minutes in case of long GCs on slow systems
add bf7d83c Merge branch 'develop' into feature/GEODE-3542
add 7018d2d GEODE-3542: Refactor test for show metrics command
add f896491 GEODE-3542: Spotless changes
add 0c8673a GEODE-3542: Add license headers
add 710524e Merge pull request #836 from jdeppe-pivotal/feature/GEODE-3542
add 91e73e8 GEODE-3732: Amended the test to better handle timeout scenarios
add 8eeb201 GEODE-3621: revert the change to maintain backward compatibility
add 77a0c76 GEODE-3749: DeltaPropagationDUnitTest.testBug40165ClientReconnects failure
add 5e868d3 GEODE-3723 Revise javadoc defn of getRequiredPermissions parameter (#864)
add db4a493 GEODE-3685: MBean wrappers are properly invoked over http
add bfad65a GEODE-3750: Adding exception logging in auto reconnect
add fe2e408 GEODE-3703 Document JAR resource becomes DEPLOY (#860)
add 739e80d GEODE-3539: Enhanced test coverage for alter runtime command options
add 22b02c7 GEODE-3539: refactored to reduce code duplication
add a29f546 GEODE-3542: Add null guards in the case of invalid commands
add 51bcce5 GEODE-3542: Make sure that gfsh is stopped properly at the end of tests
add 9f9a58c GEODE-3747: add SharedErrorCollector rule
add 080786b GEODE-3567: correctly set the serverPortSetByUser flag
add 972bee1 GEODE-3744: Local region will not participate in a transaction hosted remotely.
add ade0f60 Merge pull request #868 from apache/feature/GEODE-3744
add 1c446b3 GEODE-3730: Moved retry logic to receiver when gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION=false
add 6e00da4 GEODE-3730: Moved retry loop around switch statement
add 9d46c0e Merge pull request #848 from apache/feature/GEODE-3730
add 5df9016 GEODE-3733: Added Flaky test to the test
add 003bbac Consolidate Http request
new ca4757a Merge remote-tracking branch 'origin/develop' into feature/GEODE-3679
new 0ce55f3 Make region in TXRegionStub strong type to avoid some casting in the code.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../Tomcat8SessionsClientServerDUnitTest.java | 14 +-
.../cli/commands/StopServerAcceptanceTest.java | 66 ++
.../StopServerWithSecurityAcceptanceTest.java | 139 +++
.../rest/internal/web/controllers/Customer.java | 2 +-
.../org/apache/geode/cache/execute/Function.java | 20 +-
.../cache/query/internal/AttributeDescriptor.java | 58 +-
.../cache/query/internal/CompiledOperation.java | 4 +-
.../geode/cache/query/internal/CompiledPath.java | 2 +-
.../geode/cache/query/internal/CompiledSelect.java | 3 +-
.../geode/cache/query/internal/DefaultQuery.java | 1 -
.../cache/query/internal/DefaultQueryService.java | 21 +-
.../cache/query/internal/ExecutionContext.java | 2 +-
.../cache/query/internal/InternalQueryService.java | 18 +-
.../geode/cache/query/internal/MethodDispatch.java | 27 +-
.../query/internal/MethodInvocationAuthorizer.java | 19 +-
.../geode/cache/query/internal/PathUtils.java | 33 +-
.../RestrictedMethodInvocationAuthorizer.java | 135 +++
.../cache/query/internal/RuntimeIterator.java | 22 +-
.../geode/cache/query/internal/StructImpl.java | 17 +-
.../apache/geode/distributed/ServerLauncher.java | 19 +-
.../internal/InternalDistributedSystem.java | 2 +
.../geode/examples/SimpleSecurityManager.java | 59 ++
.../examples/security/ExampleSecurityManager.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 9 +-
.../apache/geode/internal/cache/InternalCache.java | 3 +
.../geode/internal/cache/PartitionedRegion.java | 49 +-
.../internal/cache/PartitionedRegionDataStore.java | 14 +-
.../cache/PartitionedRegionQueryEvaluator.java | 9 +-
.../geode/internal/cache/PeerTXStateStub.java | 13 +-
.../tier/sockets/command/ExecuteFunction.java | 2 +-
.../tier/sockets/command/ExecuteFunction65.java | 2 +-
.../tier/sockets/command/ExecuteFunction66.java | 2 +-
.../sockets/command/ExecuteRegionFunction.java | 3 +-
.../sockets/command/ExecuteRegionFunction61.java | 3 +-
.../sockets/command/ExecuteRegionFunction65.java | 3 +-
.../sockets/command/ExecuteRegionFunction66.java | 3 +-
.../command/ExecuteRegionFunctionSingleHop.java | 3 +-
.../sockets/command/GatewayReceiverCommand.java | 974 +++++++++---------
.../cache/tx/AbstractPeerTXRegionStub.java | 4 +-
.../internal/cache/tx/DistributedTXRegionStub.java | 8 +-
.../internal/cache/tx/PartitionedTXRegionStub.java | 31 +-
.../internal/cache/wan/GatewayReceiverStats.java | 22 +-
.../internal/cache/xmlcache/CacheCreation.java | 10 +-
.../geode/internal/i18n/LocalizedStrings.java | 2 +
.../geode/management/internal/ManagementAgent.java | 36 +-
.../management/internal/cli/CommandRequest.java | 13 -
.../internal/cli/commands/ConnectCommand.java | 7 +-
.../internal/cli/commands/ShowMetricsCommand.java | 144 +--
.../cli/functions/UserFunctionExecution.java | 3 +-
.../management/internal/cli/i18n/CliStrings.java | 2 +
.../controllers/AbstractCommandsController.java | 378 +------
.../AbstractMultiPartCommandsController.java | 77 --
.../web/controllers/ShellCommandsController.java | 154 ++-
.../internal/web/http/support/HttpRequester.java | 222 +++++
.../web/http/support/SimpleHttpRequester.java | 245 -----
.../internal/web/shell/HttpOperationInvoker.java | 336 +------
.../web/shell/RestOperationErrorHandler.java | 58 ++
.../apache/geode/security/ResourcePermission.java | 45 +-
.../RestrictedMethodInvocationAuthorizerTest.java | 264 +++++
.../distributed/ServerLauncherBuilderTest.java | 10 +
.../internal/cache/DeltaPropagationDUnitTest.java | 661 ++++++-------
.../PartitionedRegionAttributesMutatorTest.java | 211 ++++
.../cache/PartitionedRegionDataStoreJUnitTest.java | 63 --
.../cache/PartitionedRegionQueryEvaluatorTest.java | 17 +-
.../cache/execute/PRTransaction2DUnitTest.java | 145 +++
.../tier/sockets/ClientHealthMonitorJUnitTest.java | 38 +-
.../cache/tx/AbstractPeerTXRegionStubTest.java | 2 +-
...ServerBridgeClientMembershipRegressionTest.java | 3 +-
.../cli/commands/ShowMetricsCommandJUnitTest.java | 61 ++
.../cli/commands/ShowMetricsDUnitTest.java | 417 ++------
.../internal/cli/shell/GfshInitFileJUnitTest.java | 2 +
.../internal/security/TestFunctions.java | 7 +-
.../web/http/support/HttpRequesterTest.java | 149 +++
.../web/shell/HttpOperationInvokerTest.java | 73 --
.../apache/geode/security/TestSecurityManager.java | 25 +-
.../security/query/IndexSecurityDUnitTest.java | 105 ++
.../query/PartitionedIndexSecurityDUnitTest.java | 27 +-
...tionedQuerySecurityAllowedQueriesDUnitTest.java | 37 +
...nedQuerySecurityRestrictedQueriesDUnitTest.java | 37 +
...tionedQuerySecurityAllowedQueriesDUnitTest.java | 27 +-
.../PdxQuerySecurityAllowedQueriesDUnitTest.java | 74 ++
...PdxQuerySecurityRestrictedQueriesDUnitTest.java | 80 ++
.../QuerySecurityAllowedQueriesDUnitTest.java | 255 +++++
...curityAuthorizedUserBindParameterDUnitTest.java | 53 +
.../geode/security/query/QuerySecurityBase.java | 222 +++++
.../QuerySecurityRestrictedQueriesDUnitTest.java | 318 ++++++
...rityUnauthorizedUserBindParameterDUnitTest.java | 76 ++
.../geode/security/query/UserPermissions.java | 46 +
.../security/query/data/PdxQueryTestObject.java | 73 ++
.../geode/security/query/data/QueryTestObject.java | 65 ++
.../org/apache/geode/test/dunit/Disconnect.java | 53 +
.../geode/test/dunit/DistributedTestUtils.java | 20 +-
.../geode/test/dunit/cache/rules/CacheRule.java | 203 ++++
.../dunit/cache/rules/tests/CacheRuleTest.java | 287 ++++++
.../dunit/internal/JUnit4DistributedTestCase.java | 21 +-
.../dunit/rules/DistributedDisconnectRule.java | 4 +-
.../rules/DistributedRestoreSystemProperties.java | 4 +-
.../test/dunit/rules/DistributedTestRule.java | 45 +-
.../DistributedUseJacksonForJsonPathRule.java | 4 +-
.../geode/test/dunit/rules/RemoteInvoker.java | 32 +-
.../geode/test/dunit/rules/SharedCountersRule.java | 183 ++++
.../test/dunit/rules/SharedErrorCollector.java | 160 +++
.../dunit/rules/tests/SharedCountersRuleTest.java | 178 ++++
.../rules/tests/SharedErrorCollectorTest.java | 353 +++++++
.../geode/test/junit/rules/GfshParserRule.java | 48 +-
.../management/internal/security/clientServer.json | 104 +-
.../dunit/CqSecurityAuthorizedUserDUnitTest.java | 267 +++++
...SecurityPartitionedAuthorizedUserDUnitTest.java | 65 ++
...curityPartitionedUnauthorizedUserDUnitTest.java | 45 +
.../dunit/CqSecurityUnauthorizedUserDUnitTest.java | 215 ++++
.../implementing_authorization.html.md.erb | 10 +-
.../geode/test/junit/rules/gfsh/GfshExecution.java | 8 +
.../geode/test/junit/rules/gfsh/GfshRule.java | 3 +-
.../serializable/SerializableExternalResource.java | 2 -
.../geode/test/junit/runners/TestRunner.java | 22 +-
.../internal/distributed/LuceneQueryFunction.java | 14 +-
.../distributed/WaitUntilFlushedFunction.java | 13 +-
.../internal/results/LuceneGetPageFunction.java | 14 +-
.../lucene/LuceneClientSecurityDUnitTest.java | 50 +-
.../internal/cli/LuceneIndexCommandsDUnitTest.java | 207 ++--
.../protocol/protobuf/ProtobufStreamProcessor.java | 2 +-
.../acceptance/CacheMaxConnectionJUnitTest.java | 12 +-
.../wan/GatewaySenderEventRemoteDispatcher.java | 28 +-
.../KeepEventsOnGatewaySenderQueueDUnitTest.java | 168 ++++
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 1032 +++++++++++++++++---
.../shell/HttpOperationInvokerSecurityTest.java | 13 +-
126 files changed, 8023 insertions(+), 3083 deletions(-)
create mode 100644 geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
create mode 100644 geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
copy geode-junit/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java => geode-core/src/main/java/org/apache/geode/cache/query/internal/InternalQueryService.java (65%)
mode change 100755 => 100644
copy geode-junit/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java => geode-core/src/main/java/org/apache/geode/cache/query/internal/MethodInvocationAuthorizer.java (65%)
mode change 100755 => 100644
create mode 100644 geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
create mode 100644 geode-core/src/main/java/org/apache/geode/examples/SimpleSecurityManager.java
delete mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractMultiPartCommandsController.java
create mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/web/http/support/HttpRequester.java
delete mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/web/http/support/SimpleHttpRequester.java
create mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestOperationErrorHandler.java
create mode 100644 geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransaction2DUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandJUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/IndexSecurityDUnitTest.java
copy geode-junit/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java => geode-core/src/test/java/org/apache/geode/security/query/PartitionedIndexSecurityDUnitTest.java (56%)
mode change 100755 => 100644
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityAllowedQueriesDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedQueriesDUnitTest.java
copy geode-junit/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java => geode-core/src/test/java/org/apache/geode/security/query/PdxPartitionedQuerySecurityAllowedQueriesDUnitTest.java (56%)
mode change 100755 => 100644
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/PdxQuerySecurityAllowedQueriesDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/PdxQuerySecurityRestrictedQueriesDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityAllowedQueriesDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityAuthorizedUserBindParameterDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityBase.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityRestrictedQueriesDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityUnauthorizedUserBindParameterDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/UserPermissions.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/data/PdxQueryTestObject.java
create mode 100644 geode-core/src/test/java/org/apache/geode/security/query/data/QueryTestObject.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/Disconnect.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/cache/rules/CacheRule.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/cache/rules/tests/CacheRuleTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/SharedCountersRule.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorTest.java
create mode 100644 geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityAuthorizedUserDUnitTest.java
create mode 100644 geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedAuthorizedUserDUnitTest.java
create mode 100644 geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedUnauthorizedUserDUnitTest.java
create mode 100644 geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityUnauthorizedUserDUnitTest.java
create mode 100644 geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].
[geode] 01/02: Merge remote-tracking branch 'origin/develop' into
feature/GEODE-3679
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch feature/GEODE-3679
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ca4757aefa4874c973a22dc69c12ccd97eb96138
Merge: 91251e9 003bbac
Author: eshu <es...@pivotal.io>
AuthorDate: Thu Oct 5 11:13:56 2017 -0700
Merge remote-tracking branch 'origin/develop' into feature/GEODE-3679
.../Tomcat8SessionsClientServerDUnitTest.java | 14 +-
.../cli/commands/StopServerAcceptanceTest.java | 66 ++
.../StopServerWithSecurityAcceptanceTest.java | 139 +++
.../rest/internal/web/controllers/Customer.java | 2 +-
.../org/apache/geode/cache/execute/Function.java | 20 +-
.../cache/query/internal/AttributeDescriptor.java | 58 +-
.../cache/query/internal/CompiledOperation.java | 4 +-
.../geode/cache/query/internal/CompiledPath.java | 2 +-
.../geode/cache/query/internal/CompiledSelect.java | 3 +-
.../geode/cache/query/internal/DefaultQuery.java | 1 -
.../cache/query/internal/DefaultQueryService.java | 21 +-
.../cache/query/internal/ExecutionContext.java | 2 +-
.../cache/query/internal/InternalQueryService.java | 18 +-
.../geode/cache/query/internal/MethodDispatch.java | 27 +-
.../query/internal/MethodInvocationAuthorizer.java | 19 +-
.../geode/cache/query/internal/PathUtils.java | 33 +-
.../RestrictedMethodInvocationAuthorizer.java | 135 +++
.../cache/query/internal/RuntimeIterator.java | 22 +-
.../geode/cache/query/internal/StructImpl.java | 17 +-
.../apache/geode/distributed/ServerLauncher.java | 19 +-
.../internal/InternalDistributedSystem.java | 2 +
.../geode/examples/SimpleSecurityManager.java | 59 ++
.../examples/security/ExampleSecurityManager.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 9 +-
.../apache/geode/internal/cache/InternalCache.java | 3 +
.../geode/internal/cache/PartitionedRegion.java | 49 +-
.../internal/cache/PartitionedRegionDataStore.java | 14 +-
.../cache/PartitionedRegionQueryEvaluator.java | 9 +-
.../geode/internal/cache/PeerTXStateStub.java | 11 +-
.../tier/sockets/command/ExecuteFunction.java | 2 +-
.../tier/sockets/command/ExecuteFunction65.java | 2 +-
.../tier/sockets/command/ExecuteFunction66.java | 2 +-
.../sockets/command/ExecuteRegionFunction.java | 3 +-
.../sockets/command/ExecuteRegionFunction61.java | 3 +-
.../sockets/command/ExecuteRegionFunction65.java | 3 +-
.../sockets/command/ExecuteRegionFunction66.java | 3 +-
.../command/ExecuteRegionFunctionSingleHop.java | 3 +-
.../sockets/command/GatewayReceiverCommand.java | 974 +++++++++---------
.../internal/cache/wan/GatewayReceiverStats.java | 22 +-
.../internal/cache/xmlcache/CacheCreation.java | 10 +-
.../geode/internal/i18n/LocalizedStrings.java | 2 +
.../geode/management/internal/ManagementAgent.java | 36 +-
.../management/internal/cli/CommandRequest.java | 13 -
.../internal/cli/commands/ConnectCommand.java | 7 +-
.../internal/cli/commands/ShowMetricsCommand.java | 144 +--
.../cli/functions/UserFunctionExecution.java | 3 +-
.../management/internal/cli/i18n/CliStrings.java | 2 +
.../controllers/AbstractCommandsController.java | 378 +------
.../AbstractMultiPartCommandsController.java | 77 --
.../web/controllers/ShellCommandsController.java | 154 ++-
.../internal/web/http/support/HttpRequester.java | 222 +++++
.../web/http/support/SimpleHttpRequester.java | 245 -----
.../internal/web/shell/HttpOperationInvoker.java | 336 +------
.../web/shell/RestOperationErrorHandler.java | 58 ++
.../apache/geode/security/ResourcePermission.java | 45 +-
.../RestrictedMethodInvocationAuthorizerTest.java | 264 +++++
.../distributed/ServerLauncherBuilderTest.java | 10 +
.../internal/cache/DeltaPropagationDUnitTest.java | 661 ++++++-------
.../PartitionedRegionAttributesMutatorTest.java | 211 ++++
.../cache/PartitionedRegionDataStoreJUnitTest.java | 63 --
.../cache/PartitionedRegionQueryEvaluatorTest.java | 17 +-
.../cache/execute/PRTransaction2DUnitTest.java | 145 +++
.../tier/sockets/ClientHealthMonitorJUnitTest.java | 38 +-
...ServerBridgeClientMembershipRegressionTest.java | 3 +-
.../cli/commands/ShowMetricsCommandJUnitTest.java | 61 ++
.../cli/commands/ShowMetricsDUnitTest.java | 417 ++------
.../internal/cli/shell/GfshInitFileJUnitTest.java | 2 +
.../internal/security/TestFunctions.java | 7 +-
.../web/http/support/HttpRequesterTest.java | 149 +++
.../web/shell/HttpOperationInvokerTest.java | 73 --
.../apache/geode/security/TestSecurityManager.java | 25 +-
.../security/query/IndexSecurityDUnitTest.java | 105 ++
.../query/PartitionedIndexSecurityDUnitTest.java | 27 +-
...tionedQuerySecurityAllowedQueriesDUnitTest.java | 37 +
...nedQuerySecurityRestrictedQueriesDUnitTest.java | 37 +
...tionedQuerySecurityAllowedQueriesDUnitTest.java | 27 +-
.../PdxQuerySecurityAllowedQueriesDUnitTest.java | 74 ++
...PdxQuerySecurityRestrictedQueriesDUnitTest.java | 80 ++
.../QuerySecurityAllowedQueriesDUnitTest.java | 255 +++++
...curityAuthorizedUserBindParameterDUnitTest.java | 53 +
.../geode/security/query/QuerySecurityBase.java | 222 +++++
.../QuerySecurityRestrictedQueriesDUnitTest.java | 318 ++++++
...rityUnauthorizedUserBindParameterDUnitTest.java | 76 ++
.../geode/security/query/UserPermissions.java | 46 +
.../security/query/data/PdxQueryTestObject.java | 73 ++
.../geode/security/query/data/QueryTestObject.java | 65 ++
.../org/apache/geode/test/dunit/Disconnect.java | 53 +
.../geode/test/dunit/DistributedTestUtils.java | 20 +-
.../geode/test/dunit/cache/rules/CacheRule.java | 203 ++++
.../dunit/cache/rules/tests/CacheRuleTest.java | 287 ++++++
.../dunit/internal/JUnit4DistributedTestCase.java | 21 +-
.../dunit/rules/DistributedDisconnectRule.java | 4 +-
.../rules/DistributedRestoreSystemProperties.java | 4 +-
.../test/dunit/rules/DistributedTestRule.java | 45 +-
.../DistributedUseJacksonForJsonPathRule.java | 4 +-
.../geode/test/dunit/rules/RemoteInvoker.java | 32 +-
.../geode/test/dunit/rules/SharedCountersRule.java | 183 ++++
.../test/dunit/rules/SharedErrorCollector.java | 160 +++
.../dunit/rules/tests/SharedCountersRuleTest.java | 178 ++++
.../rules/tests/SharedErrorCollectorTest.java | 353 +++++++
.../geode/test/junit/rules/GfshParserRule.java | 48 +-
.../management/internal/security/clientServer.json | 104 +-
.../dunit/CqSecurityAuthorizedUserDUnitTest.java | 267 +++++
...SecurityPartitionedAuthorizedUserDUnitTest.java | 65 ++
...curityPartitionedUnauthorizedUserDUnitTest.java | 45 +
.../dunit/CqSecurityUnauthorizedUserDUnitTest.java | 215 ++++
.../implementing_authorization.html.md.erb | 10 +-
.../geode/test/junit/rules/gfsh/GfshExecution.java | 8 +
.../geode/test/junit/rules/gfsh/GfshRule.java | 3 +-
.../serializable/SerializableExternalResource.java | 2 -
.../geode/test/junit/runners/TestRunner.java | 22 +-
.../internal/distributed/LuceneQueryFunction.java | 14 +-
.../distributed/WaitUntilFlushedFunction.java | 13 +-
.../internal/results/LuceneGetPageFunction.java | 14 +-
.../lucene/LuceneClientSecurityDUnitTest.java | 50 +-
.../internal/cli/LuceneIndexCommandsDUnitTest.java | 207 ++--
.../protocol/protobuf/ProtobufStreamProcessor.java | 2 +-
.../acceptance/CacheMaxConnectionJUnitTest.java | 12 +-
.../wan/GatewaySenderEventRemoteDispatcher.java | 28 +-
.../KeepEventsOnGatewaySenderQueueDUnitTest.java | 168 ++++
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 1032 +++++++++++++++++---
.../shell/HttpOperationInvokerSecurityTest.java | 13 +-
122 files changed, 8001 insertions(+), 3058 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 02/02: Make region in TXRegionStub strong type to avoid
some casting in the code.
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch feature/GEODE-3679
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0ce55f3b24f1951da18583f1ba6f1c275cca5243
Author: eshu <es...@pivotal.io>
AuthorDate: Thu Oct 5 11:42:14 2017 -0700
Make region in TXRegionStub strong type to avoid some casting in the code.
---
.../geode/internal/cache/PeerTXStateStub.java | 4 +--
.../cache/tx/AbstractPeerTXRegionStub.java | 4 +--
.../internal/cache/tx/DistributedTXRegionStub.java | 8 +++---
.../internal/cache/tx/PartitionedTXRegionStub.java | 31 +++++++++++-----------
.../cache/tx/AbstractPeerTXRegionStubTest.java | 2 +-
5 files changed, 23 insertions(+), 26 deletions(-)
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 8e9ea89..80a2fc6 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
@@ -169,14 +169,14 @@ public class PeerTXStateStub extends TXStateStub {
TXRegionStub stub = null;
if (region.getPartitionAttributes() != null) {
// a partitioned region
- stub = new PartitionedTXRegionStub(this, region);
+ stub = new PartitionedTXRegionStub(this, (PartitionedRegion) region);
} else if (region.getScope().isLocal()) {
// GEODE-3744 Local region should not be involved in a transaction on a PeerTXStateStub
throw new TransactionException(
"Local region " + region + " should not participate in a transaction not hosted locally");
} else {
// This is a dist region
- stub = new DistributedTXRegionStub(this, region);
+ stub = new DistributedTXRegionStub(this, (DistributedRegion) region);
}
return stub;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStub.java
index b4a2998..78273c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStub.java
@@ -29,11 +29,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
public abstract class AbstractPeerTXRegionStub implements TXRegionStub {
protected final TXStateStub state;
- protected final LocalRegion region;
- public AbstractPeerTXRegionStub(TXStateStub txstate, LocalRegion r) {
+ public AbstractPeerTXRegionStub(TXStateStub txstate) {
this.state = txstate;
- this.region = r;
}
@Override
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 f0294b7..17bd83b 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
@@ -52,10 +52,10 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
public class DistributedTXRegionStub extends AbstractPeerTXRegionStub {
- private final LocalRegion region;
+ private final DistributedRegion region;
- public DistributedTXRegionStub(TXStateStub txstate, LocalRegion r) {
- super(txstate, r);
+ public DistributedTXRegionStub(TXStateStub txstate, DistributedRegion r) {
+ super(txstate);
this.region = r;
}
@@ -224,7 +224,7 @@ public class DistributedTXRegionStub extends AbstractPeerTXRegionStub {
public int entryCount() {
- return ((DistributedRegion) this.region).getRegionSize(this.state.getTarget());
+ return this.region.getRegionSize(this.state.getTarget());
}
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 10ae7a5..5673c68 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
@@ -63,8 +63,11 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
*/
private Map<Integer, Boolean> buckets = new HashMap<Integer, Boolean>();
- public PartitionedTXRegionStub(TXStateStub txstate, LocalRegion r) {
- super(txstate, r);
+ private final PartitionedRegion region;
+
+ public PartitionedTXRegionStub(TXStateStub txstate, PartitionedRegion r) {
+ super(txstate);
+ this.region = r;
}
public Map<Integer, Boolean> getBuckets() {
@@ -136,7 +139,7 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
private boolean isKeyInNonColocatedBucket(KeyInfo keyInfo) {
Map<Region<?, ?>, TXRegionStub> regionStubs = this.state.getRegionStubs();
Collection<PartitionedRegion> colcatedRegions = (Collection<PartitionedRegion>) ColocationHelper
- .getAllColocationRegions((PartitionedRegion) this.region).values();
+ .getAllColocationRegions(this.region).values();
// get all colocated region buckets touched in the transaction
for (PartitionedRegion colcatedRegion : colcatedRegions) {
PartitionedTXRegionStub regionStub =
@@ -160,9 +163,8 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
public Entry getEntry(KeyInfo keyInfo, boolean allowTombstones) {
- PartitionedRegion pr = (PartitionedRegion) region;
try {
- Entry e = pr.getEntryRemotely((InternalDistributedMember) state.getTarget(),
+ Entry e = region.getEntryRemotely((InternalDistributedMember) state.getTarget(),
keyInfo.getBucketId(), keyInfo.getKey(), false, allowTombstones);
trackBucketForTx(keyInfo);
return e;
@@ -238,9 +240,8 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
public boolean containsKey(KeyInfo keyInfo) {
- PartitionedRegion pr = (PartitionedRegion) region;
try {
- boolean retVal = pr.containsKeyRemotely((InternalDistributedMember) state.getTarget(),
+ boolean retVal = region.containsKeyRemotely((InternalDistributedMember) state.getTarget(),
keyInfo.getBucketId(), keyInfo.getKey());
trackBucketForTx(keyInfo);
return retVal;
@@ -282,10 +283,9 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
public boolean containsValueForKey(KeyInfo keyInfo) {
- PartitionedRegion pr = (PartitionedRegion) region;
try {
- boolean retVal = pr.containsValueForKeyRemotely((InternalDistributedMember) state.getTarget(),
- keyInfo.getBucketId(), keyInfo.getKey());
+ boolean retVal = region.containsValueForKeyRemotely(
+ (InternalDistributedMember) state.getTarget(), keyInfo.getBucketId(), keyInfo.getKey());
trackBucketForTx(keyInfo);
return retVal;
} catch (TransactionException e) {
@@ -318,10 +318,10 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
Object retVal = null;
final Object key = keyInfo.getKey();
final Object callbackArgument = keyInfo.getCallbackArg();
- PartitionedRegion pr = (PartitionedRegion) region;
try {
- retVal = pr.getRemotely((InternalDistributedMember) state.getTarget(), keyInfo.getBucketId(),
- key, callbackArgument, peferCD, requestingClient, clientEvent, false);
+ retVal =
+ region.getRemotely((InternalDistributedMember) state.getTarget(), keyInfo.getBucketId(),
+ key, callbackArgument, peferCD, requestingClient, clientEvent, false);
} catch (TransactionException e) {
RuntimeException re = getTransactionException(keyInfo, e);
re.initCause(e.getCause());
@@ -347,12 +347,11 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
public Object getEntryForIterator(KeyInfo keyInfo, boolean allowTombstones) {
- PartitionedRegion pr = (PartitionedRegion) region;
- InternalDistributedMember primary = pr.getBucketPrimary(keyInfo.getBucketId());
+ InternalDistributedMember primary = region.getBucketPrimary(keyInfo.getBucketId());
if (primary.equals(state.getTarget())) {
return getEntry(keyInfo, allowTombstones);
} else {
- return pr.getSharedDataView().getEntry(keyInfo, pr, allowTombstones);
+ return region.getSharedDataView().getEntry(keyInfo, region, allowTombstones);
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
index 80888ef..a7240bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
@@ -51,7 +51,7 @@ public class AbstractPeerTXRegionStubTest {
private class TestingAbstractPeerTXRegionStub extends AbstractPeerTXRegionStub {
private TestingAbstractPeerTXRegionStub(TXStateStub txState, LocalRegion r) {
- super(txState, r);
+ super(txState);
}
@Override
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.