Checkstyle
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
index c81d988..e78b018 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
-import org.apache.storm.security.auth.SubjectCompat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -58,6 +57,7 @@
 import org.apache.storm.metrics2.StormMetricRegistry;
 import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.IAutoCredentials;
+import org.apache.storm.security.auth.SubjectCompat;
 import org.apache.storm.shade.com.google.common.base.Preconditions;
 import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.apache.storm.shade.org.apache.commons.lang3.ObjectUtils;
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
index f38759f..6fec202 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
@@ -14,7 +14,6 @@
 
 import java.io.IOException;
 import java.security.Principal;
-import org.apache.storm.security.auth.SubjectCompat;
 import java.util.Map;
 import java.util.TreeMap;
 import javax.security.auth.Subject;
@@ -27,6 +26,7 @@
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
 import org.apache.storm.security.auth.ClientAuthUtils;
+import org.apache.storm.security.auth.SubjectCompat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
index 0852d74..d3652e2 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
@@ -14,7 +14,6 @@
 
 import java.io.IOException;
 import java.security.Principal;
-import org.apache.storm.security.auth.SubjectCompat;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -31,6 +30,7 @@
 import javax.security.sasl.SaslServer;
 import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.KerberosPrincipalToLocal;
+import org.apache.storm.security.auth.SubjectCompat;
 import org.apache.storm.shade.org.apache.zookeeper.server.auth.KerberosName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index ab9c7bd..3956323 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -14,7 +14,6 @@
 
 import java.io.IOException;
 import java.security.Principal;
-import org.apache.storm.security.auth.SubjectCompat;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
@@ -28,6 +27,7 @@
 import org.apache.storm.generated.WorkerToken;
 import org.apache.storm.messaging.netty.Login;
 import org.apache.storm.security.auth.ClientAuthUtils;
+import org.apache.storm.security.auth.SubjectCompat;
 import org.apache.storm.security.auth.sasl.SaslTransportPlugin;
 import org.apache.storm.security.auth.sasl.SimpleSaslServerCallbackHandler;
 import org.apache.storm.security.auth.workertoken.WorkerTokenAuthorizer;
diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
index 3a06d52..2720da0 100644
--- a/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
+++ b/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.security.Principal;
-import org.apache.storm.security.auth.SubjectCompat;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;