OODT-906 remove unrequired assignment
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/0cc60d17 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/0cc60d17 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/0cc60d17 Branch: refs/heads/master Commit: 0cc60d170539dac185b5cb062270c4aba94d5981 Parents: 82cc2da Author: Tom Barber <[email protected]> Authored: Sun Oct 25 15:50:20 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 15:50:20 2015 +0000 ---------------------------------------------------------------------- .../oodt/cas/filemgr/browser/model/CasDB.java | 2 +- .../gui/perspective/build/BuildPerspective.java | 2 +- .../perspective/view/impl/DefaultPropView.java | 2 +- .../perspective/view/impl/DefaultTreeView.java | 2 +- .../gui/perspective/view/impl/GraphView.java | 8 ++--- .../view/impl/JungJGraphModelAdapter.java | 4 +-- .../catalog/cli/action/PagedQueryCliAction.java | 2 +- .../cas/catalog/cli/action/QueryCliAction.java | 2 +- .../cli/action/ReducedPagedQueryCliAction.java | 2 +- .../cli/action/ReducedQueryCliAction.java | 2 +- .../catalog/query/FreeTextQueryExpression.java | 2 +- .../cas/catalog/query/parser/QueryParser.java | 20 ++++++------ .../query/parser/QueryParserTokenManager.java | 2 +- .../catalog/query/parser/SimpleCharStream.java | 4 +-- .../XmlRpcCommunicationChannelClient.java | 2 +- .../struct/impl/index/DataSourceIndex.java | 2 +- .../system/impl/CatalogServiceLocal.java | 4 +-- .../oodt/cas/cli/printer/StdCmdLinePrinter.java | 2 +- .../apache/oodt/cas/cli/util/CmdLineUtils.java | 2 +- .../org/apache/oodt/commons/Configuration.java | 2 +- .../commons/activity/SQLDatabaseStorage.java | 3 -- .../database/DatabaseConnectionBuilder.java | 2 +- .../apache/oodt/commons/database/SqlScript.java | 8 ++--- .../apache/oodt/commons/exec/EnvUtilities.java | 3 +- .../apache/oodt/commons/exec/StreamGobbler.java | 2 +- .../commons/filter/TimeEventWeightedHash.java | 2 +- .../oodt/commons/object/jndi/RMIContext.java | 2 +- .../java/org/apache/oodt/commons/util/XML.java | 2 +- .../apache/oodt/cas/crawl/ProductCrawler.java | 2 +- .../oodt/cas/crawl/action/FileBasedAction.java | 2 +- .../cas/crawl/daemon/CrawlDaemonController.java | 12 +++---- .../cas/curation/service/DirectoryResource.java | 2 +- .../cas/curation/service/IngestionResource.java | 2 +- .../cas/curation/service/MetadataResource.java | 6 ++-- .../cas/curation/service/PolicyResource.java | 6 ++-- .../org/apache/oodt/cas/curation/HomePage.java | 2 +- .../cas/filemgr/catalog/DataSourceCatalog.java | 11 ++----- .../catalog/DataSourceCatalogFactory.java | 2 +- .../cas/filemgr/catalog/ScienceDataCatalog.java | 1 - .../catalog/ScienceDataCatalogFactory.java | 2 +- .../cli/action/RetrieveFilesCliAction.java | 2 +- .../datatransfer/RemoteDataTransferer.java | 7 ++-- .../datatransfer/TransferStatusTracker.java | 6 ++-- .../cas/filemgr/ingest/CmdLineIngester.java | 6 ++-- .../oodt/cas/filemgr/ingest/StdIngester.java | 6 ++-- .../extractors/AbstractFilemgrMetExtractor.java | 11 ++++--- .../DataSourceRepositoryManagerFactory.java | 2 +- .../ScienceDataRepositoryManager.java | 15 --------- .../ScienceDataRepositoryManagerFactory.java | 2 +- .../repository/XMLRepositoryManager.java | 12 +++---- .../filemgr/structs/FreeTextQueryCriteria.java | 2 +- .../oodt/cas/filemgr/structs/Product.java | 2 +- .../cas/filemgr/system/XmlRpcFileManager.java | 14 ++++---- .../oodt/cas/filemgr/tools/CatalogSearch.java | 4 +-- .../oodt/cas/filemgr/tools/DeleteProduct.java | 3 +- .../oodt/cas/filemgr/tools/ExpImpCatalog.java | 2 +- .../oodt/cas/filemgr/tools/MetadataDumper.java | 4 +-- .../filemgr/tools/OptimizeLuceneCatalog.java | 1 - .../oodt/cas/filemgr/tools/ProductDumper.java | 4 +-- .../oodt/cas/filemgr/tools/QueryTool.java | 2 +- .../cas/filemgr/tools/RangeQueryTester.java | 1 - .../oodt/cas/filemgr/tools/SolrIndexer.java | 7 ++-- .../util/GenericFileManagerObjectFactory.java | 20 ++++++------ .../apache/oodt/cas/filemgr/util/SqlParser.java | 2 +- .../oodt/cas/filemgr/util/XmlStructFactory.java | 10 +++--- .../validation/DataSourceValidationLayer.java | 2 +- .../DataSourceValidationLayerFactory.java | 2 +- .../validation/ScienceDataValidationLayer.java | 22 ------------- .../ScienceDataValidationLayerFactory.java | 2 +- .../filemgr/validation/XMLValidationLayer.java | 12 +++---- .../cas/filemgr/versioning/BasicVersioner.java | 2 +- .../filemgr/versioning/DateTimeVersioner.java | 4 +-- .../cas/filemgr/versioning/VersioningUtils.java | 10 +++--- .../filemgr/catalog/TestDataSourceCatalog.java | 2 +- .../cas/filemgr/ingest/TestCachedIngester.java | 5 ++- .../oodt/cas/filemgr/ingest/TestLocalCache.java | 3 +- .../oodt/cas/filemgr/ingest/TestRmiCache.java | 3 +- .../cas/filemgr/ingest/TestStdIngester.java | 3 +- .../filemgr/structs/type/TestTypeHandler.java | 22 +++++-------- .../filemgr/system/TestXmlRpcFileManager.java | 2 +- .../system/TestXmlRpcFileManagerClient.java | 6 ++-- .../cas/filemgr/tools/TestExpImpCatalog.java | 5 +-- .../tools/TestMetadataBasedProductMover.java | 2 +- .../cas/filemgr/util/TestXmlStructFactory.java | 2 +- .../java/org/apache/oodt/grid/GridServlet.java | 2 +- .../extractors/CmdLineMetExtractor.java | 4 +-- .../extractors/CopyAndRewriteExtractor.java | 2 +- .../metadata/extractors/ExternConfigReader.java | 4 +-- .../metadata/extractors/ExternMetExtractor.java | 2 +- .../util/GenericMetadataObjectFactory.java | 4 +-- .../oodt/cas/metadata/util/PathUtils.java | 4 +-- .../OpendapProfileElementExtractor.java | 8 ++--- .../oodt/opendapps/OpendapProfileHandler.java | 2 +- .../apache/oodt/pcs/tools/PCSHealthMonitor.java | 8 ++--- .../org/apache/oodt/pcs/tools/PCSTrace.java | 2 +- .../apache/oodt/pcs/util/FileManagerUtils.java | 2 +- .../oodt/pcs/input/PGEConfigFileReader.java | 10 +++--- .../oodt/pcs/input/PGEConfigFileWriter.java | 2 +- .../apache/oodt/cas/pge/PGETaskInstance.java | 2 +- .../MetadataKeyReplacerTemplateWriter.java | 2 +- .../metlist/MetadataListPcsMetFileWriter.java | 2 +- .../oodt/cas/pge/TestPGETaskInstance.java | 2 +- .../handlers/ofsn/AbstractCrawlLister.java | 2 +- .../ofsn/OFSNFileHandlerConfiguration.java | 1 - .../handlers/ofsn/StdOFSNGetHandler.java | 1 - .../product/handlers/ofsn/util/OFSNUtils.java | 3 +- .../profile/handlers/cas/CASProfileHandler.java | 2 +- .../cas/protocol/system/ProtocolManager.java | 2 +- .../oodt/cas/protocol/http/HttpProtocol.java | 2 +- .../cas/protocol/sftp/TestJschSftpProtocol.java | 2 +- .../oodt/cas/pushpull/config/RemoteSpecs.java | 7 ++-- .../apache/oodt/cas/pushpull/daemon/Daemon.java | 2 -- .../filerestrictions/FileRestrictions.java | 2 +- .../parsers/ClassNoaaEmailParser.java | 2 +- .../pushpull/retrievalmethod/ListRetriever.java | 2 +- .../retrievalsystem/RetrievalSetup.java | 6 ++-- .../cas/resource/batchmgr/XmlRpcBatchMgr.java | 4 +-- .../resource/batchmgr/XmlRpcBatchMgrProxy.java | 6 ++-- .../cas/resource/monitor/utils/MockGmetad.java | 4 +-- .../cas/resource/mux/XmlBackendRepository.java | 2 +- .../resource/noderepo/XmlNodeRepository.java | 1 - .../resource/queuerepo/XmlQueueRepository.java | 1 - .../cas/resource/scheduler/LRUScheduler.java | 2 +- .../resource/system/XmlRpcResourceManager.java | 2 +- .../resource/system/extern/XmlRpcBatchStub.java | 6 ++-- .../cas/resource/tools/RunDirJobSubmitter.java | 4 +-- .../GenericResourceManagerObjectFactory.java | 32 +++++++++--------- .../oodt/cas/resource/util/JobBuilder.java | 2 +- .../apache/oodt/cas/resource/util/Ulimit.java | 8 ++--- .../cas/resource/jobqueue/TestJobStack.java | 2 +- .../apache/oodt/security/sso/OpenSSOImpl.java | 4 +-- .../oodt/security/sso/SingleSignOnFactory.java | 4 +-- .../oodt/security/sso/opensso/SSOProxy.java | 10 ++---- .../filemgr/browser/types/TypeBrowser.java | 2 +- .../health/VisibilityAndSortToggler.java | 2 +- .../webcomponents/health/VisibilityToggler.java | 2 +- .../oodt/cas/product/CASProductHandler.java | 1 - .../cas/product/data/DataDeliveryServlet.java | 9 ++---- .../product/data/DatasetDeliveryServlet.java | 4 +-- .../jaxrs/configurations/RdfConfiguration.java | 2 +- .../jaxrs/servlets/CasProductJaxrsServlet.java | 2 +- .../cas/product/jaxrs/writers/RdfWriter.java | 2 +- .../cas/product/jaxrs/writers/RssWriter.java | 2 +- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 4 +-- .../oodt/cas/product/rdf/RDFProductServlet.java | 8 ++--- .../apache/oodt/cas/product/rdf/RDFUtils.java | 2 +- .../oodt/cas/product/rss/RSSProductServlet.java | 6 ++-- .../product/rss/RSSProductTransferServlet.java | 4 +-- .../oodt/cas/product/data/TestDataUtils.java | 2 +- .../cli/action/GetFirstPageCliAction.java | 2 +- .../cli/action/GetLastPageCliAction.java | 2 +- .../cli/action/GetNextPageCliAction.java | 2 +- .../cli/action/GetPrevPageCliAction.java | 2 +- .../IterativeWorkflowProcessorThread.java | 2 +- .../engine/ThreadPoolWorkflowEngine.java | 6 ++-- .../processor/WorkflowProcessorQueue.java | 4 +-- .../runner/AsynchronousLocalEngineRunner.java | 18 +++++------ .../cas/workflow/examples/BranchRedirector.java | 2 +- .../DataSourceWorkflowInstanceRepository.java | 2 +- ...SourceWorkflowInstanceRepositoryFactory.java | 2 +- .../LuceneWorkflowInstanceRepository.java | 10 +----- .../WorkflowInstanceMetadataReader.java | 10 +++--- .../lifecycle/WorkflowLifecycleManager.java | 2 +- .../lifecycle/WorkflowLifecyclesReader.java | 10 +++--- .../DataSourceWorkflowRepositoryFactory.java | 2 +- .../repository/PackagedWorkflowRepository.java | 8 ++--- .../repository/XMLWorkflowRepository.java | 5 ++- .../structs/HighestFIFOPrioritySorter.java | 2 +- .../workflow/system/XmlRpcWorkflowManager.java | 18 +++++------ .../system/XmlRpcWorkflowManagerClient.java | 34 ++++++++++---------- .../cas/workflow/tools/InstanceRepoCleaner.java | 2 +- .../cas/workflow/util/CygwinScriptFile.java | 1 - .../util/GenericWorkflowObjectFactory.java | 14 ++++---- .../oodt/cas/workflow/util/ScriptFile.java | 1 - .../workflow/engine/QuerierAndRunnerUtils.java | 2 +- .../oodt/cas/workflow/engine/SimpleTester.java | 1 - .../TestAsynchronousLocalEngineRunner.java | 1 - .../cas/workflow/engine/TestTaskQuerier.java | 8 ++--- .../TestLuceneWorkflowInstanceRepository.java | 2 +- .../TestWorkflowDataSourceRepository.java | 2 +- .../system/TestXmlRpcWorkflowManagerClient.java | 2 +- .../apache/oodt/xmlps/profile/DBMSExecutor.java | 2 -- .../xmlps/queryparser/HandlerQueryParser.java | 2 +- .../xmlps/util/GenericCDEObjectFactory.java | 2 +- .../xmlps/structs/TestCDEResultInputStream.java | 6 ++-- .../java/org/apache/oodt/xmlquery/Header.java | 18 +++++++---- .../java/org/apache/oodt/xmlquery/Result.java | 2 +- .../java/org/apache/oodt/xmlquery/XMLQuery.java | 11 +++---- 188 files changed, 386 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java ---------------------------------------------------------------------- diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java index 01a9631..37b6b9f 100644 --- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java +++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java @@ -178,7 +178,7 @@ public class CasDB { QueryBuilder qb = new QueryBuilder(this); org.apache.oodt.cas.filemgr.structs.Query casQ = qb.ParseQuery(queryText); - ProductType type = null; + ProductType type; try { type = client.getProductTypeByName(productType); Vector<Product> products = (Vector<Product>) client.query(casQ, type); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java index cace96e..d7966ec 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java @@ -178,7 +178,7 @@ public class BuildPerspective extends MultiStatePerspective { this.save(); this.removeAll(); this.setLayout(new BorderLayout()); - JPanel panel = null; + JPanel panel; if (this.activeState != null) { BuildPanel buildPanel = this.stateViews.get(this.activeState); buildPanel.refresh(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java index 1e0f0b8..d8724fc 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java @@ -104,7 +104,7 @@ public class DefaultPropView extends View { } private JTable createTable(final ViewState state) { - JTable table = null; + JTable table; final ModelGraph selected = state.getSelected(); if (selected != null) { final Vector<Vector<String>> rows = new Vector<Vector<String>>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java index b8ac2f5..51c517f 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java @@ -386,7 +386,7 @@ public class DefaultTreeView extends View { private void addMetadataNodes(DefaultMutableTreeNode metadataNode, Metadata staticMetadata) { for (String group : staticMetadata.getGroups()) { - Object userObj = null; + Object userObj; if (staticMetadata.getMetadata(group) != null) { HashMap<String, String> map = new HashMap<String, String>(); map.put(group, http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java index d2061e0..e576112 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java @@ -801,7 +801,7 @@ public class GraphView extends DefaultTreeView { if (e.getButton() == MouseEvent.BUTTON3) { Object mouseOverCell = GraphView.this.jgraph.getFirstCellForLocation( e.getX(), e.getY()); - ModelGraph mouseOverGraph = null; + ModelGraph mouseOverGraph; if (mouseOverCell != null) { mouseOverGraph = (GuiUtils.find(state.getGraphs(), ((ModelNode) ((DefaultMutableTreeNode) mouseOverCell) @@ -818,8 +818,6 @@ public class GraphView extends DefaultTreeView { if (mouseOverGraph != null) mouseOverCell = GraphView.this.m_jgAdapter .getVertexCell(mouseOverGraph.getModel()); - else - mouseOverCell = null; } state.setSelected(mouseOverGraph); } else { @@ -911,7 +909,7 @@ public class GraphView extends DefaultTreeView { } private void createNewGraph(String actionCommand) { - ModelGraph newGraph = null; + ModelGraph newGraph; if (actionCommand.equals(NEW_TASK_ITEM_NAME)) { newGraph = new ModelGraph(new ModelNode(state.getFile(), GuiUtils.createUniqueName())); @@ -957,7 +955,7 @@ public class GraphView extends DefaultTreeView { } public Point getShift(ViewState state, DefaultGraphCell cell, Map nested) { - ModelGraph graph = null; + ModelGraph graph; if (cell instanceof DefaultEdge) { IdentifiableEdge edge = (IdentifiableEdge) cell.getUserObject(); Pair pair = GraphView.this.edgeMap.get(edge.id); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java index a9179ef..094cb88 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/JungJGraphModelAdapter.java @@ -222,8 +222,8 @@ public class JungJGraphModelAdapter extends DefaultGraphModel { private void addJGraphEdge(IdentifiableEdge e) { ConnectionSet set = new ConnectionSet(); DefaultEdge theEdge = new DefaultEdge(e); - DefaultGraphCell from = null; - DefaultGraphCell to = null; + DefaultGraphCell from; + DefaultGraphCell to; String fromVertexId = e.getFrom().getId(); String toVertexId = e.getTo().getId(); if (!cellMap.containsKey(fromVertexId)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java index efbe7f5..0585045 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/PagedQueryCliAction.java @@ -52,7 +52,7 @@ public class PagedQueryCliAction extends CatalogServiceCliAction { QueryExpression queryExpression = QueryParser .parseQueryExpression(query); - Page page = null; + Page page; if (catalogIds == null) { page = getClient().getPage(new PageInfo(pageSize, pageNum), queryExpression); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java index 1954297..66f58d5 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/QueryCliAction.java @@ -49,7 +49,7 @@ public class QueryCliAction extends CatalogServiceCliAction { QueryExpression queryExpression = QueryParser .parseQueryExpression(query); - QueryPager queryPager = null; + QueryPager queryPager; if (catalogIds == null) { queryPager = getClient().query(queryExpression); } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java index 49274ef..5933682 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedPagedQueryCliAction.java @@ -57,7 +57,7 @@ public class ReducedPagedQueryCliAction extends CatalogServiceCliAction { QueryExpression queryExpression = QueryParser .parseQueryExpression(query); - Page page = null; + Page page; if (catalogIds == null) { page = getClient().getPage(new PageInfo(pageSize, pageNum), queryExpression); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java index e61d5b9..4411950 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/ReducedQueryCliAction.java @@ -53,7 +53,7 @@ public class ReducedQueryCliAction extends CatalogServiceCliAction { QueryExpression queryExpression = QueryParser .parseQueryExpression(query); - QueryPager queryPager = null; + QueryPager queryPager; if (catalogIds == null) { queryPager = getClient().query(queryExpression); } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java index c5268a9..b7b58a6 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java @@ -58,7 +58,7 @@ public class FreeTextQueryExpression extends TermQueryExpression { // tokenize string using default delimiters StringTokenizer tok = new StringTokenizer(text); - String token = null; + String token; // filter noise words and add to values vector List<String> values = new Vector<String>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java index f095c93..289ce09 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java @@ -23,7 +23,7 @@ import java.util.Vector; /*@bgen(jjtree) parseInput */ SimpleNode jjtn000 = new SimpleNode(JJTPARSEINPUT); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);QueryExpression qe = null; + jjtree.openNodeScope(jjtn000);QueryExpression qe; try { qe = Query(null); jj_consume_token(0); @@ -56,7 +56,7 @@ import java.util.Vector; /*@bgen(jjtree) Query */ SimpleNode jjtn000 = new SimpleNode(JJTQUERY); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);QueryExpression qe1 = null; + jjtree.openNodeScope(jjtn000);QueryExpression qe1; QueryExpression qe2 = null; Token operator = null; try { @@ -120,7 +120,7 @@ import java.util.Vector; /*@bgen(jjtree) QueryExpression */ SimpleNode jjtn000 = new SimpleNode(JJTQUERYEXPRESSION); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);QueryExpression qe = null; + jjtree.openNodeScope(jjtn000);QueryExpression qe; try { if (jj_2_2(2147483647)) { qe = PriorityQueryExpression(bucketNames); @@ -278,8 +278,8 @@ import java.util.Vector; /*@bgen(jjtree) ComparisonQueryExpression */ SimpleNode jjtn000 = new SimpleNode(JJTCOMPARISONQUERYEXPRESSION); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);Token termName = null; - Token operator = null; + jjtree.openNodeScope(jjtn000);Token termName; + Token operator; Vector<String> values = new Vector<String>(); try { termName = jj_consume_token(TERM); @@ -363,7 +363,7 @@ import java.util.Vector; /*@bgen(jjtree) PriorityQueryExpression */ SimpleNode jjtn000 = new SimpleNode(JJTPRIORITYQUERYEXPRESSION); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);QueryExpression qe = null; + jjtree.openNodeScope(jjtn000);QueryExpression qe; try { jj_consume_token(OPEN_PARENS); qe = Query(bucketNames); @@ -397,7 +397,7 @@ import java.util.Vector; /*@bgen(jjtree) CustomQueryExpression */ SimpleNode jjtn000 = new SimpleNode(JJTCUSTOMQUERYEXPRESSION); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);Token customNameToken = null; + jjtree.openNodeScope(jjtn000);Token customNameToken; Properties p = new Properties(); try { jj_consume_token(OPEN_BRACES); @@ -499,7 +499,7 @@ import java.util.Vector; /*@bgen(jjtree) getValues */ SimpleNode jjtn000 = new SimpleNode(JJTGETVALUES); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);Token value = null; + jjtree.openNodeScope(jjtn000);Token value; try { value = jj_consume_token(VALUE); label_15: @@ -539,8 +539,8 @@ import java.util.Vector; /*@bgen(jjtree) getProperties */ SimpleNode jjtn000 = new SimpleNode(JJTGETPROPERTIES); boolean jjtc000 = true; - jjtree.openNodeScope(jjtn000);Token propertyKey = null; - Token propertyVal = null; + jjtree.openNodeScope(jjtn000);Token propertyKey; + Token propertyVal; try { propertyKey = jj_consume_token(P_KEY); label_16: http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java index 30eeff7..73d8198 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java @@ -682,7 +682,7 @@ public Token getNextToken() int kind; Token specialToken = null; Token matchedToken; - int curPos = 0; + int curPos; EOFLoop : for (;;) http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java index ef010ae..1fd645d 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java @@ -436,8 +436,8 @@ public class SimpleCharStream len = bufsize - tokenBegin + bufpos + 1 + inBuf; } - int i = 0, j = 0, k = 0; - int nextColDiff = 0, columnDiff = 0; + int i = 0, j = 0, k; + int nextColDiff, columnDiff = 0; while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java index ca98ff2..2813dd2 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java @@ -163,7 +163,7 @@ public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChann byte[] buf = new byte[this.chunkSize]; is = new FileInputStream(new File(fromUrl.getPath())); int offset = 0; - int numBytes = 0; + int numBytes; while ((numBytes = is.read(buf, offset, chunkSize)) != -1) this.transferFile(new File(toURL.getPath()).getAbsolutePath(), buf, offset, numBytes); }catch (Exception e) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java index 8335de9..e9a945a 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java @@ -485,7 +485,7 @@ public class DataSourceIndex implements Index, IngestService, QueryService { sqlQuery.append(")"); }else if (queryExpression instanceof ComparisonQueryExpression){ ComparisonQueryExpression cqe = (ComparisonQueryExpression) queryExpression; - String operator = null; + String operator; if (cqe.getOperator().equals(ComparisonQueryExpression.Operator.EQUAL_TO)) { operator = "="; } else if (cqe.getOperator().equals(ComparisonQueryExpression.Operator.GREATER_THAN)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java index 79fb47c..41ba30c 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java @@ -475,7 +475,7 @@ public class CatalogServiceLocal implements CatalogService { if (this.restrictIngestPermissions) throw new CatalogServiceException("Ingest permissions are restricted for this CatalogService -- request denied"); try { - boolean performUpdate = false; + boolean performUpdate; TransactionId<?> catalogServiceTransactionId = this.getCatalogServiceTransactionId(metadata); if (performUpdate = this.ingestMapper.hasCatalogServiceTransactionId(catalogServiceTransactionId)) LOG.log(Level.INFO, "TransactionId '" + catalogServiceTransactionId + "' is an existing TransactionId, switching to update mode"); @@ -1070,7 +1070,7 @@ public class CatalogServiceLocal implements CatalogService { restrictToCatalogIds.retainAll(getInterestedCatalogs(queryExpression, restrictToCatalogIds)); // check for catalogs interested in wrapped query expression - QueryResult wrapperExprQueryResult = null; + QueryResult wrapperExprQueryResult; QueryExpression wrapperQE = ((WrapperQueryExpression) queryExpression).getQueryExpression(); if (wrapperQE instanceof QueryLogicalGroup) { wrapperExprQueryResult = this.queryRecur((QueryLogicalGroup) wrapperQE, restrictToCatalogIds); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java b/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java index 9ebf32b..94b9a07 100644 --- a/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/printer/StdCmdLinePrinter.java @@ -130,7 +130,7 @@ public class StdCmdLinePrinter implements CmdLinePrinter { .getArgDescription(action, option); } - String argHelp = null; + String argHelp; if (option instanceof ActionCmdLineOption && option.hasArgs()) { argHelp = " " + action.getName(); } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java b/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java index 473acba..d9e0b02 100755 --- a/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java @@ -1050,7 +1050,7 @@ public class CmdLineUtils { int endIndex) { StringBuilder outputString = new StringBuilder(""); String[] splitStrings = StringUtils.split(string, " "); - StringBuffer curLine = null; + StringBuffer curLine; for (int i = 0; i < splitStrings.length; i++) { curLine = new StringBuffer(""); curLine.append(splitStrings[i]).append(" "); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/Configuration.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/Configuration.java b/commons/src/main/java/org/apache/oodt/commons/Configuration.java index f805256..eb44cbd 100644 --- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java +++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java @@ -539,7 +539,7 @@ public class Configuration { * @throws NamingException If the context can't be created. */ public Context getObjectContext() throws NamingException { - Context c = null; + Context c; final String className = (String) contextEnvironment.get(javax.naming.Context.INITIAL_CONTEXT_FACTORY); if (className == null) c = new InitialContext(contextEnvironment); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java index c1d1b06..dc7aa78 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java @@ -159,7 +159,6 @@ public class SQLDatabaseStorage implements Storage { statement.close(); } catch (SQLException ignore) { } - statement = null; } if (conn != null) { @@ -167,8 +166,6 @@ public class SQLDatabaseStorage implements Storage { conn.close(); } catch (SQLException ignore) { } - conn = null; - conn = null; } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java index b3c0f77..1d98191 100644 --- a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java +++ b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java @@ -41,7 +41,7 @@ public final class DatabaseConnectionBuilder { public static final DataSource buildDataSource(String user, String pass, String driver, String url) { - DataSource ds = null; + DataSource ds; try { Class.forName(driver); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java b/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java index 09deb6e..1a9e48b 100644 --- a/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java +++ b/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java @@ -112,9 +112,9 @@ public class SqlScript { BufferedReader reader = new BufferedReader(new FileReader(script)); try { - String line = null; + String line; StringBuilder query = new StringBuilder(); - boolean queryEnds = false; + boolean queryEnds; while ((line = reader.readLine()) != null) { if (isComment(line)) @@ -195,7 +195,6 @@ public class SqlScript { } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -204,7 +203,6 @@ public class SqlScript { } catch (Exception ignore) { } - conn = null; } } } @@ -239,7 +237,6 @@ public class SqlScript { } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -248,7 +245,6 @@ public class SqlScript { } catch (Exception ignore) { } - conn = null; } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java b/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java index 1cf857a..939238b 100644 --- a/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java +++ b/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java @@ -150,7 +150,7 @@ public final class EnvUtilities { // line by line, and replaceAll on \ with \\ // so \\\\ with \\\\\\\\ BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - String line = null; + String line; StringBuilder buf = new StringBuilder(); while ((line = reader.readLine()) != null) { @@ -165,7 +165,6 @@ public final class EnvUtilities { } catch (Exception ignore) { } - reader = null; } return new ByteArrayInputStream(buf.toString().getBytes()); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java b/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java index e17c829..8ddf691 100644 --- a/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java +++ b/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java @@ -68,7 +68,7 @@ public class StreamGobbler extends Thread { InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); - String line = null; + String line; while ((line = br.readLine()) != null && this.running) { if (pw != null) pw.println(this.type + ": " + line); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java b/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java index 86142dd..9321741 100644 --- a/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java +++ b/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java @@ -181,7 +181,7 @@ public class TimeEventWeightedHash { @Override public boolean add(E ten) { - boolean wasAdded = false; + boolean wasAdded; if (wasAdded = super.add(ten)) listSet.add(ten); return wasAdded; http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java b/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java index b8063be..bf4b5f5 100644 --- a/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java +++ b/commons/src/main/java/org/apache/oodt/commons/object/jndi/RMIContext.java @@ -298,7 +298,7 @@ public class RMIContext implements Context { * @return A list of the current bindings, as simple string names. */ private List getCurrentBindings() throws NamingException { - List names = null; + List names; try { Registry registry = getRegistry(); names = Arrays.asList(registry.list()); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/commons/src/main/java/org/apache/oodt/commons/util/XML.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XML.java b/commons/src/main/java/org/apache/oodt/commons/util/XML.java index 65439e3..e631962 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/XML.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/XML.java @@ -300,7 +300,7 @@ public class XML { * @throws SAXException If a parse error occurs. */ public static Document parse(String string) throws SAXException { - Document doc = null; + Document doc; try { DOMParser parser = XML.createDOMParser(); StringReader reader = new StringReader(string); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java index 17d1eaa..e2e702f 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java @@ -96,7 +96,7 @@ public abstract class ProductCrawler extends ProductCrawlerBean { File dir = (File) stack.pop(); LOG.log(Level.INFO, "Crawling " + dir); - File[] productFiles = null; + File[] productFiles; if (isCrawlForDirs()) { productFiles = dir.listFiles(DIR_FILTER); } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java index 32e2648..bfd4fe6 100755 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FileBasedAction.java @@ -76,7 +76,7 @@ public abstract class FileBasedAction extends CrawlerAction { } public File getSelectedFile(File product, Metadata metadata) { - File selectedFile = null; + File selectedFile; if (file == null && fileKey == null) { selectedFile = product; } else if (file != null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java index c23264d..a6d1110 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java @@ -56,7 +56,7 @@ public class CrawlDaemonController { public double getAverageCrawlTime() throws CrawlException { Vector argList = new Vector(); - double avgCrawlTime = -1.0d; + double avgCrawlTime; try { avgCrawlTime = (Double) client.execute( @@ -73,7 +73,7 @@ public class CrawlDaemonController { public int getMilisCrawling() throws CrawlException { Vector argList = new Vector(); - int milisCrawling = -1; + int milisCrawling; try { milisCrawling = (Integer) client.execute( @@ -90,7 +90,7 @@ public class CrawlDaemonController { public int getWaitInterval() throws CrawlException { Vector argList = new Vector(); - int waitInterval = -1; + int waitInterval; try { waitInterval = (Integer) client.execute( @@ -106,7 +106,7 @@ public class CrawlDaemonController { public int getNumCrawls() throws CrawlException { Vector argList = new Vector(); - int numCrawls = -1; + int numCrawls; try { numCrawls = (Integer) client.execute("crawldaemon.getNumCrawls", @@ -123,7 +123,7 @@ public class CrawlDaemonController { public boolean isRunning() throws CrawlException { Vector argList = new Vector(); - boolean running = false; + boolean running; try { running = (Boolean) client.execute("crawldaemon.isRunning", @@ -139,7 +139,7 @@ public class CrawlDaemonController { public void stop() throws CrawlException { Vector argList = new Vector(); - boolean running = false; + boolean running; try { running = (Boolean) client.execute("crawldaemon.stop", argList); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java index db3c449..e46cd93 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java @@ -88,7 +88,7 @@ public class DirectoryResource extends CurationService { public String getDirectoryAreaAsHTML(String base, String path, boolean showFiles) { StringBuilder html = new StringBuilder(); - String relativePath = null; + String relativePath; try { relativePath = this.cleansePath(path); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java index e1ba9b9..fffeb8b 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java @@ -153,7 +153,7 @@ public class IngestionResource extends CurationService { Ingester ingest = this.configureIngester(); MetadataResource metService = new MetadataResource(); for (String file : task.getFileList()) { - Metadata fileMet = null; + Metadata fileMet; try { String vFilePath = this.getVirtualPath(CurationService.config .getStagingAreaPath(), file); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java index e092ed2..4322ee1 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java @@ -139,7 +139,7 @@ public class MetadataResource extends CurationService { // this.sendRedirect("login.jsp", uriInfo, res); - Metadata metadata = null; + Metadata metadata; try { metadata = this.getStagingMetadata(id, configId, overwrite); @@ -532,7 +532,7 @@ public class MetadataResource extends CurationService { try { // retrieve product from catalog - Product product = null; + Product product; if (StringUtils.hasText(id)) { id = id.substring(id.lastIndexOf("/") + 1); product = fmClient.getProductById(id); @@ -636,7 +636,7 @@ public class MetadataResource extends CurationService { try { // retrieve product from catalog - Product product = null; + Product product; if (StringUtils.hasText(id)) { id = id.substring(id.lastIndexOf("/") + 1); product = CurationService.config.getFileManagerClient().getProductById(id); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java index 56912d2..b0e0f53 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java @@ -86,8 +86,8 @@ public class PolicyResource extends CurationService { // calls. String[] pathToks = tokenizeVirtualPath(path); - String policy = null; - String productType = null; + String policy; + String productType; if (pathToks == null) { LOG.log(Level.WARNING, "malformed path token string: " @@ -181,7 +181,7 @@ public class PolicyResource extends CurationService { } private String getProductTypesForPolicy(String policy, String format) { - String[] typeNames = null; + String[] typeNames; try { typeNames = this.getProductTypeNamesForPolicy(policy); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java ---------------------------------------------------------------------- diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java index 9ffd38c..f1f6d35 100644 --- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java +++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java @@ -30,7 +30,7 @@ public class HomePage extends WebPage { public HomePage() { super(); CurationApp app = ((CurationApp) Application.get()); - String loggedInLabel = null; + String loggedInLabel; String logoutLabel = "Log Out"; CurationSession session = (CurationSession)getSession(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java index f72cb8d..0663b95 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java @@ -142,7 +142,7 @@ public class DataSourceCatalog implements Catalog { */ public synchronized void addMetadata(Metadata m, Product product) throws CatalogException { - List<Element> metadataTypes = null; + List<Element> metadataTypes; try { metadataTypes = validationLayer.getElements(product @@ -551,7 +551,6 @@ public class DataSourceCatalog implements Catalog { } catch (SQLException ignore) { } - statement = null; } if (conn != null) { @@ -561,7 +560,6 @@ public class DataSourceCatalog implements Catalog { } catch (SQLException ignore) { } - conn = null; } } @@ -961,8 +959,8 @@ public class DataSourceCatalog implements Catalog { conn = dataSource.getConnection(); statement = conn.createStatement(); - String getProductSql = null; - String productTypeIdStr = null; + String getProductSql; + String productTypeIdStr; if (fieldIdStringFlag) { productTypeIdStr = "'" + type.getProductTypeId() + "'"; @@ -2059,7 +2057,6 @@ public class DataSourceCatalog implements Catalog { } catch (SQLException ignore) { } - rs = null; } if (statement != null) { @@ -2068,7 +2065,6 @@ public class DataSourceCatalog implements Catalog { } catch (SQLException ignore) { } - statement = null; } if (conn != null) { @@ -2078,7 +2074,6 @@ public class DataSourceCatalog implements Catalog { } catch (SQLException ignore) { } - conn = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java index cdb16c7..e027d37 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java @@ -71,7 +71,7 @@ public class DataSourceCatalogFactory implements CatalogFactory { public DataSourceCatalogFactory() { // instantiate data source - 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/catalog/ScienceDataCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java index 94b9868..075e89d 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java @@ -1040,7 +1040,6 @@ public class ScienceDataCatalog implements Catalog { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java index 19910b7..1340716 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalogFactory.java @@ -48,7 +48,7 @@ public class ScienceDataCatalogFactory implements CatalogFactory { public ScienceDataCatalogFactory() { - String jdbcUrl = null, user = null, pass = null, driver = null; + String jdbcUrl, user, pass, driver; jdbcUrl = PathUtils.replaceEnvVariables(System .getProperty("org.apache.cas.filemgr.catalog.science.jdbc.url")); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java index 187ef90..c668649 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java @@ -44,7 +44,7 @@ public class RetrieveFilesCliAction extends FileManagerCliAction { try { XmlRpcFileManagerClient fmClient = getClient(); dt.setFileManagerUrl(fmClient.getFileManagerUrl()); - Product product = null; + Product product; if (productId != null) { product = fmClient.getProductById(productId); } else if (productName != null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java index 0018916..8d0c397 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java @@ -116,7 +116,7 @@ public class RemoteDataTransferer implements DataTransfer { // for each file reference, transfer the file to the remote file manager for (Reference r : product.getProductReferences()) { // test whether or not the reference is a directory or a file - File refFile = null; + File refFile; try { refFile = new File(new URI(r.getOrigReference())); } catch (URISyntaxException e) { @@ -171,7 +171,7 @@ public class RemoteDataTransferer implements DataTransfer { "RemoteDataTransfer: Copying File: " + "fmp:" + dataStoreFile.getAbsolutePath() + " to " + "file:" + dest.getAbsolutePath()); - byte[] fileData = null; + byte[] fileData; int offset = 0; while (true) { fileData = (byte[]) client.retrieveFile( @@ -222,7 +222,7 @@ public class RemoteDataTransferer implements DataTransfer { try { is = new FileInputStream(origFile); int offset = 0; - int numBytes = 0; + int numBytes; // remove the file if it already exists: this operation // is an overwrite @@ -252,7 +252,6 @@ public class RemoteDataTransferer implements DataTransfer { } catch (Exception ignore) { } - is = null; } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java index f743c65..86f1794 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java @@ -154,7 +154,7 @@ public class TransferStatusTracker { } private long getBytesTransferred(Reference r) { - File destFile = null; + File destFile; try { destFile = new File(new URI(r.getDataStoreReference())); @@ -169,7 +169,7 @@ public class TransferStatusTracker { } private List<Reference> quietGetReferences(Product p) { - List<Reference> refs = null; + List<Reference> refs; try { refs = catalog.getProductReferences(p); @@ -186,7 +186,7 @@ public class TransferStatusTracker { } private boolean isDir(Reference r) { - File fileRef = null; + File fileRef; try { fileRef = new File(new URI(r.getDataStoreReference())); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java index b810c7d..4aa9912 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java @@ -102,7 +102,7 @@ public class CmdLineIngester extends StdIngester { } CmdLineIngester ingester = new CmdLineIngester(transferServiceFactory); - MetExtractor extractor = null; + MetExtractor extractor; if (readFromStdin) { List<String> prods = readProdFilesFromStdin(); extractor = GenericMetadataObjectFactory @@ -110,7 +110,7 @@ public class CmdLineIngester extends StdIngester { ingester.ingest(new URL(fmUrlStr), prods, extractor, new File( metConfFilePath)); } else { - String productID = null; + String productID; if (metFilePath != null) { productID = ingester.ingest(new URL(fmUrlStr), new File( filePath), new SerializableMetadata( @@ -129,7 +129,7 @@ public class CmdLineIngester extends StdIngester { private static List<String> readProdFilesFromStdin() { List<String> prodFiles = new Vector<String>(); - BufferedReader br = null; + BufferedReader br; br = new BufferedReader(new InputStreamReader(System.in)); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java index 1e22209..7b6a5c2 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java @@ -97,7 +97,7 @@ public class StdIngester implements Ingester, CoreMetKeys { */ public String ingest(URL fmUrl, File prodFile, MetExtractor extractor, File metConfFile) throws IngestException { - Metadata met = null; + Metadata met; try { met = extractor.extractMetadata(prodFile, metConfFile); } catch (MetExtractionException e) { @@ -119,7 +119,7 @@ public class StdIngester implements Ingester, CoreMetKeys { MetExtractor extractor, File metConfFile) { if (prodFiles != null && prodFiles.size() > 0) { for (String prodFilePath : prodFiles) { - String productID = null; + String productID; try { productID = ingest(fmUrl, new File(prodFilePath), @@ -205,7 +205,7 @@ public class StdIngester implements Ingester, CoreMetKeys { + productType + "]: " + FILE_LOCATION + ": [" + fileLocation + "]"); - String productID = null; + String productID; try { productID = fmClient.ingestProduct(product, met, true); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java index b60f556..5eec97d 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java @@ -18,6 +18,11 @@ package org.apache.oodt.cas.filemgr.metadata.extractors; //JDK imports +import org.apache.oodt.cas.filemgr.structs.Product; +import org.apache.oodt.cas.filemgr.structs.Reference; +import org.apache.oodt.cas.metadata.Metadata; +import org.apache.oodt.cas.metadata.exceptions.MetExtractionException; + import java.io.File; import java.net.URI; import java.net.URISyntaxException; @@ -25,10 +30,6 @@ import java.util.List; import java.util.Properties; //OODT imports -import org.apache.oodt.cas.filemgr.structs.Product; -import org.apache.oodt.cas.filemgr.structs.Reference; -import org.apache.oodt.cas.metadata.Metadata; -import org.apache.oodt.cas.metadata.exceptions.MetExtractionException; /** * @author mattmann @@ -109,7 +110,7 @@ public abstract class AbstractFilemgrMetExtractor implements protected File getProductFile(Product product) throws MetExtractionException { - File prodFile = null; + File prodFile; if (product.getProductStructure() .equals(Product.STRUCTURE_HIERARCHICAL)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java index 9e36863..0d79942 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java @@ -44,7 +44,7 @@ public class DataSourceRepositoryManagerFactory implements * </p>. */ public DataSourceRepositoryManagerFactory() { - String jdbcUrl = null, user = null, pass = null, driver = null; + String jdbcUrl, user, pass, driver; jdbcUrl = System .getProperty("org.apache.oodt.cas.filemgr.repositorymgr.datasource.jdbc.url"); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java index 8d889fc..a7d988a 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManager.java @@ -84,7 +84,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -92,7 +91,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -131,7 +129,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -139,7 +136,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -147,7 +143,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -186,7 +181,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -194,7 +188,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -202,7 +195,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -238,7 +230,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { rs.close(); } catch (Exception ignore) { } - rs = null; } if (statement != null) { @@ -246,7 +237,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -254,7 +244,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -290,7 +279,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -298,7 +286,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { conn.close(); } catch (Exception ignore) { } - conn = null; } } @@ -332,7 +319,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { statement.close(); } catch (Exception ignore) { } - statement = null; } if (conn != null) { @@ -340,7 +326,6 @@ public class ScienceDataRepositoryManager implements RepositoryManager { 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/repository/ScienceDataRepositoryManagerFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java index 70a5c50..eaeffc0 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/ScienceDataRepositoryManagerFactory.java @@ -40,7 +40,7 @@ public class ScienceDataRepositoryManagerFactory implements private DataSource dataSource; public ScienceDataRepositoryManagerFactory() { - 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/repository/XMLRepositoryManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java index 2894f6b..1c8623e 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java @@ -156,7 +156,7 @@ public class XMLRepositoryManager implements RepositoryManager { private void saveProductTypes() { for (String dirUri : productTypeHomeUris) { - File productTypeDir = null; + File productTypeDir; try { productTypeDir = new File(new URI(dirUri)); @@ -255,12 +255,12 @@ public class XMLRepositoryManager implements RepositoryManager { 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).toURI().toURL().openStream(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java index a753dd7..7615bab 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java @@ -123,7 +123,7 @@ public class FreeTextQueryCriteria extends QueryCriteria { // tokenize string using default delimiters StringTokenizer tok = new StringTokenizer(text); - String token = null; + String token; // filter noise words and add to values vector while (tok.hasMoreElements()) { http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java index 9ae6b4f..5f26656 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java @@ -278,7 +278,7 @@ public class Product { public Document toXML() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); - Document doc = null; + Document doc; try { DocumentBuilder builder = factory.newDocumentBuilder(); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java index 04ad7c3..baa30e1 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java @@ -413,7 +413,7 @@ public class XmlRpcFileManager { public Vector<Hashtable<String, Object>> getProductTypes() throws RepositoryManagerException { - List<ProductType> productTypeList = null; + List<ProductType> productTypeList; try { productTypeList = repositoryManager.getProductTypes(); @@ -431,7 +431,7 @@ public class XmlRpcFileManager { public Vector<Hashtable<String, Object>> getProductReferences( Hashtable<String, Object> productHash) throws CatalogException { - List<Reference> referenceList = null; + List<Reference> referenceList; Product product = XmlRpcStructFactory.getProductFromXmlRpc(productHash); try { @@ -652,7 +652,7 @@ public class XmlRpcFileManager { public Hashtable<String, Object> getProductTypeById(String productTypeId) throws RepositoryManagerException { - ProductType type = null; + ProductType type; try { type = repositoryManager.getProductTypeById(productTypeId); @@ -716,7 +716,7 @@ public class XmlRpcFileManager { // version the product if (!clientTransfer || (Boolean.getBoolean("org.apache.oodt.cas.filemgr.serverside.versioning"))) { - Versioner versioner = null; + Versioner versioner; try { versioner = GenericFileManagerObjectFactory .getVersionerFromClassName(p.getProductType().getVersioner()); @@ -853,12 +853,10 @@ public class XmlRpcFileManager { } catch (Exception ignore) { } - fOut = null; } } - outFile = null; - return success; + return success; } public boolean moveProduct(Hashtable<String, Object> productHash, String newPath) @@ -1337,7 +1335,7 @@ public class XmlRpcFileManager { System.getProperties().load(new FileInputStream(new File(configFile))); } - String metaFactory = null, dataFactory = null, transferFactory = null; + String metaFactory, dataFactory, transferFactory; metaFactory = System.getProperty("filemgr.catalog.factory", "org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java index d4ea841..e766167 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java @@ -151,7 +151,7 @@ public class CatalogSearch { } public static void listElements() { - Vector products = new Vector(); + Vector products; try { products = (Vector) client.getProductTypes(); for (Object product : products) { @@ -377,7 +377,7 @@ public class CatalogSearch { System.out.println(welcomeMessage); - String command = ""; + String command; for (;;) { System.out.print("CatalogSearch>"); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java index 5609799..2912688 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java @@ -121,7 +121,7 @@ public class DeleteProduct { private static List readProdIdsFromStdin() { List prodIds = new Vector(); - BufferedReader br = null; + BufferedReader br; br = new BufferedReader(new InputStreamReader(System.in)); @@ -141,7 +141,6 @@ public class DeleteProduct { } catch (Exception ignore) { } - br = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java index b41819e..bbb764e 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java @@ -182,7 +182,7 @@ public class ExpImpCatalog { } private void exportTypeToDest(ProductType type) throws Exception { - ProductPage page = null; + ProductPage page; if (this.srcCatalog != null) { page = srcCatalog.getFirstPage(type); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java index 86a0cf8..bc2c26e 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java @@ -70,7 +70,7 @@ public final class MetadataDumper { } private Metadata getMetadata(String productId) { - Product product = null; + Product product; try { product = this.fmClient.getProductById(productId); @@ -79,7 +79,7 @@ public final class MetadataDumper { + productId + "] by id"); } - Metadata met = null; + Metadata met; try { met = this.fmClient.getMetadata(product); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java index 0b535e8..2d402fc 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java @@ -77,7 +77,6 @@ public class OptimizeLuceneCatalog { writer.close(); } catch (Exception ignore) { } - writer = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java index 245185e..289d1b6 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java @@ -69,7 +69,7 @@ public final class ProductDumper { } private Product getProduct(String productId) { - Product product = null; + Product product; try { product = this.fmClient.getProductById(productId); @@ -99,7 +99,7 @@ public final class ProductDumper { } private Metadata getMetadata(Product product) { - Metadata met = null; + Metadata met; try { met = this.fmClient.getMetadata(product); http://git-wip-us.apache.org/repos/asf/oodt/blob/0cc60d17/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java index 01ad642..80245ae 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java @@ -96,7 +96,7 @@ public final class QueryTool { public List query(org.apache.oodt.cas.filemgr.structs.Query query) { List prodIds = new Vector(); - List products = new Vector(); + List products; List productTypes = safeGetProductTypes();
