You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/02/19 19:37:32 UTC
[55/63] [abbrv] incubator-geode git commit: Dealing with some
variables that need to be effectively final.
Dealing with some variables that need to be effectively final.
Now that we are using lambdas, variables passed to the lambda should be
effectively final.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/493d41b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/493d41b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/493d41b3
Branch: refs/heads/develop
Commit: 493d41b37b9077fb75e6a575220db39d41ccc8c4
Parents: 8faa384
Author: Dan Smith <up...@apache.org>
Authored: Wed Feb 10 17:24:07 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Feb 16 14:08:40 2016 -0800
----------------------------------------------------------------------
.../cache/execute/PRClientServerTestBase.java | 8 +-
.../fixed/FixedPartitioningDUnitTest.java | 112 ++++++------
...ngWithColocationAndPersistenceDUnitTest.java | 72 ++++----
.../tier/sockets/InterestListDUnitTest.java | 17 +-
.../statistics/StatisticsDUnitTest.java | 3 +-
.../security/ClientAuthenticationDUnitTest.java | 181 +++++++++++--------
.../security/ClientAuthorizationDUnitTest.java | 111 +++++++-----
.../security/ClientMultiUserAuthzDUnitTest.java | 23 ++-
.../DeltaClientAuthorizationDUnitTest.java | 38 +++-
.../security/P2PAuthenticationDUnitTest.java | 55 +++---
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 4 +-
.../cache/wan/misc/WanValidationsDUnitTest.java | 8 +-
.../SerialGatewaySenderQueueDUnitTest.java | 8 +-
13 files changed, 354 insertions(+), 286 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index d09a30f..d590496 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -605,10 +605,10 @@ public class PRClientServerTestBase extends CacheTestCase {
server3.invoke(() -> PRClientServerTestBase.createCacheInVm( props ));
- props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", "");
- client.invoke(() -> PRClientServerTestBase.createCacheInVm( props ));
+ Properties props2 = new Properties();
+ props2.setProperty("mcast-port", "0");
+ props2.setProperty("locators", "");
+ client.invoke(() -> PRClientServerTestBase.createCacheInVm( props2 ));
}
public static void createCacheInVm(Properties props) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index c715ae7..100e444 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -154,14 +154,14 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9,
new QuarterPartitionResolver(), null, false));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9,
new QuarterPartitionResolver(), null, false));
@@ -200,7 +200,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 8);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9,
@@ -247,7 +247,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa2 = FixedPartitionAttributes.createFixedPartition("Q13", false, 3);
FixedPartitionAttributes fpa3 = FixedPartitionAttributes
.createFixedPartition("Q11", false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -257,7 +257,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition("Q13", true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition("Q11", false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9,
@@ -301,7 +301,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 5,
@@ -341,7 +341,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
new QuarterPartitionResolver(), null, false));
@@ -435,14 +435,14 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false));
@@ -479,7 +479,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
FixedPartitionAttributes fpa2 = FixedPartitionAttributes
.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa2);
AsyncInvocation inv2 = member2
.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -488,7 +488,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
FixedPartitionAttributes fpa3 = FixedPartitionAttributes
.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa3);
AsyncInvocation inv3 = member3
.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -540,21 +540,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false));
@@ -587,21 +587,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false ));
@@ -639,21 +639,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
@@ -686,21 +686,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
@@ -764,21 +764,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
@@ -813,21 +813,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
null, null, false ));
@@ -860,21 +860,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
new QuarterPartitionResolver(), null, false ));
@@ -919,7 +919,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -930,7 +930,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -941,7 +941,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -981,7 +981,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -990,7 +990,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -999,7 +999,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1039,21 +1039,21 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12,
new QuarterPartitionResolver(), null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12,
new QuarterPartitionResolver(), null, false ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12,
new QuarterPartitionResolver(), null, false ));
@@ -1067,7 +1067,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
createCacheOnMember();
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
createRegionWithPartitionAttributes("Quarter", fpaList, 3, 40, 12,
new QuarterPartitionResolver(), null, false);
@@ -1130,7 +1130,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -1141,7 +1141,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -1152,7 +1152,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -1230,7 +1230,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1239,7 +1239,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1248,7 +1248,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1277,7 +1277,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1311,7 +1311,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1320,7 +1320,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1329,7 +1329,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1360,7 +1360,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1369,7 +1369,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1432,7 +1432,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
new QuarterPartitionResolver(), null, false ));
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3));
fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3));
fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3));
@@ -1442,7 +1442,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
new QuarterPartitionResolver(), null, false ));
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3));
fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3));
fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
index d071792..8d861b7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
@@ -61,7 +61,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpaList, 0, 40, 8, null, null, false ));
fpa1 = FixedPartitionAttributes.createFixedPartition("Order100", true, 2);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order",
fpaList, 0, 40, 8, null, "Customer", false ));
@@ -115,7 +115,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -126,7 +126,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -137,7 +137,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -228,7 +228,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -239,7 +239,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -250,7 +250,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -345,7 +345,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -358,7 +358,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa3 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
FixedPartitionAttributes fpa4 = FixedPartitionAttributes
.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -420,7 +420,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -446,7 +446,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -503,7 +503,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -516,7 +516,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa3 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
FixedPartitionAttributes fpa4 = FixedPartitionAttributes
.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -578,7 +578,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -604,7 +604,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
fpaList.add(fpa3);
@@ -653,7 +653,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
@@ -667,7 +667,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
@@ -676,14 +676,14 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
@@ -722,7 +722,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -743,7 +743,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -759,7 +759,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -799,7 +799,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer",
@@ -851,7 +851,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
AsyncInvocation[] async = new AsyncInvocation[2];
@@ -905,7 +905,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer",
@@ -949,7 +949,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer",
@@ -980,7 +980,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1000,7 +1000,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1009,7 +1009,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member1.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1042,7 +1042,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1051,7 +1051,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1060,7 +1060,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1086,7 +1086,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member4.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1095,7 +1095,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member3.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1104,7 +1104,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member2.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1113,7 +1113,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
- fpaList = new ArrayList<FixedPartitionAttributes>();
+ fpaList.clear();
fpaList.add(fpa1);
fpaList.add(fpa2);
member1.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index d43b067..3fa3f25 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -378,17 +378,14 @@ public class InterestListDUnitTest extends DistributedTestCase
* create Entries in all the vms
* register interest in various ways and ensure that registration listeners
* are properly invoked
+ * @throws Exception
*/
- public void testInterestRegistrationListeners() {
- int port2 = 0;
-
- try {
- createCache();
- server = addCacheServer();
- port2 = server.getPort();
- } catch (Exception ex) {
- Assert.fail("Cache creation threw an exception", ex);
- }
+ public void testInterestRegistrationListeners() throws Exception {
+ int port2;
+
+ createCache();
+ server = addCacheServer();
+ port2 = server.getPort();
addRegisterInterestListener();
vm0.invoke(() -> InterestListDUnitTest.addRegisterInterestListener());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index c038215..9fd18e6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -543,7 +543,8 @@ public class StatisticsDUnitTest extends CacheTestCase {
int puts = 0;
for (int pubVM = 0; pubVM < NUM_PUBS; pubVM++) {
- int vmPuts = (int)pubs[pubVM].invoke(() -> readIntStat(new File(pubArchives[pubVM]), "PubSubStats", "puts"));
+ int currentPubVM = pubVM;
+ int vmPuts = (int)pubs[pubVM].invoke(() -> readIntStat(new File(pubArchives[currentPubVM]), "PubSubStats", "puts"));
assertTrue(vmPuts > 0);
assertEquals(MAX_PUTS * NUM_PUB_THREADS, vmPuts);
puts += vmPuts;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
index b866011..8446eae 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
@@ -237,10 +237,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testValidCredentials: For second client credentials: "
+ credentials2 + " : " + javaProps2);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClientsNoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1, credentials2, javaProps2);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -277,8 +275,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Integer locPort1 = SecurityTestUtil.getLocatorPort();
Integer locPort2 = SecurityTestUtil.getLocatorPort();
String locString = SecurityTestUtil.getLocatorString();
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
- javaProps )));
+ Integer port1 = createServer1(extraProps, javaProps, authenticator,
+ locPort1, locString);
Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps,
javaProps )));
@@ -288,8 +286,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testNoCredentials: For first client credentials: " + credentials1
+ " : " + javaProps1);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -335,8 +333,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Integer locPort1 = SecurityTestUtil.getLocatorPort();
Integer locPort2 = SecurityTestUtil.getLocatorPort();
String locString = SecurityTestUtil.getLocatorString();
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
- javaProps )));
+ Integer port1 = createServer1(extraProps, javaProps, authenticator,
+ locPort1, locString);
Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps,
javaProps )));
@@ -346,8 +344,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testInvalidCredentials: For first client credentials: "
+ credentials1 + " : " + javaProps1);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -383,8 +381,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start the server
Integer locPort1 = SecurityTestUtil.getLocatorPort();
String locString = SecurityTestUtil.getLocatorString();
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
- javaProps )));
+ Integer port1 = createServer1(extraProps, javaProps, authenticator,
+ locPort1, locString);
Properties credentials = gen.getValidCredentials(1);
javaProps = gen.getJavaProperties();
@@ -397,6 +395,13 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Integer.valueOf(SecurityTestUtil.AUTHREQ_EXCEPTION) });
}
+ protected Integer createServer1(Properties extraProps, Properties javaProps,
+ String authenticator, Integer locPort1, String locString) {
+ Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
+ javaProps )));
+ return port1;
+ }
+
public void testNoAuthInitWithCredentials() {
itestNoAuthInitWithCredentials(Boolean.FALSE);
}
@@ -419,8 +424,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Integer locPort1 = SecurityTestUtil.getLocatorPort();
Integer locPort2 = SecurityTestUtil.getLocatorPort();
String locString = SecurityTestUtil.getLocatorString();
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
- javaProps )));
+ Integer port1 = createServer1(extraProps, javaProps, authenticator,
+ locPort1, locString);
Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps,
javaProps )));
@@ -443,9 +448,9 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Now also try with invalid credentials
- credentials2 = gen.getInvalidCredentials(5);
- javaProps2 = gen.getJavaProperties();
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2, port1, port2, null,
+ Properties credentials3 = gen.getInvalidCredentials(5);
+ Properties javaProps3 = gen.getJavaProperties();
+ client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials3, javaProps3, port1, port2, null,
multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
}
@@ -472,23 +477,23 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
extraProps, javaProps ));
// Trying to create the region on client should throw a security exception
- Properties credentials = gen.getValidCredentials(1);
- javaProps = gen.getJavaProperties();
+ Properties credentials2 = gen.getValidCredentials(1);
+ Properties javaProps2 = gen.getJavaProperties();
LogWriterUtils.getLogWriter().info(
"testInvalidAuthenticator: For first client credentials: "
- + credentials + " : " + javaProps);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials, javaProps, port1, null,
+ + credentials2 + " : " + javaProps2);
+ client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, null,
new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
client1.invoke(() -> SecurityTestUtil.closeCache());
// Also test with invalid credentials
- credentials = gen.getInvalidCredentials(1);
- javaProps = gen.getJavaProperties();
+ Properties credentials3 = gen.getInvalidCredentials(1);
+ Properties javaProps3 = gen.getJavaProperties();
LogWriterUtils.getLogWriter().info(
"testInvalidAuthenticator: For first client credentials: "
- + credentials + " : " + javaProps);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials, javaProps, port1, null,
+ + credentials3 + " : " + javaProps3);
+ client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials3, javaProps3, port1, null,
new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
}
@@ -529,10 +534,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testNoAuthenticatorWithCredentials: For second client credentials: "
+ credentials2 + " : " + javaProps2);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClientsNoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1, credentials2, javaProps2);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -581,10 +584,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: For second client credentials: "
+ credentials2 + " : " + javaProps2);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClientsNoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1, credentials2, javaProps2);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -620,12 +621,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Now try to connect client1 with invalid credentials
// Verify that the creation of region throws security exception
- credentials1 = gen.getInvalidCredentials(7);
- javaProps1 = gen.getJavaProperties();
+ Properties credentials3 = gen.getInvalidCredentials(7);
+ Properties javaProps3 = gen.getJavaProperties();
LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: For first client invalid credentials: "
- + credentials1 + " : " + javaProps1);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
+ + credentials3 + " : " + javaProps3);
+ client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials3, javaProps3, port1, port2,
null, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
if (multiUser) {
@@ -636,6 +637,15 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
}
}
+ protected void createClientsNoException(Boolean multiUser, String authInit,
+ Integer port1, Integer port2, Properties credentials1,
+ Properties javaProps1, Properties credentials2, Properties javaProps2) {
+ createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1);
+ client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
+ null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ }
+
public void testCredentialsForNotifications() {
itestCredentialsForNotifications(Boolean.FALSE);
}
@@ -677,12 +687,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: For second client credentials: "
+ credentials2 + " : " + javaProps2);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
- null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+ javaProps1);
// Set up zero forward connections to check notification handshake only
Object zeroConns = new Integer(0);
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
- zeroConns, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(multiUser, authInit, port1, port2, credentials2,
+ javaProps2, zeroConns);
// Register interest on all keys on second client
client2
@@ -733,8 +743,8 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: For second client invalid credentials: "
+ credentials2 + " : " + javaProps2);
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
- zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+ createClient2WithException(multiUser, authInit, port1, port2,
+ credentials2, javaProps2, zeroConns);
// Now try to connect client2 with invalid auth-init method
// Trying to create the region on client with valid credentials should
@@ -754,14 +764,10 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2,
"com.gemstone.gemfire.none", extraProps, javaProps ));
- // Trying to create the region on client with valid/invalid credentials
- // should throw a security exception
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1,
- javaProps1, port1, port2, zeroConns, multiUser,
- new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
- javaProps2, port1, port2, zeroConns, multiUser,
- new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+ createClient2WithException(multiUser, authInit, port1, port2,
+ credentials1, javaProps1, zeroConns);
+ createClient1WithException(multiUser, authInit, port1, port2,
+ credentials2, javaProps2, zeroConns);
}
else {
LogWriterUtils.getLogWriter().info(
@@ -780,14 +786,11 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials1, javaProps1,
port1, port2, null, multiUser,
new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2,
- port1, port2, zeroConns, multiUser,
- new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
+ createClient2AuthReqException(multiUser, port1, port2, credentials2,
+ javaProps2, zeroConns);
- // Now also try with invalid credentials on client2
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2,
- port1, port2, zeroConns, multiUser,
- new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
+ createClient2AuthReqException(multiUser, port1, port2, credentials2,
+ javaProps2, zeroConns);
}
else {
LogWriterUtils.getLogWriter().info(
@@ -804,12 +807,10 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
null, extraProps, javaProps ));
server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2,
null, extraProps, javaProps ));
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1,
- javaProps1, port1, port2, null, multiUser,
- new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
- javaProps2, port1, port2, zeroConns, multiUser,
- new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(multiUser, authInit, port1, port2,
+ credentials1, javaProps1);
+ createClient2NoException(multiUser, authInit, port1, port2,
+ credentials2, javaProps2, zeroConns);
// Register interest on all keys on second client
client2.invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest());
@@ -821,12 +822,10 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
client2.invoke(() -> SecurityTestUtil.doLocalGets( new Integer(4) ));
// Now also try with valid credentials on client2
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
- javaProps2, port1, port2, null, multiUser,
- new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1,
- javaProps1, port1, port2, zeroConns, multiUser,
- new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(multiUser, authInit, port1, port2,
+ credentials2, javaProps2);
+ createClient2NoException(multiUser, authInit, port1, port2,
+ credentials1, javaProps1, zeroConns);
// Register interest on all keys on second client
client2.invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest());
@@ -844,6 +843,44 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
}
}
+ protected void createClient1NoException(Boolean multiUser, String authInit,
+ Integer port1, Integer port2, Properties credentials2,
+ Properties javaProps2) {
+ client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
+ javaProps2, port1, port2, null, multiUser,
+ new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ }
+
+ protected void createClient2AuthReqException(Boolean multiUser, Integer port1,
+ Integer port2, Properties credentials2, Properties javaProps2,
+ Object zeroConns) {
+ client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2,
+ port1, port2, zeroConns, multiUser,
+ new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
+ }
+
+ protected void createClient1WithException(Boolean multiUser, String authInit,
+ Integer port1, Integer port2, Properties credentials2,
+ Properties javaProps2, Object zeroConns) {
+ client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
+ javaProps2, port1, port2, zeroConns, multiUser,
+ new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+ }
+
+ protected void createClient2WithException(Boolean multiUser, String authInit,
+ Integer port1, Integer port2, Properties credentials2,
+ Properties javaProps2, Object zeroConns) {
+ client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
+ zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+ }
+
+ protected void createClient2NoException(Boolean multiUser, String authInit,
+ Integer port1, Integer port2, Properties credentials2,
+ Properties javaProps2, Object zeroConns) {
+ client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
+ zeroConns, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ }
+
//////////////////////////////////////////////////////////////////////////////
// Tests for MULTI_USER_MODE start here
//////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/493d41b3/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index fe2a62d..0cbc1aa 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -217,10 +217,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
// Start servers with all required properties
Properties serverProps = buildProperties(authenticator, accessor, false,
extraAuthProps, extraAuthzProps);
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
- Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+ Integer port1 = createServer1(javaProps, serverProps);
+ Integer port2 = createServer2(javaProps, serverProps);
// Start client1 with valid CREATE credentials
Properties createCredentials = gen.getAllowedCredentials(
@@ -230,8 +228,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
LogWriterUtils.getLogWriter().info(
"testAllowPutsGets: For first client credentials: "
+ createCredentials);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(javaProps, authInit, port1, port2,
+ createCredentials);
// Start client2 with valid GET credentials
Properties getCredentials = gen.getAllowedCredentials(
@@ -242,8 +240,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
.info(
"testAllowPutsGets: For second client credentials: "
+ getCredentials);
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(javaProps, authInit, port1, port2,
+ getCredentials);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -254,6 +252,32 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) ));
}
+ protected void createClient2NoException(Properties javaProps, String authInit,
+ Integer port1, Integer port2, Properties getCredentials) {
+ client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2,
+ null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ }
+
+ protected void createClient1NoException(Properties javaProps, String authInit,
+ Integer port1, Integer port2, Properties createCredentials) {
+ client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2,
+ null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ }
+
+ protected Integer createServer2(Properties javaProps,
+ Properties serverProps) {
+ Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+ SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+ return port2;
+ }
+
+ protected Integer createServer1(Properties javaProps,
+ Properties serverProps) {
+ Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+ SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+ return port1;
+ }
+
public void testDisallowPutsGets() {
AuthzCredentialGenerator gen = getXmlAuthzGenerator();
@@ -291,18 +315,14 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
// Start servers with all required properties
Properties serverProps = buildProperties(authenticator, accessor, false,
extraAuthProps, extraAuthzProps);
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
- Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+ Integer port1 = createServer1(javaProps, serverProps);
+ Integer port2 = createServer2(javaProps, serverProps);
- // Start client1 with valid CREATE credentials
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1,
- port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(createJavaProps, authInit, port1, port2,
+ createCredentials);
- // Start client2 with invalid GET credentials
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(getJavaProps, authInit, port1, port2,
+ getCredentials);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -320,8 +340,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
LogWriterUtils.getLogWriter().info(
"testDisallowPutsGets: For second client with GET credentials: "
+ getCredentials);
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(getJavaProps, authInit, port1, port2,
+ getCredentials);
// Verify that the gets succeed
client2.invoke(() -> SecurityTestUtil.doGets(
@@ -349,8 +369,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
// Start server1 with invalid accessor
Properties serverProps = buildProperties(authenticator,
"com.gemstone.none", false, extraAuthProps, extraAuthzProps);
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+ Integer port1 = createServer1(javaProps, serverProps);
Integer port2 = new Integer(AvailablePort
.getRandomAvailablePort(AvailablePort.SOCKET));
@@ -384,15 +403,13 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
LogWriterUtils.getLogWriter().info("testInvalidAccessor: Using accessor: " + accessor);
serverProps = buildProperties(authenticator, accessor, false,
extraAuthProps, extraAuthzProps);
- server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps,
- javaProps ));
+ createServer2(javaProps, serverProps, port2);
server1.invoke(() -> SecurityTestUtil.closeCache());
- // Client creation should be successful now
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1,
- port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(createJavaProps, authInit, port1, port2,
+ createCredentials);
+ createClient2NoException(getJavaProps, authInit, port1, port2,
+ getCredentials);
// Now perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -403,6 +420,12 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) ));
}
+ protected void createServer2(Properties javaProps, Properties serverProps,
+ Integer port2) {
+ server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps,
+ javaProps ));
+ }
+
public void testPutsGetsWithFailover() {
AuthzCredentialGenerator gen = getXmlAuthzGenerator();
CredentialGenerator cGen = gen.getCredentialGenerator();
@@ -423,8 +446,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
// Start servers with all required properties
Properties serverProps = buildProperties(authenticator, accessor, false,
extraAuthProps, extraAuthzProps);
- Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+ Integer port1 = createServer1(javaProps, serverProps);
// Get a port for second server but do not start it
// This forces the clients to connect to the first server
Integer port2 = new Integer(AvailablePort
@@ -438,8 +460,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
LogWriterUtils.getLogWriter().info(
"testPutsGetsWithFailover: For first client credentials: "
+ createCredentials);
- client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1,
- port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient1NoException(createJavaProps, authInit, port1, port2,
+ createCredentials);
// Start client2 with valid GET credentials
Properties getCredentials = gen.getAllowedCredentials(
@@ -449,8 +471,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
LogWriterUtils.getLogWriter().info(
"testPutsGetsWithFailover: For second client credentials: "
+ getCredentials);
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(getJavaProps, authInit, port1, port2,
+ getCredentials);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -459,9 +481,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
client2.invoke(() -> SecurityTestUtil.doGets(
new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) ));
- // start the second one and stop the first server to force a failover
- server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps,
- javaProps ));
+ createServer2(javaProps, serverProps, port2);
server1.invoke(() -> SecurityTestUtil.closeCache());
// Perform some put operations from client1
@@ -481,9 +501,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
"testPutsGetsWithFailover: For second client disallowed GET credentials: "
+ noGetCredentials);
- // Re-connect client2 with invalid GET credentials
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, noGetCredentials, getJavaProps, port1,
- port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(getJavaProps, authInit, port1, port2,
+ noGetCredentials);
// Perform some put operations from client1
client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -504,9 +523,8 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
client2.invoke(() -> SecurityTestUtil.doNGets(
new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) ));
- // Try to connect client2 with reader credentials
- client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
- null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+ createClient2NoException(getJavaProps, authInit, port1, port2,
+ getCredentials);
// Verify that the gets succeed
client2.invoke(() -> SecurityTestUtil.doNGets(
@@ -632,10 +650,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
executeRIOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
extraAuthzProps, javaProps);
if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
- // Failover to the second server and run the block again
- server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- SecurityTestUtil.getLocatorPort(), port2, serverProps,
- javaProps ));
+ createServer2(javaProps, serverProps, port2);
server1.invoke(() -> SecurityTestUtil.closeCache());
executeRIOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
extraAuthzProps, javaProps);