http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java index 7572a40..dcd9d3b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java @@ -150,7 +150,6 @@ public final class RangeQueryTester { searcher.close(); } catch (Exception ignore) { } - searcher = null; } }
http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java index 90d708e..f99b055 100755 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java @@ -92,7 +92,7 @@ public class SolrIndexer { public SolrIndexer(String solrUrl, String fmUrl) throws InstantiationException { InputStream input = null; - String filename = null; + String filename; try { LOG.info("System property " + SOLR_INDEXER_CONFIG + " set to " @@ -636,7 +636,7 @@ public class SolrIndexer { } else if (line.hasOption("all") || line.hasOption("product") || line.hasOption("metFile") || line.hasOption("read") || line.hasOption("types") || line.hasOption("deleteAll")) { - SolrIndexer indexer = null; + SolrIndexer indexer; String solrUrl = null; String fmUrl = null; if (line.hasOption("solrUrl")) { @@ -684,7 +684,7 @@ public class SolrIndexer { */ private static List<String> readProductIdsFromStdin() { List<String> productIds = new ArrayList<String>(); - BufferedReader br = null; + BufferedReader br; br = new BufferedReader(new InputStreamReader(System.in)); String line = null; @@ -702,7 +702,6 @@ public class SolrIndexer { br.close(); } catch (Exception ignore) { } - br = null; } } return productIds; http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java index 57a4345..640cd80 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java @@ -81,8 +81,8 @@ public final class GenericFileManagerObjectFactory { @SuppressWarnings("unchecked") public static DataTransfer getDataTransferServiceFromFactory( String serviceFactory) { - DataTransferFactory dataTransferFactory = null; - Class<DataTransferFactory> dataTransferFactoryClass = null; + DataTransferFactory dataTransferFactory; + Class<DataTransferFactory> dataTransferFactoryClass; try { dataTransferFactoryClass = (Class<DataTransferFactory>) Class.forName(serviceFactory); @@ -122,8 +122,8 @@ public final class GenericFileManagerObjectFactory { @SuppressWarnings("unchecked") public static RepositoryManager getRepositoryManagerServiceFromFactory( String serviceFactory) { - RepositoryManagerFactory factory = null; - Class<RepositoryManagerFactory> clazz = null; + RepositoryManagerFactory factory; + Class<RepositoryManagerFactory> clazz; try { clazz = (Class<RepositoryManagerFactory>) Class.forName(serviceFactory); @@ -162,8 +162,8 @@ public final class GenericFileManagerObjectFactory { */ @SuppressWarnings("unchecked") public static Catalog getCatalogServiceFromFactory(String serviceFactory) { - CatalogFactory factory = null; - Class<CatalogFactory> clazz = null; + CatalogFactory factory; + Class<CatalogFactory> clazz; try { clazz = (Class<CatalogFactory>) Class.forName(serviceFactory); @@ -204,8 +204,8 @@ public final class GenericFileManagerObjectFactory { @SuppressWarnings("unchecked") public static ValidationLayer getValidationLayerFromFactory( String serviceFactory) { - ValidationLayerFactory factory = null; - Class<ValidationLayerFactory> clazz = null; + ValidationLayerFactory factory; + Class<ValidationLayerFactory> clazz; try { clazz = (Class<ValidationLayerFactory>) Class.forName(serviceFactory); @@ -233,8 +233,8 @@ public final class GenericFileManagerObjectFactory { @SuppressWarnings("unchecked") public static Cache getCacheFromFactory(String serviceFactory){ - CacheFactory factory = null; - Class<CacheFactory> clazz = null; + CacheFactory factory; + Class<CacheFactory> clazz; try { clazz = (Class<CacheFactory>) Class.forName(serviceFactory); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java index 53ff23c..9d98f96 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java @@ -256,7 +256,7 @@ public class SqlParser { stack.push("("); break; case ')': - String value = null; + String value; while (!(value = stack.pop()).equals("(")) postFix.add(value); if (stack.peek().equals("NOT")) http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java index 284898b..fda21e4 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java @@ -86,7 +86,7 @@ public final class XmlStructFactory { org.w3c.dom.Element descElem = XMLUtils.getFirstElement("description", productTypeElem); - String description = null; + String description; if (descElem.getAttribute("trim") != null && !descElem.getAttribute("trim").equals("") && !Boolean.valueOf(descElem.getAttribute("trim"))) { @@ -234,7 +234,7 @@ public final class XmlStructFactory { HashMap<String, String> subToSuperMap) { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document document = null; + Document document; try { DocumentBuilder builder = factory.newDocumentBuilder(); @@ -295,7 +295,7 @@ public final class XmlStructFactory { public static Document getElementXmlDocument(List<org.apache.oodt.cas.filemgr.structs.Element> elements) { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document document = null; + Document document; try { DocumentBuilder builder = factory.newDocumentBuilder(); @@ -336,7 +336,7 @@ public final class XmlStructFactory { public static Document getProductTypeXmlDocument(List<ProductType> productTypes) { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document document = null; + Document document; try { DocumentBuilder builder = factory.newDocumentBuilder(); @@ -438,7 +438,7 @@ public final class XmlStructFactory { org.w3c.dom.Element descElem = XMLUtils.getFirstElement("description", elementElem); - String description = null; + String description; if (descElem.getAttribute("trim") != null && !descElem.getAttribute("trim").equals("") && !Boolean.valueOf(descElem.getAttribute("trim"))) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java index 8b136db..5103d19 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java @@ -530,7 +530,7 @@ public class DataSourceValidationLayer implements ValidationLayer { Connection conn = null; Statement statement = null; ResultSet rs = null; - List<Element> elements = null; + List<Element> elements; elements = new Vector<Element>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java index ef5ab15..7d291fe 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java @@ -45,7 +45,7 @@ public class DataSourceValidationLayerFactory implements ValidationLayerFactory * </p> */ public DataSourceValidationLayerFactory() { - String jdbcUrl = null, user = null, pass = null, driver = null; + String jdbcUrl, user, pass, driver; jdbcUrl = System .getProperty("org.apache.oodt.cas.filemgr.validation.datasource.jdbc.url"); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java index e9807ed..2a13c93 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java @@ -80,7 +80,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -88,7 +87,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -121,7 +119,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -129,7 +126,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -166,7 +162,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -174,7 +169,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -182,7 +176,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -221,7 +214,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -229,7 +221,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -237,7 +228,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -272,7 +262,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -280,7 +269,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -288,7 +276,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -326,7 +313,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -334,7 +320,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -342,7 +327,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -378,7 +362,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -386,7 +369,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -419,7 +401,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -427,7 +408,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -463,7 +443,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -471,7 +450,6 @@ public class ScienceDataValidationLayer implements ValidationLayer { conn.close(); } catch (Exception ignore) { } - conn = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java index 48f343e..d30158a 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayerFactory.java @@ -40,7 +40,7 @@ public class ScienceDataValidationLayerFactory implements private DataSource dataSource; public ScienceDataValidationLayerFactory() { - String jdbcUrl = null, user = null, pass = null, driver = null; + String jdbcUrl, user, pass, driver; jdbcUrl = PathUtils .replaceEnvVariables(System http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java index b87c0b5..8c0d4c8 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java @@ -273,7 +273,7 @@ public class XMLValidationLayer implements ValidationLayer { private void saveElementsAndMappings() { for (String dirUri : xmlFileDirUris) { - File elementDir = null; + File elementDir; try { elementDir = new File(new URI(dirUri)); @@ -458,12 +458,12 @@ public class XMLValidationLayer implements ValidationLayer { private Document getDocumentRoot(String xmlFile) { // open up the XML file - DocumentBuilderFactory factory = null; - DocumentBuilder parser = null; - Document document = null; - InputSource inputSource = null; + DocumentBuilderFactory factory; + DocumentBuilder parser; + Document document; + InputSource inputSource; - InputStream xmlInputStream = null; + InputStream xmlInputStream; try { xmlInputStream = new File(xmlFile).toURL().openStream(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java index 4d1695e..a9319a1 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java @@ -82,7 +82,7 @@ public class BasicVersioner implements Versioner { // TODO: fix that hack :-) Reference r = (Reference) product.getProductReferences().get(0); - String dataStoreRef = null; + String dataStoreRef; try { dataStoreRef = new File(new URI(productRepoPath)).toURL() http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java index 21bbe4b..3e06198 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java @@ -87,7 +87,7 @@ public class DateTimeVersioner implements Versioner { if (productionDateTime == null) { // generate it ourselves then productionDateTime = dateFormatter.format(new Date()); } else { - Date prodDateTime = null; + Date prodDateTime; try { prodDateTime = DateConvert.isoParse(productionDateTime); } catch (ParseException e) { @@ -106,7 +106,7 @@ public class DateTimeVersioner implements Versioner { // we'll use the format: yyyy.dd.MM.HH.mm.ss for (Reference r : product.getProductReferences()) { - String dataStoreRef = null; + String dataStoreRef; try { dataStoreRef = new File(new URI(product.getProductType() http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java index 6334d0d..078ef93 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java @@ -69,7 +69,7 @@ public final class VersioningUtils { }; public static List<Reference> getReferencesFromDir(File dirRoot) { - List<Reference> references = null; + List<Reference> references; if (dirRoot == null) throw new IllegalArgumentException("null"); @@ -126,7 +126,7 @@ public final class VersioningUtils { } public static List<String> getURIsFromDir(File dirRoot) { - List<String> uris = null; + List<String> uris; if (dirRoot == null) throw new IllegalArgumentException("null"); @@ -209,7 +209,7 @@ public final class VersioningUtils { String productRepoPath, List<Reference> references) { for (Reference r : references) { String dataStoreRef = null; - String productRepoPathRef = null; + String productRepoPathRef; try { productRepoPathRef = new File(new URI(productRepoPath)).toURL() @@ -262,7 +262,7 @@ public final class VersioningUtils { } public static String getAbsolutePathFromUri(String uriStr) { - URI uri = null; + URI uri; String absPath = null; try { @@ -278,7 +278,7 @@ public final class VersioningUtils { } private static long quietGetFileSizeFromUri(String uri) { - File fileRef = null; + File fileRef; try { fileRef = new File(new URI(uri)); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java index 368bf94..76ee6e3 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java @@ -88,7 +88,7 @@ public class TestDataSourceCatalog extends TestCase { // get a temp directory File tempDir = null; - File tempFile = null; + File tempFile; try { tempFile = File.createTempFile("foo", "bar"); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java index 78115bf..fe4df37 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java @@ -104,7 +104,7 @@ public class TestCachedIngester extends TestCase { } public void testIngest() { - Metadata prodMet = null; + Metadata prodMet; try { URL ingestUrl = this.getClass().getResource("/ingest"); @@ -131,7 +131,6 @@ public class TestCachedIngester extends TestCase { assertNotNull(p); assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus()); assertTrue(fmClient.hasProduct("test.txt")); - fmClient = null; } catch (Exception e) { fail(e.getMessage()); } @@ -182,7 +181,7 @@ public class TestCachedIngester extends TestCase { } private void ingestTestFile() { - Metadata prodMet = null; + Metadata prodMet; StdIngester ingester = new StdIngester(transferServiceFacClass); try { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java index 7e54081..618e85b 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java @@ -181,7 +181,7 @@ public class TestLocalCache extends TestCase { } private void doIngest() { - Metadata prodMet = null; + Metadata prodMet; try { URL ingestUrl = this.getClass().getResource("/ingest"); @@ -209,7 +209,6 @@ public class TestLocalCache extends TestCase { assertNotNull(p); assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus()); assertTrue(fmClient.hasProduct("test.txt")); - fmClient = null; } catch (Exception e) { fail(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java index 63978b7..5d64370 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java @@ -197,7 +197,7 @@ public class TestRmiCache extends TestCase { } private void doIngest() { - Metadata prodMet = null; + Metadata prodMet; try { URL ingestUrl = this.getClass().getResource("/ingest"); @@ -225,7 +225,6 @@ public class TestRmiCache extends TestCase { assertNotNull(p); assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus()); assertTrue(fmClient.hasProduct("test.txt")); - fmClient = null; } catch (Exception e) { fail(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java index 48d93ac..957f601 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java @@ -63,7 +63,7 @@ public class TestStdIngester extends TestCase { } public void testIngest() { - Metadata prodMet = null; + Metadata prodMet; try { URL ingestUrl = this.getClass().getResource("/ingest"); @@ -89,7 +89,6 @@ public class TestStdIngester extends TestCase { assertNotNull(p); assertEquals(Product.STATUS_RECEIVED, p.getTransferStatus()); assertTrue(fmClient.hasProduct("test.txt")); - fmClient = null; } catch (Exception e){ fail(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java index 6b5f6aa..60b9eda 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java @@ -93,7 +93,7 @@ public class TestTypeHandler extends TestCase { // get a temp directory File tempDir = null; - File tempFile = null; + File tempFile; try { tempFile = File.createTempFile("foo", "bar"); @@ -447,7 +447,7 @@ public class TestTypeHandler extends TestCase { ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); - String getProductSql = ""; + String getProductSql; String tableName = type.getName() + "_metadata"; String subSelectQueryBase = "SELECT product_id FROM " + tableName + " "; @@ -463,7 +463,7 @@ public class TestTypeHandler extends TestCase { for (QueryCriteria criteria : query.getCriteria()) { clauseNum++; - String elementIdStr = null; + String elementIdStr; if (fieldIdStringFlag) { elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()) @@ -473,7 +473,7 @@ public class TestTypeHandler extends TestCase { this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId(); } - String clause = null; + String clause; if (!gotFirstClause) { clause = "(p.element_id = " + elementIdStr @@ -598,7 +598,7 @@ public class TestTypeHandler extends TestCase { // must call next first, or else no relative cursor if (rs.next()) { // grab the first one - int numGrabbed = -1; + int numGrabbed; if (pageNum == 1) { numGrabbed = 1; @@ -651,7 +651,6 @@ public class TestTypeHandler extends TestCase { } catch (SQLException ignore) { } - rs = null; } if (statement != null) { @@ -660,7 +659,6 @@ public class TestTypeHandler extends TestCase { } catch (SQLException ignore) { } - statement = null; } if (conn != null) { @@ -670,7 +668,6 @@ public class TestTypeHandler extends TestCase { } catch (SQLException ignore) { } - conn = null; } } @@ -689,7 +686,7 @@ public class TestTypeHandler extends TestCase { conn = dataSource.getConnection(); statement = conn.createStatement(); - String getProductSql = ""; + String getProductSql; String tableName = type.getName() + "_metadata"; String subSelectQueryBase = "SELECT product_id FROM " + tableName + " "; @@ -705,7 +702,7 @@ public class TestTypeHandler extends TestCase { for (QueryCriteria criteria : query.getCriteria()) { clauseNum++; - String elementIdStr = null; + String elementIdStr; if (fieldIdStringFlag) { elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()) @@ -715,7 +712,7 @@ public class TestTypeHandler extends TestCase { this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId(); } - String clause = null; + String clause; if (!gotFirstClause) { clause = "(p.element_id = " + elementIdStr @@ -855,7 +852,6 @@ public class TestTypeHandler extends TestCase { } catch (SQLException ignore) { } - rs = null; } if (statement != null) { @@ -864,7 +860,6 @@ public class TestTypeHandler extends TestCase { } catch (SQLException ignore) { } - statement = null; } if (conn != null) { @@ -874,7 +869,6 @@ public class TestTypeHandler extends TestCase { } catch (SQLException ignore) { } - conn = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java index 4129f67..2a66dad 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java @@ -208,7 +208,7 @@ public class TestXmlRpcFileManager extends TestCase { } private void ingestTestFile() { - Metadata prodMet = null; + Metadata prodMet; StdIngester ingester = new StdIngester(transferServiceFacClass); try { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java index d67e3c4..ec6d392 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java @@ -85,7 +85,7 @@ public class TestXmlRpcFileManagerClient extends TestCase { XmlRpcFileManagerClient fmc = new XmlRpcFileManagerClient(new URL( "http://localhost:"; + FM_PORT)); - Metadata reducedMet = null; + Metadata reducedMet; List pTypes = fmc.getProductTypes(); assertNotNull(pTypes); assertTrue(pTypes.size() > 0); @@ -151,7 +151,7 @@ public class TestXmlRpcFileManagerClient extends TestCase { URL refUrl = this.getClass().getResource("/ingest/test-file-3.txt"); URL metUrl = this.getClass().getResource("/ingest/test-file-3.txt.met"); - Metadata prodMet = null; + Metadata prodMet; StdIngester ingester = new StdIngester(transferServiceFacClass); prodMet = new SerializableMetadata(new FileInputStream( metUrl.getFile())); @@ -254,7 +254,7 @@ public class TestXmlRpcFileManagerClient extends TestCase { } private void ingestTestFile() { - Metadata prodMet = null; + Metadata prodMet; StdIngester ingester = new StdIngester(transferServiceFacClass); try { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java index 18096a9..f7d71e0 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java @@ -99,7 +99,6 @@ public class TestExpImpCatalog extends TestCase { } assertEquals(1, countProds); - fmClient = null; } catch (Exception e) { e.printStackTrace(); fail(e.getMessage()); @@ -142,7 +141,6 @@ public class TestExpImpCatalog extends TestCase { } assertEquals(2, countProds); - fmClient = null; } catch (Exception e) { e.printStackTrace(); fail(e.getMessage()); @@ -170,7 +168,6 @@ public class TestExpImpCatalog extends TestCase { prod.setProductReferences(fmClient.getProductReferences(prod)); assertNotNull(prod.getProductReferences()); assertEquals(1, prod.getProductReferences().size()); - fmClient = null; } catch (Exception e) { e.printStackTrace(); fail(e.getMessage()); @@ -225,7 +222,7 @@ public class TestExpImpCatalog extends TestCase { } private void ingestTestFiles() { - Metadata prodMet = null; + Metadata prodMet; StdIngester ingester = new StdIngester(transferServiceFacClass); try { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java index 028f9ab..1d4ad71 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java @@ -77,7 +77,7 @@ public class TestMetadataBasedProductMover extends TestCase { } private void ingestTestFile() { - Metadata prodMet = null; + Metadata prodMet; StdIngester ingester = new StdIngester(transferServiceFacClass); try { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java index 201d623..03254db 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java @@ -52,7 +52,7 @@ public class TestXmlStructFactory extends TestCase { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document document = null; + Document document; try { DocumentBuilder builder = factory.newDocumentBuilder(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/grid/src/main/java/org/apache/oodt/grid/GridServlet.java ---------------------------------------------------------------------- diff --git a/grid/src/main/java/org/apache/oodt/grid/GridServlet.java b/grid/src/main/java/org/apache/oodt/grid/GridServlet.java index 0f5cf5d..7a039ff 100755 --- a/grid/src/main/java/org/apache/oodt/grid/GridServlet.java +++ b/grid/src/main/java/org/apache/oodt/grid/GridServlet.java @@ -57,7 +57,7 @@ public abstract class GridServlet extends HttpServlet { if (path == null) throw new ServletException("The config.xml file can't be accessed. Are we running from a war file!??!"); File file = new File(path); - Configuration c = null; + Configuration c; try { c = new Configuration(file); } catch (SAXException ex) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java index 93ef68b..7edd70e 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java @@ -55,7 +55,7 @@ public abstract class CmdLineMetExtractor extends AbstractMetExtractor { CmdLineMetExtractor extractor) throws Exception { String usage = "Usage: " + extractor.getClass().getName() + " <file> <configfile>"; - String extractFilePath = null, configFilePath = null; + String extractFilePath, configFilePath; if (args.length < 2) { System.err.println(usage); @@ -75,7 +75,7 @@ public abstract class CmdLineMetExtractor extends AbstractMetExtractor { CmdLineMetExtractor extractor, OutputStream os) throws Exception { String usage = "Usage: " + extractor.getClass().getName() + " <file> <configfile>"; - String extractFilePath = null, configFilePath = null; + String extractFilePath, configFilePath; if (args.length < 2) { System.err.println(usage); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java index 8cd7217..8b45d7a 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java @@ -78,7 +78,7 @@ public class CopyAndRewriteExtractor extends CmdLineMetExtractor { "No config file defined: unable to copy and rewrite metadata!"); } - Metadata met = null; + Metadata met; try { met = new SerializableMetadata(new File(PathUtils http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java index 18a5d4c..3a736eb 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java @@ -87,7 +87,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader, Vector argVector = new Vector(); for (int i = 0; i < argNodes.getLength(); i++) { Element argElem = (Element) argNodes.item(i); - String argStr = null; + String argStr; if (Boolean.valueOf( argElem.getAttribute(IS_DATA_FILE_ATTR) .toLowerCase())) @@ -99,7 +99,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader, else argStr = XMLUtils.getSimpleElementText(argElem); - String appendExt = null; + String appendExt; if (!(appendExt = argElem.getAttribute(APPEND_EXT_ATTR)) .equals("")) argStr += "." + appendExt; http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java index e151366..238d1e9 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java @@ -95,7 +95,7 @@ public class ExternMetExtractor extends CmdLineMetExtractor implements // generate metadata file LOG.log(Level.INFO, "Generating met file for product file: [" + file.getAbsolutePath() + "]"); - int status = -1; + int status; try { LOG.log(Level.INFO, "Executing command line: [" + ExecUtils.printCommandLine(commandLineArgs) http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java index eed3a70..445f853 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java @@ -40,8 +40,8 @@ public final class GenericMetadataObjectFactory { .getLogger(GenericMetadataObjectFactory.class.getName()); public static MetExtractor getMetExtractorFromClassName(String className) { - Class metExtractorClass = null; - MetExtractor extractor = null; + Class metExtractorClass; + MetExtractor extractor; try { metExtractorClass = Class.forName(className); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java index bfa245e..8954f2e 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java @@ -66,7 +66,7 @@ public final class PathUtils { for (int i = 0; i < origPath.length(); i++) { if (origPath.charAt(i) == '[') { VarData data = readEnvVarName(origPath, i); - String var = null; + String var; if (metadata != null && metadata.getMetadata(data.getFieldName()) != null) { List valList = metadata.getAllMetadata(data.getFieldName()); @@ -142,7 +142,7 @@ public final class PathUtils { throw new Exception("No date type specified - '" + dateString + "'"); String dateType = splitDate[1].replaceAll("[\\[\\]\\s]", ""); - String replacement = ""; + String replacement; if (dateType.equals("DAY")) { replacement = StringUtils.leftPad(gc .get(GregorianCalendar.DAY_OF_MONTH) http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java index b4416af..ef1da78 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java @@ -62,7 +62,7 @@ public class OpendapProfileElementExtractor { Profile profile, DAS das) throws NoSuchAttributeException { RangedProfileElement elem = new RangedProfileElement(profile); elem.setName(elemName); - AttributeTable attTable = null; + AttributeTable attTable; try { attTable = das.getAttributeTable(varname); @@ -85,7 +85,7 @@ public class OpendapProfileElementExtractor { Attribute attr = attTable.getAttribute(attrName); if (!attr.isContainer()) { - Enumeration attrValues = null; + Enumeration attrValues; try { attrValues = attr.getValues(); @@ -125,7 +125,7 @@ public class OpendapProfileElementExtractor { EnumeratedProfileElement elem = new EnumeratedProfileElement(profile); elem.setName(elemName); - AttributeTable attTable = null; + AttributeTable attTable; try { attTable = das.getAttributeTable(elemName); } catch (NoSuchAttributeException e) { @@ -139,7 +139,7 @@ public class OpendapProfileElementExtractor { while (attributeNames.hasMoreElements()) { String attrName = (String) attributeNames.nextElement(); Attribute attr = attTable.getAttribute(attrName); - Enumeration attrValues = null; + Enumeration attrValues; try { attrValues = attr.getValues(); } catch (NoSuchAttributeException e) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java index 5870fef..871cd0c 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileHandler.java @@ -109,7 +109,7 @@ public class OpendapProfileHandler implements ProfileHandler { LOG.log(Level.FINE,"Connecting to opendapurl="+opendapUrl); Profile profile = new Profile(); - DConnect dConn = null; + DConnect dConn; try { dConn = new DConnect(opendapUrl, true); } catch (FileNotFoundException e) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java index 307667b..7538984 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java @@ -184,8 +184,8 @@ public final class PCSHealthMonitor implements CoreMetKeys, public static void main(String[] args) throws Exception { String usage = "PCSHealthMonitor <fm url> <wm url> <rm url> <crawler xml file path> <workflow states xml file path>\n"; - String fmUrlStr = null, wmUrlStr = null, rmUrlStr = null; - String crawlerXmlFilePath = null, workflowStateXmlPath = null; + String fmUrlStr, wmUrlStr, rmUrlStr; + String crawlerXmlFilePath, workflowStateXmlPath; if (args.length != 5) { System.err.println(usage); @@ -471,7 +471,7 @@ public final class PCSHealthMonitor implements CoreMetKeys, } private void quickPrintBatchStubs() { - List resNodes = null; + List resNodes; if (getRmUp()) { // only print if the resource manager is up @@ -594,7 +594,7 @@ public final class PCSHealthMonitor implements CoreMetKeys, } private boolean getCrawlerUp(String crawlUrlStr) { - CrawlDaemonController controller = null; + CrawlDaemonController controller; try { controller = new CrawlDaemonController(crawlUrlStr); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java index 28b24f7..ae31bd2 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java @@ -145,7 +145,7 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata { System.out.println(REPORT_LINE_SEPARATOR); System.out.println("Generated from workflow:"); System.out.println(""); - WorkflowInstance inst = null; + WorkflowInstance inst; try { inst = getWorkflowInstanceById(wm.safeGetWorkflowInstances(), met http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java index cb672a3..a75550c 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java @@ -294,7 +294,7 @@ public class FileManagerUtils implements PCSConfigMetadata { } public Product getLatestProduct(Query query, ProductType type) { - List products = null; + List products; try { products = fmgrClient.query(query, type); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java ---------------------------------------------------------------------- diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java index 9a04a6d..327714a 100644 --- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java +++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java @@ -66,7 +66,7 @@ public class PGEConfigFileReader { * If there is an error reading the url. */ public PGEConfigurationFile read(URL url) throws PGEConfigFileException { - PGEConfigurationFile configFile = null; + PGEConfigurationFile configFile; try { configFile = read(url.openStream()); @@ -95,11 +95,11 @@ public class PGEConfigFileReader { */ public PGEConfigurationFile read(InputStream is) throws PGEConfigFileException { - PGEConfigurationFile configFile = null; + PGEConfigurationFile configFile; - DocumentBuilderFactory factory = null; - DocumentBuilder parser = null; - Document document = null; + DocumentBuilderFactory factory; + DocumentBuilder parser; + Document document; if (is == null) { return null; http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java ---------------------------------------------------------------------- diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java index 165da6d..5d6de33 100644 --- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java +++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java @@ -98,7 +98,7 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys, public Document getConfigFileXml() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document document = null; + Document document; try { DocumentBuilder builder = factory.newDocumentBuilder(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java index 609b198..0b16ac8 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java @@ -500,7 +500,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { protected ProductCrawler createProductCrawler() throws Exception { /* create a ProductCrawler based on whether or not the output dir specifies a MIME_EXTRACTOR_REPO */ logger.info("Configuring ProductCrawler..."); - ProductCrawler crawler = null; + ProductCrawler crawler; if (pgeMetadata.getMetadata(MIME_EXTRACTOR_REPO) != null && !pgeMetadata.getMetadata(MIME_EXTRACTOR_REPO).equals("")){ crawler = new AutoDetectProductCrawler(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java index 775445a..f0ee686 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacerTemplateWriter.java @@ -63,7 +63,7 @@ public class MetadataKeyReplacerTemplateWriter extends String separator = args.length == 2 ? (String) args[1] : DEFAULT_SEPARATOR; for (String key : metadata.getAllKeys()) { - String replaceVal = null; + String replaceVal; if (metadata.isMultiValued(key)) { List<String> values = metadata.getAllMetadata(key); replaceVal = StringUtils.join(values, separator); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java index 019e4cd..b2509c0 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java @@ -65,7 +65,7 @@ public class MetadataListPcsMetFileWriter extends PcsMetFileWriter { if (val != null && !val.equals("")) { if (!metadataElement.getAttribute(ENV_REPLACE_ATTR).toLowerCase().equals("false")) val = PathUtils.doDynamicReplacement(val, inputMetadata); - String[] vals = null; + String[] vals; if (metadataElement.getAttribute(SPLIT_ATTR).toLowerCase().equals("false")) { vals = new String[] { val }; } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java ---------------------------------------------------------------------- diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java index 812f526..f10b031 100644 --- a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java +++ b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java @@ -328,7 +328,7 @@ public class TestPGETaskInstance { private static Document parseXmlFile(File file) throws Exception{ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - Document dom = null; + Document dom; DocumentBuilder db = dbf.newDocumentBuilder(); dom = db.parse(file); return dom; http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java index f5c28e0..34f76f7 100644 --- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java +++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java @@ -92,7 +92,7 @@ public abstract class AbstractCrawlLister implements OFSNListHandler { File dir = (File) stack.pop(); LOG.log(Level.INFO, "OFSN: Crawling " + dir); - File[] productFiles = null; + File[] productFiles; if (crawlForDirs) { productFiles = dir.listFiles(DIR_FILTER); } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java index e663f56..5e8b73d 100644 --- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java +++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfiguration.java @@ -125,7 +125,6 @@ public class OFSNFileHandlerConfiguration { private void cleanse(String path) { if (path != null && !path.endsWith("/")) { - path += "/"; } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java index 2a56cf1..0b39838 100644 --- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java +++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java @@ -81,7 +81,6 @@ public class StdOFSNGetHandler implements OFSNGetHandler { } catch (Exception ignore) { } - in = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java index fbf335f..be5aa12 100644 --- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java +++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java @@ -76,7 +76,7 @@ public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys, String productRoot, boolean showDirSize, boolean showFileSize) { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document document = null; + Document document; try { DocumentBuilder builder = factory.newDocumentBuilder(); @@ -163,7 +163,6 @@ public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys, } catch (Exception ignore) { } - out = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java index 1ef17a1..945508a 100644 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java @@ -258,7 +258,7 @@ public class CASProfileHandler implements ProfileHandler { private List queryAndBuildProfiles(ProductType type, Query query) { List profiles = new Vector(); - List products = null; + List products; try { products = fmClient.query(query, type); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java ---------------------------------------------------------------------- diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java index f08e67d..630ab29 100644 --- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java +++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/system/ProtocolManager.java @@ -78,7 +78,7 @@ public class ProtocolManager { return verifiedMap.get(site).newInstance(); } else { for (ProtocolFactory factory : protocolConfig.getFactoriesBySite(site)) { - Protocol protocol = null; + Protocol protocol; try { protocol = factory.newInstance(); if (verifier == null || verifier.verify(protocol, site, auth)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java ---------------------------------------------------------------------- diff --git a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java index 24077c7..dba31cb 100644 --- a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java +++ b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java @@ -61,7 +61,7 @@ public class HttpProtocol implements Protocol { public void cd(ProtocolFile file) throws ProtocolException { try { - HttpFile httpFile = null; + HttpFile httpFile; if (!(file instanceof HttpFile)) { URL link = HttpUtils.resolveUri(currentFile.getLink().toURI(), file.getPath()).toURL(); httpFile = new HttpFile(link.getPath(), file.isDir(), link); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java ---------------------------------------------------------------------- diff --git a/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java b/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java index a4a250a..3bded2d 100644 --- a/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java +++ b/protocol/sftp/src/test/java/org/apache/oodt/cas/protocol/sftp/TestJschSftpProtocol.java @@ -274,7 +274,7 @@ public class TestJschSftpProtocol extends TestCase { File publicKeyFile = new File(publicKeysDir, "sample-dsa.pub"); br = new BufferedReader(new FileReader(new File("src/test/resources/sample-dsa.pub").getAbsoluteFile())); ps = new PrintStream(new FileOutputStream(publicKeyFile)); - String nextLine = null; + String nextLine; while ((nextLine = br.readLine()) != null) { ps.println(nextLine.replace("2022", Integer.toString(port))); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java index 52ea401..6359fcd 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java @@ -120,7 +120,7 @@ public class RemoteSpecs implements ConfigParserMetKeys { NodeList propInfoList = ((Element) daemonNode) .getElementsByTagName(PROP_INFO_TAG); LinkedList<PropFilesInfo> pfiList = new LinkedList<PropFilesInfo>(); - PropFilesInfo pfi = null; + PropFilesInfo pfi; if (propInfoList.getLength() > 0) { Node propInfoNode = propInfoList.item(0); @@ -187,8 +187,7 @@ public class RemoteSpecs implements ConfigParserMetKeys { String regExp = ((Element) downloadInfo) .getAttribute(REG_EXP_ATTR); if (regExp.equals("")) - regExp = propFilesRegExp; - NodeList propsList = ((Element) propInfoNode) + NodeList propsList = ((Element) propInfoNode) .getElementsByTagName(PROP_FILE_TAG); HashMap<File, Parser> propFileToParserMap = new HashMap<File, Parser>(); for (int p = 0; p < propsList.getLength(); p++) { @@ -238,7 +237,7 @@ public class RemoteSpecs implements ConfigParserMetKeys { // get DATAINFO elements NodeList dataInfoList = ((Element) daemonNode) .getElementsByTagName(DATA_INFO_TAG); - DataFilesInfo dfi = null; + DataFilesInfo dfi; if (dataInfoList.getLength() > 0) { Node dataInfo = dataInfoList.item(0); String queryElement = ((Element) dataInfo) http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java index 135c6e5..805b900 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java @@ -456,7 +456,6 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface, String element = this.daemonInfo.getDataFilesInfo() .getQueryMetadataElementName(); if (element == null || element.equals("")) - element = "Filename"; return this.daemonInfo.getDataFilesInfo().getQueryMetadataElementName(); } @@ -542,7 +541,6 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface, if (args[i].equals("--rmiPort")) rmiPort = Integer.parseInt(args[++i]); else if (args[i].equals("--waitForNotification")) - waitForCrawlNotification = true; } LocateRegistry.createRegistry(rmiPort); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java index b080c59..949aab8 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java @@ -477,7 +477,7 @@ public class FileRestrictions { public static boolean isAllowed(VirtualFile file, VirtualFile root) { boolean vfDoesNotExist = false, lastFileIsDir = file.isDir(); - VirtualFile vf = null; + VirtualFile vf; while ((vf = root.getChildRecursive(file)) == null) { vfDoesNotExist = true; lastFileIsDir = file.isDir(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java index c7992c3..cc148f5 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java @@ -63,7 +63,7 @@ public class ClassNoaaEmailParser implements Parser { Pattern getPattern = Pattern.compile("\\s*get\\s{1,}.{1,}?(?:\\s|$)"); Matcher getMatcher = getPattern.matcher(sb); - VirtualFile vf = null; + VirtualFile vf; while (cdMatcher.find() && getMatcher.find()) { String cdCommand = sb.substring(cdMatcher.start(), cdMatcher.end()); String directory = cdCommand.trim().split(" ")[1]; http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java index a2b4e78..743e5f8 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java @@ -60,7 +60,7 @@ public class ListRetriever implements RetrievalMethod { public void processPropFile(FileRetrievalSystem frs, Parser propFileParser, File propFile, DataFilesInfo dfi, DataFileToPropFileLinker linker) throws Exception { - RemoteSite remoteSite = null; + RemoteSite remoteSite; // parse property file Metadata fileMetadata = new Metadata(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java index 147781e..865d08f 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java @@ -81,7 +81,7 @@ public class RetrievalSetup { .initialize(); dataFilesFRS.registerDownloadListener(linker); - File[] propFiles = null; + File[] propFiles; while ((propFiles = getCurrentlyDownloadedPropFiles(pfi)).length > 0 || downloadingProps) { for (File propFile : propFiles) { @@ -89,7 +89,7 @@ public class RetrievalSetup { Parser parser = pfi.getParserForFile(propFile); Class<RetrievalMethod> rmClass = config.getParserInfo() .getRetrievalMethod(parser); - RetrievalMethod rm = null; + RetrievalMethod rm; if ((rm = this.classToRmMap.get(rmClass)) == null) { LOG.log(Level.INFO, "Creating '" + rmClass.getCanonicalName() @@ -167,7 +167,7 @@ public class RetrievalSetup { Parser parser = pfi.getParserForFile(dirStructFile); Class<RetrievalMethod> rmClass = config .getParserInfo().getRetrievalMethod(parser); - RetrievalMethod rm = null; + RetrievalMethod rm; if ((rm = RetrievalSetup.this.classToRmMap .get(rmClass)) == null) { LOG.log(Level.INFO, "Creating '" http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java index 4d28cb8..61ecb30 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java @@ -131,7 +131,7 @@ public class XmlRpcBatchMgr implements Batchmgr { * org.apache.oodt.cas.resource.structs.ResourceNode) */ public boolean killJob(String jobId, ResourceNode node) { - JobSpec spec = null; + JobSpec spec; try { spec = repo.getJobById(jobId); } catch (Exception e) { @@ -179,7 +179,6 @@ public class XmlRpcBatchMgr implements Batchmgr { XmlRpcBatchMgrProxy proxy = (XmlRpcBatchMgrProxy) this.specToProxyMap .remove(spec.getJob().getId()); if (proxy != null) { - proxy = null; } } @@ -200,7 +199,6 @@ public class XmlRpcBatchMgr implements Batchmgr { XmlRpcBatchMgrProxy proxy = (XmlRpcBatchMgrProxy) this.specToProxyMap .remove(spec.getJob().getId()); if (proxy != null) { - proxy = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java index 65f2405..16eaaac 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java @@ -69,7 +69,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable { client = new XmlRpcClient(remoteHost.getIpAddr()); Vector argList = new Vector(); - boolean alive = false; + boolean alive; try { alive = (Boolean) client.execute("batchstub.isAlive", argList); @@ -88,7 +88,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable { Vector argList = new Vector(); argList.add(XmlRpcStructFactory.getXmlRpcJob(jobSpec.getJob())); - boolean result = false; + boolean result; try { result = (Boolean) client.execute("batchstub.killJob", argList); } catch (XmlRpcException e) { @@ -112,7 +112,7 @@ public class XmlRpcBatchMgrProxy extends Thread implements Runnable { argList.add(XmlRpcStructFactory.getXmlRpcJob(jobSpec.getJob())); argList.add(jobSpec.getIn().write()); - boolean result = false; + boolean result; try { parent.jobExecuting(jobSpec); result = (Boolean) client http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java index 8c655e1..f41ebc3 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/utils/MockGmetad.java @@ -86,8 +86,8 @@ public class MockGmetad implements Runnable { } public static void main(String [] args) throws Exception{ - String xmlPath = null; - int serverPort = -1; + String xmlPath; + int serverPort; final String usage = "java MockGmetad <xml path> <port>\n"; if (args.length != 2){ http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java index 32ca801..ffa2779 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java @@ -174,7 +174,7 @@ public class XmlBackendRepository implements BackendRepository { private static String getFactoryAttribute(String queue,Element elem, String tag) throws RepositoryException { NodeList children = elem.getElementsByTagName(tag); try { - String attr = ""; + String attr; if (children.getLength() != 1 || (attr = ((Element)children.item(0)).getAttribute("factory")) == "") { throw new RepositoryException("Could not find exactly one "+tag+", with factory set, in queue: "+queue); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java index 6adf58f..fd31062 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/XmlNodeRepository.java @@ -77,7 +77,6 @@ public class XmlNodeRepository implements NodeRepository { String nodesDirStr = nodesDir.getAbsolutePath(); if (!nodesDirStr.endsWith("/")) { - nodesDirStr += "/"; } // get all the workflow xml files http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java index aad472c..cc8ba86 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java @@ -82,7 +82,6 @@ public class XmlQueueRepository implements QueueRepository { String nodesDirStr = nodesDir.getAbsolutePath(); if (!nodesDirStr.endsWith("/")) { - nodesDirStr += "/"; } // get all the workflow xml files http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java index d756292..698c871 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java @@ -91,7 +91,7 @@ public class LRUScheduler implements Scheduler { } catch (Exception ignore) {} if (!myJobQueue.isEmpty()) { - JobSpec exec = null; + JobSpec exec; try { exec = myJobQueue.getNextJob(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java index 1258c93..1f73aa8 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java @@ -145,7 +145,7 @@ public class XmlRpcResourceManager { } public Hashtable getJobInfo(String jobId) throws JobRepositoryException { - JobSpec spec = null; + JobSpec spec; try { spec = scheduler.getJobQueue().getJobRepository() http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java index 835aba9..5add384 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java @@ -130,8 +130,8 @@ public class XmlRpcBatchStub { } private boolean genericExecuteJob(Hashtable jobHash, Object jobInput) { - JobInstance exec = null; - JobInput in = null; + JobInstance exec; + JobInput in; try { Job job = XmlRpcStructFactory.getJobFromXmlRpc(jobHash); @@ -162,7 +162,6 @@ public class XmlRpcBatchStub { synchronized (jobThreadMap) { Thread endThread = (Thread) jobThreadMap.get(job.getId()); if (endThread != null) - endThread = null; } return false; } @@ -170,7 +169,6 @@ public class XmlRpcBatchStub { synchronized (jobThreadMap) { Thread endThread = (Thread) jobThreadMap.get(job.getId()); if (endThread != null) - endThread = null; } return runner.wasSuccessful();
