Repository: oodt Updated Branches: refs/heads/master 5dd6c3197 -> afb8fdc4f
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/1f04b372 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/1f04b372 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/1f04b372 Branch: refs/heads/master Commit: 1f04b372d05d78a61f4559cead2b58ab5d4b54f1 Parents: 5dd6c31 Author: Tom Barber <[email protected]> Authored: Thu Oct 8 23:39:18 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Thu Oct 8 23:39:18 2015 +0100 ---------------------------------------------------------------------- .../action/GetSupportedCatalogIdsCliAction.java | 2 +- .../mapping/DataSourceIngestMapperFactory.java | 3 -- .../cas/catalog/query/parser/QueryParser.java | 18 ++++------ .../query/parser/QueryParserTokenManager.java | 11 ------ .../channel/CommunicationChannelServer.java | 20 +++++------ .../XmlRpcCommunicationChannelServer.java | 15 ++++---- .../oodt/cas/catalog/struct/QueryService.java | 1 - .../dictionary/WorkflowManagerDictionary.java | 14 +++----- .../apache/oodt/cas/catalog/system/Catalog.java | 28 +++++---------- .../system/impl/CatalogServiceLocal.java | 38 +++++++------------- 10 files changed, 49 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java index 450e657..a7ca08e 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java @@ -17,7 +17,7 @@ package org.apache.oodt.cas.catalog.cli.action; //OODT imports -import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient; +//import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient; import org.apache.oodt.cas.cli.exception.CmdLineActionException; /** http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java index 056e035..8203c93 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java @@ -19,9 +19,6 @@ package org.apache.oodt.cas.catalog.mapping; //Spring imports import org.springframework.beans.factory.annotation.Required; -//OODT imports -import org.apache.oodt.commons.database.DatabaseConnectionBuilder; - /** * @author bfoster * @version $Revision$ http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java index e9c0818..44c19be 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java @@ -1,17 +1,13 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParser.java */ package org.apache.oodt.cas.catalog.query.parser; - import java.io.ByteArrayInputStream; - import java.util.Arrays; - import java.util.HashSet; - import java.util.Vector; - import java.util.Properties; - import org.apache.oodt.cas.catalog.query.QueryExpression; - import org.apache.oodt.cas.catalog.query.QueryLogicalGroup; - import org.apache.oodt.cas.catalog.query.StdQueryExpression; - import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression; - import org.apache.oodt.cas.catalog.query.CustomQueryExpression; - import org.apache.oodt.cas.catalog.term.Term; + import org.apache.oodt.cas.catalog.query.*; +import org.apache.oodt.cas.catalog.term.Term; + +import java.io.ByteArrayInputStream; +import java.util.HashSet; +import java.util.Properties; +import java.util.Vector; public class QueryParser/*@bgen(jjtree)*/implements QueryParserTreeConstants, QueryParserConstants {/*@bgen(jjtree)*/ protected JJTQueryParserState jjtree = new JJTQueryParserState(); http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java index 52abf3c..1babab2 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java @@ -1,16 +1,5 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParserTokenManager.java */ package org.apache.oodt.cas.catalog.query.parser; -import java.io.ByteArrayInputStream; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Vector; -import java.util.Properties; -import org.apache.oodt.cas.catalog.query.QueryExpression; -import org.apache.oodt.cas.catalog.query.QueryLogicalGroup; -import org.apache.oodt.cas.catalog.query.StdQueryExpression; -import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression; -import org.apache.oodt.cas.catalog.query.CustomQueryExpression; -import org.apache.oodt.cas.catalog.term.Term; public class QueryParserTokenManager implements QueryParserConstants { http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java index a486a58..671a408 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java @@ -17,19 +17,8 @@ package org.apache.oodt.cas.catalog.server.channel; //JDK imports -import java.net.URL; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -//OODT imports -import org.apache.oodt.cas.catalog.exception.CatalogServiceException; import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata; -import org.apache.oodt.cas.catalog.page.CatalogReceipt; -import org.apache.oodt.cas.catalog.page.Page; -import org.apache.oodt.cas.catalog.page.PageInfo; -import org.apache.oodt.cas.catalog.page.QueryPager; -import org.apache.oodt.cas.catalog.page.TransactionReceipt; +import org.apache.oodt.cas.catalog.page.*; import org.apache.oodt.cas.catalog.query.QueryExpression; import org.apache.oodt.cas.catalog.struct.Dictionary; import org.apache.oodt.cas.catalog.struct.Index; @@ -39,6 +28,13 @@ import org.apache.oodt.cas.catalog.system.CatalogService; import org.apache.oodt.cas.catalog.util.PluginURL; import org.apache.oodt.cas.metadata.Metadata; +import java.net.URL; +import java.util.List; +import java.util.Properties; +import java.util.Set; + +//OODT imports + /** * @author bfoster * @version $Revision$ http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java index 07b2ca2..2e901ec 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java @@ -17,13 +17,6 @@ package org.apache.oodt.cas.catalog.server.channel.xmlrpc; //JDK imports -import java.io.File; -import java.io.FileOutputStream; -import java.util.List; -import java.util.Set; - -//OODT imports -import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata; import org.apache.oodt.cas.catalog.page.CatalogReceipt; import org.apache.oodt.cas.catalog.page.Page; import org.apache.oodt.cas.catalog.page.PageInfo; @@ -35,9 +28,15 @@ import org.apache.oodt.cas.catalog.struct.Index; import org.apache.oodt.cas.catalog.struct.TransactionId; import org.apache.oodt.cas.catalog.system.Catalog; import org.apache.oodt.cas.metadata.Metadata; +import org.apache.xmlrpc.WebServer; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; +import java.util.Set; + +//OODT imports //APACHE imports -import org.apache.xmlrpc.WebServer; /** * @author bfoster http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java index 31b729c..2fd5cf6 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java @@ -23,7 +23,6 @@ import java.util.Map; //OODT imports import org.apache.oodt.cas.catalog.exception.QueryServiceException; import org.apache.oodt.cas.catalog.page.IngestReceipt; -import org.apache.oodt.cas.catalog.page.TransactionReceipt; import org.apache.oodt.cas.catalog.query.QueryExpression; import org.apache.oodt.cas.catalog.term.TermBucket; http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java index 48649b3..1c59709 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java @@ -16,22 +16,18 @@ */ package org.apache.oodt.cas.catalog.struct.impl.dictionary; -//JDK imports -import java.util.Set; - //OODT imports import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException; -import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression; -import org.apache.oodt.cas.catalog.query.NotQueryExpression; -import org.apache.oodt.cas.catalog.query.QueryExpression; -import org.apache.oodt.cas.catalog.query.QueryLogicalGroup; -import org.apache.oodt.cas.catalog.query.StdQueryExpression; -import org.apache.oodt.cas.catalog.query.TermQueryExpression; +import org.apache.oodt.cas.catalog.query.*; import org.apache.oodt.cas.catalog.struct.Dictionary; import org.apache.oodt.cas.catalog.term.Term; import org.apache.oodt.cas.catalog.term.TermBucket; import org.apache.oodt.cas.metadata.Metadata; +//JDK imports +import java.util.Set; + + /** * * @author bfoster http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java index 4f5fc93..2708e01 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java @@ -16,36 +16,27 @@ */ package org.apache.oodt.cas.catalog.system; -//JDK imports -import java.lang.reflect.InvocationTargetException; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; - //OODT imports import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException; import org.apache.oodt.cas.catalog.exception.CatalogException; import org.apache.oodt.cas.catalog.exception.CatalogIndexException; -import org.apache.oodt.cas.catalog.exception.IngestServiceException; import org.apache.oodt.cas.catalog.page.CatalogReceipt; import org.apache.oodt.cas.catalog.page.IndexPager; import org.apache.oodt.cas.catalog.page.IngestReceipt; import org.apache.oodt.cas.catalog.query.QueryExpression; import org.apache.oodt.cas.catalog.struct.Dictionary; -import org.apache.oodt.cas.catalog.struct.Index; -import org.apache.oodt.cas.catalog.struct.IngestService; -import org.apache.oodt.cas.catalog.struct.QueryService; -import org.apache.oodt.cas.catalog.struct.TransactionId; -import org.apache.oodt.cas.catalog.struct.TransactionIdFactory; +import org.apache.oodt.cas.catalog.struct.*; import org.apache.oodt.cas.catalog.term.Term; import org.apache.oodt.cas.catalog.term.TermBucket; import org.apache.oodt.cas.metadata.Metadata; +//JDK imports +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; + + /** * @author bfoster * @version $Revision$ @@ -146,12 +137,11 @@ public class Catalog { /** * - * @param transactionId * @param metadata * @return TransactionId param if used by underlying catalog, otherwise * the TransactionId generated and used by underlying catalog. if no * TermBuckets where created from the Metadata then null is returned - * @throws IngestServiceException + * @throws CatalogException */ public CatalogReceipt ingest(Metadata metadata) throws CatalogException { try { http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java index dddb9b9..a880b09 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java @@ -16,38 +16,13 @@ */ package org.apache.oodt.cas.catalog.system.impl; -//JDK imports -import java.io.File; -import java.net.URL; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.Vector; -import java.util.Map.Entry; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.logging.Level; -import java.util.logging.Logger; - //OODT imports import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException; import org.apache.oodt.cas.catalog.exception.CatalogException; -import org.apache.oodt.cas.catalog.exception.CatalogIndexException; import org.apache.oodt.cas.catalog.exception.CatalogServiceException; import org.apache.oodt.cas.catalog.mapping.IngestMapper; import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata; -import org.apache.oodt.cas.catalog.page.CatalogReceipt; -import org.apache.oodt.cas.catalog.page.Page; -import org.apache.oodt.cas.catalog.page.PageInfo; -import org.apache.oodt.cas.catalog.page.ProcessedPageInfo; -import org.apache.oodt.cas.catalog.page.QueryPager; -import org.apache.oodt.cas.catalog.page.TransactionReceipt; +import org.apache.oodt.cas.catalog.page.*; import org.apache.oodt.cas.catalog.query.QueryExpression; import org.apache.oodt.cas.catalog.query.QueryLogicalGroup; import org.apache.oodt.cas.catalog.query.WrapperQueryExpression; @@ -62,6 +37,17 @@ import org.apache.oodt.cas.catalog.util.PluginURL; import org.apache.oodt.cas.catalog.util.QueryUtils; import org.apache.oodt.cas.metadata.Metadata; +//JDK imports +import java.io.File; +import java.net.URL; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.logging.Level; +import java.util.logging.Logger; + + /** * @author bfoster * @version $Revision$
