You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/30 02:00:19 UTC
[5/7] incubator-geode git commit: Rename getter with side effect
Rename getter with side effect
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/31ca34d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/31ca34d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/31ca34d6
Branch: refs/heads/feature/GEODE-693
Commit: 31ca34d6ed5b40df38d2a6b8c633bf96f65bb31e
Parents: 310698c
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Mar 29 12:27:21 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Mar 29 12:27:21 2016 -0700
----------------------------------------------------------------------
.../security/ClientAuthenticationTestCase.java | 18 +++++++++---------
.../gemfire/security/SecurityTestUtils.java | 2 +-
.../gemfire/security/MultiuserAPIDUnitTest.java | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31ca34d6/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java
index ea3d941..191ea3e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java
@@ -87,7 +87,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the servers
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = server1.invoke(() -> createCacheServer(locPort1, locString, authenticator, extraProps, javaProps));
int port2 = server2.invoke(() -> createCacheServer(locPort2, locString, authenticator, extraProps, javaProps));
@@ -133,7 +133,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the servers
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = createServer1(extraProps, javaProps, authenticator, locPort1, locString);
int port2 = server2.invoke(() -> createCacheServer(locPort2, locString, authenticator, extraProps, javaProps));
@@ -176,7 +176,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the servers
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = createServer1(extraProps, javaProps, authenticator, locPort1, locString);
int port2 = server2.invoke(() -> createCacheServer(locPort2, locString, authenticator, extraProps, javaProps));
@@ -212,7 +212,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the server
int locPort1 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = createServer1(extraProps, javaProps, authenticator, locPort1, locString);
Properties credentials = gen.getValidCredentials(1);
@@ -233,7 +233,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the servers
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = createServer1(extraProps, javaProps, authenticator, locPort1, locString);
int port2 = server2.invoke(() -> createCacheServer(locPort2, locString, authenticator, extraProps, javaProps));
@@ -272,7 +272,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the server with invalid authenticator
int locPort1 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = server1.invoke(() -> createCacheServer(locPort1, locString, "com.gemstone.gemfire.none", extraProps, javaProps));
@@ -305,7 +305,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the servers with no authenticator
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = server1.invoke(() -> createCacheServer(locPort1, locString, null, extraProps, javaProps));
int port2 = server2.invoke(() -> createCacheServer(locPort2, locString, null, extraProps, javaProps));
@@ -343,7 +343,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the first server
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = server1.invoke(() -> createCacheServer(locPort1, locString, authenticator, extraProps, javaProps));
@@ -419,7 +419,7 @@ public abstract class ClientAuthenticationTestCase extends JUnit4DistributedTest
// Start the first server
int locPort1 = getLocatorPort();
int locPort2 = getLocatorPort();
- String locString = getLocatorString();
+ String locString = getAndClearLocatorString();
int port1 = server1.invoke(() -> createCacheServer(locPort1, locString, authenticator, extraProps, javaProps));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31ca34d6/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
index 4474279..ce53b02 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
@@ -180,7 +180,7 @@ public final class SecurityTestUtils {
* Note that this clears the string after returning for convenience in reusing
* for other tests. Hence it should normally be invoked only once for a test.
*/
- protected static String getLocatorString() { // TODO: rename
+ protected static String getAndClearLocatorString() {
String locString = locatorString;
locatorString = null;
return locString;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31ca34d6/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index bdff2c2..9e04f5f 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -272,7 +272,7 @@ public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase {
// Start the servers
int locPort1 = SecurityTestUtils.getLocatorPort();
int locPort2 = SecurityTestUtils.getLocatorPort();
- String locString = SecurityTestUtils.getLocatorString();
+ String locString = SecurityTestUtils.getAndClearLocatorString();
int port1 = server1.invoke(() -> createCacheServer(locPort1, locString, authenticator, extraProps, javaProps));
int port2 = server2.invoke(() -> createCacheServer(locPort2, locString, authenticator, extraProps, javaProps));