[3/4] curator git commit: CURATOR-356 Allow SASL configuration for TestingServer

2016-10-26 Thread cammckenzie 
CURATOR-356 Allow SASL configuration for TestingServer


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/dd20f1db
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/dd20f1db
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/dd20f1db

Branch: refs/heads/CURATOR-3.0
Commit: dd20f1dbed3879372483d7e8f7eb05d920707168
Parents: b51bb01
Author: eolivelli 
Authored: Wed Oct 26 13:43:21 2016 +0200
Committer: eolivelli 
Committed: Wed Oct 26 13:43:21 2016 +0200

--
 .../org/apache/curator/test/InstanceSpec.java   | 28 ++-
 .../curator/test/QuorumConfigBuilder.java   |  7 +++
 .../curator/test/TestQuorumConfigBuilder.java   | 49 
 3 files changed, 82 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/dd20f1db/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
--
diff --git 
a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java 
b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
index b39a949..32b1738 100644
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@ -25,6 +25,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -69,6 +71,7 @@ public class InstanceSpec
 private final int serverId;
 private final int tickTime;
 private final int maxClientCnxns;
+private final Map customProperties;
 
 public static InstanceSpec newInstanceSpec()
 {
@@ -113,7 +116,7 @@ public class InstanceSpec
  */
 public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId)
 {
-this(dataDirectory, port, electionPort, quorumPort, 
deleteDataDirectoryOnClose, serverId, -1, -1);
+this(dataDirectory, port, electionPort, quorumPort, 
deleteDataDirectoryOnClose, serverId, -1, -1, null);
 }
 
 /**
@@ -126,7 +129,22 @@ public class InstanceSpec
  * @param tickTime   tickTime. Set -1 to used fault server 
configuration
  * @param maxClientCnxns max number of client connections from 
the same IP. Set -1 to use default server configuration
  */
-public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int 
maxClientCnxns)
+public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int 
maxClientCnxns) {
+this(dataDirectory, port, electionPort, quorumPort, 
deleteDataDirectoryOnClose, serverId, tickTime, maxClientCnxns, null);
+}
+
+/**
+ * @param dataDirectory  where to store data/logs/etc.
+ * @param port   the port to listen on - each server 
in the ensemble must use a unique port
+ * @param electionPort   the electionPort to listen on - each 
server in the ensemble must use a unique electionPort
+ * @param quorumPort the quorumPort to listen on - each 
server in the ensemble must use a unique quorumPort
+ * @param deleteDataDirectoryOnClose if true, the data directory will be 
deleted when {@link TestingCluster#close()} is called
+ * @param serverId   the server ID for the instance
+ * @param tickTime   tickTime. Set -1 to used fault server 
configuration
+ * @param maxClientCnxns max number of client connections from 
the same IP. Set -1 to use default server configuration
+ * @param customProperties   other properties to be passed to the 
server
+ */
+public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int 
maxClientCnxns, Map customProperties)
 {
 this.dataDirectory = (dataDirectory != null) ? dataDirectory : 
Files.createTempDir();
 this.port = (port >= 0) ? port : getRandomPort();
@@ -136,6 +154,7 @@ public class InstanceSpec
 this.serverId = (serverId >= 0) ? serverId : 
nextServerId.getAndIncrement();
 this.tickTime = (tickTime > 0 ? tickTime : -1); // -1 to set default 
value
 this.maxClientCnxns = (maxClientCnxns >= 0 ? maxClientCnxns : -1); // 
-1 to set default value
+this.customProperties =

curator git commit: CURATOR-356 Allow SASL configuration for TestingServer

2016-10-26 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master b51bb0117 -> dd20f1dbe


CURATOR-356 Allow SASL configuration for TestingServer


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/dd20f1db
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/dd20f1db
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/dd20f1db

Branch: refs/heads/master
Commit: dd20f1dbed3879372483d7e8f7eb05d920707168
Parents: b51bb01
Author: eolivelli 
Authored: Wed Oct 26 13:43:21 2016 +0200
Committer: eolivelli 
Committed: Wed Oct 26 13:43:21 2016 +0200

--
 .../org/apache/curator/test/InstanceSpec.java   | 28 ++-
 .../curator/test/QuorumConfigBuilder.java   |  7 +++
 .../curator/test/TestQuorumConfigBuilder.java   | 49 
 3 files changed, 82 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/dd20f1db/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
--
diff --git 
a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java 
b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
index b39a949..32b1738 100644
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@ -25,6 +25,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -69,6 +71,7 @@ public class InstanceSpec
 private final int serverId;
 private final int tickTime;
 private final int maxClientCnxns;
+private final Map customProperties;
 
 public static InstanceSpec newInstanceSpec()
 {
@@ -113,7 +116,7 @@ public class InstanceSpec
  */
 public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId)
 {
-this(dataDirectory, port, electionPort, quorumPort, 
deleteDataDirectoryOnClose, serverId, -1, -1);
+this(dataDirectory, port, electionPort, quorumPort, 
deleteDataDirectoryOnClose, serverId, -1, -1, null);
 }
 
 /**
@@ -126,7 +129,22 @@ public class InstanceSpec
  * @param tickTime   tickTime. Set -1 to used fault server 
configuration
  * @param maxClientCnxns max number of client connections from 
the same IP. Set -1 to use default server configuration
  */
-public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int 
maxClientCnxns)
+public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int 
maxClientCnxns) {
+this(dataDirectory, port, electionPort, quorumPort, 
deleteDataDirectoryOnClose, serverId, tickTime, maxClientCnxns, null);
+}
+
+/**
+ * @param dataDirectory  where to store data/logs/etc.
+ * @param port   the port to listen on - each server 
in the ensemble must use a unique port
+ * @param electionPort   the electionPort to listen on - each 
server in the ensemble must use a unique electionPort
+ * @param quorumPort the quorumPort to listen on - each 
server in the ensemble must use a unique quorumPort
+ * @param deleteDataDirectoryOnClose if true, the data directory will be 
deleted when {@link TestingCluster#close()} is called
+ * @param serverId   the server ID for the instance
+ * @param tickTime   tickTime. Set -1 to used fault server 
configuration
+ * @param maxClientCnxns max number of client connections from 
the same IP. Set -1 to use default server configuration
+ * @param customProperties   other properties to be passed to the 
server
+ */
+public InstanceSpec(File dataDirectory, int port, int electionPort, int 
quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int 
maxClientCnxns, Map customProperties)
 {
 this.dataDirectory = (dataDirectory != null) ? dataDirectory : 
Files.createTempDir();
 this.port = (port >= 0) ? port : getRandomPort();
@@ -136,6 +154,7 @@ public class InstanceSpec
 this.serverId = (serverId >= 0) ? serverId : 
nextServerId.getAndIncrement();
 this.tickTime = (tickTime > 0 ? tickTime : -1); // -1 to set default 
value
 this.maxClientCnxns = (maxClientCnxns >= 0 ?