OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/afb8fdc4 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/afb8fdc4 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/afb8fdc4 Branch: refs/heads/master Commit: afb8fdc4fe71105a37546dc43a118c61926f27af Parents: 9a2597e Author: Tom Barber <[email protected]> Authored: Fri Oct 9 16:35:17 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Oct 9 16:35:17 2015 +0100 ---------------------------------------------------------------------- .../xmlquery/ChunkedProductInputStream.java | 6 ++--- .../org/apache/oodt/xmlquery/LargeResult.java | 1 - .../oodt/profile/RangedProfileElement.java | 10 ++++---- .../handlers/DatabaseProfileManager.java | 26 +++++++++++--------- .../oodt/profile/handlers/ProfileHandler.java | 5 ++-- .../oodt/profile/handlers/ProfileManager.java | 7 +++--- .../lightweight/LightweightProfileServer.java | 23 ++++++----------- .../SearchableEnumeratedProfileElement.java | 2 -- .../lightweight/SearchableProfileElement.java | 1 - .../xmlps/queryparser/HandlerQueryParser.java | 11 ++++----- .../org/apache/oodt/xmlquery/Statistic.java | 12 ++++----- 11 files changed, 45 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java index 8988f8d..b5dceee 100644 --- a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java +++ b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java @@ -18,12 +18,12 @@ package org.apache.oodt.xmlquery; -import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; import org.apache.oodt.product.ProductException; import org.apache.oodt.product.Retriever; +import java.io.IOException; +import java.io.InputStream; + /** * Streamer for chunked products. * http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java b/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java index efc6102..e05414e 100644 --- a/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java +++ b/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java @@ -20,7 +20,6 @@ package org.apache.oodt.xmlquery; import java.util.List; import java.util.StringTokenizer; -import org.apache.oodt.product.Retriever; import java.io.InputStream; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java index 769826f..5c98743 100644 --- a/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java +++ b/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java @@ -18,15 +18,15 @@ package org.apache.oodt.profile; -import java.io.Serializable; -import java.util.Collections; -import java.util.List; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; import org.apache.oodt.commons.util.XML; import org.w3c.dom.DOMException; import org.w3c.dom.Node; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.Resource; + import java.net.URI; +import java.util.Collections; +import java.util.List; /** * Ranged profile element. http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java index 73eb294..af95a44 100755 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java @@ -15,17 +15,21 @@ package org.apache.oodt.profile.handlers; -import java.io.*; -import java.net.MalformedURLException; -import java.sql.*; -import java.util.*; -import org.apache.oodt.commons.Configuration; -import org.apache.oodt.commons.util.DOMParser; -import org.apache.oodt.commons.util.*; -import org.apache.oodt.xmlquery.*; -import org.w3c.dom.*; -import org.xml.sax.*; -import org.apache.oodt.profile.*; +import org.apache.oodt.commons.util.XML; +import org.apache.oodt.profile.Profile; +import org.apache.oodt.profile.ProfileException; +import org.apache.oodt.profile.ProfileSQLException; +import org.apache.oodt.xmlquery.XMLQuery; +import org.w3c.dom.DOMException; +import org.w3c.dom.Node; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; /********************************************************************************** ** http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java index f66ae3e..b7cf85a 100644 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java @@ -18,12 +18,11 @@ package org.apache.oodt.profile.handlers; -import java.util.Collection; -import java.util.List; import org.apache.oodt.profile.Profile; import org.apache.oodt.profile.ProfileException; import org.apache.oodt.xmlquery.XMLQuery; -import org.w3c.dom.Document; + +import java.util.List; /** * Interface of a profile handler. http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java index f7d17c8..c5aa987 100755 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java @@ -15,12 +15,11 @@ package org.apache.oodt.profile.handlers; -import java.util.Collection; -import java.util.Iterator; import org.apache.oodt.profile.Profile; import org.apache.oodt.profile.ProfileException; -import org.apache.oodt.xmlquery.XMLQuery; -import org.w3c.dom.Document; + +import java.util.Collection; +import java.util.Iterator; /** * Interface of a profile manager. http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java index 29977ea..947d67f 100644 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java @@ -18,25 +18,11 @@ package org.apache.oodt.profile.handlers.lightweight; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.Stack; -import org.apache.oodt.commons.Configuration; -import org.apache.oodt.commons.ExecServerConfig; +import org.apache.oodt.commons.util.DOMParser; +import org.apache.oodt.commons.util.XML; import org.apache.oodt.profile.Profile; import org.apache.oodt.profile.ProfileException; import org.apache.oodt.profile.handlers.ProfileHandler; -import org.apache.oodt.commons.util.DOMParser; -import org.apache.oodt.commons.util.XML; import org.apache.oodt.xmlquery.QueryElement; import org.apache.oodt.xmlquery.XMLQuery; import org.w3c.dom.Document; @@ -46,6 +32,11 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.*; + /** * A lightweight profile server. * http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java index 3f99bce..67168b0 100644 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java @@ -18,8 +18,6 @@ package org.apache.oodt.profile.handlers.lightweight; -import java.rmi.RemoteException; -import org.apache.oodt.xmlquery.XMLQuery; import org.apache.oodt.profile.EnumeratedProfileElement; import java.util.List; http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java index 39a8093..141de78 100644 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java @@ -18,7 +18,6 @@ package org.apache.oodt.profile.handlers.lightweight; -import org.apache.oodt.profile.ProfileElement; /** * A profile element that can be searched. http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java index a3a18fd..a49d429 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java @@ -20,17 +20,16 @@ package org.apache.oodt.xmlps.queryparser; //JDK imports import org.apache.oodt.xmlps.mapping.Mapping; import org.apache.oodt.xmlps.mapping.MappingField; +import org.apache.oodt.xmlquery.QueryElement; import java.util.List; import java.util.Stack; //OODT imports -import org.apache.oodt.xmlquery.QueryElement; -import org.apache.oodt.xmlquery.XMLQuery; /** * - * Parsers the {@link XMLQuery} and its @link XMLQuery#getWhereElementSet()} + * Parsers the {@link org.apache.oodt.xmlquery.XMLQuery} and its @link XMLQuery#getWhereElementSet()} * into an {@link Expression} tree. */ public class HandlerQueryParser implements ParseConstants { @@ -38,7 +37,7 @@ public class HandlerQueryParser implements ParseConstants { /** * Calls {@link #parse(Stack, Mapping)} with a null mapping. * - * @param queryStack The {@link XMLQuery#getWhereElementSet()}. + * @param queryStack The {@link org.apache.oodt.xmlquery.XMLQuery#getWhereElementSet()}. * @return The parsed {@link Expression} tree. */ public static Expression parse(Stack<QueryElement> queryStack) { @@ -47,10 +46,10 @@ public class HandlerQueryParser implements ParseConstants { /** * - * Parses the {@link XMLQuery#getWhereElementSet()} using the provided + * Parses the {@link org.apache.oodt.xmlquery.XMLQuery#getWhereElementSet()} using the provided * <param>map</param>. * - * @param queryStack The {@link XMLQuery#getWhereElementSet()} + * @param queryStack The {@link org.apache.oodt.xmlquery.XMLQuery#getWhereElementSet()} * @param map The provided ontological mapping. * @return The parsed {@link Expression} tree. */ http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java index c706ba2..409f6f6 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java @@ -21,13 +21,11 @@ package org.apache.oodt.xmlquery; -import java.io.*; -import java.util.*; -import org.apache.oodt.commons.Configuration; -import org.apache.oodt.commons.util.DOMParser; -import org.apache.oodt.commons.util.*; -import org.w3c.dom.*; -import org.xml.sax.*; +import org.apache.oodt.commons.util.XML; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * EDM Statisti class.
