From f8a69b681aa852848c0b720481f45de8ca934f78 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 27 Jan 2012 11:33:42 +0000 Subject: NO-JIRA : [Java] Tidy up import statements across the codebase, remove unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236638 13f79535-47bb-0310-9956-ffa450edef68 --- .../management/common/JMXConnnectionFactory.java | 21 ++++++++++----------- .../common/mbeans/ConfigurationManagement.java | 4 ++-- .../management/common/mbeans/LoggingManagement.java | 9 ++++----- .../management/common/mbeans/ManagedBroker.java | 13 ++++++------- .../management/common/mbeans/ManagedConnection.java | 15 +++++++-------- .../management/common/mbeans/ManagedExchange.java | 15 +++++++-------- .../qpid/management/common/mbeans/ManagedQueue.java | 15 +++++++++------ .../management/common/mbeans/ServerInformation.java | 7 +++---- .../management/common/mbeans/UserManagement.java | 9 ++++----- .../common/mbeans/annotations/MBeanOperation.java | 3 +-- .../common/sasl/CRAMMD5HashedSaslClientFactory.java | 3 +-- .../management/common/sasl/ClientSaslFactory.java | 3 +-- .../qpid/management/common/sasl/JCAProvider.java | 3 +-- .../management/common/sasl/PlainSaslClient.java | 13 ++++++++++--- .../common/sasl/UserPasswordCallbackHandler.java | 8 ++++++-- .../sasl/UsernameHashedPasswordCallbackHandler.java | 9 ++++----- .../management/common/mbeans/ManagedQueueTest.java | 11 +++++------ 17 files changed, 81 insertions(+), 80 deletions(-) (limited to 'qpid/java/management/common/src') diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java index 40202c2679..25267cc888 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java @@ -21,10 +21,12 @@ package org.apache.qpid.management.common; -import java.io.IOException; -import java.security.Security; -import java.util.HashMap; -import java.util.Map; +import org.apache.qpid.management.common.sasl.CRAMMD5HashedSaslClientFactory; +import org.apache.qpid.management.common.sasl.Constants; +import org.apache.qpid.management.common.sasl.JCAProvider; +import org.apache.qpid.management.common.sasl.SaslProvider; +import org.apache.qpid.management.common.sasl.UserPasswordCallbackHandler; +import org.apache.qpid.management.common.sasl.UsernameHashedPasswordCallbackHandler; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; @@ -32,13 +34,10 @@ import javax.management.remote.JMXServiceURL; import javax.net.ssl.SSLException; import javax.security.auth.callback.CallbackHandler; import javax.security.sasl.SaslClientFactory; - -import org.apache.qpid.management.common.sasl.CRAMMD5HashedSaslClientFactory; -import org.apache.qpid.management.common.sasl.Constants; -import org.apache.qpid.management.common.sasl.JCAProvider; -import org.apache.qpid.management.common.sasl.SaslProvider; -import org.apache.qpid.management.common.sasl.UserPasswordCallbackHandler; -import org.apache.qpid.management.common.sasl.UsernameHashedPasswordCallbackHandler; +import java.io.IOException; +import java.security.Security; +import java.util.HashMap; +import java.util.Map; public class JMXConnnectionFactory { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java index a21a6713cc..4582dc4088 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java @@ -20,10 +20,10 @@ */ package org.apache.qpid.management.common.mbeans; -import javax.management.MBeanOperationInfo; - import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; +import javax.management.MBeanOperationInfo; + public interface ConfigurationManagement { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java index 6d15869f0c..ced943d01a 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java @@ -20,17 +20,16 @@ */ package org.apache.qpid.management.common.mbeans; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; import javax.management.MBeanOperationInfo; import javax.management.openmbean.TabularData; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * Interface for the LoggingManagement MBean diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java index b74342df1f..91f80b27c4 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java @@ -21,17 +21,16 @@ package org.apache.qpid.management.common.mbeans; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; import javax.management.JMException; import javax.management.MBeanException; import javax.management.MBeanOperationInfo; - -import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * The ManagedBroker is the management interface to expose management diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java index c2900a3533..bf74fa5b13 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java @@ -21,20 +21,19 @@ package org.apache.qpid.management.common.mbeans; +import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; + +import javax.management.JMException; +import javax.management.MBeanOperationInfo; +import javax.management.openmbean.TabularData; import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; -import javax.management.JMException; -import javax.management.MBeanOperationInfo; -import javax.management.openmbean.TabularData; - -import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; - /** * The management interface exposed to allow management of Connections. * diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java index 78a1eb964f..6c1ab3de8d 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java @@ -20,18 +20,17 @@ */ package org.apache.qpid.management.common.mbeans; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; import javax.management.JMException; import javax.management.MBeanOperationInfo; import javax.management.openmbean.TabularData; - -import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * The management interface exposed to allow management of an Exchange. diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java index c23a0f5076..254ec01519 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java @@ -20,17 +20,20 @@ */ package org.apache.qpid.management.common.mbeans; -import java.io.IOException; -import java.util.*; +import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; +import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; import javax.management.JMException; import javax.management.MBeanOperationInfo; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; - -import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; -import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; /** * The management interface exposed to allow management of a queue. diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java index 9d40edd8d0..38b89b58c5 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java @@ -20,13 +20,12 @@ */ package org.apache.qpid.management.common.mbeans; -import java.io.IOException; - -import javax.management.MBeanOperationInfo; - import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute; import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; +import javax.management.MBeanOperationInfo; +import java.io.IOException; + /** * Interface for the ServerInformation MBean * diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java index 1a82c58ee9..540ae3ee6a 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java @@ -20,15 +20,14 @@ */ package org.apache.qpid.management.common.mbeans; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation; import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter; -import javax.management.openmbean.TabularData; import javax.management.MBeanOperationInfo; +import javax.management.openmbean.TabularData; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; public interface UserManagement { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java index c608f64817..99b7c283d8 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java @@ -21,14 +21,13 @@ package org.apache.qpid.management.common.mbeans.annotations; +import javax.management.MBeanOperationInfo; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.management.MBeanOperationInfo; - /** * Annotation for MBean operations. */ diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java index be4897d6c4..ec819ae65f 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java @@ -20,13 +20,12 @@ */ package org.apache.qpid.management.common.sasl; -import java.util.Map; - import javax.security.auth.callback.CallbackHandler; import javax.security.sasl.Sasl; import javax.security.sasl.SaslClient; import javax.security.sasl.SaslClientFactory; import javax.security.sasl.SaslException; +import java.util.Map; public class CRAMMD5HashedSaslClientFactory implements SaslClientFactory { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java index ee5803a220..263c2962ea 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java @@ -20,12 +20,11 @@ */ package org.apache.qpid.management.common.sasl; -import java.util.Map; - import javax.security.auth.callback.CallbackHandler; import javax.security.sasl.SaslClient; import javax.security.sasl.SaslClientFactory; import javax.security.sasl.SaslException; +import java.util.Map; public class ClientSaslFactory implements SaslClientFactory { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java index f5a3ca8ccc..cb2007dd50 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java @@ -20,11 +20,10 @@ */ package org.apache.qpid.management.common.sasl; +import javax.security.sasl.SaslClientFactory; import java.security.Provider; import java.util.Map; -import javax.security.sasl.SaslClientFactory; - public class JCAProvider extends Provider { private static final long serialVersionUID = 1L; diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java index 806975c32f..01af41c2c9 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java @@ -20,9 +20,16 @@ */ package org.apache.qpid.management.common.sasl; -import java.io.*; -import javax.security.auth.callback.*; -import javax.security.sasl.*; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.sasl.Sasl; +import javax.security.sasl.SaslClient; +import javax.security.sasl.SaslException; +import java.io.IOException; +import java.io.UnsupportedEncodingException; public class PlainSaslClient implements SaslClient { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java index a1634f86d9..caee5d481a 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java @@ -19,8 +19,12 @@ */ package org.apache.qpid.management.common.sasl; -import java.io.*; -import javax.security.auth.callback.*; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import java.io.IOException; public class UserPasswordCallbackHandler implements CallbackHandler { diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java index 09aba1f3e1..314ef70144 100644 --- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java +++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java @@ -20,16 +20,15 @@ */ package org.apache.qpid.management.common.sasl; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; public class UsernameHashedPasswordCallbackHandler implements CallbackHandler diff --git a/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java b/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java index c931b921df..042e666601 100644 --- a/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java +++ b/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java @@ -20,16 +20,15 @@ */ package org.apache.qpid.management.common.mbeans; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.List; +import junit.framework.TestCase; import javax.management.MBeanAttributeInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; - -import junit.framework.TestCase; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.List; public class ManagedQueueTest extends TestCase { -- cgit v1.2.1