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 --- .../info/src/main/java/org/apache/qpid/info/Activator.java | 5 +++-- .../info/src/main/java/org/apache/qpid/info/SystemInfo.java | 2 +- .../src/main/java/org/apache/qpid/info/util/HttpPoster.java | 10 +++++----- .../test/java/org/apache/qpid/info/test/HttpPosterTest.java | 8 ++++---- .../java/org/apache/qpid/info/test/InfoServiceImplTest.java | 10 +++++----- .../src/test/java/org/apache/qpid/info/test/InfoServlet.java | 6 +++--- .../info/src/test/java/org/apache/qpid/info/test/InfoTest.java | 6 ++++-- .../test/java/org/apache/qpid/info/test/IniFileReaderTest.java | 1 + .../test/java/org/apache/qpid/info/test/SoapClientTest.java | 1 + .../test/java/org/apache/qpid/info/test/SystemInfoTest.java | 1 + .../src/test/java/org/apache/qpid/info/test/XMLWriterTest.java | 1 + 11 files changed, 29 insertions(+), 22 deletions(-) (limited to 'qpid/java/broker-plugins/experimental') diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java index 21e7be26c1..b3e3d1676e 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java @@ -21,11 +21,12 @@ package org.apache.qpid.info; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + import org.apache.qpid.info.util.HttpPoster; import org.apache.qpid.info.util.IniFileReader; import org.apache.qpid.info.util.SoapClient; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; import java.io.File; import java.util.Arrays; diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java index 8bd94fe14d..7c0eb61f1d 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java @@ -27,9 +27,9 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import java.util.TreeMap; -import java.util.Map.Entry; /** * Collector for system specific information diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java index d27980be05..3526e01374 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java @@ -21,11 +21,6 @@ package org.apache.qpid.info.util; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStreamWriter; @@ -33,6 +28,11 @@ import java.net.InetAddress; import java.net.URL; import java.net.URLConnection; import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; /** * diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java index 4f76fea8ef..0adb543fd4 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java @@ -20,13 +20,13 @@ */ package org.apache.qpid.info.test; -import java.util.List; -import java.util.Properties; +import junit.framework.TestCase; +import org.mortbay.jetty.testing.ServletTester; import org.apache.qpid.info.util.HttpPoster; -import org.mortbay.jetty.testing.ServletTester; -import junit.framework.TestCase; +import java.util.List; +import java.util.Properties; /* * This test verifies that the plugin posts correctly to a webserver diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java index 9f359582a5..0cd73d9de5 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java @@ -21,15 +21,15 @@ package org.apache.qpid.info.test; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import junit.framework.TestCase; import org.apache.qpid.info.Info; import org.apache.qpid.info.InfoServiceImpl; -import junit.framework.TestCase; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; /* * This test verifies the invoke() method for the info service making sure that the parameters are returned diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java index 6b12a2d80c..07fc371bad 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java @@ -21,13 +21,13 @@ package org.apache.qpid.info.test; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; import javax.servlet.GenericServlet; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; /* * This is a servlet used by the embedded Jetty to be able to receive http post diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java index bb4965ef1e..d154757058 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java @@ -21,11 +21,13 @@ package org.apache.qpid.info.test; -import java.util.HashMap; -import java.util.Properties; import junit.framework.TestCase; + import org.apache.qpid.info.Info; +import java.util.HashMap; +import java.util.Properties; + /* * This test verifies the toString(), toProps(), toXML() and toStringBuffer() methods of the Info object * diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java index 77ecaa2176..bae1d7bd2a 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java @@ -22,6 +22,7 @@ package org.apache.qpid.info.test; import junit.framework.TestCase; + import org.apache.qpid.info.util.IniFileReader; import java.io.BufferedWriter; diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java index a3d993a39f..ffb7a910b8 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java @@ -22,6 +22,7 @@ package org.apache.qpid.info.test; import junit.framework.TestCase; + import org.apache.qpid.info.util.SoapClient; import java.io.BufferedReader; diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java index 6cb8e3a90a..6f138f5605 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java @@ -22,6 +22,7 @@ package org.apache.qpid.info.test; import junit.framework.TestCase; + import org.apache.qpid.info.SystemInfo; import java.util.Arrays; diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java index f352226361..d23c16f60e 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java @@ -22,6 +22,7 @@ package org.apache.qpid.info.test; import junit.framework.TestCase; + import org.apache.qpid.info.util.XMLWriter; import java.util.HashMap; -- cgit v1.2.1