OODT-904 remove redundant throws
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ed6be8c7 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ed6be8c7 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ed6be8c7 Branch: refs/heads/master Commit: ed6be8c7c9cf14d22c50d6639ef36c79f965ba8d Parents: 1781060 Author: Tom Barber <[email protected]> Authored: Sun Oct 25 15:44:55 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 15:44:55 2015 +0000 ---------------------------------------------------------------------- .../model/repo/XmlWorkflowModelRepository.java | 6 ++-- .../gui/perspective/build/BuildPerspective.java | 31 +++++++++--------- .../catalog/mapping/DataSourceIngestMapper.java | 2 +- .../conv/AsciiSortableVersionConverter.java | 2 +- .../filter/time/conv/VersionConverter.java | 2 +- .../catalog/repository/CatalogRepository.java | 2 +- .../MemoryBasedCatalogRepository.java | 9 ++---- .../repository/SerializedCatalogRepository.java | 6 ++-- .../repository/SpringCatalogRepository.java | 2 +- .../server/CatalogServiceServerLauncher.java | 2 +- .../channel/CommunicationChannelServer.java | 6 ++-- .../RmiCommunicationChannelClientInterface.java | 2 +- .../rmi/RmiCommunicationChannelServer.java | 8 ++--- .../XmlRpcCommunicationChannelServer.java | 2 +- .../oodt/cas/catalog/struct/Dictionary.java | 6 ++-- .../apache/oodt/cas/catalog/struct/Index.java | 8 ++--- .../dictionary/WorkflowManagerDictionary.java | 9 ++---- .../struct/impl/index/DataSourceIndex.java | 9 +++--- .../index/WorkflowManagerDataSourceIndex.java | 11 +++---- .../apache/oodt/cas/catalog/system/Catalog.java | 3 +- .../system/impl/CatalogServiceLocal.java | 3 +- .../system/impl/TestCatalogServiceLocal.java | 5 ++- .../cli/option/store/CmdLineOptionStore.java | 2 +- .../store/spring/SpringCmdLineOptionStore.java | 3 +- .../oodt/cas/cli/parser/CmdLineParser.java | 2 +- .../oodt/cas/cli/parser/StdCmdLineParser.java | 2 +- .../org/apache/oodt/commons/Initializer.java | 2 +- .../activity/XMLStandardOutputStorage.java | 34 ++++++++++---------- .../oodt/commons/activity/XMLStorage.java | 34 ++++++++++---------- .../apache/oodt/commons/database/SqlScript.java | 4 +-- .../org/apache/oodt/commons/date/DateUtils.java | 4 +-- .../oodt/commons/io/LoggerOutputStream.java | 2 +- .../org/apache/oodt/commons/util/DOMParser.java | 12 +++---- .../org/apache/oodt/commons/util/JDBC_DB.java | 6 ++-- .../org/apache/oodt/commons/util/SAXParser.java | 10 +++--- .../java/org/apache/oodt/commons/util/XML.java | 2 +- .../oodt/cas/crawl/action/ExternAction.java | 2 +- .../oodt/cas/crawl/action/FileBasedAction.java | 2 +- .../oodt/cas/crawl/action/IngestAncillary.java | 3 +- .../cas/curation/service/MetadataResource.java | 2 +- .../oodt/cas/filemgr/catalog/Catalog.java | 2 +- .../cas/filemgr/catalog/DataSourceCatalog.java | 2 +- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 2 +- .../cas/filemgr/catalog/ScienceDataCatalog.java | 2 +- .../cas/filemgr/catalog/solr/SolrCatalog.java | 2 +- .../datatransfer/RemoteDataTransferFactory.java | 2 +- .../oodt/cas/filemgr/ingest/Ingester.java | 2 +- .../oodt/cas/filemgr/ingest/StdIngester.java | 2 +- .../DataSourceRepositoryManagerFactory.java | 2 +- .../cas/filemgr/system/XmlRpcFileManager.java | 4 +-- .../cas/filemgr/system/auth/Dispatcher.java | 2 +- .../filemgr/system/auth/SecureWebServer.java | 2 +- .../filemgr/tools/OptimizeLuceneCatalog.java | 2 +- .../oodt/cas/filemgr/tools/SolrIndexer.java | 6 ++-- .../DataSourceValidationLayerFactory.java | 2 +- .../filemgr/validation/XMLValidationLayer.java | 9 ++---- .../oodt/cas/filemgr/catalog/MockCatalog.java | 2 +- .../apache/oodt/grid/ProductQueryServlet.java | 2 +- .../apache/oodt/grid/ProfileQueryServlet.java | 2 +- .../java/org/apache/oodt/grid/QueryServlet.java | 2 +- .../metadata/extractors/ExternMetExtractor.java | 2 +- .../apache/oodt/pcs/input/PGEXMLFileUtils.java | 5 ++- .../java/org/apache/oodt/cas/pge/PGETask.java | 4 +-- .../apache/oodt/cas/pge/PGETaskInstance.java | 15 ++++----- .../apache/oodt/cas/pge/staging/FileStager.java | 2 +- .../org/apache/oodt/cas/pge/util/XmlHelper.java | 6 ++-- .../oodt/product/LargeProductQueryHandler.java | 2 +- .../product/handlers/ofsn/OFSNFileHandler.java | 4 +-- .../handlers/DatabaseProfileManager.java | 30 ++++++++--------- .../oodt/profile/handlers/ProfileManager.java | 10 +++--- .../protocol/cli/action/DownloadCliAction.java | 2 +- .../oodt/cas/protocol/imaps/ImapsProtocol.java | 4 +-- .../apache/oodt/cas/pushpull/config/Config.java | 5 ++- .../apache/oodt/cas/pushpull/daemon/Daemon.java | 6 ++-- .../cas/pushpull/daemon/DaemonController.java | 2 +- .../parsers/GenericEmailParser.java | 2 +- .../cas/pushpull/protocol/ProtocolHandler.java | 14 +++----- .../cas/pushpull/protocol/ProtocolPath.java | 4 +-- .../retrievalsystem/FileRetrievalSystem.java | 15 ++++----- .../retrievalsystem/RetrievalSetup.java | 6 ++-- .../oodt/cas/resource/jobqueue/JobQueue.java | 6 ++-- .../oodt/cas/resource/jobqueue/JobStack.java | 6 ++-- .../monitor/ganglia/GangliaResourceMonitor.java | 3 +- .../cas/resource/scheduler/QueueManager.java | 8 ++--- .../resource/system/extern/XmlRpcBatchStub.java | 5 ++- .../oodt/cas/product/CASProductHandler.java | 2 +- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 2 +- .../oodt/cas/product/rdf/RDFProductServlet.java | 2 +- .../processor/WorkflowProcessorQueue.java | 3 +- .../runner/AsynchronousLocalEngineRunner.java | 6 ++-- .../workflow/engine/runner/EngineRunner.java | 6 ++-- .../workflow/engine/runner/ResourceRunner.java | 6 ++-- .../repository/PackagedWorkflowRepository.java | 4 +-- .../workflow/system/XmlRpcWorkflowManager.java | 6 ++-- .../repository/MockWorkflowRepository.java | 3 +- 95 files changed, 242 insertions(+), 283 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java index 2767d60..f1d663b 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/model/repo/XmlWorkflowModelRepository.java @@ -196,8 +196,7 @@ public class XmlWorkflowModelRepository { } } - private void saveGraph(ModelGraph graph, Element parentElem, Document document) - throws FileNotFoundException, ParserConfigurationException { + private void saveGraph(ModelGraph graph, Element parentElem, Document document) { ModelNode node = graph.getModel(); Element workflowElem = document.createElement(node.getExecutionType()); @@ -496,8 +495,7 @@ public class XmlWorkflowModelRepository { } private Metadata loadConfiguration(List<FileBasedElement> rootElements, - Node configNode, HashMap<String, ConfigGroup> globalConfGroups) - throws Exception { + Node configNode, HashMap<String, ConfigGroup> globalConfGroups) { Metadata curMetadata = new Metadata(); NodeList curGrandChildren = configNode.getChildNodes(); for (int k = 0; k < curGrandChildren.getLength(); k++) { http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java index 2d7416b..cace96e 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java @@ -18,6 +18,20 @@ package org.apache.oodt.cas.workflow.gui.perspective.build; //JDK imports +import org.apache.oodt.cas.workflow.gui.model.ModelGraph; +import org.apache.oodt.cas.workflow.gui.perspective.MultiStatePerspective; +import org.apache.oodt.cas.workflow.gui.perspective.view.MultiStateView; +import org.apache.oodt.cas.workflow.gui.perspective.view.View; +import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange; +import org.apache.oodt.cas.workflow.gui.perspective.view.ViewListener; +import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState; +import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultPropView; +import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultTreeView; +import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GlobalConfigView; +import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GraphView; +import org.apache.oodt.cas.workflow.gui.perspective.view.impl.TreeProjectView; +import org.apache.oodt.cas.workflow.gui.util.GuiUtils; + import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; @@ -28,6 +42,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; + import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; @@ -37,19 +52,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; //OODT imports -import org.apache.oodt.cas.workflow.gui.model.ModelGraph; -import org.apache.oodt.cas.workflow.gui.perspective.MultiStatePerspective; -import org.apache.oodt.cas.workflow.gui.perspective.view.MultiStateView; -import org.apache.oodt.cas.workflow.gui.perspective.view.View; -import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange; -import org.apache.oodt.cas.workflow.gui.perspective.view.ViewListener; -import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState; -import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultPropView; -import org.apache.oodt.cas.workflow.gui.perspective.view.impl.DefaultTreeView; -import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GlobalConfigView; -import org.apache.oodt.cas.workflow.gui.perspective.view.impl.GraphView; -import org.apache.oodt.cas.workflow.gui.perspective.view.impl.TreeProjectView; -import org.apache.oodt.cas.workflow.gui.util.GuiUtils; /** * @@ -91,8 +93,7 @@ public class BuildPerspective extends MultiStatePerspective { public BuildPerspective(Class<? extends View> projectViewClass, Class<? extends View> mainViewClass, Class<? extends View> treeViewClass, - Class<? extends View> propViewClass, Class<? extends View> globalViewClass) - throws InstantiationException, IllegalAccessException { + Class<? extends View> propViewClass, Class<? extends View> globalViewClass) { super("Build"); this.projectViewClass = projectViewClass; this.mainViewClass = mainViewClass; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java index 2f77735..081b6d6 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java @@ -51,7 +51,7 @@ public class DataSourceIngestMapper implements IngestMapper { protected DataSource dataSource; public DataSourceIngestMapper(String user, String pass, String driver, - String jdbcUrl) throws InstantiationException { + String jdbcUrl) { this.dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass, driver, jdbcUrl); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java index 0268930..80a649d 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java @@ -27,7 +27,7 @@ package org.apache.oodt.cas.catalog.query.filter.time.conv; */ public class AsciiSortableVersionConverter implements VersionConverter { - public double convertToPriority(String version) throws Exception { + public double convertToPriority(String version) { double priority = 0; char[] versionCharArray = version.toCharArray(); for (int i = 0, j = versionCharArray.length - 1; i < versionCharArray.length; i++, j--) http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java index 7f19ac8..69ac864 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java @@ -27,6 +27,6 @@ package org.apache.oodt.cas.catalog.query.filter.time.conv; */ public interface VersionConverter { - double convertToPriority(String version) throws Exception; + double convertToPriority(String version); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java index b83c4ad..5fdc1f7 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java @@ -100,6 +100,6 @@ public interface CatalogRepository { List<PluginURL> deserializePluginURLs() throws CatalogRepositoryException; - boolean isModifiable() throws CatalogRepositoryException; + boolean isModifiable(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java index 4a82e98..16bbadb 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java @@ -77,8 +77,7 @@ public class MemoryBasedCatalogRepository implements CatalogRepository { * org.apache.oodt.cas.catalog.repository.CatalogRepository#deserializeCatalog * (java.lang.String) */ - public Catalog deserializeCatalog(String catalogUrn) - throws CatalogRepositoryException { + public Catalog deserializeCatalog(String catalogUrn) { return this.catalogMap.get(catalogUrn); } @@ -88,8 +87,7 @@ public class MemoryBasedCatalogRepository implements CatalogRepository { * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository# * isCatalogSerialized(java.lang.String) */ - public boolean isCatalogSerialized(String catalogUrn) - throws CatalogRepositoryException { + public boolean isCatalogSerialized(String catalogUrn) { return this.catalogMap.containsKey(catalogUrn); } @@ -115,8 +113,7 @@ public class MemoryBasedCatalogRepository implements CatalogRepository { return new Vector<PluginURL>(this.classLoaderUrls); } - public boolean isModifiable() - throws CatalogRepositoryException { + public boolean isModifiable() { return true; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java index b130280..7cbb8ff 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java @@ -111,8 +111,7 @@ public class SerializedCatalogRepository implements CatalogRepository { * (non-Javadoc) * @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#isCatalogSerialized(java.lang.String) */ - public boolean isCatalogSerialized(String catalogUrn) - throws CatalogRepositoryException { + public boolean isCatalogSerialized(String catalogUrn) { return this.getCatalogFile(catalogUrn).exists(); } @@ -177,8 +176,7 @@ public class SerializedCatalogRepository implements CatalogRepository { } } - public boolean isModifiable() - throws CatalogRepositoryException { + public boolean isModifiable() { return true; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java index c78f7fb..029d235 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java @@ -64,7 +64,7 @@ public class SpringCatalogRepository implements CatalogRepository { throw new CatalogRepositoryException("Modification not allowed during runtime"); } - public boolean isModifiable() throws CatalogRepositoryException { + public boolean isModifiable() { return false; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java index 4b911af..163bdca 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java @@ -32,7 +32,7 @@ import org.apache.oodt.cas.cli.CmdLineUtility; */ public class CatalogServiceServerLauncher { - private CatalogServiceServerLauncher() throws InstantiationException {} + private CatalogServiceServerLauncher() {} public static void main(String[] args) throws Exception { // Load Catalog Service properties. http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 681208d..bfd43a1 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 @@ -43,13 +43,13 @@ import java.util.Set; */ public interface CommunicationChannelServer { - void setCatalogService(CatalogService catalogService) throws Exception; + void setCatalogService(CatalogService catalogService); - void setPort(int port) throws Exception; + void setPort(int port); int getPort(); - void startup() throws Exception; + void startup(); void shutdown() throws Exception; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java index 28a2d1a..97f261b 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java @@ -43,7 +43,7 @@ public interface RmiCommunicationChannelClientInterface extends Remote { void setCatalogRepository(CatalogRepository catalogRepository); - CatalogRepository getCatalogRepository() throws Exception; + CatalogRepository getCatalogRepository(); IngestMapper getIngestMapper() throws RemoteException; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java index 32a0610..c03000b 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java @@ -54,8 +54,7 @@ public class RmiCommunicationChannelServer implements } - public void startup() - throws IOException { + public void startup() { // TODO Auto-generated method stub } @@ -261,13 +260,12 @@ public class RmiCommunicationChannelServer implements } - public void setCatalogService(CatalogService catalogService) - throws Exception { + public void setCatalogService(CatalogService catalogService) { // TODO Auto-generated method stub } - public void setPort(int port) throws Exception { + public void setPort(int port) { // TODO Auto-generated method stub } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 d26458d..77018b3 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 @@ -53,7 +53,7 @@ public class XmlRpcCommunicationChannelServer extends super(); } - public void startup() throws Exception { + public void startup() { this.webServer = new WebServer(this.port); this.webServer.addHandler(this.getClass().getSimpleName(), this); this.webServer.start(); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java index e5281fd..f415346 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java @@ -41,7 +41,7 @@ public interface Dictionary { * @return TermBucket representing the given Metadata for this Dictionary or * null if Metadata is not recognized by this Dictionary */ - TermBucket lookup(Metadata metadata) throws CatalogDictionaryException; + TermBucket lookup(Metadata metadata); /** * Generates Metadata for the given TermBucket. A call to lookup(Metadata) and @@ -52,7 +52,7 @@ public interface Dictionary { * @return Metadata for the given TermBucket. If the TermBucket is not understood, * then an empty Metadata object should be returned. */ - Metadata reverseLookup(TermBucket termBucket) throws CatalogDictionaryException; + Metadata reverseLookup(TermBucket termBucket); /** * @@ -60,6 +60,6 @@ public interface Dictionary { * @return * @throws CatalogDictionaryException */ - boolean understands(QueryExpression queryExpression) throws CatalogDictionaryException; + boolean understands(QueryExpression queryExpression); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java index 80fe4c1..1a8723f 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java @@ -36,9 +36,9 @@ import org.apache.oodt.cas.catalog.page.IndexPager; */ public interface Index { - Properties getProperties() throws CatalogIndexException; + Properties getProperties(); - String getProperty(String key) throws CatalogIndexException; + String getProperty(String key); /** * Returns a list of TransactionIds associated with the @@ -47,13 +47,13 @@ public interface Index { * @return A page of TransactionIds, if page does not exist, * then returns null. */ - List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException; + List<TransactionId<?>> getPage(IndexPager indexPage); /** * * @return */ - TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException; + TransactionIdFactory getTransactionIdFactory(); /** * http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 5ffdf6d..4506dff 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 @@ -36,8 +36,7 @@ import java.util.Set; */ public class WorkflowManagerDictionary implements Dictionary { - public TermBucket lookup(Metadata metadata) - throws CatalogDictionaryException { + public TermBucket lookup(Metadata metadata) { if (metadata.getMetadata("ProductType") != null && metadata.getAllMetadata("ProductType").contains("Workflows")) { TermBucket workflowBucket = new TermBucket("Workflows"); for (Object key : metadata.getHashtable().keySet()) @@ -48,8 +47,7 @@ public class WorkflowManagerDictionary implements Dictionary { } } - public Metadata reverseLookup(TermBucket termBucket) - throws CatalogDictionaryException { + public Metadata reverseLookup(TermBucket termBucket) { Metadata metadata = new Metadata(); if (termBucket.getName().equals("Workflows")) { for (Term term : termBucket.getTerms()) @@ -58,8 +56,7 @@ public class WorkflowManagerDictionary implements Dictionary { return metadata; } - public boolean understands(QueryExpression queryExpression) - throws CatalogDictionaryException { + public boolean understands(QueryExpression queryExpression) { Set<String> bucketNames = queryExpression.getBucketNames(); if (bucketNames == null || bucketNames.contains("Workflows")) { return queryExpression instanceof NotQueryExpression http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java index e7083ed..8335de9 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java @@ -99,7 +99,7 @@ public class DataSourceIndex implements Index, IngestService, QueryService { /** * {@inheritDoc} */ - public List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException { + public List<TransactionId<?>> getPage(IndexPager indexPage) { // Connection conn = null; // Statement stmt = null; // ResultSet rs = null; @@ -133,22 +133,21 @@ public class DataSourceIndex implements Index, IngestService, QueryService { /** * {@inheritDoc} */ - public Properties getProperties() throws CatalogIndexException { + public Properties getProperties() { return new Properties(); } /** * {@inheritDoc} */ - public String getProperty(String key) throws CatalogIndexException { + public String getProperty(String key) { return null; } /** * {@inheritDoc} */ - public TransactionIdFactory getTransactionIdFactory() - throws CatalogIndexException { + public TransactionIdFactory getTransactionIdFactory() { return new UuidTransactionIdFactory(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java index 0facced..aaebda5 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java @@ -62,25 +62,24 @@ public class WorkflowManagerDataSourceIndex implements Index, QueryService { protected DataSource dataSource; - public WorkflowManagerDataSourceIndex(String user, String pass, String driver, String jdbcUrl) throws InstantiationException { + public WorkflowManagerDataSourceIndex(String user, String pass, String driver, String jdbcUrl) { this.dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass, driver, jdbcUrl); } - public List<TransactionId<?>> getPage(IndexPager indexPage) - throws CatalogIndexException { + public List<TransactionId<?>> getPage(IndexPager indexPage) { // TODO Auto-generated method stub return null; } - public Properties getProperties() throws CatalogIndexException { + public Properties getProperties() { return new Properties(); } - public String getProperty(String key) throws CatalogIndexException { + public String getProperty(String key) { return null; } - public TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException { + public TransactionIdFactory getTransactionIdFactory() { return new LongTransactionIdFactory(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 2708e01..7a16067 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 @@ -111,7 +111,8 @@ public class Catalog { return this.index.getPage(indexPage); } - public TransactionId<?> getTransactionIdFromString(String catalogTransactionId) throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, CatalogIndexException { + public TransactionId<?> getTransactionIdFromString(String catalogTransactionId) throws IllegalArgumentException, SecurityException, + CatalogIndexException { return this.getTransactionIdFactory().createTransactionId(catalogTransactionId); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/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 25fbac2..b67447b 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 @@ -1103,7 +1103,8 @@ TR: for (CatalogReceipt catalogReceipt : qr.getCatalogReceipts()) { return catalogReceipts; } - protected QueryExpression reduceToUnderstoodExpressions(Catalog catalog, QueryExpression queryExpression) throws CatalogDictionaryException, CatalogException { + protected QueryExpression reduceToUnderstoodExpressions(Catalog catalog, QueryExpression queryExpression) throws + CatalogException { if (queryExpression instanceof QueryLogicalGroup) { QueryLogicalGroup queryLogicalGroup = (QueryLogicalGroup) queryExpression; List<QueryExpression> restrictedExpressions = new Vector<QueryExpression>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java ---------------------------------------------------------------------- diff --git a/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java b/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java index 5bdaaf4..1a9fd24 100644 --- a/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java +++ b/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java @@ -168,7 +168,7 @@ public class TestCatalogServiceLocal extends TestCase { } private InMemoryIngestMapperFactory getOracleIngestMapperFactory( - String tmpDirPath) throws SQLException, IOException { + String tmpDirPath) { String user = "sa"; String pass = ""; String driver = "org.hsqldb.jdbcDriver"; @@ -183,8 +183,7 @@ public class TestCatalogServiceLocal extends TestCase { return factory; } - private DataSourceIndexFactory getInMemoryDSFactory(String tmpDirPath) - throws IOException, SQLException { + private DataSourceIndexFactory getInMemoryDSFactory(String tmpDirPath) { String user = "sa"; String pass = ""; String driver = "org.hsqldb.jdbcDriver"; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java index 8e5b374..d6342d9 100644 --- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java @@ -31,6 +31,6 @@ import org.apache.oodt.cas.cli.option.CmdLineOption; public interface CmdLineOptionStore { Set<CmdLineOption> loadSupportedOptions() - throws CmdLineOptionStoreException; + ; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java index f0b1b15..3af6a0d 100644 --- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java @@ -46,8 +46,7 @@ public class SpringCmdLineOptionStore implements CmdLineOptionStore { } @Override - public Set<CmdLineOption> loadSupportedOptions() - throws CmdLineOptionStoreException { + public Set<CmdLineOption> loadSupportedOptions() { @SuppressWarnings("unchecked") Map<String, CmdLineOption> optionsMap = appContext .getBeansOfType(CmdLineOption.class); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java index c8284f1..9a3be89 100644 --- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java @@ -31,6 +31,6 @@ import org.apache.oodt.cas.cli.util.ParsedArg; */ public interface CmdLineParser { - List<ParsedArg> parse(String[] args) throws CmdLineParserException; + List<ParsedArg> parse(String[] args); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java index abb028e..2a77bb8 100755 --- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java @@ -51,7 +51,7 @@ import com.google.common.collect.Lists; */ public class StdCmdLineParser implements CmdLineParser { - public List<ParsedArg> parse(String[] args) throws CmdLineParserException { + public List<ParsedArg> parse(String[] args) { List<ParsedArg> parsedArgs = Lists.newArrayList(); for (String arg : args) { http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/Initializer.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/Initializer.java b/commons/src/main/java/org/apache/oodt/commons/Initializer.java index 1bb0301..67c2c4b 100644 --- a/commons/src/main/java/org/apache/oodt/commons/Initializer.java +++ b/commons/src/main/java/org/apache/oodt/commons/Initializer.java @@ -29,5 +29,5 @@ public interface Initializer { * * @throws EDAException if an error occurs. */ - void initialize() throws EDAException; + void initialize(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java index 4449877..828c61e 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java @@ -1,19 +1,19 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.oodt.commons.activity; @@ -40,7 +40,7 @@ public class XMLStandardOutputStorage extends XMLStorage { factory = TransformerFactory.newInstance(); } - protected void saveDocument(Document doc) throws IOException { + protected void saveDocument(Document doc) { try { Transformer transformer = factory.newTransformer(); DOMSource source = new DOMSource(doc); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java index d171ac1..9d0c189 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java @@ -1,19 +1,19 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.oodt.commons.activity; @@ -71,7 +71,7 @@ public abstract class XMLStorage implements Storage { * @param doc XML document containing the activity's incidents. * @throws IOException if an error occurs. */ - protected abstract void saveDocument(Document doc) throws IOException; + protected abstract void saveDocument(Document doc); /** Factory for document builders which we use to create XML documents. */ protected DocumentBuilderFactory factory; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java b/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java index d23f2d3..3a856be 100644 --- a/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java +++ b/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java @@ -56,7 +56,7 @@ public class SqlScript { * @throws SQLException */ - public SqlScript(String scriptFileName, DataSource ds) throws SQLException { + public SqlScript(String scriptFileName, DataSource ds) { script = new File(scriptFileName); statementList = new Vector(); this.ds = ds; @@ -132,7 +132,7 @@ public class SqlScript { } } - public void execute() throws SQLException { + public void execute() { if (useBatch) { doExecuteBatch(); } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java index 4f31a67..cd22509 100644 --- a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java +++ b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java @@ -110,7 +110,7 @@ public class DateUtils { return taiCal; } - private static synchronized Calendar taiToUtc(Calendar taiCal) throws Exception { + private static synchronized Calendar taiToUtc(Calendar taiCal) { Calendar calUtc = Calendar.getInstance(TimeZone.getTimeZone("UTC")); calUtc.setTimeInMillis(taiCal.getTimeInMillis() - taiCal.getTimeZone().getRawOffset()); return calUtc; @@ -144,7 +144,7 @@ public class DateUtils { return toUtc(getCurrentLocalTime()); } - public static Calendar getCurrentLocalTime() throws Exception { + public static Calendar getCurrentLocalTime() { return Calendar.getInstance(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java b/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java index fede09e..074e55c 100644 --- a/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java +++ b/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java @@ -54,7 +54,7 @@ public class LoggerOutputStream extends OutputStream { } public LoggerOutputStream(Logger logger, int numOfBytesPerWrite, - Level logLevel) throws InstantiationException { + Level logLevel) { this.logger = logger; this.buffer = CharBuffer.wrap(new char[numOfBytesPerWrite]); this.logLevel = logLevel; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java b/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java index 8f12bfb..38ee748 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/DOMParser.java @@ -68,7 +68,7 @@ public class DOMParser { } /** Resets the parser. */ - public void reset() throws Exception { + public void reset() { document = null; } @@ -91,7 +91,7 @@ public class DOMParser { * known, but the requested state * is not supported. */ - public void setFeature(String featureId, boolean state) throws SAXNotRecognizedException, SAXNotSupportedException { + public void setFeature(String featureId, boolean state) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no features"); } @@ -107,7 +107,7 @@ public class DOMParser { * @exception SAXNotRecognizedException If the requested feature is * not known. */ - public boolean getFeature(String featureId) throws SAXNotRecognizedException, SAXNotSupportedException { + public boolean getFeature(String featureId) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no features"); } @@ -126,7 +126,7 @@ public class DOMParser { * known, but the requested * value is not supported. */ - public void setProperty(String propertyId, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { + public void setProperty(String propertyId, Object value) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no properties"); } @@ -143,7 +143,7 @@ public class DOMParser { * not known. * */ - public Object getProperty(String propertyId) throws SAXNotRecognizedException, SAXNotSupportedException { + public Object getProperty(String propertyId) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no properties"); } @@ -253,7 +253,7 @@ public class DOMParser { * @exception SAXException An exception thrown if the parser does not * support the specified locale. */ - public void setLocale(Locale locale) throws SAXException { + public void setLocale(Locale locale) { throw new IllegalStateException("This parser does not support localized error messages"); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java b/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java index 86b21ff..d9ecebe 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java @@ -52,8 +52,7 @@ public class JDBC_DB *******************************************************************/ public JDBC_DB( - java.util.Properties sys_props) throws SQLException - { + java.util.Properties sys_props) { serverProps = sys_props; keep_connect_open = true; @@ -62,8 +61,7 @@ public class JDBC_DB public JDBC_DB( java.util.Properties sys_props, - Connection srv_connect) throws SQLException - { + Connection srv_connect) { serverProps = sys_props; connect = srv_connect; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java b/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java index 949dc08..cff407c 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/SAXParser.java @@ -72,7 +72,7 @@ public class SAXParser { * known, but the requested state * is not supported. */ - public void setFeature(String featureId, boolean state) throws SAXNotRecognizedException, SAXNotSupportedException { + public void setFeature(String featureId, boolean state) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no features"); } @@ -88,7 +88,7 @@ public class SAXParser { * @exception SAXNotRecognizedException If the requested feature is * not known. */ - public boolean getFeature(String featureId) throws SAXNotRecognizedException, SAXNotSupportedException { + public boolean getFeature(String featureId) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no features"); } @@ -107,7 +107,7 @@ public class SAXParser { * known, but the requested * value is not supported. */ - public void setProperty(String propertyId, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { + public void setProperty(String propertyId, Object value) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no properties"); } @@ -124,7 +124,7 @@ public class SAXParser { * not known. * */ - public Object getProperty(String propertyId) throws SAXNotRecognizedException, SAXNotSupportedException { + public Object getProperty(String propertyId) throws SAXNotSupportedException { throw new SAXNotSupportedException("This parser supports no properties"); } @@ -238,7 +238,7 @@ public class SAXParser { * @exception SAXException An exception thrown if the parser does not * support the specified locale. */ - public void setLocale(Locale locale) throws SAXException { + public void setLocale(Locale locale) { throw new IllegalStateException("This parser doesn't support localized error messages"); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/commons/src/main/java/org/apache/oodt/commons/util/XML.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XML.java b/commons/src/main/java/org/apache/oodt/commons/util/XML.java index 6239946..e49c967 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/XML.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/XML.java @@ -235,7 +235,7 @@ public class XML { * @param omitXMLDeclaration True if we should omit the XML declaration, false to keep the XML declaration. * @throws IOException If an I/O error occurs. */ - public static void serialize(Document doc, Writer writer, boolean omitXMLDeclaration) throws IOException { + public static void serialize(Document doc, Writer writer, boolean omitXMLDeclaration) { try { TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java index bfbe5bb..f8713b4 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/ExternAction.java @@ -73,7 +73,7 @@ public class ExternAction extends CrawlerAction { this.executeCommand = executeCommand; } - public void setWorkingDir(String workingDir) throws Exception { + public void setWorkingDir(String workingDir) { this.workingDir = workingDir; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java index e6d7da6..32e2648 100755 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java @@ -109,5 +109,5 @@ public abstract class FileBasedAction extends CrawlerAction { } public abstract boolean performFileAction(File actionFile, Metadata metadata) - throws CrawlerActionException; + ; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java index 7cacd66..905f51e 100755 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java @@ -63,8 +63,7 @@ public class IngestAncillary extends FileBasedAction { } @Override - public boolean performFileAction(File actionFile, Metadata metadata) - throws CrawlerActionException { + public boolean performFileAction(File actionFile, Metadata metadata) { Metadata ingestMetadata = new Metadata(); if (ancillaryMetadata != null) { for (String key : this.ancillaryMetadata.keySet()) { http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java index 3d3ec1a..9e3a2c6 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java @@ -672,7 +672,7 @@ public class MetadataResource extends CurationService { * If any error occurs during this delete operation. */ public void deleteCatalogProduct(Product product) - throws IOException, CatalogException { + throws CatalogException { CurationService.config.getFileManagerClient().removeProduct(product); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java index 0a10fed..f056336 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java @@ -324,7 +324,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs (e.g., the layer isn't initialized). */ - ValidationLayer getValidationLayer() throws CatalogException; + ValidationLayer getValidationLayer(); /** * http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java index 896dbcd..44fd309 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java @@ -1325,7 +1325,7 @@ public class DataSourceCatalog implements Catalog { * * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer() */ - public ValidationLayer getValidationLayer() throws CatalogException { + public ValidationLayer getValidationLayer() { // note that validationLayer may be null to allow for leniency in subclasses return validationLayer; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java index 843d226..89b8f1b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java @@ -735,7 +735,7 @@ public class LuceneCatalog implements Catalog { * * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer() */ - public ValidationLayer getValidationLayer() throws CatalogException { + public ValidationLayer getValidationLayer() { return valLayer; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java index cf8268f..94b9868 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java @@ -732,7 +732,7 @@ public class ScienceDataCatalog implements Catalog { return products; } - public ValidationLayer getValidationLayer() throws CatalogException { + public ValidationLayer getValidationLayer() { return this.validationLayer; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java index 67c6532..9812605 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrCatalog.java @@ -468,7 +468,7 @@ public class SolrCatalog implements Catalog { } @Override - public ValidationLayer getValidationLayer() throws CatalogException { + public ValidationLayer getValidationLayer() { // FIXME: must parse Solr schema.xmnl from: // http://localhost:8080/solr/admin/file/?contentType=text/xml;charset=utf-8&file=schema.xml throw new RuntimeException("Method 'getValidationLayer' not yet implemented"); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java index ecd89ab..a830781 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java @@ -42,7 +42,7 @@ public class RemoteDataTransferFactory implements DataTransferFactory { /** * */ - public RemoteDataTransferFactory() throws InstantiationException { + public RemoteDataTransferFactory() { chunkSize = Integer.getInteger( "org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize", 1024); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java index c2251ea..b12dfd4 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java @@ -97,7 +97,7 @@ public interface Ingester { * If there is an error ingesting the {@link Product}s. */ void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor, - File metConfFile) throws IngestException; + File metConfFile); /** * Checks the file manager at the given {@link URL} to see whether or not it http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java index adc9b69..09ffe22 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java @@ -116,7 +116,7 @@ public class StdIngester implements Ingester, CoreMetKeys { * java.util.List, org.apache.oodt.cas.metadata.MetExtractor, java.io.File) */ public void ingest(URL fmUrl, List<String> prodFiles, - MetExtractor extractor, File metConfFile) throws IngestException { + MetExtractor extractor, File metConfFile) { if (prodFiles != null && prodFiles.size() > 0) { for (Iterator<String> i = prodFiles.iterator(); i.hasNext();) { String prodFilePath = i.next(); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java index d369bc9..9e36863 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java @@ -43,7 +43,7 @@ public class DataSourceRepositoryManagerFactory implements * Default Constructor * </p>. */ - public DataSourceRepositoryManagerFactory() throws Exception { + public DataSourceRepositoryManagerFactory() { String jdbcUrl = null, user = null, pass = null, driver = null; jdbcUrl = System http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java index 0adb7bf..04ad7c3 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java @@ -699,8 +699,8 @@ public class XmlRpcFileManager { public String ingestProduct(Hashtable<String, Object> productHash, Hashtable<String, String> metadata, boolean clientTransfer) - throws VersioningException, RepositoryManagerException, - DataTransferException, CatalogException { + throws + CatalogException { Product p = XmlRpcStructFactory.getProductFromXmlRpc(productHash); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java index 5e5e564..94740f4 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java @@ -46,5 +46,5 @@ public interface Dispatcher { * If any error occurs. */ Result handleRequest(String methodSpecifier, List params, - String user, String password) throws Exception; + String user, String password); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java index c6fc861..2008c8e 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java @@ -44,7 +44,7 @@ public final class SecureWebServer extends org.apache.xmlrpc.WebServer * @throws IOException * If any error occurs. */ - public SecureWebServer(int port) throws IOException { + public SecureWebServer(int port) { super(port); addHandler("$default", this); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java index d490e29..0b535e8 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java @@ -55,7 +55,7 @@ public class OptimizeLuceneCatalog { this.mergeFactor = mf; } - public void doOptimize() throws Exception { + public void doOptimize() { IndexWriter writer = null; boolean createIndex = false; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java index 609b6af..90d708e 100755 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java @@ -204,8 +204,8 @@ public class SolrIndexer { * When an error occurs communicating with the Solr server instance. */ public void indexMetFile(File file, boolean delete) - throws InstantiationException, IOException, - SolrServerException { + throws + SolrServerException { LOG.info("Attempting to index product from metadata file."); try { SerializableMetadata metadata = new SerializableMetadata("UTF-8", false); @@ -497,7 +497,7 @@ public class SolrIndexer { * @throws IOException * @throws SolrServerException */ - public void deleteProductByName(String productName) throws IOException, SolrServerException { + public void deleteProductByName(String productName) { LOG.info("Attempting to delete product: " + productName); try { http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java index ee9547f..ef5ab15 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java @@ -44,7 +44,7 @@ public class DataSourceValidationLayerFactory implements ValidationLayerFactory * Default Constructor * </p> */ - public DataSourceValidationLayerFactory() throws Exception { + public DataSourceValidationLayerFactory() { String jdbcUrl = null, user = null, pass = null, driver = null; jdbcUrl = System http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java index 81d5c2f..8627952 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java @@ -221,8 +221,7 @@ public class XMLValidationLayer implements ValidationLayer { * @throws ValidationLayerException * If any error occurs */ - public List<Element> getElements(ProductType type, boolean direct) - throws ValidationLayerException { + public List<Element> getElements(ProductType type, boolean direct) { List<Element> elems = new Vector<Element>(); String currType = type.getProductTypeId(); if (productTypeElementMap.containsKey(currType)) { @@ -257,8 +256,7 @@ public class XMLValidationLayer implements ValidationLayer { * @throws ValidationLayerException * If any error occurs */ - public void addParentForProductType(ProductType type, String parentId) - throws ValidationLayerException { + public void addParentForProductType(ProductType type, String parentId) { subToSuperMap.put(type.getProductTypeId(), parentId); saveElementsAndMappings(); } @@ -269,8 +267,7 @@ public class XMLValidationLayer implements ValidationLayer { * @throws ValidationLayerException * If any error occurs */ - public void removeParentForProductType(ProductType type) - throws ValidationLayerException { + public void removeParentForProductType(ProductType type) { subToSuperMap.remove(type.getProductTypeId()); saveElementsAndMappings(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java index 6d8131c..a9bcbd7 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/MockCatalog.java @@ -176,7 +176,7 @@ public class MockCatalog implements Catalog { } @Override - public ValidationLayer getValidationLayer() throws CatalogException { + public ValidationLayer getValidationLayer() { return null; } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java ---------------------------------------------------------------------- diff --git a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java index de411bf..8229e75 100755 --- a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java +++ b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java @@ -49,7 +49,7 @@ public class ProductQueryServlet extends QueryServlet { /** {@inheritDoc} */ protected void handleQuery(XMLQuery query, List handlers, HttpServletRequest req, HttpServletResponse res) - throws IOException, ServletException { + throws IOException { if (handlers.isEmpty()) { res.sendError(HttpServletResponse.SC_NOT_FOUND, "no query handlers available to handle query"); return; http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java ---------------------------------------------------------------------- diff --git a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java index b6dea55..80b1592 100755 --- a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java +++ b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java @@ -52,7 +52,7 @@ public class ProfileQueryServlet extends QueryServlet { /** {@inheritDoc} */ protected void handleQuery(XMLQuery query, List handlers, HttpServletRequest req, HttpServletResponse res) - throws IOException, ServletException { + throws IOException { // Find if the query should be targeted to specific handlers. Set ids = new HashSet(); if (query.getFromElementSet() != null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java ---------------------------------------------------------------------- diff --git a/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java index a3a7ad3..f22c6a9 100755 --- a/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java +++ b/grid/src/main/java/org/apache/oodt/grid/QueryServlet.java @@ -61,7 +61,7 @@ public abstract class QueryServlet extends GridServlet { * @throws ServletException if a servlet error occurs. */ protected abstract void handleQuery(XMLQuery query, List handlers, HttpServletRequest req, HttpServletResponse res) - throws IOException, ServletException; + throws IOException; /** * Treat GETs as POSTs. http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java index 095f3d2..e151366 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java @@ -52,7 +52,7 @@ public class ExternMetExtractor extends CmdLineMetExtractor implements private static ExternConfigReader reader = new ExternConfigReader(); - public ExternMetExtractor() throws InstantiationException { + public ExternMetExtractor() { super(reader); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java ---------------------------------------------------------------------- diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java index 815f63f..6d69d26 100644 --- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java +++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java @@ -183,8 +183,7 @@ public final class PGEXMLFileUtils { return matrixList; } - public static Map getScalarsAsMap(Element group) - throws PGEConfigFileException { + public static Map getScalarsAsMap(Element group) { // get the nodelist for scalars NodeList scalars = group.getElementsByTagName("scalar"); @@ -212,7 +211,7 @@ public final class PGEXMLFileUtils { return scalarMap; } - public static List getScalars(Element group) throws PGEConfigFileException { + public static List getScalars(Element group) { // get the nodelist for scalars NodeList scalars = group.getElementsByTagName("scalar"); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java index 0ef8a63..eb8242d 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETask.java @@ -50,8 +50,8 @@ public class PGETask { } public void run(String pgeTaskInstanceClasspath) - throws InstantiationException, IllegalAccessException, - ClassNotFoundException, WorkflowTaskInstanceException { + throws + WorkflowTaskInstanceException { PGETaskInstance pgeTaskInst = createPGETaskInstance( pgeTaskInstanceClasspath, LOGGER); pgeTaskInst.run(this.metadata, this.wftConfig); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java index 108892c..609b198 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java @@ -176,7 +176,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { return logger; } - protected String createLogFileName() throws Exception { + protected String createLogFileName() { String filenamePattern = pgeMetadata.getMetadata(LOG_FILENAME_PATTERN); if (filenamePattern != null) { return filenamePattern; @@ -187,7 +187,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { } protected PgeMetadata createPgeMetadata(Metadata dynMetadata, - WorkflowTaskConfiguration config) throws Exception { + WorkflowTaskConfiguration config) { logger.info("Converting workflow configuration to static metadata..."); Metadata staticMetadata = new Metadata(); for (Object objKey : config.getProperties().keySet()) { @@ -251,13 +251,12 @@ public class PGETaskInstance implements WorkflowTaskInstance { } protected ConfigFilePropertyAdder loadPropertyAdder( - String propertyAdderClasspath) throws Exception { + String propertyAdderClasspath) { logger.fine("Loading property adder: " + propertyAdderClasspath); return createConfigFilePropertyAdder(propertyAdderClasspath, logger); } - protected void runPropertyAdder(ConfigFilePropertyAdder propAdder) - throws Exception { + protected void runPropertyAdder(ConfigFilePropertyAdder propAdder) { logger.info("Running property adder: " + propAdder.getClass().getCanonicalName()); propAdder.addConfigProperties(pgeMetadata, @@ -272,7 +271,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { return new XmlRpcWorkflowManagerClient(new URL(url)); } - protected String getWorkflowInstanceId() throws Exception { + protected String getWorkflowInstanceId() { String instanceId = pgeMetadata.getMetadata(CoreMetKeys.WORKFLOW_INST_ID); logger.info("Workflow instanceId is [" + instanceId + "]"); Validate.notNull(instanceId, "Must specify " @@ -294,7 +293,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { + getDumpMetadataName(); } - protected String getDumpMetadataName() throws Exception { + protected String getDumpMetadataName() { return "pgetask-metadata.xml"; } @@ -333,7 +332,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { } } - protected FileStager getFileStager() throws Exception { + protected FileStager getFileStager() { String fileStagerClass = pgeMetadata.getMetadata(FILE_STAGER); if (fileStagerClass != null) { logger.info("Loading FileStager [" + fileStagerClass + "]"); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java index 19b22a0..3ee5c2d 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java @@ -108,7 +108,7 @@ public abstract class FileStager { } @VisibleForTesting - static URI asURI(String path) throws URISyntaxException { + static URI asURI(String path) { Validate.notNull(path, "path must not be null"); URI uri = URI.create(path); http://git-wip-us.apache.org/repos/asf/oodt/blob/ed6be8c7/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java index 532e607..0fd6d61 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java @@ -178,8 +178,7 @@ public class XmlHelper { return key; } - public static boolean isEnvReplaceNoRecur(Element elem, Metadata metadata) - throws Exception { + public static boolean isEnvReplaceNoRecur(Element elem, Metadata metadata) { String isEnvReplaceNoRecur = elem .getAttribute(ENV_REPLACE_NO_RECUR_ATTR); if (Strings.isNullOrEmpty(isEnvReplaceNoRecur)) { @@ -189,8 +188,7 @@ public class XmlHelper { } } - public static boolean isEnvReplace(Element elem, Metadata metadata) - throws Exception { + public static boolean isEnvReplace(Element elem, Metadata metadata) { String isEnvReplace = elem.getAttribute(ENV_REPLACE_ATTR); if (Strings.isNullOrEmpty(isEnvReplace)) { return true;
