You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 11:37:51 UTC
[5/5] oodt git commit: OODT-896 remove interface modifier
OODT-896 remove interface modifier
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d7bbba08
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d7bbba08
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d7bbba08
Branch: refs/heads/master
Commit: d7bbba0823aee35272755ad8eb9aee34c072d1d0
Parents: d95d4c7
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 10:24:45 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 10:24:45 2015 +0000
----------------------------------------------------------------------
.../gui/perspective/view/ViewListener.java | 2 +-
.../oodt/cas/catalog/mapping/IngestMapper.java | 40 +++++-----
.../catalog/mapping/IngestMapperFactory.java | 2 +-
.../filter/time/conv/VersionConverter.java | 2 +-
.../oodt/cas/catalog/query/parser/Node.java | 14 ++--
.../query/parser/QueryParserTreeConstants.java | 20 ++---
.../catalog/repository/CatalogRepository.java | 12 +--
.../repository/CatalogRepositoryFactory.java | 2 +-
.../channel/CommunicationChannelClient.java | 78 +++++++++---------
.../CommunicationChannelClientFactory.java | 6 +-
.../channel/CommunicationChannelServer.java | 82 +++++++++----------
.../CommunicationChannelServerFactory.java | 8 +-
.../RmiCommunicationChannelClientInterface.java | 66 +++++++--------
.../oodt/cas/catalog/struct/Dictionary.java | 6 +-
.../cas/catalog/struct/DictionaryFactory.java | 2 +-
.../apache/oodt/cas/catalog/struct/Index.java | 10 +--
.../oodt/cas/catalog/struct/IndexFactory.java | 2 +-
.../oodt/cas/catalog/struct/IngestService.java | 8 +-
.../oodt/cas/catalog/struct/QueryService.java | 10 +--
.../catalog/struct/TransactionIdFactory.java | 4 +-
.../oodt/cas/catalog/system/CatalogService.java | 84 ++++++++++----------
.../catalog/system/CatalogServiceFactory.java | 2 +-
.../cli/action/store/CmdLineActionStore.java | 2 +-
.../action/store/CmdLineActionStoreFactory.java | 2 +-
.../spring/SpringSetContextInjectionType.java | 4 +-
.../cas/cli/construct/CmdLineConstructor.java | 4 +-
.../oodt/cas/cli/option/CmdLineOption.java | 50 ++++++------
.../cas/cli/option/HandleableCmdLineOption.java | 6 +-
.../cli/option/ValidatableCmdLineOption.java | 4 +-
.../option/handler/CmdLineOptionHandler.java | 12 +--
.../cas/cli/option/require/RequirementRule.java | 4 +-
.../cli/option/store/CmdLineOptionStore.java | 2 +-
.../option/store/CmdLineOptionStoreFactory.java | 2 +-
.../validator/CmdLineOptionValidator.java | 4 +-
.../oodt/cas/cli/parser/CmdLineParser.java | 2 +-
.../cas/cli/presenter/CmdLinePresenter.java | 10 +--
.../oodt/cas/cli/printer/CmdLinePrinter.java | 14 ++--
.../spring/SpringSetIdInjectionType.java | 4 +-
.../oodt/cas/crawl/status/IngestStatus.java | 8 +-
.../MimeExtractorConfigMetKeys.java | 32 ++++----
.../curation/metadata/CuratorConfMetKeys.java | 20 ++---
.../curation/structs/IngestionTaskStatus.java | 6 +-
.../oodt/cas/filemgr/catalog/Catalog.java | 42 +++++-----
.../cas/filemgr/catalog/CatalogFactory.java | 2 +-
.../catalog/solr/ProductIdGenerator.java | 2 +-
.../cas/filemgr/datatransfer/DataTransfer.java | 10 +--
.../datatransfer/DataTransferFactory.java | 2 +-
.../apache/oodt/cas/filemgr/ingest/Cache.java | 26 +++---
.../oodt/cas/filemgr/ingest/CacheFactory.java | 2 +-
.../oodt/cas/filemgr/ingest/Ingester.java | 14 ++--
.../cas/filemgr/ingest/RemoteableCache.java | 26 +++---
.../oodt/cas/filemgr/metadata/CoreMetKeys.java | 18 ++---
.../cas/filemgr/metadata/ProductMetKeys.java | 18 ++---
.../extractors/FilemgrMetExtractor.java | 4 +-
.../filemgr/repository/RepositoryManager.java | 14 ++--
.../repository/RepositoryManagerFactory.java | 2 +-
.../structs/query/conv/VersionConverter.java | 2 +-
.../cas/filemgr/system/auth/Dispatcher.java | 4 +-
.../oodt/cas/filemgr/util/Pagination.java | 8 +-
.../cas/filemgr/validation/ValidationLayer.java | 18 ++---
.../validation/ValidationLayerFactory.java | 2 +-
.../oodt/cas/filemgr/versioning/Versioner.java | 4 +-
.../apache/oodt/cas/metadata/MetExtractor.java | 20 ++---
.../cas/metadata/MetExtractorConfigReader.java | 2 +-
.../extractors/ExternConfigReaderMetKeys.java | 22 ++---
.../extractors/ExternMetExtractorMetKeys.java | 6 +-
.../FilenameTokenExtractorMetKeys.java | 16 ++--
.../metadata/filenaming/NamingConvention.java | 2 +-
.../PreConditionOperatorMetKeys.java | 8 +-
.../oodt/cas/install/CASInstallDirMetKeys.java | 10 +--
.../org/apache/oodt/opendapps/DapNames.java | 8 +-
.../opendapps/config/OpendapConfigMetKeys.java | 60 +++++++-------
.../opendapps/config/OpendapProfileMetKeys.java | 8 +-
.../pcs/health/CrawlerPropertiesMetKeys.java | 6 +-
.../pcs/health/PCSHealthMonitorMetKeys.java | 24 +++---
.../oodt/pcs/health/WorkflowStatesMetKeys.java | 4 +-
.../oodt/pcs/listing/ListingConfKeys.java | 12 +--
.../oodt/pcs/metadata/PCSConfigMetadata.java | 48 +++++------
.../apache/oodt/pcs/metadata/PCSMetadata.java | 50 ++++++------
.../org/apache/oodt/pcs/query/PCSQuery.java | 2 +-
.../oodt/pcs/input/PGEConfigFileKeys.java | 30 +++----
.../apache/oodt/pcs/input/PGEDataParseKeys.java | 30 +++----
.../services/config/PCSServiceConfMetKeys.java | 16 ++--
.../oodt/cas/pge/ConfigFilePropertyAdder.java | 2 +-
.../oodt/cas/pge/config/PgeConfigBuilder.java | 2 +-
.../oodt/cas/pge/config/PgeConfigMetKeys.java | 70 ++++++++--------
.../cas/pge/writers/SciPgeConfigFileWriter.java | 4 +-
.../product/handlers/ofsn/OFSNGetHandler.java | 6 +-
.../product/handlers/ofsn/OFSNListHandler.java | 4 +-
.../handlers/ofsn/metadata/OFSNMetKeys.java | 10 +--
.../ofsn/metadata/OFSNXMLConfigMetKeys.java | 22 ++---
.../handlers/ofsn/metadata/OFSNXMLMetKeys.java | 12 +--
.../handlers/ofsn/metadata/OODTMetKeys.java | 2 +-
.../handlers/ofsn/metadata/XMLQueryMetKeys.java | 4 +-
.../org/apache/oodt/cas/protocol/Protocol.java | 24 +++---
.../oodt/cas/protocol/ProtocolFactory.java | 4 +-
.../oodt/cas/protocol/auth/Authentication.java | 4 +-
.../cas/protocol/config/ProtocolConfig.java | 4 +-
.../cas/protocol/util/ProtocolFileFilter.java | 2 +-
.../cas/protocol/verify/ProtocolVerifier.java | 2 +-
.../verify/ProtocolVerifierFactory.java | 2 +-
.../oodt/cas/pushpull/config/ConfigMetKeys.java | 40 +++++-----
.../pushpull/config/ConfigParserMetKeys.java | 82 +++++++++----------
.../pushpull/daemon/DaemonLauncherMBean.java | 8 +-
.../cas/pushpull/daemon/DaemonListener.java | 8 +-
.../oodt/cas/pushpull/daemon/DaemonMBean.java | 46 +++++------
.../cas/pushpull/daemon/DaemonRmiInterface.java | 18 ++---
.../cas/pushpull/expressions/ValidInput.java | 4 +-
.../cas/pushpull/filerestrictions/Parser.java | 2 +-
.../retrievalmethod/RetrievalMethod.java | 6 +-
.../retrievalsystem/DownloadListener.java | 6 +-
.../retrievalsystem/RemoteFileMetKeys.java | 26 +++---
.../oodt/cas/resource/batchmgr/Batchmgr.java | 12 +--
.../cas/resource/batchmgr/BatchmgrFactory.java | 2 +-
.../oodt/cas/resource/jobqueue/JobQueue.java | 18 ++---
.../cas/resource/jobqueue/JobQueueFactory.java | 2 +-
.../cas/resource/jobrepo/JobRepository.java | 12 +--
.../resource/jobrepo/JobRepositoryFactory.java | 2 +-
.../oodt/cas/resource/metadata/JobMetadata.java | 4 +-
.../oodt/cas/resource/monitor/Monitor.java | 16 ++--
.../cas/resource/monitor/MonitorFactory.java | 2 +-
.../monitor/ganglia/GangliaMetKeys.java | 58 +++++++-------
.../ganglia/loadcalc/LoadCalculator.java | 2 +-
.../ganglia/loadcalc/LoadCalculatorFactory.java | 2 +-
.../oodt/cas/resource/mux/BackendManager.java | 10 +--
.../cas/resource/mux/BackendRepository.java | 2 +-
.../resource/mux/BackendRepositoryFactory.java | 2 +-
.../cas/resource/noderepo/NodeRepository.java | 2 +-
.../noderepo/NodeRepositoryFactory.java | 2 +-
.../cas/resource/queuerepo/QueueRepository.java | 2 +-
.../queuerepo/QueueRepositoryFactory.java | 2 +-
.../oodt/cas/resource/scheduler/Scheduler.java | 12 +--
.../resource/scheduler/SchedulerFactory.java | 2 +-
.../oodt/cas/resource/structs/JobInput.java | 2 +-
.../oodt/cas/resource/structs/JobStatus.java | 12 +--
.../oodt/cas/resource/util/Configurable.java | 2 +-
.../oodt/cas/resource/util/UlimitMetKeys.java | 22 ++---
.../oodt/cas/resource/util/XmlRpcWriteable.java | 4 +-
.../apache/oodt/security/sso/SingleSignOn.java | 12 +--
.../oodt/security/sso/opensso/SSOMetKeys.java | 46 +++++------
.../cas/product/CASProductHandlerMetKeys.java | 6 +-
.../oodt/cas/product/data/DataDeliveryKeys.java | 8 +-
.../oodt/cas/product/rdf/RDFConfigMetKeys.java | 2 +-
.../cas/product/rdf/RDFConfigReaderMetKeys.java | 44 +++++-----
.../oodt/cas/product/rss/RSSConfigMetKeys.java | 4 +-
.../cas/product/rss/RSSConfigReaderMetKeys.java | 20 ++---
.../cas/workflow/engine/WorkflowEngine.java | 22 ++---
.../workflow/engine/WorkflowEngineFactory.java | 2 +-
.../processor/WorkflowProcessorListener.java | 2 +-
.../engine/runner/EngineRunnerFactory.java | 2 +-
.../instrepo/WorkflowInstanceMetMapKeys.java | 12 +--
.../instrepo/WorkflowInstanceRepository.java | 18 ++---
.../WorkflowInstanceRepositoryFactory.java | 2 +-
.../lifecycle/WorkflowLifecycleMetKeys.java | 12 +--
.../oodt/cas/workflow/metadata/CoreMetKeys.java | 14 ++--
.../workflow/repository/WorkflowRepository.java | 32 ++++----
.../repository/WorkflowRepositoryFactory.java | 2 +-
.../cas/workflow/structs/PrioritySorter.java | 2 +-
.../structs/WorkflowConditionInstance.java | 2 +-
.../cas/workflow/structs/WorkflowStatus.java | 16 ++--
.../workflow/structs/WorkflowTaskInstance.java | 2 +-
.../oodt/cas/workflow/util/Pagination.java | 12 +--
.../xmlps/mapping/MappingReaderMetKeys.java | 36 ++++-----
.../oodt/xmlps/mapping/funcs/MappingFunc.java | 6 +-
.../oodt/xmlps/queryparser/Expression.java | 2 +-
.../oodt/xmlps/queryparser/ParseConstants.java | 38 ++++-----
.../apache/oodt/xmlps/util/XMLQueryKeys.java | 4 +-
167 files changed, 1142 insertions(+), 1134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
index da88b27..29f855a 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
@@ -27,6 +27,6 @@ package org.apache.oodt.cas.workflow.gui.perspective.view;
*/
public interface ViewListener {
- public void stateChangeNotify(ViewChange<?> change);
+ void stateChangeNotify(ViewChange<?> change);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
index 556c161..865f2f2 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
@@ -50,22 +50,22 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any error
*/
- public void storeTransactionIdMapping(
- TransactionId<?> catalogServiceTransactionId, TransactionIdFactory catalogServiceTransactionIdFactory,
- CatalogReceipt catalogReceipt, TransactionIdFactory catalogTransactionIdFactory)
+ void storeTransactionIdMapping(
+ TransactionId<?> catalogServiceTransactionId, TransactionIdFactory catalogServiceTransactionIdFactory,
+ CatalogReceipt catalogReceipt, TransactionIdFactory catalogTransactionIdFactory)
throws CatalogRepositoryException;
- public Set<TransactionId<?>> getPageOfCatalogTransactionIds(IndexPager indexPager,
- String catalogId) throws CatalogRepositoryException;
+ Set<TransactionId<?>> getPageOfCatalogTransactionIds(IndexPager indexPager,
+ String catalogId) throws CatalogRepositoryException;
- public void deleteTransactionIdMapping(TransactionId<?> catalogTransactionId,
- String catalogId) throws CatalogRepositoryException;
+ void deleteTransactionIdMapping(TransactionId<?> catalogTransactionId,
+ String catalogId) throws CatalogRepositoryException;
- public void deleteAllMappingsForCatalogServiceTransactionId(
- TransactionId<?> catalogServiceTransactionId)
+ void deleteAllMappingsForCatalogServiceTransactionId(
+ TransactionId<?> catalogServiceTransactionId)
throws CatalogRepositoryException;
- public void deleteAllMappingsForCatalog(String catalogId)
+ void deleteAllMappingsForCatalog(String catalogId)
throws CatalogRepositoryException;
/**
@@ -79,8 +79,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any error
*/
- public boolean hasCatalogServiceTransactionId(
- TransactionId<?> catalogServiceTransactionId)
+ boolean hasCatalogServiceTransactionId(
+ TransactionId<?> catalogServiceTransactionId)
throws CatalogRepositoryException;
/**
@@ -96,8 +96,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any Error
*/
- public TransactionId<?> getCatalogServiceTransactionId(
- TransactionId<?> catalogTransactionId, String catalogId)
+ TransactionId<?> getCatalogServiceTransactionId(
+ TransactionId<?> catalogTransactionId, String catalogId)
throws CatalogRepositoryException;
/**
@@ -113,8 +113,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any Error
*/
- public TransactionId<?> getCatalogTransactionId(
- TransactionId<?> catalogServiceTransactionId, String catalogId)
+ TransactionId<?> getCatalogTransactionId(
+ TransactionId<?> catalogServiceTransactionId, String catalogId)
throws CatalogRepositoryException;
/**
@@ -126,8 +126,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any Error
*/
- public Set<String> getCatalogIds(
- TransactionId<?> catalogServiceTransactionId)
+ Set<String> getCatalogIds(
+ TransactionId<?> catalogServiceTransactionId)
throws CatalogRepositoryException;
/**
@@ -137,8 +137,8 @@ public interface IngestMapper {
* @return
* @throws CatalogRepositoryException
*/
- public CatalogReceipt getCatalogReceipt(
- TransactionId<?> catalogServiceTransactionId, String catalogId)
+ CatalogReceipt getCatalogReceipt(
+ TransactionId<?> catalogServiceTransactionId, String catalogId)
throws CatalogRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
index 1127a01..964a0dd 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
@@ -26,6 +26,6 @@ package org.apache.oodt.cas.catalog.mapping;
*/
public interface IngestMapperFactory {
- public IngestMapper createMapper();
+ IngestMapper createMapper();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 29f2314..7f19ac8 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 {
- public double convertToPriority(String version) throws Exception;
+ double convertToPriority(String version) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
index 09710a8..a2e88e7 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
@@ -11,26 +11,26 @@ interface Node {
/** This method is called after the node has been made the current
node. It indicates that child nodes can now be added to it. */
- public void jjtOpen();
+ void jjtOpen();
/** This method is called after all the child nodes have been
added. */
- public void jjtClose();
+ void jjtClose();
/** This pair of methods are used to inform the node of its
parent. */
- public void jjtSetParent(Node n);
- public Node jjtGetParent();
+ void jjtSetParent(Node n);
+ Node jjtGetParent();
/** This method tells the node to add its argument to the node's
list of children. */
- public void jjtAddChild(Node n, int i);
+ void jjtAddChild(Node n, int i);
/** This method returns a child node. The children are numbered
from zero, left to right. */
- public Node jjtGetChild(int i);
+ Node jjtGetChild(int i);
/** Return the number of children the node has. */
- public int jjtGetNumChildren();
+ int jjtGetNumChildren();
}
/* JavaCC - OriginalChecksum=d803b99b9dbe9f48568711ddba598d1d (do not edit this line) */
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
index cf3628b..4b13120 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
@@ -4,18 +4,18 @@ package org.apache.oodt.cas.catalog.query.parser;
public interface QueryParserTreeConstants
{
- public int JJTPARSEINPUT = 0;
- public int JJTQUERY = 1;
- public int JJTQUERYEXPRESSION = 2;
- public int JJTSTDQUERYEXPRESSION = 3;
- public int JJTCOMPARISONQUERYEXPRESSION = 4;
- public int JJTPRIORITYQUERYEXPRESSION = 5;
- public int JJTCUSTOMQUERYEXPRESSION = 6;
- public int JJTGETVALUES = 7;
- public int JJTGETPROPERTIES = 8;
+ int JJTPARSEINPUT = 0;
+ int JJTQUERY = 1;
+ int JJTQUERYEXPRESSION = 2;
+ int JJTSTDQUERYEXPRESSION = 3;
+ int JJTCOMPARISONQUERYEXPRESSION = 4;
+ int JJTPRIORITYQUERYEXPRESSION = 5;
+ int JJTCUSTOMQUERYEXPRESSION = 6;
+ int JJTGETVALUES = 7;
+ int JJTGETPROPERTIES = 8;
- public String[] jjtNodeName = {
+ String[] jjtNodeName = {
"parseInput",
"Query",
"QueryExpression",
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 12b90e0..a05015e 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
@@ -58,7 +58,7 @@ public interface CatalogRepository {
* @throws CatalogRepositoryException
* Any Error
*/
- public void serializeCatalog(Catalog catalog)
+ void serializeCatalog(Catalog catalog)
throws CatalogRepositoryException;
//
// /**
@@ -83,7 +83,7 @@ public interface CatalogRepository {
* @throws CatalogRepositoryException
* Any Error
*/
- public void deleteSerializedCatalog(String catalogUrn)
+ void deleteSerializedCatalog(String catalogUrn)
throws CatalogRepositoryException;
/**
@@ -93,15 +93,15 @@ public interface CatalogRepository {
* @throws CatalogRepositoryException
* Any Error
*/
- public Set<Catalog> deserializeAllCatalogs()
+ Set<Catalog> deserializeAllCatalogs()
throws CatalogRepositoryException;
- public void serializePluginURLs(List<PluginURL> urls)
+ void serializePluginURLs(List<PluginURL> urls)
throws CatalogRepositoryException;
- public List<PluginURL> deserializePluginURLs()
+ List<PluginURL> deserializePluginURLs()
throws CatalogRepositoryException;
- public boolean isModifiable() throws CatalogRepositoryException;
+ boolean isModifiable() throws CatalogRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
index e171154..3bb09ea 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
@@ -29,6 +29,6 @@ import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
*/
public interface CatalogRepositoryFactory {
- public CatalogRepository createRepository() throws CatalogRepositoryException;
+ CatalogRepository createRepository() throws CatalogRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
index cfd9b3b..1d06251 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
@@ -47,13 +47,13 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface CommunicationChannelClient {
- public void shutdown() throws Exception;
+ void shutdown() throws Exception;
- public boolean isRestrictQueryPermissions() throws Exception;
+ boolean isRestrictQueryPermissions() throws Exception;
// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws Exception;
- public boolean isRestrictIngestPermissions() throws Exception;
+ boolean isRestrictIngestPermissions() throws Exception;
// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws Exception;
@@ -62,90 +62,92 @@ public interface CommunicationChannelClient {
// public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws Exception;
//
- public void addCatalog(Catalog catalog) throws Exception;
+ void addCatalog(Catalog catalog) throws Exception;
- public void replaceCatalog(Catalog catalog) throws Exception;
+ void replaceCatalog(Catalog catalog) throws Exception;
- public void addCatalog(String catalogId, Index index) throws Exception;
+ void addCatalog(String catalogId, Index index) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission,
+ boolean restrictIngestPermission) throws Exception;
- public void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
+ void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
- public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
+ void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
- public void replaceIndex(String catalogId, Index index) throws Exception;
+ void replaceIndex(String catalogId, Index index) throws Exception;
- public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
+ void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
- public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
+ void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
- public void removeCatalog(String catalogUrn) throws Exception;
+ void removeCatalog(String catalogUrn) throws Exception;
// public void removeCatalog(String catalogUrn, boolean preserveMapping) throws Exception;
- public List<PluginURL> getPluginUrls() throws Exception;
+ List<PluginURL> getPluginUrls() throws Exception;
- public void addPluginUrls(List<PluginURL> pluginUrls) throws Exception;
+ void addPluginUrls(List<PluginURL> pluginUrls) throws Exception;
- public URL getPluginStorageDir() throws Exception;
+ URL getPluginStorageDir() throws Exception;
- public void transferUrl(URL fromUrl, URL toUrl) throws Exception;
+ void transferUrl(URL fromUrl, URL toUrl) throws Exception;
// public Set<Catalog> getCurrentCatalogList() throws Exception;
//
// public Catalog getCatalog(String catalogUrn) throws Exception;
- public Set<String> getCurrentCatalogIds() throws Exception;
+ Set<String> getCurrentCatalogIds() throws Exception;
- public TransactionReceipt ingest(Metadata metadata) throws Exception;
+ TransactionReceipt ingest(Metadata metadata) throws Exception;
- public void delete(Metadata metadata) throws Exception;
+ void delete(Metadata metadata) throws Exception;
- public List<String> getProperty(String key) throws Exception;
+ List<String> getProperty(String key) throws Exception;
- public Properties getCalalogProperties() throws Exception;
+ Properties getCalalogProperties() throws Exception;
- public Properties getCalalogProperties(String catalogUrn) throws Exception;
+ Properties getCalalogProperties(String catalogUrn) throws Exception;
// public Page getFirstPage(QueryExpression queryExpression) throws Exception;
//
// public Page getFirstPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public Page getNextPage(Page page) throws Exception;
+ Page getNextPage(Page page) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public Page getLastPage(QueryExpression queryExpression) throws Exception;
//
// public Page getLastPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public List<TransactionalMetadata> getMetadata(Page page) throws Exception;
+ List<TransactionalMetadata> getMetadata(Page page) throws Exception;
- public QueryPager query(QueryExpression queryExpression) throws Exception;
+ QueryPager query(QueryExpression queryExpression) throws Exception;
- public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws Exception;
- public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
- public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception;
+ List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
- public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws Exception;
+ List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
index 2bc3c58..24d0eb7 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
@@ -26,10 +26,10 @@ package org.apache.oodt.cas.catalog.server.channel;
*/
public interface CommunicationChannelClientFactory {
- public CommunicationChannelClient createCommunicationChannelClient();
+ CommunicationChannelClient createCommunicationChannelClient();
- public void setServerUrl(String url);
+ void setServerUrl(String url);
- public String getServerUrl();
+ String getServerUrl();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 825cfc7..681208d 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,21 +43,21 @@ import java.util.Set;
*/
public interface CommunicationChannelServer {
- public void setCatalogService(CatalogService catalogService) throws Exception;
+ void setCatalogService(CatalogService catalogService) throws Exception;
- public void setPort(int port) throws Exception;
+ void setPort(int port) throws Exception;
- public int getPort();
+ int getPort();
- public void startup() throws Exception;
+ void startup() throws Exception;
- public void shutdown() throws Exception;
+ void shutdown() throws Exception;
- public boolean isRestrictQueryPermissions() throws Exception;
+ boolean isRestrictQueryPermissions() throws Exception;
//
// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws Exception;
//
- public boolean isRestrictIngestPermissions() throws Exception;
+boolean isRestrictIngestPermissions() throws Exception;
//
// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws Exception;
@@ -65,88 +65,90 @@ public interface CommunicationChannelServer {
//
// public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws Exception;
//
- public void addCatalog(Catalog catalog) throws Exception;
+void addCatalog(Catalog catalog) throws Exception;
- public void replaceCatalog(Catalog catalog) throws Exception;
+ void replaceCatalog(Catalog catalog) throws Exception;
- public void addCatalog(String catalogId, Index index) throws Exception;
+ void addCatalog(String catalogId, Index index) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission,
+ boolean restrictIngestPermission) throws Exception;
- public void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
+ void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
- public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
+ void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
- public void replaceIndex(String catalogId, Index index) throws Exception;
+ void replaceIndex(String catalogId, Index index) throws Exception;
- public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
+ void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
- public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
+ void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
- public void removeCatalog(String catalogUrn) throws Exception;
+ void removeCatalog(String catalogUrn) throws Exception;
// public void removeCatalog(String catalogUrn, boolean preserveMapping) throws Exception;
- public List<PluginURL> getPluginUrls() throws Exception;
+ List<PluginURL> getPluginUrls() throws Exception;
- public void addPluginUrls(List<PluginURL> pluginURLs) throws Exception;
+ void addPluginUrls(List<PluginURL> pluginURLs) throws Exception;
- public URL getPluginStorageDir() throws Exception;
+ URL getPluginStorageDir() throws Exception;
// public Set<Catalog> getCurrentCatalogList() throws Exception;
//
// public Catalog getCatalog(String catalogUrn) throws Exception;
- public Set<String> getCurrentCatalogIds() throws Exception;
+ Set<String> getCurrentCatalogIds() throws Exception;
- public TransactionReceipt ingest(Metadata metadata) throws Exception;
+ TransactionReceipt ingest(Metadata metadata) throws Exception;
- public void delete(Metadata metadata) throws Exception;
+ void delete(Metadata metadata) throws Exception;
- public List<String> getProperty(String key) throws Exception;
+ List<String> getProperty(String key) throws Exception;
- public Properties getCalalogProperties() throws Exception;
+ Properties getCalalogProperties() throws Exception;
- public Properties getCalalogProperties(String catalogUrn) throws Exception;
+ Properties getCalalogProperties(String catalogUrn) throws Exception;
// public Page getFirstPage(QueryExpression queryExpression) throws Exception;
//
// public Page getFirstPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public Page getNextPage(Page page) throws Exception;
+ Page getNextPage(Page page) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public Page getLastPage(QueryExpression queryExpression) throws Exception;
//
// public Page getLastPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public List<TransactionalMetadata> getMetadata(Page page) throws Exception;
+ List<TransactionalMetadata> getMetadata(Page page) throws Exception;
- public QueryPager query(QueryExpression queryExpression) throws Exception;
+ QueryPager query(QueryExpression queryExpression) throws Exception;
- public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws Exception;
- public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
// public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
- public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws Exception;
+ List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
index 8f74fe9..db6116b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
@@ -29,12 +29,12 @@ import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
*/
public interface CommunicationChannelServerFactory {
- public CommunicationChannelServer createCommunicationChannelServer();
+ CommunicationChannelServer createCommunicationChannelServer();
- public void setPort(int port);
+ void setPort(int port);
- public int getPort();
+ int getPort();
- public void setCatalogServiceFactory(CatalogServiceFactory catalogServiceFactory);
+ void setCatalogServiceFactory(CatalogServiceFactory catalogServiceFactory);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 1bd14ed..28a2d1a 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
@@ -41,67 +41,69 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface RmiCommunicationChannelClientInterface extends Remote {
- public void setCatalogRepository(CatalogRepository catalogRepository);
+ void setCatalogRepository(CatalogRepository catalogRepository);
- public CatalogRepository getCatalogRepository() throws Exception;
+ CatalogRepository getCatalogRepository() throws Exception;
- public IngestMapper getIngestMapper() throws RemoteException;
+ IngestMapper getIngestMapper() throws RemoteException;
- public void setIngestMapper(IngestMapper ingestMapper) throws RemoteException;
+ void setIngestMapper(IngestMapper ingestMapper) throws RemoteException;
- public boolean isRestrictQueryPermissions() throws RemoteException;
+ boolean isRestrictQueryPermissions() throws RemoteException;
- public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws RemoteException;
+ void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws RemoteException;
- public boolean isHasIngestPermissions() throws RemoteException;
+ boolean isHasIngestPermissions() throws RemoteException;
- public void setHasIngestPermissions(boolean restrictIngestPermissions) throws RemoteException;
+ void setHasIngestPermissions(boolean restrictIngestPermissions) throws RemoteException;
- public Class<? extends TransactionId<?>> getTransactionIdClass() throws RemoteException;
+ Class<? extends TransactionId<?>> getTransactionIdClass() throws RemoteException;
- public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws RemoteException;
+ void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws RemoteException;
- public void addCatalog(Catalog catalog) throws RemoteException;
+ void addCatalog(Catalog catalog) throws RemoteException;
- public void addCatalog(Catalog catalog, boolean allowOverride) throws RemoteException;
+ void addCatalog(Catalog catalog, boolean allowOverride) throws RemoteException;
- public void removeCatalog(String catalogUrn) throws RemoteException;
+ void removeCatalog(String catalogUrn) throws RemoteException;
- public void removeCatalog(String catalogUrn, boolean preserveMapping) throws RemoteException;
+ void removeCatalog(String catalogUrn, boolean preserveMapping) throws RemoteException;
- public Set<Catalog> getCurrentCatalogList() throws RemoteException;
+ Set<Catalog> getCurrentCatalogList() throws RemoteException;
- public Catalog getCatalog(String catalogUrn) throws RemoteException;
+ Catalog getCatalog(String catalogUrn) throws RemoteException;
- public Set<String> getCurrentCatalogIds() throws RemoteException;
+ Set<String> getCurrentCatalogIds() throws RemoteException;
- public TransactionId<?> ingest(Metadata metadata) throws RemoteException;
+ TransactionId<?> ingest(Metadata metadata) throws RemoteException;
- public void delete(Metadata metadata) throws RemoteException;
+ void delete(Metadata metadata) throws RemoteException;
- public List<String> getProperty(String key) throws RemoteException;
+ List<String> getProperty(String key) throws RemoteException;
- public Properties getCalalogProperties() throws RemoteException;
+ Properties getCalalogProperties() throws RemoteException;
- public Properties getCalalogProperties(String catalogUrn) throws RemoteException;
+ Properties getCalalogProperties(String catalogUrn) throws RemoteException;
- public QueryPager query(QueryExpression queryExpression) throws RemoteException;
+ QueryPager query(QueryExpression queryExpression) throws RemoteException;
- public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws RemoteException;
+ QueryPager query(QueryExpression queryExpression, boolean sortResults) throws RemoteException;
- public Set<TransactionalMetadata> getNextPage(QueryPager queryPager) throws RemoteException;
+ Set<TransactionalMetadata> getNextPage(QueryPager queryPager) throws RemoteException;
- public Set<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws RemoteException;
+ Set<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws RemoteException;
- public Set<TransactionalMetadata> getAllPages(QueryPager queryPager) throws RemoteException;
+ Set<TransactionalMetadata> getAllPages(QueryPager queryPager) throws RemoteException;
- public Set<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws RemoteException;
+ Set<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws RemoteException;
- public Set<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws RemoteException;
+ Set<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws RemoteException;
- public Set<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws RemoteException;
+ Set<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws RemoteException;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws RemoteException;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws RemoteException;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn, boolean generateNew) throws RemoteException;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn,
+ boolean generateNew) throws RemoteException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 4d9d512..e5281fd 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
*/
- public TermBucket lookup(Metadata metadata) throws CatalogDictionaryException;
+ TermBucket lookup(Metadata metadata) throws CatalogDictionaryException;
/**
* 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.
*/
- public Metadata reverseLookup(TermBucket termBucket) throws CatalogDictionaryException;
+ Metadata reverseLookup(TermBucket termBucket) throws CatalogDictionaryException;
/**
*
@@ -60,6 +60,6 @@ public interface Dictionary {
* @return
* @throws CatalogDictionaryException
*/
- public boolean understands(QueryExpression queryExpression) throws CatalogDictionaryException;
+ boolean understands(QueryExpression queryExpression) throws CatalogDictionaryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
index ed89e41..55e7947 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
@@ -24,6 +24,6 @@ package org.apache.oodt.cas.catalog.struct;
*/
public interface DictionaryFactory {
- public Dictionary createDictionary();
+ Dictionary createDictionary();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 ed33efc..c6d293e 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 {
- public Properties getProperties() throws CatalogIndexException;
+ Properties getProperties() throws CatalogIndexException;
- public String getProperty(String key) throws CatalogIndexException;
+ String getProperty(String key) throws CatalogIndexException;
/**
* 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.
*/
- public List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException;
+ List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException;
/**
*
* @return
*/
- public TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException;
+ TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException;
/**
*
@@ -61,6 +61,6 @@ public interface Index {
* @return
* @throws CatalogIndexException
*/
- public boolean hasTransactionId(TransactionId<?> transactionid) throws CatalogIndexException;
+ boolean hasTransactionId(TransactionId<?> transactionid) throws CatalogIndexException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
index 184eed5..5dd4098 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
@@ -24,6 +24,6 @@ package org.apache.oodt.cas.catalog.struct;
*/
public interface IndexFactory {
- public Index createIndex();
+ Index createIndex();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
index 7704edb..161d004 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
@@ -42,7 +42,7 @@ public interface IngestService {
* @return IngestReceipt Receipt of ingest
* @throws IngestServiceException Any error
*/
- public IngestReceipt ingest(List<TermBucket> termBuckets) throws IngestServiceException;
+ IngestReceipt ingest(List<TermBucket> termBuckets) throws IngestServiceException;
/**
* TermBucket updates to given TransactionId. A new TransactionId can be returned in IngestReceipt
@@ -53,7 +53,7 @@ public interface IngestService {
* @param termBuckets
* @throws IngestServiceException
*/
- public IngestReceipt update(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
+ IngestReceipt update(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
/**
* Deletes all TermBuckets attached to given TransactionId -- there should be no trace of
@@ -61,7 +61,7 @@ public interface IngestService {
* @param transactionId The ID for given transaction which should be erased
* @throws IngestServiceException Any error
*/
- public boolean delete(TransactionId<?> transactionId) throws IngestServiceException;
+ boolean delete(TransactionId<?> transactionId) throws IngestServiceException;
/**
* Deletes only the Terms in the given TermBuckets from the given TransactionId
@@ -69,6 +69,6 @@ public interface IngestService {
* @param termBuckets The reduction set of Terms for each TermBucket
* @throws IngestServiceException Any error
*/
- public boolean reduce(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
+ boolean reduce(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 2fd5cf6..ffef5d5 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
@@ -42,7 +42,7 @@ public interface QueryService {
* @return Returns a List of TransactionIds that meet the query, otherwise
* an empty List is no TransactionIds are found for the given query
*/
- public List<IngestReceipt> query(QueryExpression queryExpression) throws QueryServiceException;
+ List<IngestReceipt> query(QueryExpression queryExpression) throws QueryServiceException;
/**
* Returns the results of the given query such that: [startIndex, endIndex)
@@ -52,7 +52,7 @@ public interface QueryService {
* @return The results of the given query such that: [startIndex, endIndex)
* @throws QueryServiceException on an error
*/
- public List<IngestReceipt> query(QueryExpression queryExpression, int startIndex, int endIndex) throws QueryServiceException;
+ List<IngestReceipt> query(QueryExpression queryExpression, int startIndex, int endIndex) throws QueryServiceException;
/**
* Returns the number of results found for the given query
@@ -60,7 +60,7 @@ public interface QueryService {
* @return The number of results found for the given query
* @throws QueryServiceException on an error
*/
- public int sizeOf(QueryExpression queryExpression) throws QueryServiceException;
+ int sizeOf(QueryExpression queryExpression) throws QueryServiceException;
/**
* Returns a List of TermBuckets ingested for a given TransactionId
@@ -68,7 +68,7 @@ public interface QueryService {
* @return A List of TermBuckets for the given TransactionId or empty list
* if no record of the give TranactionId exists
*/
- public List<TermBucket> getBuckets(TransactionId<?> transactionId) throws QueryServiceException;
+ List<TermBucket> getBuckets(TransactionId<?> transactionId) throws QueryServiceException;
/**
* Does the same as getBuckets(TransactionId), except is performed over a list
@@ -76,6 +76,6 @@ public interface QueryService {
* @param transactionIds A List of TransactionIds for which TermBuckets are wanted
* @return A Map of TransactionIds to TermBuckets
*/
- public Map<TransactionId<?>, List<TermBucket>> getBuckets(List<TransactionId<?>> transactionIds) throws QueryServiceException;
+ Map<TransactionId<?>, List<TermBucket>> getBuckets(List<TransactionId<?>> transactionIds) throws QueryServiceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
index 587383d..eb5d42b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
@@ -24,8 +24,8 @@ package org.apache.oodt.cas.catalog.struct;
*/
public interface TransactionIdFactory {
- public TransactionId<?> createNewTransactionId();
+ TransactionId<?> createNewTransactionId();
- public TransactionId<?> createTransactionId(String transactionIdString);
+ TransactionId<?> createTransactionId(String transactionIdString);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
index 05374d4..28d8ebb 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
@@ -47,82 +47,84 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface CatalogService {
- public static final String CATALOG_SERVICE_TRANSACTION_ID_MET_KEY = "urn:CatalogService:TransactionId";
- public static final String CATALOG_IDS_MET_KEY = "urn:CatalogService:CatalogIds";
- public static final String ENABLE_UPDATE_MET_KEY = "urn:CatalogService:EnableUpdate";
- public static final String CATALOG_TRANSACTION_ID_MET_KEY = "urn:Catalog:TransactionId";
- public static final String CATALOG_ID_MET_KEY = "urn:Catalog:Id";
+ String CATALOG_SERVICE_TRANSACTION_ID_MET_KEY = "urn:CatalogService:TransactionId";
+ String CATALOG_IDS_MET_KEY = "urn:CatalogService:CatalogIds";
+ String ENABLE_UPDATE_MET_KEY = "urn:CatalogService:EnableUpdate";
+ String CATALOG_TRANSACTION_ID_MET_KEY = "urn:Catalog:TransactionId";
+ String CATALOG_ID_MET_KEY = "urn:Catalog:Id";
- public void shutdown() throws CatalogServiceException;
+ void shutdown() throws CatalogServiceException;
- public boolean isRestrictQueryPermissions() throws CatalogServiceException;
+ boolean isRestrictQueryPermissions() throws CatalogServiceException;
- public boolean isRestrictIngestPermissions() throws CatalogServiceException;
+ boolean isRestrictIngestPermissions() throws CatalogServiceException;
- public void addCatalog(Catalog catalog) throws CatalogServiceException;
+ void addCatalog(Catalog catalog) throws CatalogServiceException;
- public void replaceCatalog(Catalog catalog) throws CatalogServiceException;
+ void replaceCatalog(Catalog catalog) throws CatalogServiceException;
- public void addCatalog(String catalogId, Index index) throws CatalogServiceException;
+ void addCatalog(String catalogId, Index index) throws CatalogServiceException;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws CatalogServiceException;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws CatalogServiceException;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws CatalogServiceException;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission,
+ boolean restrictIngestPermission) throws CatalogServiceException;
- public void addDictionary(String catalogId, Dictionary dictionary) throws CatalogServiceException;
+ void addDictionary(String catalogId, Dictionary dictionary) throws CatalogServiceException;
- public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws CatalogServiceException;
+ void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws CatalogServiceException;
- public void replaceIndex(String catalogId, Index index) throws CatalogServiceException;
+ void replaceIndex(String catalogId, Index index) throws CatalogServiceException;
- public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws CatalogServiceException;
+ void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws CatalogServiceException;
- public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws CatalogServiceException;
+ void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws CatalogServiceException;
- public void removeCatalog(String catalogId) throws CatalogServiceException;
+ void removeCatalog(String catalogId) throws CatalogServiceException;
- public URL getPluginStorageDir() throws CatalogServiceException;
+ URL getPluginStorageDir() throws CatalogServiceException;
- public List<PluginURL> getPluginUrls() throws CatalogServiceException;
+ List<PluginURL> getPluginUrls() throws CatalogServiceException;
- public void addPluginUrls(List<PluginURL> pluginURLs) throws CatalogServiceException;
+ void addPluginUrls(List<PluginURL> pluginURLs) throws CatalogServiceException;
- public Set<String> getCurrentCatalogIds() throws CatalogServiceException;
+ Set<String> getCurrentCatalogIds() throws CatalogServiceException;
- public TransactionReceipt ingest(Metadata metadata) throws CatalogServiceException;
+ TransactionReceipt ingest(Metadata metadata) throws CatalogServiceException;
- public void delete(Metadata metadata) throws CatalogServiceException;
+ void delete(Metadata metadata) throws CatalogServiceException;
- public List<String> getProperty(String key) throws CatalogServiceException;
+ List<String> getProperty(String key) throws CatalogServiceException;
- public Properties getCalalogProperties() throws CatalogServiceException;
+ Properties getCalalogProperties() throws CatalogServiceException;
- public Properties getCalalogProperties(String catalogUrn) throws CatalogServiceException;
+ Properties getCalalogProperties(String catalogUrn) throws CatalogServiceException;
- public Page getNextPage(Page page) throws CatalogServiceException;
+ Page getNextPage(Page page) throws CatalogServiceException;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws CatalogServiceException;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws CatalogServiceException;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
- public List<TransactionalMetadata> getMetadata(Page page) throws CatalogServiceException;
+ List<TransactionalMetadata> getMetadata(Page page) throws CatalogServiceException;
- public QueryPager query(QueryExpression queryExpression) throws CatalogServiceException;
+ QueryPager query(QueryExpression queryExpression) throws CatalogServiceException;
- public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
+ QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
- public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws CatalogServiceException;
+ List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws CatalogServiceException;
- public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws CatalogServiceException;
+ List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws CatalogServiceException;
- public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws CatalogServiceException;
+ List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws CatalogServiceException;
- public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws CatalogServiceException;
+ List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws CatalogServiceException;
- public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws CatalogServiceException;
+ List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws CatalogServiceException;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws CatalogServiceException;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws CatalogServiceException;
- public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws CatalogServiceException;
+ TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws CatalogServiceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
index 7ced6ce..360e098 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
@@ -26,6 +26,6 @@ package org.apache.oodt.cas.catalog.system;
*/
public interface CatalogServiceFactory {
- public CatalogService createCatalogService();
+ CatalogService createCatalogService();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
index a92b4f1..1d12f7f 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
@@ -30,6 +30,6 @@ import org.apache.oodt.cas.cli.exception.CmdLineActionStoreException;
*/
public interface CmdLineActionStore {
- public Set<CmdLineAction> loadSupportedActions()
+ Set<CmdLineAction> loadSupportedActions()
throws CmdLineActionStoreException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
index 2b90387..d372d65 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
@@ -23,5 +23,5 @@ package org.apache.oodt.cas.cli.action.store;
*/
public interface CmdLineActionStoreFactory {
- public CmdLineActionStore createStore();
+ CmdLineActionStore createStore();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
index e251b70..950773f 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
@@ -28,7 +28,7 @@ import org.springframework.context.ApplicationContext;
*/
public interface SpringSetContextInjectionType {
- public void setContext(ApplicationContext appContext);
+ void setContext(ApplicationContext appContext);
- public ApplicationContext getContext();
+ ApplicationContext getContext();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java b/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
index 50c4612..3736951 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
@@ -34,7 +34,7 @@ import org.apache.oodt.cas.cli.util.ParsedArg;
*/
public interface CmdLineConstructor {
- public Set<CmdLineOptionInstance> construct(CmdLineIterable<ParsedArg> parsedArgs,
- Set<CmdLineOption> validOptions) throws CmdLineConstructionException;
+ Set<CmdLineOptionInstance> construct(CmdLineIterable<ParsedArg> parsedArgs,
+ Set<CmdLineOption> validOptions) throws CmdLineConstructionException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
index 8b60fb9..3a0dfda 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
@@ -29,53 +29,53 @@ import org.apache.oodt.cas.cli.option.require.RequirementRule;
*/
public interface CmdLineOption {
- public void setLongOption(String longOption);
+ void setLongOption(String longOption);
- public String getLongOption();
+ String getLongOption();
- public void setShortOption(String shortOption);
+ void setShortOption(String shortOption);
- public String getShortOption();
+ String getShortOption();
- public void setDescription(String description);
+ void setDescription(String description);
- public String getDescription();
+ String getDescription();
- public void setType(Class<?> type);
+ void setType(Class<?> type);
- public Class<?> getType();
+ Class<?> getType();
- public void setRepeating(boolean repeating);
+ void setRepeating(boolean repeating);
- public boolean isRepeating();
+ boolean isRepeating();
- public void setHasArgs(boolean hasArgs);
+ void setHasArgs(boolean hasArgs);
- public boolean hasArgs();
+ boolean hasArgs();
- public void setArgsDescription(String argDescription);
+ void setArgsDescription(String argDescription);
- public String getArgsDescription();
+ String getArgsDescription();
- public void setStaticArgs(List<String> values);
+ void setStaticArgs(List<String> values);
- public List<String> getStaticArgs();
+ List<String> getStaticArgs();
- public boolean hasStaticArgs();
+ boolean hasStaticArgs();
- public void setRequired(boolean required);
+ void setRequired(boolean required);
- public boolean isRequired();
+ boolean isRequired();
- public void setRequirementRules(List<RequirementRule> requirementRules);
+ void setRequirementRules(List<RequirementRule> requirementRules);
- public List<RequirementRule> getRequirementRules();
+ List<RequirementRule> getRequirementRules();
- public void setIsSubOption(boolean isSubOption);
+ void setIsSubOption(boolean isSubOption);
- public boolean isSubOption();
+ boolean isSubOption();
- public boolean equals(Object obj);
+ boolean equals(Object obj);
- public int hashCode();
+ int hashCode();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
index 79cd149..f7578ab 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
@@ -27,9 +27,9 @@ import org.apache.oodt.cas.cli.option.handler.CmdLineOptionHandler;
*/
public interface HandleableCmdLineOption {
- public void setHandler(CmdLineOptionHandler handler);
+ void setHandler(CmdLineOptionHandler handler);
- public CmdLineOptionHandler getHandler();
+ CmdLineOptionHandler getHandler();
- public boolean hasHandler();
+ boolean hasHandler();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
index f18c537..387ad63 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
@@ -30,8 +30,8 @@ import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator;
*/
public interface ValidatableCmdLineOption {
- public void setValidators(List<CmdLineOptionValidator> validators);
+ void setValidators(List<CmdLineOptionValidator> validators);
- public List<CmdLineOptionValidator> getValidators();
+ List<CmdLineOptionValidator> getValidators();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
index 98f4aca..7fd2906 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
@@ -35,10 +35,10 @@ public interface CmdLineOptionHandler {
* is also called when help is run so allows registration to take
* place if necessary for help analysis.
*/
- public abstract void initialize(CmdLineOption option);
+ void initialize(CmdLineOption option);
- public abstract void handleOption(CmdLineAction selectedAction,
- CmdLineOptionInstance optionInstance);
+ void handleOption(CmdLineAction selectedAction,
+ CmdLineOptionInstance optionInstance);
/**
* Gets the {@link CmdLineOptionHandler}s help message when associated with
@@ -49,13 +49,13 @@ public interface CmdLineOptionHandler {
* {@link CmdLineOptionHandler} was associated with
* @return The help message for this {@link CmdLineOptionHandler}
*/
- public abstract String getHelp(CmdLineOption option);
+ String getHelp(CmdLineOption option);
/**
* If this handler causes the argument descriptor to be different for
* certain {@link CmdLineAction}s, then should return the arg
* description here.
*/
- public abstract String getArgDescription(CmdLineAction action,
- CmdLineOption option);
+ String getArgDescription(CmdLineAction action,
+ CmdLineOption option);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
index 438c02b..ad5ad4a 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
@@ -27,10 +27,10 @@ import org.apache.oodt.cas.cli.action.CmdLineAction;
*/
public interface RequirementRule {
- public enum Relation {
+ enum Relation {
REQUIRED, OPTIONAL, NONE
}
- public Relation getRelation(CmdLineAction action);
+ Relation getRelation(CmdLineAction action);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 7df83de..8e5b374 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
@@ -30,7 +30,7 @@ import org.apache.oodt.cas.cli.option.CmdLineOption;
*/
public interface CmdLineOptionStore {
- public Set<CmdLineOption> loadSupportedOptions()
+ Set<CmdLineOption> loadSupportedOptions()
throws CmdLineOptionStoreException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
index 8dec068..39c2bf2 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
@@ -23,6 +23,6 @@ package org.apache.oodt.cas.cli.option.store;
*/
public interface CmdLineOptionStoreFactory {
- public CmdLineOptionStore createStore();
+ CmdLineOptionStore createStore();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
index 16ed176..2e4faa6 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
@@ -26,7 +26,7 @@ import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
*/
public interface CmdLineOptionValidator {
- public class Result {
+ class Result {
public enum Grade {
PASS, FAIL;
}
@@ -52,5 +52,5 @@ public interface CmdLineOptionValidator {
* Throws {@link CmdLineValidationException} if validation fails, otherwise
* method just returns.
*/
- public Result validate(CmdLineOptionInstance optionInst);
+ Result validate(CmdLineOptionInstance optionInst);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 9e65191..c8284f1 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 {
- public List<ParsedArg> parse(String[] args) throws CmdLineParserException;
+ List<ParsedArg> parse(String[] args) throws CmdLineParserException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java b/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
index 5cafd3a..6954ea7 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
@@ -23,13 +23,13 @@ package org.apache.oodt.cas.cli.presenter;
*/
public interface CmdLinePresenter {
- public void presentOptionHelp(String optionHelpMessage);
+ void presentOptionHelp(String optionHelpMessage);
- public void presentActionHelp(String actionHelpMessage);
+ void presentActionHelp(String actionHelpMessage);
- public void presentActionsHelp(String actionsHelpMessage);
+ void presentActionsHelp(String actionsHelpMessage);
- public void presentErrorMessage(String errorMessage);
+ void presentErrorMessage(String errorMessage);
- public void presentActionMessage(String actionMessage);
+ void presentActionMessage(String actionMessage);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java b/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
index 709beef..f7a9cc6 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
@@ -43,7 +43,7 @@ public interface CmdLinePrinter {
* Supported {@link CmdLineOption}s
* @return Help message for specified action
*/
- public String printActionHelp(CmdLineAction action, Set<CmdLineOption> options);
+ String printActionHelp(CmdLineAction action, Set<CmdLineOption> options);
/**
* Generates help messages given {@link CmdLineAction}s.
@@ -52,7 +52,7 @@ public interface CmdLinePrinter {
* {@link CmdLineAction}s to print help for
* @return Help message for given {@link CmdLineAction}s
*/
- public String printActionsHelp(Set<CmdLineAction> actions);
+ String printActionsHelp(Set<CmdLineAction> actions);
/**
* Generates help message for given {@link CmdLineOption}s.
@@ -61,7 +61,7 @@ public interface CmdLinePrinter {
* {@link CmdLineOption}s for which help message will be generated
* @return Help message for given {@link CmdLineOption}s
*/
- public String printOptionsHelp(Set<CmdLineOption> options);
+ String printOptionsHelp(Set<CmdLineOption> options);
/**
* Generate validation error message for results of failed validations.
@@ -70,7 +70,7 @@ public interface CmdLinePrinter {
* {@link List} of FAILed validations
* @return Generated validation error message
*/
- public String printOptionValidationErrors(List<Result> results);
+ String printOptionValidationErrors(List<Result> results);
/**
* Generates missing required options error message from given
@@ -81,8 +81,8 @@ public interface CmdLinePrinter {
* not set.
* @return Generated missing required options error message.
*/
- public String printRequiredOptionsMissingError(
- Set<CmdLineOption> missingOptions);
+ String printRequiredOptionsMissingError(
+ Set<CmdLineOption> missingOptions);
/**
* Generates {@link CmdLineAction} message from list of messages.
@@ -90,5 +90,5 @@ public interface CmdLinePrinter {
* @param messages The messages from a {@link CmdLineAction}
* @return printed message from list of messages.
*/
- public String printActionMessages(List<String> messages);
+ String printActionMessages(List<String> messages);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java b/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
index 1a0b146..3c38b0a 100755
--- a/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
+++ b/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
@@ -35,13 +35,13 @@ public interface SpringSetIdInjectionType {
* @return Unique String id
*/
@Required
- public String getId();
+ String getId();
/**
* Set a unique id that represents this objects instance
* @param id Unique String id
*/
@Required
- public void setId(String id);
+ void setId(String id);
}