Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/afce50d6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/afce50d6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/afce50d6 Branch: refs/heads/master Commit: afce50d65bf8e8b7b425600411d796f7ab84c7a3 Parents: 9eb93a1 7f62ec1 Author: Josh Elser <els...@apache.org> Authored: Mon Sep 15 21:03:01 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Sep 15 21:03:01 2014 -0400 ---------------------------------------------------------------------- .../core/client/ClientConfiguration.java | 33 ++++++++++---------- .../accumulo/test/functional/AbstractMacIT.java | 5 ++- .../test/functional/SslWithClientAuthIT.java | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/afce50d6/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java index 4ac9e40,b64fab4..8319a54 --- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java @@@ -223,28 -224,28 +224,28 @@@ public class ClientConfiguration extend /** * Same as {@link #with(ClientProperty, String)} for ClientProperty.INSTANCE_NAME - * + * */ public ClientConfiguration withInstance(String instanceName) { - ArgumentChecker.notNull(instanceName); + checkArgument(instanceName != null, "instanceName is null"); return with(ClientProperty.INSTANCE_NAME, instanceName); } /** * Same as {@link #with(ClientProperty, String)} for ClientProperty.INSTANCE_ID - * + * */ public ClientConfiguration withInstance(UUID instanceId) { - ArgumentChecker.notNull(instanceId); + checkArgument(instanceId != null, "instanceId is null"); return with(ClientProperty.INSTANCE_ID, instanceId.toString()); } /** * Same as {@link #with(ClientProperty, String)} for ClientProperty.INSTANCE_ZK_HOST - * + * */ public ClientConfiguration withZkHosts(String zooKeepers) { - ArgumentChecker.notNull(zooKeepers); + checkArgument(zooKeepers != null, "zooKeepers is null"); return with(ClientProperty.INSTANCE_ZK_HOST, zooKeepers); } @@@ -283,10 -284,10 +284,10 @@@ /** * Same as {@link #with(ClientProperty, String)} for ClientProperty.RPC_SSL_TRUSTORE_PATH, ClientProperty.RPC_SSL_TRUSTORE_PASSWORD, and * ClientProperty.RPC_SSL_TRUSTORE_TYPE - * + * */ public ClientConfiguration withTruststore(String path, String password, String type) { - ArgumentChecker.notNull(path); + checkArgument(path != null, "path is null"); setProperty(ClientProperty.RPC_SSL_TRUSTSTORE_PATH, path); if (password != null) setProperty(ClientProperty.RPC_SSL_TRUSTSTORE_PASSWORD, password); @@@ -306,10 -307,10 +307,10 @@@ /** * Same as {@link #with(ClientProperty, String)} for ClientProperty.INSTANCE_RPC_SSL_CLIENT_AUTH, ClientProperty.RPC_SSL_KEYSTORE_PATH, * ClientProperty.RPC_SSL_KEYSTORE_PASSWORD, and ClientProperty.RPC_SSL_KEYSTORE_TYPE - * + * */ public ClientConfiguration withKeystore(String path, String password, String type) { - ArgumentChecker.notNull(path); + checkArgument(path != null, "path is null"); setProperty(ClientProperty.INSTANCE_RPC_SSL_CLIENT_AUTH, "true"); setProperty(ClientProperty.RPC_SSL_KEYSTORE_PATH, path); if (password != null)
