remove use of shaded core packages

Elasticsearch core no longer uses shaded dependencies by default, so this change makes
the plugin use the unshaded dependencies.

Original commit: elastic/x-pack-elasticsearch@495f636266

pom.xml

@@ -112,11 +112,10 @@
             <version>1.0</version>
             <scope>test</scope>
         </dependency>
-
+        <!-- needed for tests that use templating -->
-        <!-- remove after es core bug fixed: https://github.com/elastic/elasticsearch/issues/11360 -->
         <dependency>
-            <groupId>net.java.dev.jna</groupId>
+            <groupId>com.github.spullara.mustache.java</groupId>
-            <artifactId>jna</artifactId>
+            <artifactId>compiler</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -127,6 +126,11 @@
             <version>${license.plugin.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>dk.brics.automaton</groupId>
             <artifactId>automaton</artifactId>

src/main/java/org/elasticsearch/shield/ShieldBuild.java

@@ -9,8 +9,8 @@ import org.elasticsearch.common.io.FastStringReader;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.joda.time.DateTimeZone;
+import org.joda.time.DateTimeZone;
-import org.elasticsearch.common.joda.time.format.ISODateTimeFormat;
+import org.joda.time.format.ISODateTimeFormat;
 
 import java.io.IOException;
 import java.util.Properties;

src/main/java/org/elasticsearch/shield/ShieldException.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.shield;
 
 import org.elasticsearch.ElasticsearchException;
-
 import org.elasticsearch.common.collect.Tuple;
 
 /**

src/main/java/org/elasticsearch/shield/ShieldModule.java

@@ -5,16 +5,16 @@
  */
 package org.elasticsearch.shield;
 
-import org.elasticsearch.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.action.ShieldActionModule;
 import org.elasticsearch.shield.audit.AuditTrailModule;
 import org.elasticsearch.shield.authc.AuthenticationModule;
 import org.elasticsearch.shield.authz.AuthorizationModule;
+import org.elasticsearch.shield.crypto.CryptoModule;
 import org.elasticsearch.shield.license.LicenseModule;
 import org.elasticsearch.shield.rest.ShieldRestModule;
-import org.elasticsearch.shield.crypto.CryptoModule;
 import org.elasticsearch.shield.ssl.SSLModule;
 import org.elasticsearch.shield.support.AbstractShieldModule;
 import org.elasticsearch.shield.transport.ShieldTransportModule;

src/main/java/org/elasticsearch/shield/ShieldPlugin.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.shield;
 
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.support.Headers;
 import org.elasticsearch.cluster.settings.ClusterDynamicSettingsModule;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.component.LifecycleComponent;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.settings.Settings;
@@ -19,8 +19,8 @@ import org.elasticsearch.shield.authc.Realms;
 import org.elasticsearch.shield.authc.support.SecuredString;
 import org.elasticsearch.shield.authc.support.UsernamePasswordToken;
 import org.elasticsearch.shield.authz.store.FileRolesStore;
-import org.elasticsearch.shield.license.LicenseService;
 import org.elasticsearch.shield.crypto.InternalCryptoService;
+import org.elasticsearch.shield.license.LicenseService;
 import org.elasticsearch.shield.transport.filter.IPFilter;
 
 import java.nio.file.Path;

src/main/java/org/elasticsearch/shield/action/ShieldActionFilter.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.shield.action;
 
+import com.google.common.base.Predicate;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
@@ -13,7 +14,6 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
 import org.elasticsearch.action.support.ActionFilter;
 import org.elasticsearch.action.support.ActionFilterChain;
-import org.elasticsearch.common.base.Predicate;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
@@ -24,10 +24,10 @@ import org.elasticsearch.shield.authc.AuthenticationService;
 import org.elasticsearch.shield.authz.AuthorizationException;
 import org.elasticsearch.shield.authz.AuthorizationService;
 import org.elasticsearch.shield.authz.Privilege;
+import org.elasticsearch.shield.crypto.CryptoService;
+import org.elasticsearch.shield.crypto.SignatureException;
 import org.elasticsearch.shield.license.LicenseEventsNotifier;
 import org.elasticsearch.shield.license.LicenseService;
-import org.elasticsearch.shield.crypto.SignatureException;
-import org.elasticsearch.shield.crypto.CryptoService;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/org/elasticsearch/shield/action/authc/cache/TransportClearRealmCacheAction.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.shield.action.authc.cache;
 
+import com.google.common.collect.Lists;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.nodes.TransportNodesAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
-import org.elasticsearch.common.collect.Lists;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.authc.Realm;

src/main/java/org/elasticsearch/shield/audit/AuditTrailModule.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.audit;
 
+import com.google.common.collect.Sets;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.collect.Sets;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.inject.PreProcessModule;
 import org.elasticsearch.common.inject.multibindings.Multibinder;

src/main/java/org/elasticsearch/shield/audit/index/IndexAuditTrail.java

@@ -32,8 +32,8 @@ import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.EnumSet;
 
-import static org.elasticsearch.shield.audit.AuditUtil.restRequestContent;
 import static org.elasticsearch.shield.audit.AuditUtil.indices;
+import static org.elasticsearch.shield.audit.AuditUtil.restRequestContent;
 
 /**
  * Audit trail implementation that writes events into an index.

src/main/java/org/elasticsearch/shield/audit/index/IndexAuditTrailBulkProcessor.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.shield.audit.index;
 
+import com.google.common.base.Splitter;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.bulk.BulkProcessor;
 import org.elasticsearch.action.bulk.BulkRequest;
@@ -12,7 +13,6 @@ import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.base.Splitter;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;

src/main/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrail.java

@@ -5,8 +5,6 @@
  */
 package org.elasticsearch.shield.audit.logfile;
 
-import org.elasticsearch.action.IndicesRequest;
-import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
@@ -14,7 +12,6 @@ import org.elasticsearch.common.network.NetworkUtils;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
-import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.shield.User;
 import org.elasticsearch.shield.audit.AuditTrail;
@@ -25,13 +22,12 @@ import org.elasticsearch.shield.transport.filter.ShieldIpFilterRule;
 import org.elasticsearch.transport.TransportMessage;
 import org.elasticsearch.transport.TransportRequest;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
-import static org.elasticsearch.shield.audit.AuditUtil.restRequestContent;
 import static org.elasticsearch.shield.audit.AuditUtil.indices;
+import static org.elasticsearch.shield.audit.AuditUtil.restRequestContent;
 
 /**
  *

src/main/java/org/elasticsearch/shield/authc/Realms.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.collect.Lists;
-import org.elasticsearch.common.collect.Sets;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/shield/authc/activedirectory/ActiveDirectoryGroupsResolver.java

@@ -5,22 +5,20 @@
  */
 package org.elasticsearch.shield.authc.activedirectory;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.*;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.shield.authc.ldap.support.LdapSession.GroupsResolver;
 import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
+import org.elasticsearch.shield.authc.ldap.support.LdapSession.GroupsResolver;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.elasticsearch.shield.authc.ldap.support.LdapUtils.OBJECT_CLASS_PRESENCE_FILTER;
+import static org.elasticsearch.shield.authc.ldap.support.LdapUtils.*;
-import static org.elasticsearch.shield.authc.ldap.support.LdapUtils.search;
-import static org.elasticsearch.shield.authc.ldap.support.LdapUtils.searchForEntry;
 
 /**
  *

src/main/java/org/elasticsearch/shield/authc/activedirectory/ActiveDirectorySessionFactory.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc.activedirectory;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.*;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.ShieldSettingsException;
 import org.elasticsearch.shield.ShieldSettingsFilter;

src/main/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStore.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc.esusers;
 
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableMap;
 import org.elasticsearch.common.inject.internal.Nullable;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStore.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.shield.authc.esusers;
 
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableMap;
 import org.elasticsearch.common.inject.internal.Nullable;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;
@@ -26,7 +26,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Pattern;

src/main/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersTool.java

@@ -5,14 +5,14 @@
  */
 package org.elasticsearch.shield.authc.esusers.tool;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.*;
+import org.apache.commons.cli.CommandLine;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.base.Joiner;
 import org.elasticsearch.common.cli.CheckFileCommand;
 import org.elasticsearch.common.cli.CliTool;
 import org.elasticsearch.common.cli.CliToolConfig;
 import org.elasticsearch.common.cli.Terminal;
-import org.elasticsearch.common.cli.commons.CommandLine;
-import org.elasticsearch.common.collect.*;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.shield.authc.Realms;

src/main/java/org/elasticsearch/shield/authc/ldap/LdapRealm.java

@@ -12,8 +12,8 @@ import org.elasticsearch.shield.ShieldSettingsException;
 import org.elasticsearch.shield.ShieldSettingsFilter;
 import org.elasticsearch.shield.authc.RealmConfig;
 import org.elasticsearch.shield.authc.ldap.support.AbstractLdapRealm;
-import org.elasticsearch.shield.authc.support.DnRoleMapper;
 import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
+import org.elasticsearch.shield.authc.support.DnRoleMapper;
 import org.elasticsearch.shield.ssl.ClientSSLService;
 import org.elasticsearch.watcher.ResourceWatcherService;
 

src/main/java/org/elasticsearch/shield/authc/ldap/LdapSessionFactory.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.shield.authc.ldap;
 
 import com.unboundid.ldap.sdk.*;
-
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.ShieldSettingsException;
 import org.elasticsearch.shield.authc.RealmConfig;
@@ -17,7 +16,6 @@ import org.elasticsearch.shield.authc.support.SecuredString;
 import org.elasticsearch.shield.ssl.ClientSSLService;
 
 import javax.net.SocketFactory;
-
 import java.text.MessageFormat;
 import java.util.Locale;
 

src/main/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactory.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc.ldap;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.*;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.shield.ShieldSettingsException;

src/main/java/org/elasticsearch/shield/authc/ldap/SearchGroupsResolver.java

@@ -5,15 +5,15 @@
  */
 package org.elasticsearch.shield.authc.ldap;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.*;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.shield.ShieldSettingsException;
-import org.elasticsearch.shield.authc.ldap.support.LdapSession.GroupsResolver;
 import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
+import org.elasticsearch.shield.authc.ldap.support.LdapSession.GroupsResolver;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/org/elasticsearch/shield/authc/ldap/UserAttributeGroupsResolver.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc.ldap;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.*;
 import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.shield.authc.ldap.support.LdapSession.GroupsResolver;

src/main/java/org/elasticsearch/shield/authc/ldap/support/LdapUtils.java

@@ -6,12 +6,10 @@
 package org.elasticsearch.shield.authc.ldap.support;
 
 import com.unboundid.ldap.sdk.*;
-
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.shield.authc.ldap.ShieldLdapException;
 
 import javax.naming.ldap.Rdn;
-
 import java.text.MessageFormat;
 import java.util.Locale;
 

src/main/java/org/elasticsearch/shield/authc/ldap/support/SessionFactory.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.shield.authc.ldap.support;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.LDAPConnectionOptions;
 import com.unboundid.ldap.sdk.LDAPException;
 import com.unboundid.ldap.sdk.LDAPURL;
 import com.unboundid.util.ssl.HostNameSSLSocketVerifier;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.shield.ShieldSettingsException;
@@ -20,9 +20,9 @@ import org.elasticsearch.shield.authc.support.SecuredString;
 
 import java.util.regex.Pattern;
 
+import static com.google.common.base.Predicates.contains;
+import static com.google.common.collect.Iterables.all;
 import static java.util.Arrays.asList;
-import static org.elasticsearch.common.base.Predicates.contains;
-import static org.elasticsearch.common.collect.Iterables.all;
 
 /**
  * This factory holds settings needed for authenticating to LDAP and creating LdapConnections.

src/main/java/org/elasticsearch/shield/authc/pki/PkiRealm.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.authc.pki;
 
-import org.elasticsearch.common.base.Strings;
+import com.google.common.base.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/shield/authc/support/CachingUsernamePasswordRealm.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.shield.authc.support;
 
-import org.elasticsearch.common.cache.Cache;
+import com.google.common.cache.Cache;
-import org.elasticsearch.common.cache.CacheBuilder;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.util.concurrent.UncheckedExecutionException;
 import org.elasticsearch.shield.User;
 import org.elasticsearch.shield.authc.AuthenticationException;
 import org.elasticsearch.shield.authc.RealmConfig;

src/main/java/org/elasticsearch/shield/authc/support/CharArrays.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.authc.support;
 
-import org.elasticsearch.common.base.Charsets;
+import com.google.common.base.Charsets;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

src/main/java/org/elasticsearch/shield/authc/support/DnRoleMapper.java

@@ -5,11 +5,11 @@
  */
 package org.elasticsearch.shield.authc.support;
 
+import com.google.common.collect.ImmutableMap;
 import com.unboundid.ldap.sdk.DN;
 import com.unboundid.ldap.sdk.LDAPException;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.collect.ImmutableMap;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;

src/main/java/org/elasticsearch/shield/authc/support/Hasher.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.authc.support;
 
+import com.google.common.base.Charsets;
 import org.elasticsearch.common.Base64;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.shield.ShieldException;
 import org.elasticsearch.shield.ShieldSettingsException;
 

src/main/java/org/elasticsearch/shield/authz/AuthorizationService.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.authz;
 
-import org.elasticsearch.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.shield.User;
 import org.elasticsearch.transport.TransportRequest;
 

src/main/java/org/elasticsearch/shield/authz/InternalAuthorizationService.java

@@ -5,6 +5,10 @@
  */
 package org.elasticsearch.shield.authz;
 
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
 import org.elasticsearch.action.CompositeIndicesRequest;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.admin.indices.alias.Alias;
@@ -13,10 +17,6 @@ import org.elasticsearch.action.search.ClearScrollAction;
 import org.elasticsearch.action.search.SearchScrollAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.common.base.Predicate;
-import org.elasticsearch.common.base.Predicates;
-import org.elasticsearch.common.collect.ImmutableList;
-import org.elasticsearch.common.collect.Sets;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/shield/authz/Permission.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.shield.authz;
 
-import org.elasticsearch.common.base.Predicate;
+import com.google.common.base.Predicate;
-import org.elasticsearch.common.cache.CacheBuilder;
+import com.google.common.cache.CacheBuilder;
-import org.elasticsearch.common.cache.CacheLoader;
+import com.google.common.cache.CacheLoader;
-import org.elasticsearch.common.cache.LoadingCache;
+import com.google.common.cache.LoadingCache;
-import org.elasticsearch.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
-import org.elasticsearch.common.collect.Iterators;
+import com.google.common.collect.Iterators;
-import org.elasticsearch.common.collect.UnmodifiableIterator;
+import com.google.common.collect.UnmodifiableIterator;
 import org.elasticsearch.shield.support.AutomatonPredicate;
 import org.elasticsearch.shield.support.Automatons;
 

src/main/java/org/elasticsearch/shield/authz/Privilege.java

@@ -5,10 +5,16 @@
  */
 package org.elasticsearch.shield.authz;
 
+import com.google.common.base.Predicate;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import dk.brics.automaton.Automaton;
 import dk.brics.automaton.BasicAutomata;
 import dk.brics.automaton.BasicOperations;
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.indices.create.CreateIndexAction;
 import org.elasticsearch.action.get.GetAction;
 import org.elasticsearch.action.get.MultiGetAction;
@@ -16,13 +22,6 @@ import org.elasticsearch.action.search.MultiSearchAction;
 import org.elasticsearch.action.search.SearchAction;
 import org.elasticsearch.action.suggest.SuggestAction;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.base.Predicate;
-import org.elasticsearch.common.cache.CacheBuilder;
-import org.elasticsearch.common.cache.CacheLoader;
-import org.elasticsearch.common.cache.LoadingCache;
-import org.elasticsearch.common.collect.ImmutableSet;
-import org.elasticsearch.common.collect.Sets;
-import org.elasticsearch.common.util.concurrent.UncheckedExecutionException;
 import org.elasticsearch.shield.ShieldException;
 import org.elasticsearch.shield.support.AutomatonPredicate;
 import org.elasticsearch.shield.support.Automatons;

src/main/java/org/elasticsearch/shield/authz/SystemRole.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.authz;
 
-import org.elasticsearch.common.base.Predicate;
+import com.google.common.base.Predicate;
 
 /**
  *

src/main/java/org/elasticsearch/shield/authz/indicesresolver/DefaultIndicesResolver.java

@@ -5,16 +5,16 @@
  */
 package org.elasticsearch.shield.authz.indicesresolver;
 
+import com.carrotsearch.hppc.ObjectLookupContainer;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.elasticsearch.action.AliasesRequest;
 import org.elasticsearch.action.CompositeIndicesRequest;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.common.collect.ImmutableList;
-import org.elasticsearch.common.collect.Lists;
-import org.elasticsearch.common.collect.Sets;
-import org.elasticsearch.common.hppc.ObjectLookupContainer;
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.indices.IndexMissingException;

src/main/java/org/elasticsearch/shield/authz/store/FileRolesStore.java

@@ -5,15 +5,14 @@
  */
 package org.elasticsearch.shield.authz.store;
 
+import com.fasterxml.jackson.dataformat.yaml.snakeyaml.error.YAMLException;
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableMap;
-import org.elasticsearch.common.collect.ImmutableSet;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.io.PathUtils;
-import org.elasticsearch.common.jackson.dataformat.yaml.snakeyaml.error.YAMLException;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;

src/main/java/org/elasticsearch/shield/client/ShieldClient.java

@@ -5,8 +5,6 @@
  */
 package org.elasticsearch.shield.client;
 
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
 
 /**

src/main/java/org/elasticsearch/shield/crypto/InternalCryptoService.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.crypto;
 
+import com.google.common.base.Charsets;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Base64;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/shield/crypto/tool/SystemKeyTool.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.shield.crypto.tool;
 
+import com.google.common.collect.Sets;
+import org.apache.commons.cli.CommandLine;
 import org.elasticsearch.common.cli.CheckFileCommand;
 import org.elasticsearch.common.cli.CliTool;
 import org.elasticsearch.common.cli.CliToolConfig;
 import org.elasticsearch.common.cli.Terminal;
-import org.elasticsearch.common.cli.commons.CommandLine;
-import org.elasticsearch.common.collect.Sets;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.shield.crypto.InternalCryptoService;

src/main/java/org/elasticsearch/shield/license/LicenseService.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.license;
 
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.joda.FormatDateTimeFormatter;

src/main/java/org/elasticsearch/shield/rest/ShieldRestFilter.java

@@ -8,7 +8,6 @@ package org.elasticsearch.shield.rest;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.http.netty.NettyHttpRequest;
 import org.elasticsearch.rest.*;
@@ -16,6 +15,7 @@ import org.elasticsearch.shield.authc.AuthenticationService;
 import org.elasticsearch.shield.authc.pki.PkiRealm;
 import org.elasticsearch.shield.transport.SSLClientAuth;
 import org.elasticsearch.shield.transport.netty.ShieldNettyHttpServerTransport;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 import java.security.cert.Certificate;

src/main/java/org/elasticsearch/shield/ssl/AbstractSSLService.java

@@ -5,26 +5,26 @@
  */
 package org.elasticsearch.shield.ssl;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.primitives.Ints;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.cache.CacheBuilder;
-import org.elasticsearch.common.cache.CacheLoader;
-import org.elasticsearch.common.cache.LoadingCache;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.util.concurrent.UncheckedExecutionException;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.shield.ShieldSettingsException;
 
 import javax.net.ssl.*;
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.nio.file.Files;
 import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/org/elasticsearch/shield/support/AutomatonPredicate.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.support;
 
-import dk.brics.automaton.RunAutomaton;
+import com.google.common.base.Predicate;
 import dk.brics.automaton.Automaton;
-import org.elasticsearch.common.base.Predicate;
+import dk.brics.automaton.RunAutomaton;
 
 /**
 *

src/main/java/org/elasticsearch/shield/support/Automatons.java

@@ -5,18 +5,19 @@
  */
 package org.elasticsearch.shield.support;
 
-import dk.brics.automaton.BasicAutomata;
+import com.google.common.collect.ImmutableList;
 import dk.brics.automaton.Automaton;
+import dk.brics.automaton.BasicAutomata;
 import dk.brics.automaton.BasicOperations;
 import dk.brics.automaton.RegExp;
-import org.elasticsearch.common.collect.ImmutableList;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import static dk.brics.automaton.BasicOperations.minus;
+import static dk.brics.automaton.BasicOperations.union;
 import static dk.brics.automaton.MinimizationOperations.minimize;
-import static dk.brics.automaton.BasicOperations.*;
 
 /**
  *

src/main/java/org/elasticsearch/shield/support/ShieldFiles.java

@@ -5,15 +5,13 @@
  */
 package org.elasticsearch.shield.support;
 
-import org.elasticsearch.common.base.Charsets;
+import com.google.common.base.Charsets;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.file.*;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFileAttributes;
-import java.nio.file.attribute.PosixFilePermission;
-import java.util.Set;
 
 public class ShieldFiles {
 

src/main/java/org/elasticsearch/shield/transport/SSLExceptionHelper.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.transport;
 
-import org.elasticsearch.common.netty.handler.ssl.NotSslRecordException;
+import org.jboss.netty.handler.ssl.NotSslRecordException;
 
 import javax.net.ssl.SSLException;
 

src/main/java/org/elasticsearch/shield/transport/ServerTransportFilter.java

@@ -6,11 +6,7 @@
 package org.elasticsearch.shield.transport;
 
 import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.netty.channel.Channel;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
-import org.elasticsearch.shield.ShieldException;
 import org.elasticsearch.shield.User;
 import org.elasticsearch.shield.action.ShieldActionMapper;
 import org.elasticsearch.shield.authc.AuthenticationException;
@@ -20,9 +16,10 @@ import org.elasticsearch.shield.authz.AuthorizationService;
 import org.elasticsearch.transport.TransportChannel;
 import org.elasticsearch.transport.TransportRequest;
 import org.elasticsearch.transport.netty.NettyTransportChannel;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSession;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 

src/main/java/org/elasticsearch/shield/transport/ShieldServerTransportService.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.transport;
 
+import com.google.common.collect.Maps;
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.common.collect.Maps;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.ShieldException;

src/main/java/org/elasticsearch/shield/transport/ShieldTransportModule.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.transport;
 
-import org.elasticsearch.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.inject.PreProcessModule;
 import org.elasticsearch.common.inject.util.Providers;

src/main/java/org/elasticsearch/shield/transport/filter/IPFilter.java

@@ -5,15 +5,15 @@
  */
 package org.elasticsearch.shield.transport.filter;
 
+import com.carrotsearch.hppc.ObjectObjectHashMap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.ObjectArrays;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.collect.HppcMaps;
-import org.elasticsearch.common.collect.ImmutableMap;
-import org.elasticsearch.common.collect.Maps;
-import org.elasticsearch.common.collect.ObjectArrays;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.component.Lifecycle;
 import org.elasticsearch.common.component.LifecycleListener;
-import org.elasticsearch.common.hppc.ObjectObjectHashMap;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.internal.Nullable;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/shield/transport/filter/ShieldIpFilterRule.java

@@ -5,11 +5,11 @@
  */
 package org.elasticsearch.shield.transport.filter;
 
-import org.elasticsearch.common.net.InetAddresses;
+import com.google.common.net.InetAddresses;
-import org.elasticsearch.common.netty.handler.ipfilter.IpFilterRule;
-import org.elasticsearch.common.netty.handler.ipfilter.IpSubnetFilterRule;
-import org.elasticsearch.common.netty.handler.ipfilter.PatternRule;
 import org.elasticsearch.shield.ShieldException;
+import org.jboss.netty.handler.ipfilter.IpFilterRule;
+import org.jboss.netty.handler.ipfilter.IpSubnetFilterRule;
+import org.jboss.netty.handler.ipfilter.PatternRule;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

src/main/java/org/elasticsearch/shield/transport/netty/HandshakeWaitingHandler.java

@@ -6,8 +6,8 @@
 package org.elasticsearch.shield.transport.netty;
 
 import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.netty.channel.*;
+import org.jboss.netty.channel.*;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 import java.util.LinkedList;
 import java.util.Queue;

src/main/java/org/elasticsearch/shield/transport/netty/IPFilterNettyUpstreamHandler.java

@@ -5,11 +5,11 @@
  */
 package org.elasticsearch.shield.transport.netty;
 
-import org.elasticsearch.common.netty.channel.ChannelEvent;
-import org.elasticsearch.common.netty.channel.ChannelHandler;
-import org.elasticsearch.common.netty.channel.ChannelHandlerContext;
-import org.elasticsearch.common.netty.handler.ipfilter.IpFilteringHandlerImpl;
 import org.elasticsearch.shield.transport.filter.IPFilter;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.ipfilter.IpFilteringHandlerImpl;
 
 import java.net.InetSocketAddress;
 

src/main/java/org/elasticsearch/shield/transport/netty/ShieldNettyHttpServerTransport.java

@@ -6,11 +6,6 @@
 package org.elasticsearch.shield.transport.netty;
 
 import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.netty.channel.ChannelHandlerContext;
-import org.elasticsearch.common.netty.channel.ChannelPipeline;
-import org.elasticsearch.common.netty.channel.ChannelPipelineFactory;
-import org.elasticsearch.common.netty.channel.ExceptionEvent;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.BigArrays;
@@ -18,10 +13,16 @@ import org.elasticsearch.http.netty.NettyHttpServerTransport;
 import org.elasticsearch.shield.ssl.ServerSSLService;
 import org.elasticsearch.shield.transport.SSLClientAuth;
 import org.elasticsearch.shield.transport.filter.IPFilter;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 import javax.net.ssl.SSLEngine;
 
-import static org.elasticsearch.shield.transport.SSLExceptionHelper.*;
+import static org.elasticsearch.shield.transport.SSLExceptionHelper.isCloseDuringHandshakeException;
+import static org.elasticsearch.shield.transport.SSLExceptionHelper.isNotSslRecordException;
 
 /**
  *

src/main/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransport.java

@@ -8,8 +8,6 @@ package org.elasticsearch.shield.transport.netty;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.internal.Nullable;
-import org.elasticsearch.common.netty.channel.*;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.BigArrays;
@@ -20,6 +18,8 @@ import org.elasticsearch.shield.transport.SSLClientAuth;
 import org.elasticsearch.shield.transport.filter.IPFilter;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.netty.NettyTransport;
+import org.jboss.netty.channel.*;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;

src/test/java/org/elasticsearch/integration/AbstractPrivilegeTests.java

@@ -8,7 +8,6 @@ package org.elasticsearch.integration;
 import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.collect.Maps;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.http.HttpServerTransport;
 import org.elasticsearch.shield.authc.support.Hasher;
 import org.elasticsearch.shield.authc.support.SecuredString;

src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.integration;
 
+import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
 import org.elasticsearch.cluster.metadata.SnapshotMetaData;
-import org.elasticsearch.common.collect.ImmutableMap;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.test.junit.annotations.TestLogging;

src/test/java/org/elasticsearch/integration/LicensingTests.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.integration;
 
+import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsIndices;
@@ -12,7 +13,6 @@ import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.collect.ImmutableSet;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.inject.Inject;

src/test/java/org/elasticsearch/integration/ScrollIdSigningTests.java

@@ -10,8 +10,8 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.shield.authz.AuthorizationException;
-import org.elasticsearch.shield.crypto.InternalCryptoService;
 import org.elasticsearch.shield.crypto.CryptoService;
+import org.elasticsearch.shield.crypto.InternalCryptoService;
 import org.elasticsearch.test.ShieldIntegrationTest;
 import org.junit.Test;
 

src/test/java/org/elasticsearch/integration/SettingsFilterTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.integration;
 
+import com.google.common.base.Charsets;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;

src/test/java/org/elasticsearch/integration/ShieldCachePermissionTests.java

@@ -21,7 +21,8 @@ import org.junit.Test;
 import java.util.Collections;
 
 import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 
 public class ShieldCachePermissionTests extends ShieldIntegrationTest {
 

src/test/java/org/elasticsearch/integration/ldap/AbstractAdLdapRealmTests.java

@@ -12,9 +12,9 @@ import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.authc.activedirectory.ActiveDirectoryRealm;
 import org.elasticsearch.shield.authc.ldap.LdapRealm;
+import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
 import org.elasticsearch.shield.authc.support.SecuredString;
 import org.elasticsearch.shield.authc.support.UsernamePasswordToken;
-import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
 import org.elasticsearch.shield.authz.AuthorizationException;
 import org.elasticsearch.shield.transport.netty.ShieldNettyTransport;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;

src/test/java/org/elasticsearch/shield/action/ShieldActionFilterTests.java

@@ -15,9 +15,9 @@ import org.elasticsearch.shield.audit.AuditTrail;
 import org.elasticsearch.shield.authc.AuthenticationService;
 import org.elasticsearch.shield.authz.AuthorizationException;
 import org.elasticsearch.shield.authz.AuthorizationService;
-import org.elasticsearch.shield.license.LicenseEventsNotifier;
-import org.elasticsearch.shield.crypto.SignatureException;
 import org.elasticsearch.shield.crypto.CryptoService;
+import org.elasticsearch.shield.crypto.SignatureException;
+import org.elasticsearch.shield.license.LicenseEventsNotifier;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/org/elasticsearch/shield/audit/index/IndexAuditTrailTests.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.shield.audit.index;
 
+import com.google.common.base.Predicate;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
 import org.elasticsearch.action.exists.ExistsResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.base.Predicate;
 import org.elasticsearch.common.inject.util.Providers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
@@ -30,7 +30,6 @@ import org.elasticsearch.test.ShieldIntegrationTest;
 import org.elasticsearch.transport.TransportInfo;
 import org.elasticsearch.transport.TransportMessage;
 import org.elasticsearch.transport.TransportRequest;
-
 import org.junit.After;
 import org.junit.Test;
 
@@ -38,9 +37,9 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Locale;
 
-import static org.elasticsearch.node.NodeBuilder.*;
+import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.*;
 import static org.elasticsearch.shield.audit.index.IndexNameResolver.Rollover.*;
+import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE;
 import static org.hamcrest.Matchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

src/test/java/org/elasticsearch/shield/authc/activedirectory/ActiveDirectoryGroupsResolverTests.java

@@ -5,16 +5,16 @@
  */
 package org.elasticsearch.shield.authc.activedirectory;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.Filter;
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPConnectionOptions;
 import com.unboundid.ldap.sdk.LDAPURL;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.env.Environment;
-import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
 import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
+import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
 import org.elasticsearch.shield.ssl.ClientSSLService;
 import org.elasticsearch.shield.support.NoOpLogger;
 import org.elasticsearch.test.ElasticsearchTestCase;

src/test/java/org/elasticsearch/shield/authc/activedirectory/ActiveDirectoryRealmTests.java

@@ -14,15 +14,13 @@ import com.unboundid.ldap.sdk.schema.Schema;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.User;
 import org.elasticsearch.shield.authc.RealmConfig;
-import org.elasticsearch.shield.authc.support.DnRoleMapper;
+import org.elasticsearch.shield.authc.support.*;
-import org.elasticsearch.shield.authc.support.CachingUsernamePasswordRealm;
-import org.elasticsearch.shield.authc.support.SecuredString;
-import org.elasticsearch.shield.authc.support.SecuredStringTests;
-import org.elasticsearch.shield.authc.support.UsernamePasswordToken;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.watcher.ResourceWatcherService;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.elasticsearch.shield.authc.ldap.support.SessionFactory.HOSTNAME_VERIFICATION_SETTING;
 import static org.elasticsearch.shield.authc.ldap.support.SessionFactory.URLS_SETTING;

src/test/java/org/elasticsearch/shield/authc/esusers/ESUsersRealmTests.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.shield.authc.esusers;
 
 import com.carrotsearch.randomizedtesting.annotations.Repeat;
+import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
@@ -15,7 +16,6 @@ import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.support.Headers;
-import org.elasticsearch.common.collect.ImmutableSet;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.rest.BaseRestHandler;

src/test/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStoreTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc.esusers;
 
-import org.elasticsearch.common.base.Charsets;
+import com.google.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
-import org.elasticsearch.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.settings.Settings;

src/test/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStoreTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authc.esusers;
 
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.settings.Settings;

src/test/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersToolTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.authc.esusers.tool;
 
+import com.google.common.base.Charsets;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.common.cli.CliTool;
 import org.elasticsearch.common.cli.CliToolTestCase;
 import org.elasticsearch.common.cli.Terminal;

src/test/java/org/elasticsearch/shield/authc/ldap/LdapRealmTests.java

@@ -10,13 +10,13 @@ import org.elasticsearch.rest.RestController;
 import org.elasticsearch.shield.ShieldSettingsException;
 import org.elasticsearch.shield.User;
 import org.elasticsearch.shield.authc.RealmConfig;
+import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
+import org.elasticsearch.shield.authc.ldap.support.LdapTest;
 import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
+import org.elasticsearch.shield.authc.support.DnRoleMapper;
 import org.elasticsearch.shield.authc.support.SecuredString;
 import org.elasticsearch.shield.authc.support.SecuredStringTests;
 import org.elasticsearch.shield.authc.support.UsernamePasswordToken;
-import org.elasticsearch.shield.authc.support.DnRoleMapper;
-import org.elasticsearch.shield.authc.ldap.support.LdapTest;
-import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.watcher.ResourceWatcherService;
 import org.junit.After;

src/test/java/org/elasticsearch/shield/authc/ldap/LdapSessionFactoryTests.java

@@ -7,12 +7,12 @@ package org.elasticsearch.shield.authc.ldap;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.authc.RealmConfig;
+import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
+import org.elasticsearch.shield.authc.ldap.support.LdapSession;
+import org.elasticsearch.shield.authc.ldap.support.LdapTest;
 import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
 import org.elasticsearch.shield.authc.support.SecuredString;
 import org.elasticsearch.shield.authc.support.SecuredStringTests;
-import org.elasticsearch.shield.authc.ldap.support.LdapSession;
-import org.elasticsearch.shield.authc.ldap.support.LdapTest;
-import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
 import org.elasticsearch.test.junit.annotations.Network;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.shield.authc.ldap;
 
 import com.unboundid.ldap.sdk.*;
-
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;

src/test/java/org/elasticsearch/shield/authc/ldap/SearchGroupsResolverTests.java

@@ -5,16 +5,16 @@
  */
 package org.elasticsearch.shield.authc.ldap;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPConnectionOptions;
 import com.unboundid.ldap.sdk.LDAPURL;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.shield.ShieldSettingsException;
-import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
 import org.elasticsearch.shield.authc.ldap.support.LdapSearchScope;
+import org.elasticsearch.shield.authc.ldap.support.SessionFactory;
 import org.elasticsearch.shield.ssl.ClientSSLService;
 import org.elasticsearch.shield.support.NoOpLogger;
 import org.elasticsearch.test.ElasticsearchTestCase;

src/test/java/org/elasticsearch/shield/authc/ldap/UserAttributeGroupsResolverTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.shield.authc.ldap;
 
+import com.google.common.primitives.Ints;
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPConnectionOptions;
 import com.unboundid.ldap.sdk.LDAPURL;
-import org.elasticsearch.common.primitives.Ints;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.env.Environment;

src/test/java/org/elasticsearch/shield/authc/ldap/support/LdapTest.java

@@ -6,7 +6,9 @@
 package org.elasticsearch.shield.authc.ldap.support;
 
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
-import com.unboundid.ldap.sdk.*;
+import com.unboundid.ldap.sdk.Attribute;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.LDAPURL;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.shield.authc.RealmConfig;
 import org.elasticsearch.shield.authc.ldap.LdapRealm;

src/test/java/org/elasticsearch/shield/authc/ldap/support/SessionFactoryTests.java

@@ -14,8 +14,8 @@ import org.elasticsearch.shield.authc.support.SecuredString;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
+import static org.hamcrest.Matchers.*;
 
 public class SessionFactoryTests extends ElasticsearchTestCase {
 

src/test/java/org/elasticsearch/shield/authc/pki/PkiAuthenticationTests.java

@@ -29,7 +29,6 @@ import org.junit.Test;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
-
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;

src/test/java/org/elasticsearch/shield/authc/pki/PkiWithoutSSLTests.java

@@ -20,7 +20,7 @@ import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
 import org.elasticsearch.test.rest.client.http.HttpResponse;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
 
 @ClusterScope(numClientNodes = 0, numDataNodes = 1)
 public class PkiWithoutSSLTests extends ShieldIntegrationTest {

src/test/java/org/elasticsearch/shield/authc/support/DnRoleMapperTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.shield.authc.support;
 
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.unboundid.ldap.sdk.DN;
-import org.elasticsearch.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableList;
-import org.elasticsearch.common.collect.ImmutableMap;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.shield.audit.logfile.CapturingLogger;

src/test/java/org/elasticsearch/shield/authc/support/SecuredStringTests.java

@@ -6,13 +6,10 @@
 package org.elasticsearch.shield.authc.support;
 
 import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.base.Charsets;
-
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.sameInstance;
 
 public class SecuredStringTests extends ElasticsearchTestCase {
     public static SecuredString build(String password){

src/test/java/org/elasticsearch/shield/authz/IndexAliasesTests.java

@@ -19,9 +19,7 @@ import org.junit.Test;
 import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.BASIC_AUTH_HEADER;
 import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
 
 public class IndexAliasesTests extends ShieldIntegrationTest {
 

src/test/java/org/elasticsearch/shield/authz/InternalAuthorizationServiceTests.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.shield.authz;
 
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesAction;
@@ -17,7 +18,6 @@ import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.search.action.SearchServiceTransportAction;
 import org.elasticsearch.shield.User;
@@ -30,12 +30,9 @@ import org.elasticsearch.transport.TransportRequest;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.*;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 public class InternalAuthorizationServiceTests extends ElasticsearchTestCase {
 

src/test/java/org/elasticsearch/shield/authz/PermissionTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authz;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.action.get.GetAction;
-import org.elasticsearch.common.base.Predicate;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/org/elasticsearch/shield/authz/PrivilegeTests.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.shield.authz;
 
+import com.google.common.base.Predicate;
 import org.elasticsearch.action.get.GetAction;
 import org.elasticsearch.action.get.MultiGetAction;
 import org.elasticsearch.action.search.MultiSearchAction;
 import org.elasticsearch.action.search.SearchAction;
 import org.elasticsearch.action.suggest.SuggestAction;
-import org.elasticsearch.common.base.Predicate;
 import org.elasticsearch.shield.ShieldException;
 import org.elasticsearch.shield.support.AutomatonPredicate;
 import org.elasticsearch.shield.support.Automatons;

src/test/java/org/elasticsearch/shield/authz/SystemRoleTests.java

@@ -8,7 +8,7 @@ package org.elasticsearch.shield.authz;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
 
 /**
  *

src/test/java/org/elasticsearch/shield/authz/indicesresolver/DefaultIndicesResolverTests.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.shield.authz.indicesresolver;
 
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesAction;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
@@ -24,7 +25,6 @@ import org.elasticsearch.cluster.metadata.AliasAction;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.shield.User;

src/test/java/org/elasticsearch/shield/authz/store/FileRolesStoreTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.shield.authz.store;
 
-import org.elasticsearch.common.base.Charsets;
+import com.google.common.base.Charsets;
-import org.elasticsearch.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
-import org.elasticsearch.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.shield.audit.logfile.CapturingLogger;

src/test/java/org/elasticsearch/shield/crypto/InternalCryptoServiceTests.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.shield.crypto;
 
-import org.elasticsearch.common.base.Charsets;
+import com.google.common.base.Charsets;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -16,17 +16,16 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.crypto.SecretKey;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import javax.crypto.SecretKey;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.notNullValue;
 
 /**
  *

src/test/java/org/elasticsearch/shield/rest/ShieldRestFilterTests.java

@@ -17,7 +17,7 @@ import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Mockito.*;
 
 /**

src/test/java/org/elasticsearch/shield/ssl/SSLSettingsTests.java

@@ -7,8 +7,8 @@ package org.elasticsearch.shield.ssl;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.test.ElasticsearchTestCase;
 import org.elasticsearch.shield.ssl.AbstractSSLService.SSLSettings;
+import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
 import javax.net.ssl.KeyManagerFactory;

src/test/java/org/elasticsearch/shield/support/AutomatonsTests.java

@@ -11,7 +11,7 @@ import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
 import static org.elasticsearch.shield.support.Automatons.*;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
 
 /**
  *

src/test/java/org/elasticsearch/shield/support/ShieldFilesTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.shield.support;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Sets;
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
@@ -23,9 +23,7 @@ import java.util.Set;
 
 import static java.nio.file.attribute.PosixFilePermission.*;
 import static org.elasticsearch.shield.support.ShieldFiles.openAtomicMoveWriter;
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 
 public class ShieldFilesTests extends ElasticsearchTestCase {
 

src/test/java/org/elasticsearch/shield/transport/TransportFilterTests.java

@@ -37,9 +37,7 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE;
 import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.eq;
 
 /**
  *

src/test/java/org/elasticsearch/shield/transport/filter/IPFilterTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.transport.filter;
 
+import com.google.common.net.InetAddresses;
 import org.elasticsearch.common.component.Lifecycle;
-import org.elasticsearch.common.net.InetAddresses;
 import org.elasticsearch.common.network.NetworkUtils;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.BoundTransportAddress;

src/test/java/org/elasticsearch/shield/transport/netty/HandshakeWaitingHandlerTests.java

@@ -6,14 +6,6 @@
 package org.elasticsearch.shield.transport.netty;
 
 import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.netty.bootstrap.ClientBootstrap;
-import org.elasticsearch.common.netty.bootstrap.ServerBootstrap;
-import org.elasticsearch.common.netty.buffer.ChannelBuffer;
-import org.elasticsearch.common.netty.buffer.ChannelBuffers;
-import org.elasticsearch.common.netty.channel.*;
-import org.elasticsearch.common.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.elasticsearch.common.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.env.Environment;
@@ -21,6 +13,14 @@ import org.elasticsearch.shield.ShieldException;
 import org.elasticsearch.shield.ShieldSettingsFilter;
 import org.elasticsearch.shield.ssl.ServerSSLService;
 import org.elasticsearch.test.ElasticsearchTestCase;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.*;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.handler.ssl.SslHandler;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/org/elasticsearch/shield/transport/netty/IPFilterNettyUpstreamHandlerTests.java

@@ -7,7 +7,6 @@ package org.elasticsearch.shield.transport.netty;
 
 import com.google.common.net.InetAddresses;
 import org.elasticsearch.common.component.Lifecycle;
-import org.elasticsearch.common.netty.channel.*;
 import org.elasticsearch.common.network.NetworkUtils;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.BoundTransportAddress;
@@ -18,6 +17,7 @@ import org.elasticsearch.shield.audit.AuditTrail;
 import org.elasticsearch.shield.transport.filter.IPFilter;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.elasticsearch.transport.Transport;
+import org.jboss.netty.channel.*;
 import org.junit.Before;
 import org.junit.Test;
 

src/test/java/org/elasticsearch/shield/transport/netty/ShieldNettyHttpServerTransportTests.java

@@ -6,8 +6,6 @@
 package org.elasticsearch.shield.transport.netty;
 
 import org.elasticsearch.common.netty.OpenChannelsHandler;
-import org.elasticsearch.common.netty.channel.ChannelPipelineFactory;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
@@ -19,6 +17,8 @@ import org.elasticsearch.shield.ssl.ServerSSLService;
 import org.elasticsearch.shield.transport.SSLClientAuth;
 import org.elasticsearch.shield.transport.filter.IPFilter;
 import org.elasticsearch.test.ElasticsearchTestCase;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.ssl.SslHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -27,8 +27,8 @@ import java.nio.file.Path;
 import java.util.Locale;
 
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
+import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.mock;
-import static org.hamcrest.Matchers.*;
 
 public class ShieldNettyHttpServerTransportTests extends ElasticsearchTestCase {
 

src/test/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransportTests.java

@@ -7,8 +7,6 @@ package org.elasticsearch.shield.transport.netty;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.common.netty.OpenChannelsHandler;
-import org.elasticsearch.common.netty.channel.ChannelPipelineFactory;
-import org.elasticsearch.common.netty.handler.ssl.SslHandler;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
@@ -21,6 +19,8 @@ import org.elasticsearch.shield.transport.SSLClientAuth;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.netty.NettyTransport;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.ssl.SslHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -29,8 +29,8 @@ import java.nio.file.Path;
 import java.util.Locale;
 
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
-import static org.mockito.Mockito.mock;
 import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.mock;
 
 public class ShieldNettyTransportTests extends ElasticsearchTestCase {
 

src/test/java/org/elasticsearch/shield/transport/ssl/SslIntegrationTests.java

@@ -31,7 +31,9 @@ import org.elasticsearch.test.ShieldSettingsSource;
 import org.elasticsearch.transport.Transport;
 import org.junit.Test;
 
-import javax.net.ssl.*;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.TrustManagerFactory;
 import java.io.InputStreamReader;
 import java.security.KeyStore;
 import java.security.SecureRandom;