http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java index 0b6110a..ac9958f 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java @@ -30,14 +30,14 @@ import java.io.File; */ public interface IngestStatus { - public static enum Result { + enum Result { SUCCESS, FAILURE, SKIPPED, PRECONDS_FAILED; } - public File getProduct(); + File getProduct(); - public Result getResult(); + Result getResult(); - public String getMessage(); + String getMessage(); }
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java index fa8ca4d..8c3b6ec 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java @@ -29,36 +29,36 @@ package org.apache.oodt.cas.crawl.typedetection; */ public interface MimeExtractorConfigMetKeys { - public static final String MAGIC_ATTR = "magic"; + String MAGIC_ATTR = "magic"; - public static final String MIME_REPO_ATTR = "mimeRepo"; + String MIME_REPO_ATTR = "mimeRepo"; - public static final String DEFAULT_EXTRACTOR_TAG = "default"; + String DEFAULT_EXTRACTOR_TAG = "default"; - public static final String EXTRACTOR_TAG = "extractor"; + String EXTRACTOR_TAG = "extractor"; - public static final String NAMING_CONVENTION_TAG = "namingConvention"; + String NAMING_CONVENTION_TAG = "namingConvention"; - public static final String EXTRACTOR_CLASS_TAG = "extractorClass"; + String EXTRACTOR_CLASS_TAG = "extractorClass"; - public static final String EXTRACTOR_CONFIG_TAG = "config"; + String EXTRACTOR_CONFIG_TAG = "config"; - public static final String EXTRACTOR_PRECONDITIONS_TAG = "preconditions"; + String EXTRACTOR_PRECONDITIONS_TAG = "preconditions"; - public static final String MIME_TAG = "mime"; + String MIME_TAG = "mime"; - public static final String MIME_TYPE_ATTR = "type"; + String MIME_TYPE_ATTR = "type"; - public static final String CLASS_ATTR = "class"; + String CLASS_ATTR = "class"; - public static final String FILE_ATTR = "file"; + String FILE_ATTR = "file"; - public static final String ENV_REPLACE_ATTR = "envReplace"; + String ENV_REPLACE_ATTR = "envReplace"; - public static final String PRECONDITION_COMPARATORS_TAG = "preCondComparators"; + String PRECONDITION_COMPARATORS_TAG = "preCondComparators"; - public static final String PRECONDITION_COMPARATOR_TAG = "preCondComparator"; + String PRECONDITION_COMPARATOR_TAG = "preCondComparator"; - public static final String ID_ATTR = "id"; + String ID_ATTR = "id"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java index 465a51d..c1556c5 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java @@ -29,24 +29,24 @@ package org.apache.oodt.cas.curation.metadata; */ public interface CuratorConfMetKeys { - final String MET_EXTRACTOR_CONF_UPLOAD_PATH = "org.apache.oodt.cas.curator.metExtractorConf.uploadPath"; + String MET_EXTRACTOR_CONF_UPLOAD_PATH = "org.apache.oodt.cas.curator.metExtractorConf.uploadPath"; - final String POLICY_UPLOAD_PATH = "org.apache.oodt.cas.curator.dataDefinition.uploadPath"; + String POLICY_UPLOAD_PATH = "org.apache.oodt.cas.curator.dataDefinition.uploadPath"; - final String FM_URL = "org.apache.oodt.cas.fm.url"; + String FM_URL = "org.apache.oodt.cas.fm.url"; - final String DEFAULT_TRANSFER_FACTORY = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory"; + String DEFAULT_TRANSFER_FACTORY = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory"; - final String CRAWLER_CONF_FILE = "classpath:/org.apache/oodt/cas/crawl/crawler-config.xml"; + String CRAWLER_CONF_FILE = "classpath:/org.apache/oodt/cas/crawl/crawler-config.xml"; - final String STAGING_AREA_PATH = "org.apache.oodt.cas.curator.stagingAreaPath"; + String STAGING_AREA_PATH = "org.apache.oodt.cas.curator.stagingAreaPath"; - final String MET_AREA_PATH = "org.apache.oodt.cas.curator.metAreaPath"; + String MET_AREA_PATH = "org.apache.oodt.cas.curator.metAreaPath"; - final String MET_EXTENSION = "org.apache.oodt.cas.curator.metExtension"; + String MET_EXTENSION = "org.apache.oodt.cas.curator.metExtension"; - final String FM_PROPS = "org.apache.oodt.cas.curator.fmProps"; + String FM_PROPS = "org.apache.oodt.cas.curator.fmProps"; - final String CATALOG_FACTORY_CLASS = "org.apache.oodt.cas.curator.catalogFactoryClass"; + String CATALOG_FACTORY_CLASS = "org.apache.oodt.cas.curator.catalogFactoryClass"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java index 7527060..9d806df 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java @@ -28,9 +28,9 @@ package org.apache.oodt.cas.curation.structs; */ public interface IngestionTaskStatus { - public static final String FINISHED = "Finished"; + String FINISHED = "Finished"; - public static final String STARTED = "Started"; + String STARTED = "Started"; - public static final String NOT_STARTED = "Not Started"; + String NOT_STARTED = "Not Started"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 841633e..0a10fed 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 @@ -46,7 +46,7 @@ import org.apache.oodt.cas.metadata.Metadata; */ public interface Catalog extends Pagination { - public final static String X_POINT_ID = Catalog.class.getName(); + String X_POINT_ID = Catalog.class.getName(); /** * <p> @@ -61,7 +61,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any general error occurs. */ - public void addMetadata(Metadata m, Product product) + void addMetadata(Metadata m, Product product) throws CatalogException; /** @@ -77,7 +77,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any general error occurs. */ - public void removeMetadata(Metadata m, Product product) + void removeMetadata(Metadata m, Product product) throws CatalogException; /** @@ -90,7 +90,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs during the add. */ - public void addProduct(Product product) throws CatalogException; + void addProduct(Product product) throws CatalogException; /** * <p> @@ -103,7 +103,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public void modifyProduct(Product product) throws CatalogException; + void modifyProduct(Product product) throws CatalogException; /** * <p> @@ -115,7 +115,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public void removeProduct(Product product) throws CatalogException; + void removeProduct(Product product) throws CatalogException; /** * <p> @@ -127,7 +127,7 @@ public interface Catalog extends Pagination { * caller should make sure that the product ID field is set. * @throws CatalogException */ - public void setProductTransferStatus(Product product) + void setProductTransferStatus(Product product) throws CatalogException; /** @@ -143,7 +143,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If anything goes wrong. */ - public void addProductReferences(Product product) throws CatalogException; + void addProductReferences(Product product) throws CatalogException; /** * <p> @@ -158,7 +158,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public Product getProductById(String productId) throws CatalogException; + Product getProductById(String productId) throws CatalogException; /** * <p> @@ -172,7 +172,7 @@ public interface Catalog extends Pagination { * populated as well. * @throws CatalogException */ - public Product getProductByName(String productName) throws CatalogException; + Product getProductByName(String productName) throws CatalogException; /** * <p> @@ -185,7 +185,7 @@ public interface Catalog extends Pagination { * specified Product. * @throws CatalogException */ - public List getProductReferences(Product product) throws CatalogException; + List getProductReferences(Product product) throws CatalogException; /** * <p> @@ -196,7 +196,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public List<Product> getProducts() throws CatalogException; + List<Product> getProducts() throws CatalogException; /** * <p> @@ -211,7 +211,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public List<Product> getProductsByProductType(ProductType type) + List<Product> getProductsByProductType(ProductType type) throws CatalogException; /** @@ -226,7 +226,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public Metadata getMetadata(Product product) throws CatalogException; + Metadata getMetadata(Product product) throws CatalogException; /** * <p> @@ -241,7 +241,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public Metadata getReducedMetadata(Product product, List<String> elements) + Metadata getReducedMetadata(Product product, List<String> elements) throws CatalogException; /** @@ -258,7 +258,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public List<String> query(Query query, ProductType type) throws CatalogException; + List<String> query(Query query, ProductType type) throws CatalogException; /** * <p> @@ -282,7 +282,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public ProductPage pagedQuery(Query query, ProductType type, int pageNum) + ProductPage pagedQuery(Query query, ProductType type, int pageNum) throws CatalogException; /** @@ -298,7 +298,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public List<Product> getTopNProducts(int n) throws CatalogException; + List<Product> getTopNProducts(int n) throws CatalogException; /** * <p> @@ -315,7 +315,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public List<Product> getTopNProducts(int n, ProductType type) + List<Product> getTopNProducts(int n, ProductType type) throws CatalogException; /** @@ -324,7 +324,7 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs (e.g., the layer isn't initialized). */ - public ValidationLayer getValidationLayer() throws CatalogException; + ValidationLayer getValidationLayer() throws CatalogException; /** * @@ -335,6 +335,6 @@ public interface Catalog extends Pagination { * @throws CatalogException * If any error occurs. */ - public int getNumProducts(ProductType type) throws CatalogException; + int getNumProducts(ProductType type) throws CatalogException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java index 46a0f75..933f009 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java @@ -31,5 +31,5 @@ public interface CatalogFactory { /** * @return A new {@link Catalog} object implementation. */ - public Catalog createCatalog(); + Catalog createCatalog(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java index c1577f4..a0ee611 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java @@ -26,6 +26,6 @@ import org.apache.oodt.cas.filemgr.structs.Product; */ public interface ProductIdGenerator { - public String generateId(Product product); + String generateId(Product product); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java index b4708e2..fee3078 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java @@ -38,14 +38,14 @@ import java.net.URL; */ public interface DataTransfer { /* extension point ID */ - public static final String X_POINT_ID = DataTransfer.class.getName(); + String X_POINT_ID = DataTransfer.class.getName(); /** * * @param url The URL to the File Manager that this transferer will be * transferring Products to. */ - public void setFileManagerUrl(URL url); + void setFileManagerUrl(URL url); /** * @@ -58,7 +58,7 @@ public interface DataTransfer { * @throws IOException * If there is an IO eerror when performing the transfer. */ - public void transferProduct(Product product) throws DataTransferException, + void transferProduct(Product product) throws DataTransferException, IOException; /** @@ -70,8 +70,8 @@ public interface DataTransfer { * @throws IOException * If there is an IO eerror when performing the transfer. */ - public void retrieveProduct(Product product, File directory) throws DataTransferException, + void retrieveProduct(Product product, File directory) throws DataTransferException, IOException; - public void deleteProduct(Product product) throws DataTransferException, IOException; + void deleteProduct(Product product) throws DataTransferException, IOException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java index 0f09d1b..9acab13 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java @@ -29,5 +29,5 @@ public interface DataTransferFactory { /** * @return A new {@link DataTransfer} implementation. */ - public DataTransfer createDataTransfer(); + DataTransfer createDataTransfer(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java index 66a8578..44b627f 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java @@ -36,14 +36,14 @@ import java.util.List; */ public interface Cache { - public static final String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName"; + String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName"; /** * Clears the current cache. This should be used before a re-{@link #sync(String, String))} * occurs. * */ - public void clear(); + void clear(); /** * Checks the cache to determine if a {@link Product} with the given @@ -54,7 +54,7 @@ public interface Cache { * @return True if the {@link Product} is foudn in the Cache, False, * otherwise. */ - public boolean contains(String productName); + boolean contains(String productName); /** * Specifies the {@link URL} to the File Manager to connect this Cache to. @@ -63,13 +63,13 @@ public interface Cache { * The {@link URL} of the File Manager to cache {@link Product}s * from. */ - public void setFileManager(URL fmUrl); + void setFileManager(URL fmUrl); /** * * @return The size of the current {@link Product} cache. */ - public int size(); + int size(); /** * Synchronizes this Cache with the File Manager specified by the @@ -81,7 +81,7 @@ public interface Cache { * @throws CacheException * If there is any error. */ - public void sync(List<String> uniqueElementProductTypeNames) throws CacheException; + void sync(List<String> uniqueElementProductTypeNames) throws CacheException; /** * Synchronizes this Cache with the File Manager specified by the @@ -96,8 +96,8 @@ public interface Cache { * @throws CacheException * If there is any error. */ - public void sync(String uniqueElementName, - List<String> uniqueElementProductTypeNames) throws CacheException; + void sync(String uniqueElementName, + List<String> uniqueElementProductTypeNames) throws CacheException; /** * Synchronizes this Cache with the File Manager specified by the @@ -109,7 +109,7 @@ public interface Cache { * @throws CacheException * If any error occurs. */ - public void sync() throws CacheException; + void sync() throws CacheException; /** * Sets the names of the {@link ProductType}s to cache. @@ -118,8 +118,8 @@ public interface Cache { * A {@link List} of java.util.String names of * {@link ProductType}s. */ - public void setUniqueElementProductTypeNames( - List<String> uniqueElementProductTypeNames); + void setUniqueElementProductTypeNames( + List<String> uniqueElementProductTypeNames); /** * Sets the name of the met element to use as the identifier of a @@ -130,7 +130,7 @@ public interface Cache { * The name of the met element used to uniquely identify * {@link Product}s. */ - public void setUniqueElementName(String uniqueElementName); + void setUniqueElementName(String uniqueElementName); /** * Gets the {@link URL} of the File Manager that this Cache communicates @@ -139,5 +139,5 @@ public interface Cache { * @return The {@link URL} of the File Manager that this Cache communicates * with. */ - public URL getFileManagerUrl(); + URL getFileManagerUrl(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java index a901ada..68bdd7b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java @@ -34,6 +34,6 @@ public interface CacheFactory { * @throws InstantiationException If the the particular {@link Cache} can * not be created for some reason. */ - public Cache createCache() throws InstantiationException; + Cache createCache() throws InstantiationException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/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 45e71d4..c2251ea 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 @@ -58,8 +58,8 @@ public interface Ingester { * @throws IngestException * If there is an error ingesting the {@link Product} */ - public String ingest(URL fmUrl, File prodFile, MetExtractor extractor, - File metConfFile) throws IngestException; + String ingest(URL fmUrl, File prodFile, MetExtractor extractor, + File metConfFile) throws IngestException; /** * Ingests a {@link Product} to the file manager service object identified @@ -78,7 +78,7 @@ public interface Ingester { * @throws IngestException * If there is an error ingesting the {@link Product} */ - public String ingest(URL fmUrl, File prodFile, Metadata met) + String ingest(URL fmUrl, File prodFile, Metadata met) throws IngestException; /** @@ -96,8 +96,8 @@ public interface Ingester { * @throws IngestException * If there is an error ingesting the {@link Product}s. */ - public void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor, - File metConfFile) throws IngestException; + void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor, + File metConfFile) throws IngestException; /** * Checks the file manager at the given {@link URL} to see whether or not it @@ -111,7 +111,7 @@ public interface Ingester { * @url The {@link URL} pointer to the file manager service. * @return */ - public boolean hasProduct(URL fmUrl, File prodFile) throws CatalogException; + boolean hasProduct(URL fmUrl, File prodFile) throws CatalogException; /** * Checks the file manager at the given {@link URL} to see whether or not it @@ -127,6 +127,6 @@ public interface Ingester { * not unique) name. * @return True if the file manager has the product, false otherwise. */ - public boolean hasProduct(URL fmUrl, String productName) throws CatalogException; + boolean hasProduct(URL fmUrl, String productName) throws CatalogException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java index ab5ad93..c6ea595 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java @@ -35,14 +35,14 @@ import java.util.List; */ public interface RemoteableCache extends Remote{ - public static final String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName"; + String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName"; /** * Clears the current cache. This should be used before a re-{@link #sync(String, String))} * occurs. * */ - public void clear() throws RemoteException; + void clear() throws RemoteException; /** * Checks the cache to determine if a {@link Product} with the given @@ -53,7 +53,7 @@ public interface RemoteableCache extends Remote{ * @return True if the {@link Product} is foudn in the Cache, False, * otherwise. */ - public boolean contains(String productName) throws RemoteException; + boolean contains(String productName) throws RemoteException; /** * Specifies the {@link URL} to the File Manager to connect this Cache to. @@ -62,13 +62,13 @@ public interface RemoteableCache extends Remote{ * The {@link URL} of the File Manager to cache {@link Product}s * from. */ - public void setFileManager(URL fmUrl) throws RemoteException; + void setFileManager(URL fmUrl) throws RemoteException; /** * * @return The size of the current {@link Product} cache. */ - public int size() throws RemoteException; + int size() throws RemoteException; /** * Synchronizes this Cache with the File Manager specified by the @@ -80,7 +80,7 @@ public interface RemoteableCache extends Remote{ * @throws RemoteException * If there is any error. */ - public void sync(List<String> uniqueElementProductTypeNames) throws RemoteException; + void sync(List<String> uniqueElementProductTypeNames) throws RemoteException; /** * Synchronizes this Cache with the File Manager specified by the @@ -95,8 +95,8 @@ public interface RemoteableCache extends Remote{ * @throws RemoteException * If there is any error. */ - public void sync(String uniqueElementName, - List<String> uniqueElementProductTypeNames) throws RemoteException; + void sync(String uniqueElementName, + List<String> uniqueElementProductTypeNames) throws RemoteException; /** * Synchronizes this Cache with the File Manager specified by the @@ -108,7 +108,7 @@ public interface RemoteableCache extends Remote{ * @throws RemoteException * If any error occurs. */ - public void sync() throws RemoteException; + void sync() throws RemoteException; /** * Sets the names of the {@link ProductType}s to cache. @@ -117,8 +117,8 @@ public interface RemoteableCache extends Remote{ * A {@link List} of java.util.String names of * {@link ProductType}s. */ - public void setUniqueElementProductTypeNames( - List<String> uniqueElementProductTypeNames) throws RemoteException; + void setUniqueElementProductTypeNames( + List<String> uniqueElementProductTypeNames) throws RemoteException; /** * Sets the name of the met element to use as the identifier of a @@ -129,7 +129,7 @@ public interface RemoteableCache extends Remote{ * The name of the met element used to uniquely identify * {@link Product}s. */ - public void setUniqueElementName(String uniqueElementName) + void setUniqueElementName(String uniqueElementName) throws RemoteException; /** @@ -139,5 +139,5 @@ public interface RemoteableCache extends Remote{ * @return The {@link URL} of the File Manager that this Cache communicates * with. */ - public URL getFileManagerUrl() throws RemoteException; + URL getFileManagerUrl() throws RemoteException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java index edd14d5..d23a7f5 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java @@ -26,22 +26,22 @@ package org.apache.oodt.cas.filemgr.metadata; */ public interface CoreMetKeys { - public static final String PRODUCT_NAME = "ProductName"; + String PRODUCT_NAME = "ProductName"; - public static final String PRODUCT_ID = "ProductId"; + String PRODUCT_ID = "ProductId"; - public static final String PRODUCT_RECEVIED_TIME = "ProductReceivedTime"; + String PRODUCT_RECEVIED_TIME = "ProductReceivedTime"; - public static final String FILE_LOCATION = "FileLocation"; + String FILE_LOCATION = "FileLocation"; - public static final String FILENAME = "Filename"; + String FILENAME = "Filename"; - public static final String FILE_SIZE = "FileSize"; + String FILE_SIZE = "FileSize"; - public static final String PRODUCT_TYPE = "ProductType"; + String PRODUCT_TYPE = "ProductType"; - public static final String PRODUCT_STRUCTURE = "ProductStructure"; + String PRODUCT_STRUCTURE = "ProductStructure"; - public static final String MIME_TYPE = "MimeType"; + String MIME_TYPE = "MimeType"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java index b725da2..558c6eb 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java @@ -31,22 +31,22 @@ package org.apache.oodt.cas.filemgr.metadata; */ public interface ProductMetKeys { - public static final String PRODUCT_ID = "ProductId"; + String PRODUCT_ID = "ProductId"; - public static final String PRODUCT_NAME = "ProductName"; + String PRODUCT_NAME = "ProductName"; - public static final String PRODUCT_STRUCTURE = "ProductStructure"; + String PRODUCT_STRUCTURE = "ProductStructure"; - public static final String PRODUCT_TRANSFER_STATUS = "ProductTransferStatus"; + String PRODUCT_TRANSFER_STATUS = "ProductTransferStatus"; - public static final String PRODUCT_ROOT_REFERENCE = "ProductRootReference"; + String PRODUCT_ROOT_REFERENCE = "ProductRootReference"; - public static final String PRODUCT_DATASTORE_REFS = "ProductDataStoreReferences"; + String PRODUCT_DATASTORE_REFS = "ProductDataStoreReferences"; - public static final String PRODUCT_ORIG_REFS = "ProductOrigReferences"; + String PRODUCT_ORIG_REFS = "ProductOrigReferences"; - public static final String PRODUCT_MIME_TYPES = "ProductMimeType"; + String PRODUCT_MIME_TYPES = "ProductMimeType"; - public static final String PRODUCT_FILE_SIZES = "ProductFileSize"; + String PRODUCT_FILE_SIZES = "ProductFileSize"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java index 64f1e87..e2ee1c4 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java @@ -46,7 +46,7 @@ public interface FilemgrMetExtractor { * @return Extracted {@link Metadata} derived from the existing * {@link Metadata} and {@link Product} provided. */ - public Metadata extractMetadata(Product product, Metadata met) + Metadata extractMetadata(Product product, Metadata met) throws MetExtractionException; /** @@ -56,5 +56,5 @@ public interface FilemgrMetExtractor { * The {@link Properties} object to configure this Metadata * extractor with. */ - public void configure(Properties props); + void configure(Properties props); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java index 0bd4e84..f5c56b2 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java @@ -40,7 +40,7 @@ import java.util.List; public interface RepositoryManager { /* extension point ID */ - public static String X_POINT_ID = RepositoryManager.class.getName(); + String X_POINT_ID = RepositoryManager.class.getName(); /** * <p> @@ -51,7 +51,7 @@ public interface RepositoryManager { * The {@link ProductType} to add. * @throws RepositoryManagerException */ - public void addProductType(ProductType productType) + void addProductType(ProductType productType) throws RepositoryManagerException; /** @@ -65,7 +65,7 @@ public interface RepositoryManager { * @throws RepositoryManagerException * If any error occurs. */ - public void modifyProductType(ProductType productType) + void modifyProductType(ProductType productType) throws RepositoryManagerException; /** @@ -78,7 +78,7 @@ public interface RepositoryManager { * @throws RepositoryManagerException * If any error occurs during the removal. */ - public void removeProductType(ProductType productType) + void removeProductType(ProductType productType) throws RepositoryManagerException; /** @@ -94,7 +94,7 @@ public interface RepositoryManager { * @throws RepositoryManagerException * If any error occurs. */ - public ProductType getProductTypeById(String productTypeId) + ProductType getProductTypeById(String productTypeId) throws RepositoryManagerException; /** @@ -109,7 +109,7 @@ public interface RepositoryManager { * @throws RepositoryManagerException * If any error occurs. */ - public ProductType getProductTypeByName(String productTypeName) + ProductType getProductTypeByName(String productTypeName) throws RepositoryManagerException; /** @@ -121,5 +121,5 @@ public interface RepositoryManager { * @throws RepositoryManagerException * If any error occurs. */ - public List<ProductType> getProductTypes() throws RepositoryManagerException; + List<ProductType> getProductTypes() throws RepositoryManagerException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java index d533d5e..db38bd8 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java @@ -28,5 +28,5 @@ package org.apache.oodt.cas.filemgr.repository; */ public interface RepositoryManagerFactory { - public RepositoryManager createRepositoryManager(); + RepositoryManager createRepositoryManager(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java index 91cb252..4d7ef8f 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java @@ -28,6 +28,6 @@ package org.apache.oodt.cas.filemgr.structs.query.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/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 5dd68ca..5e5e564 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 @@ -45,6 +45,6 @@ public interface Dispatcher { * @throws Exception * If any error occurs. */ - public Result handleRequest(String methodSpecifier, List params, - String user, String password) throws Exception; + Result handleRequest(String methodSpecifier, List params, + String user, String password) throws Exception; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java index 9c04840..7e9f85a 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java @@ -38,7 +38,7 @@ public interface Pagination { * The ProductType to obtain the first {@link ProductPage} for. * @return The first page of products for a particular {@link ProductType}. */ - public ProductPage getFirstPage(ProductType type); + ProductPage getFirstPage(ProductType type); /** * @@ -46,7 +46,7 @@ public interface Pagination { * The ProductType to obtain the last {@link ProductPage} for. * @return The last page of products for a particular {@link ProductType}. */ - public ProductPage getLastProductPage(ProductType type); + ProductPage getLastProductPage(ProductType type); /** * @@ -59,7 +59,7 @@ public interface Pagination { * @return The next page in the ProductType product list, given the * currentPage. */ - public ProductPage getNextPage(ProductType type, ProductPage currentPage); + ProductPage getNextPage(ProductType type, ProductPage currentPage); /** * @@ -72,5 +72,5 @@ public interface Pagination { * @return The previous page in the ProductType product list, given the * currentPage. */ - public ProductPage getPrevPage(ProductType type, ProductPage currentPage); + ProductPage getPrevPage(ProductType type, ProductPage currentPage); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java index a901bc2..59a4b5d 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java @@ -48,7 +48,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs during the add. */ - public void addElement(Element element) throws ValidationLayerException; + void addElement(Element element) throws ValidationLayerException; /** * <p> @@ -60,7 +60,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public void modifyElement(Element element) throws ValidationLayerException; + void modifyElement(Element element) throws ValidationLayerException; /** * <p> @@ -71,7 +71,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public void removeElement(Element element) throws ValidationLayerException; + void removeElement(Element element) throws ValidationLayerException; /** * <p> @@ -86,7 +86,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public void addElementToProductType(ProductType type, Element element) + void addElementToProductType(ProductType type, Element element) throws ValidationLayerException; /** @@ -104,7 +104,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public void removeElementFromProductType(ProductType type, Element element) + void removeElementFromProductType(ProductType type, Element element) throws ValidationLayerException; /** @@ -120,7 +120,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public List<Element> getElements(ProductType type) + List<Element> getElements(ProductType type) throws ValidationLayerException; /** @@ -129,7 +129,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public List<Element> getElements() throws ValidationLayerException; + List<Element> getElements() throws ValidationLayerException; /** * Gets an element by its String identifier. @@ -140,7 +140,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public Element getElementById(String elementId) + Element getElementById(String elementId) throws ValidationLayerException; /** @@ -152,7 +152,7 @@ public interface ValidationLayer { * @throws ValidationLayerException * If any error occurs. */ - public Element getElementByName(String elementName) + Element getElementByName(String elementName) throws ValidationLayerException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java index 73b89ff..014cde0 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java @@ -28,5 +28,5 @@ package org.apache.oodt.cas.filemgr.validation; */ public interface ValidationLayerFactory { - public ValidationLayer createValidationLayer(); + ValidationLayer createValidationLayer(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java index 2b274f3..1c1b0c1 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java @@ -34,9 +34,9 @@ import org.apache.oodt.cas.metadata.Metadata; */ public interface Versioner { - public static final String X_POINT_ID = Versioner.class.getName(); + String X_POINT_ID = Versioner.class.getName(); - public void createDataStoreReferences(Product product, Metadata metadata) + void createDataStoreReferences(Product product, Metadata metadata) throws VersioningException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java index 699d7c6..ee2f4b6 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java @@ -51,7 +51,7 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs. */ - public Metadata extractMetadata(File f) throws MetExtractionException; + Metadata extractMetadata(File f) throws MetExtractionException; /** * Extracts {@link Metadata} from a given <code>/path/to/some/file</code>. @@ -62,7 +62,7 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs. */ - public Metadata extractMetadata(String filePath) + Metadata extractMetadata(String filePath) throws MetExtractionException; /** @@ -75,7 +75,7 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs. */ - public Metadata extractMetadata(URL fileUrl) throws MetExtractionException; + Metadata extractMetadata(URL fileUrl) throws MetExtractionException; /** * Sets the config file for this MetExtractor to the specified {@link File} @@ -85,7 +85,7 @@ public interface MetExtractor { * The config file for this MetExtractor. * @throws MetExtractionException */ - public void setConfigFile(File f) throws MetExtractionException; + void setConfigFile(File f) throws MetExtractionException; /** * Sets the config file for this MetExtractor to the specified {@link File} @@ -95,7 +95,7 @@ public interface MetExtractor { * The config file path for this MetExtractor. * @throws MetExtractionException */ - public void setConfigFile(String filePath) throws MetExtractionException; + void setConfigFile(String filePath) throws MetExtractionException; /** * Sets the MetExtractorConfig for the MetExtractor @@ -103,7 +103,7 @@ public interface MetExtractor { * @param config * The MetExtractorConfig */ - public void setConfigFile(MetExtractorConfig config); + void setConfigFile(MetExtractorConfig config); /** * Extracts {@link Metadata} from the given {@link File} using the specified @@ -118,7 +118,7 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs. */ - public Metadata extractMetadata(File f, File configFile) + Metadata extractMetadata(File f, File configFile) throws MetExtractionException; /** @@ -134,7 +134,7 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs. */ - public Metadata extractMetadata(File f, String configFilePath) + Metadata extractMetadata(File f, String configFilePath) throws MetExtractionException; /** @@ -150,7 +150,7 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs */ - public Metadata extractMetadata(File f, MetExtractorConfig config) + Metadata extractMetadata(File f, MetExtractorConfig config) throws MetExtractionException; /** @@ -166,6 +166,6 @@ public interface MetExtractor { * @throws MetExtractionException * If any error occurs */ - public Metadata extractMetadata(URL fileUrl, MetExtractorConfig config) + Metadata extractMetadata(URL fileUrl, MetExtractorConfig config) throws MetExtractionException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java index 9f982b1..bb972ee 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java @@ -46,7 +46,7 @@ public interface MetExtractorConfigReader { * @throws MetExtractorConfigReaderException * If any error occurs */ - public MetExtractorConfig parseConfigFile(File configFile) + MetExtractorConfig parseConfigFile(File configFile) throws MetExtractorConfigReaderException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java index d638977..9b2b82f 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java @@ -28,26 +28,26 @@ package org.apache.oodt.cas.metadata.extractors; */ public interface ExternConfigReaderMetKeys { - public static final String EXEC_TAG = "exec"; + String EXEC_TAG = "exec"; - public static final String WORKING_DIR_ATTR = "workingDir"; + String WORKING_DIR_ATTR = "workingDir"; - public static final String MET_FILE_EXT_ATTR = "metFileExt"; + String MET_FILE_EXT_ATTR = "metFileExt"; - public static final String EXTRACTOR_BIN_PATH_TAG = "extractorBinPath"; + String EXTRACTOR_BIN_PATH_TAG = "extractorBinPath"; - public static final String ENV_REPLACE_ATTR = "envReplace"; + String ENV_REPLACE_ATTR = "envReplace"; - public static final String ARGS_TAG = "args"; + String ARGS_TAG = "args"; - public static final String ARG_TAG = "arg"; + String ARG_TAG = "arg"; - public static final String IS_DATA_FILE_ATTR = "isDataFile"; + String IS_DATA_FILE_ATTR = "isDataFile"; - public static final String IS_MET_FILE_ATTR = "isMetFile"; + String IS_MET_FILE_ATTR = "isMetFile"; - public static final String APPEND_EXT_ATTR = "appendExt"; + String APPEND_EXT_ATTR = "appendExt"; - public static final String IS_PATH_ATTR = "isPath"; + String IS_PATH_ATTR = "isPath"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java index 85702dd..a8fb93e 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java @@ -29,10 +29,10 @@ package org.apache.oodt.cas.metadata.extractors; */ public interface ExternMetExtractorMetKeys { - public static final String DATA_FILE_PLACE_HOLDER = "<DATA_FILE_PLACE_HOLDER>"; + String DATA_FILE_PLACE_HOLDER = "<DATA_FILE_PLACE_HOLDER>"; - public static final String MET_FILE_PLACE_HOLDER = "<MET_FILE_PLACE_HOLDER>"; + String MET_FILE_PLACE_HOLDER = "<MET_FILE_PLACE_HOLDER>"; - public static final String DEFAULT_MET_FILE_EXTENSION = "met"; + String DEFAULT_MET_FILE_EXTENSION = "met"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java index 46b24ce..11bce23 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java @@ -28,20 +28,20 @@ package org.apache.oodt.cas.metadata.extractors; */ public interface FilenameTokenExtractorMetKeys { - public static final String TIME_FORMAT_STRING_SCALAR = "TimeFormatString"; + String TIME_FORMAT_STRING_SCALAR = "TimeFormatString"; - public static final String SUBSTRING_OFFSET_GROUP = "SubstringOffsetGroup"; + String SUBSTRING_OFFSET_GROUP = "SubstringOffsetGroup"; - public static final String TOKEN_LIST_GROUP = "TokenNameListGroup"; + String TOKEN_LIST_GROUP = "TokenNameListGroup"; - public static final String TOKEN_DELIMETER_SCALAR = "Delimeter"; + String TOKEN_DELIMETER_SCALAR = "Delimeter"; - public static final String TOKEN_MET_KEYS_VECTOR = "TokenMetKeys"; + String TOKEN_MET_KEYS_VECTOR = "TokenMetKeys"; - public static final String PRODUCTION_DATE_TIME_GROUP = "ProductionDateTimeGroup"; + String PRODUCTION_DATE_TIME_GROUP = "ProductionDateTimeGroup"; - public static final String DATETIME_SCALAR = "DateTimeFormat"; + String DATETIME_SCALAR = "DateTimeFormat"; - public static final String COMMON_METADATA_GROUP = "CommonMetadata"; + String COMMON_METADATA_GROUP = "CommonMetadata"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java index 4d6a73d..25882af 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java @@ -30,6 +30,6 @@ import org.apache.oodt.cas.metadata.exceptions.NamingConventionException; */ public interface NamingConvention { - public File rename(File file, Metadata metadata) + File rename(File file, Metadata metadata) throws NamingConventionException; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java index 32938f0..96160f7 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java @@ -30,12 +30,12 @@ package org.apache.oodt.cas.metadata.preconditions; */ public interface PreConditionOperatorMetKeys { - public static String EQUAL_TO = "EQUAL_TO"; + String EQUAL_TO = "EQUAL_TO"; - public static String NOT_EQUAL_TO = "NOT_EQUAL_TO"; + String NOT_EQUAL_TO = "NOT_EQUAL_TO"; - public static String GREATER_THAN = "GREATER_THAN"; + String GREATER_THAN = "GREATER_THAN"; - public static String LESS_THAN = "LESS_THAN"; + String LESS_THAN = "LESS_THAN"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java ---------------------------------------------------------------------- diff --git a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java index 806eafe..c4ca432 100644 --- a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java +++ b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java @@ -28,15 +28,15 @@ package org.apache.oodt.cas.install; */ public interface CASInstallDirMetKeys { - public static final String POLICY_DIR_NAME = "policy"; + String POLICY_DIR_NAME = "policy"; - public static final String CONFIG_DIR_NAME = "etc"; + String CONFIG_DIR_NAME = "etc"; - public static final String LIB_DIR_NAME = "lib"; + String LIB_DIR_NAME = "lib"; - public static final String BIN_DIR_NAME = "bin"; + String BIN_DIR_NAME = "bin"; - public static final String[] FM_CONFIG_FILES = { "filemgr.properties", + String[] FM_CONFIG_FILES = { "filemgr.properties", "logging.properties" }; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java b/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java index 1fba636..6ee2378 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java @@ -26,12 +26,12 @@ package org.apache.oodt.opendapps; */ public interface DapNames { - public static final String ACTUAL_RANGE = "actual_range"; + String ACTUAL_RANGE = "actual_range"; - public static final String UNITS = "units"; + String UNITS = "units"; - public static final String START = "start"; + String START = "start"; - public static final String END = "end"; + String END = "end"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java index 6be8298..cf68dab 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java @@ -24,64 +24,64 @@ package org.apache.oodt.opendapps.config; */ public interface OpendapConfigMetKeys { - public static final String RES_ATTR_SPEC_TYPE = "resAttr"; + String RES_ATTR_SPEC_TYPE = "resAttr"; - public static final String PROF_ATTR_SPEC_TYPE = "profAttr"; + String PROF_ATTR_SPEC_TYPE = "profAttr"; - public static final String PROF_ELEM_SPEC_TYPE = "profElem"; + String PROF_ELEM_SPEC_TYPE = "profElem"; - public static final String ENUM_ELEMENT_TYPE = "EnumeratedProfileElement"; + String ENUM_ELEMENT_TYPE = "EnumeratedProfileElement"; - public static final String RANGED_ELEMENT_TYPE = "RangedProfileElement"; + String RANGED_ELEMENT_TYPE = "RangedProfileElement"; - public static final String DAP_ROOT_TAG = "root"; + String DAP_ROOT_TAG = "root"; - public static final String DATASET_URL_ATTR = "datasetURL"; + String DATASET_URL_ATTR = "datasetURL"; - public static final String CATALOG_URL_ATTR = "catalogURL"; + String CATALOG_URL_ATTR = "catalogURL"; - public static final String FILTER_ATTR = "filter"; + String FILTER_ATTR = "filter"; - public static final String REWRITE_ROOT_TAG = "rewrite"; + String REWRITE_ROOT_TAG = "rewrite"; - public static final String REWRITE_VAR_TAG = "var"; + String REWRITE_VAR_TAG = "var"; - public static final String REWRITE_VAR_NAME_ATTR = "name"; + String REWRITE_VAR_NAME_ATTR = "name"; - public static final String REWRITE_VAR_RENAME_ATTR = "rename"; + String REWRITE_VAR_RENAME_ATTR = "rename"; - public static final String REWRITE_VAR_TYPE_ATTR = "type"; + String REWRITE_VAR_TYPE_ATTR = "type"; - public static final String CONSTANT_ROOT_TAG = "constants"; + String CONSTANT_ROOT_TAG = "constants"; - public static final String CONSTANT_TAG = "const"; + String CONSTANT_TAG = "const"; - public static final String CONSTANT_NAME_ATTR = "name"; + String CONSTANT_NAME_ATTR = "name"; - public static final String CONSTANT_TYPE_ATTR = "type"; + String CONSTANT_TYPE_ATTR = "type"; - public static final String CONSTANT_VALUE_ATTR = "value"; + String CONSTANT_VALUE_ATTR = "value"; - public static final String DATASET_MET_ROOT_TAG = "datasetMetadata"; + String DATASET_MET_ROOT_TAG = "datasetMetadata"; - public static final String DATASET_MET_ELEM_TAG = "elem"; + String DATASET_MET_ELEM_TAG = "elem"; - public static final String DATASET_MET_NAME_ATTR = "name"; + String DATASET_MET_NAME_ATTR = "name"; - public static final String DATASET_MET_VALUE_ATTR = "value"; + String DATASET_MET_VALUE_ATTR = "value"; - public static final String RES_LOCATION_ATTR = "resLocation"; + String RES_LOCATION_ATTR = "resLocation"; - public static final String PROCESSING_INSTRUCTIONS_TAG = "processingInstructions"; + String PROCESSING_INSTRUCTIONS_TAG = "processingInstructions"; - public static final String PROCESSING_INSTRUCTION_TAG = "processingInstruction"; + String PROCESSING_INSTRUCTION_TAG = "processingInstruction"; - public static final String PROCESSING_INSTRUCTION_NAME_ATTR = "name"; + String PROCESSING_INSTRUCTION_NAME_ATTR = "name"; - public static final String PROCESSING_INSTRUCTION_VALUE_ATTR = "value"; + String PROCESSING_INSTRUCTION_VALUE_ATTR = "value"; - public static final String EXCLUDE_VARIABLES_ATTR = "excludeVariables"; + String EXCLUDE_VARIABLES_ATTR = "excludeVariables"; - public static final String DATETIME_FORMAT_ATTR = "datetimeFormat"; + String DATETIME_FORMAT_ATTR = "datetimeFormat"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java index d060b57..f833be8 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java @@ -24,13 +24,13 @@ package org.apache.oodt.opendapps.config; */ public interface OpendapProfileMetKeys { - public static final String VARIABLES = "Variables"; + String VARIABLES = "Variables"; - public static final String COORDINATES = "Coordinates"; + String COORDINATES = "Coordinates"; - public static final String VARIABLES_LONG_NAMES = "Variable Long Names"; + String VARIABLES_LONG_NAMES = "Variable Long Names"; - public static final String CF_STANDARD_NAMES = "CF Standard Names"; + String CF_STANDARD_NAMES = "CF Standard Names"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java index 411dd8d..535d1f2 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java @@ -26,10 +26,10 @@ package org.apache.oodt.pcs.health; */ public interface CrawlerPropertiesMetKeys { - public static final String CRAWLER_INFO_GROUP = "CrawlerInfo"; + String CRAWLER_INFO_GROUP = "CrawlerInfo"; - public static final String CRAWLER_PROPERTIES_GROUP = "CrawlProperties"; + String CRAWLER_PROPERTIES_GROUP = "CrawlProperties"; - public static final String CRAWLER_HOST_NAME = "Hostname"; + String CRAWLER_HOST_NAME = "Hostname"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java index c28feb5..245e0da 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java @@ -25,28 +25,28 @@ package org.apache.oodt.pcs.health; */ public interface PCSHealthMonitorMetKeys { - public static final String HEADER_AND_FOOTER = "--------------------------------------"; + String HEADER_AND_FOOTER = "--------------------------------------"; - public static final String SECTION_SEPARATOR = "--------"; + String SECTION_SEPARATOR = "--------"; - public static final String REPORT_BANNER = "PCS Health Monitor Report"; + String REPORT_BANNER = "PCS Health Monitor Report"; - public static final String FILE_MANAGER_DAEMON_NAME = "File Manager"; + String FILE_MANAGER_DAEMON_NAME = "File Manager"; - public static final String WORKFLOW_MANAGER_DAEMON_NAME = "Workflow Manager"; + String WORKFLOW_MANAGER_DAEMON_NAME = "Workflow Manager"; - public static final String RESOURCE_MANAGER_DAEMON_NAME = "Resource Manager"; + String RESOURCE_MANAGER_DAEMON_NAME = "Resource Manager"; - public static final String BATCH_STUB_DAEMON_NAME = "batch stub"; + String BATCH_STUB_DAEMON_NAME = "batch stub"; - public static final String STATUS_UP = "UP"; + String STATUS_UP = "UP"; - public static final String STATUS_DOWN = "DOWN"; + String STATUS_DOWN = "DOWN"; - public static final int TOP_N_PRODUCTS = 20; + int TOP_N_PRODUCTS = 20; - public static final int CRAWLER_DOWN_INT = -1; + int CRAWLER_DOWN_INT = -1; - public static final double CRAWLER_DOWN_DOUBLE = -1.0; + double CRAWLER_DOWN_DOUBLE = -1.0; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java index e4c1e55..d4837f3 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java @@ -26,8 +26,8 @@ package org.apache.oodt.pcs.health; */ public interface WorkflowStatesMetKeys { - public static final String WORKFLOW_STATES_GROUP = "WorkflowStatesGroup"; + String WORKFLOW_STATES_GROUP = "WorkflowStatesGroup"; - public static final String WORKFLOW_STATES_VECTOR = "States"; + String WORKFLOW_STATES_VECTOR = "States"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java index 114052d..54a8437 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java @@ -27,16 +27,16 @@ package org.apache.oodt.pcs.listing; */ public interface ListingConfKeys { - public static final String MET_FIELD_COLS_GROUP = "MetFieldColumns"; + String MET_FIELD_COLS_GROUP = "MetFieldColumns"; - public static final String MET_FIELDS_ORDER_VECTOR = "OrderedMetKeys"; + String MET_FIELDS_ORDER_VECTOR = "OrderedMetKeys"; - public static final String COLLECTION_FIELDS_GROUP = "CollectionFields"; + String COLLECTION_FIELDS_GROUP = "CollectionFields"; - public static final String COLLECTION_FIELDS_NAMES = "FieldNames"; + String COLLECTION_FIELDS_NAMES = "FieldNames"; - public static final String EXCLUDED_PRODUCT_TYPE_GROUP = "ExcludedProductTypeList"; + String EXCLUDED_PRODUCT_TYPE_GROUP = "ExcludedProductTypeList"; - public static final String EXCLUDED_VECTOR = "ProductTypes"; + String EXCLUDED_VECTOR = "ProductTypes"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java index 9e4f894..1bc5487 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java @@ -26,54 +26,54 @@ package org.apache.oodt.pcs.metadata; */ public interface PCSConfigMetadata { - public static final String PGE_TASK_TYPE = "PCS_PGETaskType"; + String PGE_TASK_TYPE = "PCS_PGETaskType"; - public static final String NUM_JAVA_EXT_DIRS = "PCS_NumJavaExtDirs"; + String NUM_JAVA_EXT_DIRS = "PCS_NumJavaExtDirs"; // use this key like: JAVA_EXT_DIR+"1", or JAVA_EXT_DIR+"2" - public static final String JAVA_EXT_DIR = "PCS_JavaExtDir"; + String JAVA_EXT_DIR = "PCS_JavaExtDir"; - public static final String JAVA_MAIN_CLASS = "PCS_JavaMainClass"; + String JAVA_MAIN_CLASS = "PCS_JavaMainClass"; - public static final String FILE_MANAGER_URL = "PCS_FileManagerUrl"; + String FILE_MANAGER_URL = "PCS_FileManagerUrl"; - public static final String SCF_FILE_MANAGER_URL = "SCF_FileManagerUrl"; + String SCF_FILE_MANAGER_URL = "SCF_FileManagerUrl"; - public static final String WORKFLOW_MANAGER_URL = "PCS_WorkflowManagerUrl"; + String WORKFLOW_MANAGER_URL = "PCS_WorkflowManagerUrl"; - public static final String PGE_CONFIG_FILE_PROPERTY_ADDER_CLASS = "PCS_PGEConfigPropertyAdderClass"; + String PGE_CONFIG_FILE_PROPERTY_ADDER_CLASS = "PCS_PGEConfigPropertyAdderClass"; - public static final String CLIENT_TRANSFER_SERVICE_FACTORY = "PCS_ClientTransferServiceFactory"; + String CLIENT_TRANSFER_SERVICE_FACTORY = "PCS_ClientTransferServiceFactory"; - public static final String CRAWLER_CLEANUP = "PCS_CrawlerCleanup"; + String CRAWLER_CLEANUP = "PCS_CrawlerCleanup"; - public static final String CRAWLER_CRAWLDIRS = "PCS_CrawlerCrawlForDirs"; + String CRAWLER_CRAWLDIRS = "PCS_CrawlerCrawlForDirs"; - public static final String CONFIG_FILE_SCHEMA_PATH = "PCS_ConfigFileSchemaPath"; + String CONFIG_FILE_SCHEMA_PATH = "PCS_ConfigFileSchemaPath"; - public static final String PGE_CONFIG_FILE_NAME = "PCS_PGEConfigFileName"; + String PGE_CONFIG_FILE_NAME = "PCS_PGEConfigFileName"; - public static final String PGE_LOG_FILE_NAME = "PCS_PGELogFileName"; + String PGE_LOG_FILE_NAME = "PCS_PGELogFileName"; - public static final String PGE_TYPE_GDS_ADAPTOR = "GDSAdaptor"; + String PGE_TYPE_GDS_ADAPTOR = "GDSAdaptor"; - public static final String PGE_TYPE_GDS_PGE = "GDSPge"; + String PGE_TYPE_GDS_PGE = "GDSPge"; - public static final String UNKNOWN = "UNKNOWN"; + String UNKNOWN = "UNKNOWN"; - public static final String WORKFLOW_MGR_URL = "WorkflowManagerUrl"; + String WORKFLOW_MGR_URL = "WorkflowManagerUrl"; - public static final String WORKFLOW_INST_ID = "WorkflowInstId"; + String WORKFLOW_INST_ID = "WorkflowInstId"; - public static final String MAX_ALLOWABLE_GAP_MINUTES = "PCS_MaxAllowableTimeGapMinutes"; + String MAX_ALLOWABLE_GAP_MINUTES = "PCS_MaxAllowableTimeGapMinutes"; /* PGE task statuses */ - public static final String STAGING_INPUT = "STAGING INPUT"; + String STAGING_INPUT = "STAGING INPUT"; - public static final String CONF_FILE_BUILD = "BUILDING CONFIG FILE"; + String CONF_FILE_BUILD = "BUILDING CONFIG FILE"; - public static final String RUNNING_PGE = "PGE EXEC"; + String RUNNING_PGE = "PGE EXEC"; - public static final String CRAWLING = "CRAWLING"; + String CRAWLING = "CRAWLING"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java index 7f107b2..7f72271 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java @@ -25,54 +25,54 @@ package org.apache.oodt.pcs.metadata; public interface PCSMetadata { /* Met Fields */ - public static final String APPLICATION_SUCCESS_FLAG = "ApplicationSuccessFlag"; + String APPLICATION_SUCCESS_FLAG = "ApplicationSuccessFlag"; - public static final String ON_DISK = "OnDisk"; + String ON_DISK = "OnDisk"; - public static final String TAPE_LOCATION = "TapeLocation"; + String TAPE_LOCATION = "TapeLocation"; - public static final String PRODUCTION_LOCATION = "ProductionLocation"; + String PRODUCTION_LOCATION = "ProductionLocation"; - public static final String PRODUCTION_LOCATION_CODE = "ProductionLocationCode"; + String PRODUCTION_LOCATION_CODE = "ProductionLocationCode"; - public static final String DATA_VERSION = "DataVersion"; + String DATA_VERSION = "DataVersion"; - public static final String DATA_PROVIDER = "DataProvider"; + String DATA_PROVIDER = "DataProvider"; - public static final String COLLECTION_LABEL = "CollectionLabel"; + String COLLECTION_LABEL = "CollectionLabel"; - public static final String COMMENTS = "Comments"; + String COMMENTS = "Comments"; - public static final String EXECUTABLE_PATHNAMES = "ExecutablePathnames"; + String EXECUTABLE_PATHNAMES = "ExecutablePathnames"; - public static final String EXECUTABLE_VERSIONS = "ExecutableVersions"; + String EXECUTABLE_VERSIONS = "ExecutableVersions"; - public static final String PROCESSING_LEVEL = "ProcessingLevel"; + String PROCESSING_LEVEL = "ProcessingLevel"; - public static final String JOB_ID = "JobId"; + String JOB_ID = "JobId"; - public static final String TASK_ID = "TaskId"; + String TASK_ID = "TaskId"; - public static final String PRODUCTION_DATE_TIME = "ProductionDateTime"; + String PRODUCTION_DATE_TIME = "ProductionDateTime"; - public static final String INPUT_FILES = "InputFiles"; + String INPUT_FILES = "InputFiles"; - public static final String PGE_NAME = "PGEName"; + String PGE_NAME = "PGEName"; - public static final String OUTPUT_FILES = "OutputFiles"; + String OUTPUT_FILES = "OutputFiles"; - public static final String TEST_TAG = "TestTag"; + String TEST_TAG = "TestTag"; - public static final String SUB_TEST_TAG = "SubTestTag"; + String SUB_TEST_TAG = "SubTestTag"; - public static final String TEST_LOCATION = "TestLocation"; + String TEST_LOCATION = "TestLocation"; - public static final String TEST_COUNTER = "TestCounter"; + String TEST_COUNTER = "TestCounter"; - public static final String TEST_DATE = "TestDate"; + String TEST_DATE = "TestDate"; - public static final String START_DATE_TIME = "StartDateTime"; + String START_DATE_TIME = "StartDateTime"; - public static final String END_DATE_TIME = "EndDateTime"; + String END_DATE_TIME = "EndDateTime"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java b/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java index 78ef1b6..59d8f3f 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java @@ -39,6 +39,6 @@ public interface PCSQuery extends PCSMetadata, CoreMetKeys { * * @return A filemgr compliant {@link Query} object. */ - public Query buildQuery(); + Query buildQuery(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java ---------------------------------------------------------------------- diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java index 1c0b4db..47623f2 100644 --- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java +++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java @@ -26,34 +26,34 @@ package org.apache.oodt.pcs.input; */ public interface PGEConfigFileKeys { - public static final String RECORDED_AUX_INPUT_FILES_GROUP = "RecordedAuxiliaryInputFiles"; + String RECORDED_AUX_INPUT_FILES_GROUP = "RecordedAuxiliaryInputFiles"; - public static final String DYNAMIC_AUX_INPUT_FILES_GROUP = "DynamicAuxiliaryInputFiles"; + String DYNAMIC_AUX_INPUT_FILES_GROUP = "DynamicAuxiliaryInputFiles"; - public static final String INPUT_PRODUCT_FILES_GROUP = "InputProductFiles"; + String INPUT_PRODUCT_FILES_GROUP = "InputProductFiles"; - public static final String PRODUCT_PATH_GROUP = "ProductPathGroup"; + String PRODUCT_PATH_GROUP = "ProductPathGroup"; - public static final String PGE_NAME_GROUP = "PGENameGroup"; + String PGE_NAME_GROUP = "PGENameGroup"; - public static final String MODE_GROUP = "ModeGroup"; + String MODE_GROUP = "ModeGroup"; - public static final String GEOMETRY_GROUP = "Geometry"; + String GEOMETRY_GROUP = "Geometry"; - public static final String PRIMARY_EXECUTABLE_GROUP = "PrimaryExecutable"; + String PRIMARY_EXECUTABLE_GROUP = "PrimaryExecutable"; - public static final String SFIF_FILE_GROUP = "StaticFileIdentificationFiles"; + String SFIF_FILE_GROUP = "StaticFileIdentificationFiles"; - public static final String JOB_IDENTIFICATION_GROUP = "JobIdentification"; + String JOB_IDENTIFICATION_GROUP = "JobIdentification"; - public static final String SCF_IDENTIFICATION_GROUP = "SCFIdentification"; + String SCF_IDENTIFICATION_GROUP = "SCFIdentification"; - public static final String MONITOR_GROUP = "MonitorGroup"; + String MONITOR_GROUP = "MonitorGroup"; - public static final String MONITOR_LEVEL_GROUP = "MonitorLevel"; + String MONITOR_LEVEL_GROUP = "MonitorLevel"; - public static final String LOG_METADATA_GROUP = "LogMetadata"; + String LOG_METADATA_GROUP = "LogMetadata"; - public static final String COMMAND_LINE_PARAMETERS_GROUP = "CommandLineParameters"; + String COMMAND_LINE_PARAMETERS_GROUP = "CommandLineParameters"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java ---------------------------------------------------------------------- diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java index 795e063..72615b6 100644 --- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java +++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java @@ -27,33 +27,33 @@ package org.apache.oodt.pcs.input; */ public interface PGEDataParseKeys { - public static final int PARSING_VEC = -10; + int PARSING_VEC = -10; - public static final int PARSING_SCALAR = -20; + int PARSING_SCALAR = -20; - public static final int PARSING_MATRIX = -30; + int PARSING_MATRIX = -30; - public static final int UNSET = -1; + int UNSET = -1; - public static final String GROUP_TAG_NAME = "group"; + String GROUP_TAG_NAME = "group"; - public static final String SCALAR_TAG_NAME = "scalar"; + String SCALAR_TAG_NAME = "scalar"; - public static final String VECTOR_TAG_NAME = "vector"; + String VECTOR_TAG_NAME = "vector"; - public static final String MATRIX_TAG_NAME = "matrix"; + String MATRIX_TAG_NAME = "matrix"; - public static final String PGE_INPUT_TAG_NAME = "input"; + String PGE_INPUT_TAG_NAME = "input"; - public static final String VECTOR_ELEMENT_TAG = "element"; + String VECTOR_ELEMENT_TAG = "element"; - public static final String MATRIX_ROW_TAG = "tr"; + String MATRIX_ROW_TAG = "tr"; - public static final String MATRIX_COL_TAG = "td"; + String MATRIX_COL_TAG = "td"; - public static final String NAME_ATTR = "name"; + String NAME_ATTR = "name"; - public static final String ROWS_ATTR = "rows"; + String ROWS_ATTR = "rows"; - public static final String COLS_ATTR = "cols"; + String COLS_ATTR = "cols"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java ---------------------------------------------------------------------- diff --git a/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java b/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java index 167cdd3..653126f 100644 --- a/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java +++ b/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java @@ -27,20 +27,20 @@ package org.apache.oodt.pcs.services.config; */ public interface PCSServiceConfMetKeys { - public static final String FM_URL = "org.apache.oodt.cas.fm.url"; + String FM_URL = "org.apache.oodt.cas.fm.url"; - public static final String WM_URL = "org.apache.oodt.cas.wm.url"; + String WM_URL = "org.apache.oodt.cas.wm.url"; - public static final String RM_URL = "org.apache.oodt.cas.rm.url"; + String RM_URL = "org.apache.oodt.cas.rm.url"; - public static final String PCS_LL_CONF_FILE_PATH = "org.apache.oodt.pcs.ll.conf.filePath"; + String PCS_LL_CONF_FILE_PATH = "org.apache.oodt.pcs.ll.conf.filePath"; - public static final String PCS_HEALTH_CRAWLER_CONF_PATH = "org.apache.oodt.pcs.health.crawler.conf.filePath"; + String PCS_HEALTH_CRAWLER_CONF_PATH = "org.apache.oodt.pcs.health.crawler.conf.filePath"; - public static final String PCS_HEALTH_WORKFLOW_STATUS_PATH = "org.apache.oodt.pcs.health.workflow.statuses.filePath"; + String PCS_HEALTH_WORKFLOW_STATUS_PATH = "org.apache.oodt.pcs.health.workflow.statuses.filePath"; - public static final String PCS_TRACE_ENABLE_NON_CAT = "org.apache.oodt.pcs.trace.enableNonCat"; + String PCS_TRACE_ENABLE_NON_CAT = "org.apache.oodt.pcs.trace.enableNonCat"; - public static final String PCS_TRACE_PTYPE_EXCLUDE_LIST = "org.apache.oodt.pcs.trace.productTypeExcludeList"; + String PCS_TRACE_PTYPE_EXCLUDE_LIST = "org.apache.oodt.pcs.trace.productTypeExcludeList"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java b/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java index 2170925..b6df211 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java @@ -35,6 +35,6 @@ import org.apache.oodt.cas.pge.metadata.PgeMetadata; */ public interface ConfigFilePropertyAdder { - public void addConfigProperties(PgeMetadata metadata, Object... objs); + void addConfigProperties(PgeMetadata metadata, Object... objs); } http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java b/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java index 0bde153..b2e05e4 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java @@ -26,5 +26,5 @@ import org.apache.oodt.cas.pge.metadata.PgeMetadata; */ public interface PgeConfigBuilder { - public PgeConfig build(PgeMetadata pgeMetadata) throws Exception; + PgeConfig build(PgeMetadata pgeMetadata) throws Exception; }
