| commit | a323f0362417c9f62dd9d6d3ee6c513e78fa03cc | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Tue Feb 10 20:04:01 2015 -0500 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Tue Feb 10 20:04:01 2015 -0500 |
| tree | fbfefb0615d65912e969301fc07f80611a77e3df | |
| parent | 712504b2df712c9265dee3e4493858508148e32f [diff] |
ACCUMULO-3576 Use guava's preconditions, not jline's
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java index baae411..d8ebc4a 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java +++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
@@ -21,12 +21,12 @@ import java.util.LinkedHashSet; import java.util.Set; -import jline.internal.Preconditions; - import org.apache.accumulo.core.conf.CredentialProviderFactoryShim; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.hadoop.conf.Configuration; +import com.google.common.base.Preconditions; + /** * An {@link AuthenticationToken} backed by a Hadoop CredentialProvider. */
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java index 81fe540..3c3c051 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
@@ -23,13 +23,13 @@ import java.util.Collections; import java.util.List; -import jline.internal.Preconditions; - import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.hadoop.conf.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; + /** * Shim around Hadoop: tries to use the CredentialProviderFactory provided by hadoop-common, falling back to a copy inside accumulo-core. * <p>