OODT-905 swap for for foreach...
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/82cc2da5 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/82cc2da5 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/82cc2da5 Branch: refs/heads/master Commit: 82cc2da5eee08070ddd05d17ad7f6745341930bd Parents: d3ee12a Author: Tom Barber <[email protected]> Authored: Sun Oct 25 15:47:42 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 15:47:42 2015 +0000 ---------------------------------------------------------------------- .../oodt/cas/filemgr/browser/model/CasDB.java | 10 +- .../cas/filemgr/browser/model/QueryBuilder.java | 12 +- .../gui/perspective/view/impl/GraphView.java | 6 +- .../catalog/query/parser/ParseException.java | 12 +- .../cas/catalog/query/parser/QueryParser.java | 8 +- .../cas/catalog/query/parser/SimpleNode.java | 4 +- .../system/impl/CatalogServiceLocal.java | 45 +-- .../org/apache/oodt/commons/Configuration.java | 61 ++-- .../org/apache/oodt/commons/ExecServer.java | 14 +- .../apache/oodt/commons/ExecServerConfig.java | 8 +- .../org/apache/oodt/commons/MultiServer.java | 19 +- .../apache/oodt/commons/activity/Activity.java | 5 +- .../oodt/commons/activity/ActivityTracker.java | 40 +-- .../commons/activity/CompositeActivity.java | 45 +-- .../commons/activity/SQLDatabaseRetrieval.java | 12 +- .../commons/activity/SQLDatabaseStorage.java | 18 +- .../oodt/commons/activity/XMLStorage.java | 14 +- .../apache/oodt/commons/database/SqlScript.java | 8 +- .../org/apache/oodt/commons/io/LogFilter.java | 5 +- .../org/apache/oodt/commons/util/CacheMap.java | 8 +- .../commons/util/EnterpriseEntityResolver.java | 8 +- .../oodt/commons/util/LogEventMultiplexer.java | 32 +- .../apache/oodt/commons/util/PropertyMgr.java | 8 +- .../org/apache/oodt/commons/util/Utility.java | 8 +- .../java/org/apache/oodt/commons/util/XML.java | 13 +- .../apache/oodt/commons/ConfigurationTest.java | 42 ++- .../cas/crawl/AutoDetectProductCrawler.java | 14 +- .../apache/oodt/cas/crawl/ProductCrawler.java | 8 +- .../cas/curation/service/CurationService.java | 10 +- .../cas/curation/service/DirectoryResource.java | 14 +- .../cas/curation/service/MetadataResource.java | 8 +- .../curation/util/ExtractorConfigReader.java | 2 +- .../cas/filemgr/catalog/DataSourceCatalog.java | 45 ++- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 24 +- .../cli/action/LuceneQueryCliAction.java | 12 +- .../datatransfer/RemoteDataTransferer.java | 58 ++- .../datatransfer/TransferStatusTracker.java | 14 +- .../oodt/cas/filemgr/ingest/StdIngester.java | 39 +- .../repository/XMLRepositoryManager.java | 188 +++++----- .../filemgr/structs/FreeTextQueryCriteria.java | 15 +- .../oodt/cas/filemgr/structs/Product.java | 12 +- .../filemgr/system/auth/SecureWebServer.java | 9 +- .../oodt/cas/filemgr/tools/CatalogSearch.java | 41 +-- .../oodt/cas/filemgr/tools/DeleteProduct.java | 26 +- .../tools/MetadataBasedProductMover.java | 25 +- .../oodt/cas/filemgr/tools/QueryTool.java | 25 +- .../cas/filemgr/tools/RangeQueryTester.java | 4 +- .../oodt/cas/filemgr/util/XmlStructFactory.java | 57 ++- .../filemgr/validation/XMLValidationLayer.java | 355 +++++++++---------- .../filemgr/versioning/DateTimeVersioner.java | 81 ++--- .../cas/filemgr/versioning/VersioningUtils.java | 67 ++-- .../filemgr/catalog/TestDataSourceCatalog.java | 4 +- .../cas/filemgr/ingest/TestCachedIngester.java | 4 +- .../oodt/cas/filemgr/ingest/TestLocalCache.java | 4 +- .../oodt/cas/filemgr/ingest/TestRmiCache.java | 4 +- .../cas/filemgr/ingest/TestStdIngester.java | 4 +- .../repository/TestXMLRepositoryManager.java | 4 +- .../filemgr/structs/type/TestTypeHandler.java | 148 ++++---- .../filemgr/system/TestXmlRpcFileManager.java | 4 +- .../system/TestXmlRpcFileManagerClient.java | 4 +- .../cas/filemgr/tools/TestExpImpCatalog.java | 12 +- .../tools/TestMetadataBasedProductMover.java | 14 +- .../validation/TestXMLValidationLayer.java | 14 +- .../org/apache/oodt/grid/ConfigServlet.java | 6 +- .../org/apache/oodt/grid/Configuration.java | 17 +- .../apache/oodt/grid/ProductQueryServlet.java | 23 +- .../apache/oodt/grid/ProfileQueryServlet.java | 55 +-- .../java/org/apache/oodt/grid/QueryServlet.java | 35 +- .../oodt/grid/RestfulProductQueryServlet.java | 8 +- .../oodt/cas/install/CASInstallDistMojo.java | 24 +- .../apache/oodt/opendapps/DatasetCrawler.java | 8 +- .../oodt/pcs/health/CrawlPropertiesFile.java | 4 +- .../apache/oodt/pcs/tools/PCSHealthMonitor.java | 34 +- .../apache/oodt/pcs/tools/PCSLongLister.java | 11 +- .../org/apache/oodt/pcs/tools/PCSTrace.java | 11 +- .../apache/oodt/pcs/util/FileManagerUtils.java | 16 +- .../oodt/pcs/input/PGEConfigFileReader.java | 28 +- .../oodt/pcs/input/PGEConfigFileWriter.java | 48 ++- .../handlers/ofsn/AbstractCrawlLister.java | 9 +- .../product/handlers/ofsn/URLGetHandler.java | 10 +- .../oodt/profile/EnumeratedProfileElement.java | 10 +- .../java/org/apache/oodt/profile/Profile.java | 13 +- .../org/apache/oodt/profile/ProfileElement.java | 17 +- .../java/org/apache/oodt/profile/Utility.java | 15 +- .../gui/pstructs/ProfileAttributesPrinter.java | 20 +- .../gui/pstructs/ProfileElementPrinter.java | 10 +- .../profile/gui/pstructs/ProfilePrinter.java | 14 +- .../gui/pstructs/ResourceAttributesPrinter.java | 115 +++--- .../profile/handlers/cas/CASProfileHandler.java | 10 +- .../profile/handlers/cas/util/ProfileUtils.java | 7 +- .../lightweight/LightweightProfileServer.java | 92 ++--- .../SearchableResourceAttributes.java | 10 +- .../LightweightProfileServerTest.java | 20 +- .../cas/protocol/ftp/CommonsNetFtpProtocol.java | 32 +- .../cas/resource/batchmgr/XmlRpcBatchMgr.java | 12 +- .../resource/noderepo/XmlNodeRepository.java | 40 ++- .../resource/queuerepo/XmlQueueRepository.java | 141 ++++---- .../cas/resource/structs/NameValueJobInput.java | 8 +- .../oodt/cas/resource/tools/JobSubmitter.java | 6 +- .../cas/resource/util/XmlRpcStructFactory.java | 32 +- .../resource/monitor/TestAssignmentMonitor.java | 6 +- .../system/TestXmlRpcResourceManager.java | 4 +- .../workflow/model/WorkflowViewer.java | 3 +- .../apache/oodt/cas/product/data/DataUtils.java | 29 +- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 20 +- .../oodt/cas/product/rdf/RDFProductServlet.java | 33 +- .../apache/oodt/cas/product/rdf/RDFUtils.java | 4 +- .../oodt/cas/product/rss/RSSProductServlet.java | 14 +- .../product/rss/RSSProductTransferServlet.java | 98 ++--- .../cli/action/GetTaskByIdCliAction.java | 10 +- .../AbstractPaginatibleInstanceRepository.java | 4 +- .../LuceneWorkflowInstanceRepository.java | 74 ++-- .../MemoryWorkflowInstanceRepository.java | 13 +- .../instrepo/WorkflowInstanceMetMap.java | 4 +- .../workflow/lifecycle/WorkflowLifecycle.java | 8 +- .../lifecycle/WorkflowLifecycleManager.java | 12 +- .../repository/XMLWorkflowRepository.java | 30 +- .../workflow/system/XmlRpcWorkflowManager.java | 182 +++++----- .../system/XmlRpcWorkflowManagerClient.java | 48 +-- .../util/GenericWorkflowObjectFactory.java | 30 +- .../oodt/cas/workflow/util/ScriptFile.java | 4 +- .../cas/workflow/util/XmlRpcStructFactory.java | 40 +-- .../TestAsynchronousLocalEngineRunner.java | 4 +- .../cas/workflow/engine/TestTaskRunner.java | 4 +- .../TestLuceneWorkflowInstanceRepository.java | 5 +- .../system/TestXmlRpcWorkflowManagerClient.java | 6 +- .../oodt/xmlps/mapping/DatabaseTableGroup.java | 4 +- .../apache/oodt/xmlps/profile/DBMSExecutor.java | 10 +- .../oodt/xmlps/profile/XMLPSProfileHandler.java | 8 +- .../xmlps/queryparser/HandlerQueryParser.java | 4 +- .../org/apache/oodt/xmlps/structs/CDERow.java | 3 +- .../xmlps/product/TestXMLPSProductHandler.java | 3 +- .../org/apache/oodt/xmlquery/QueryResult.java | 24 +- .../java/org/apache/oodt/xmlquery/Result.java | 24 +- .../java/org/apache/oodt/xmlquery/XMLQuery.java | 43 ++- 135 files changed, 1801 insertions(+), 1820 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 2677254..01a9631 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 @@ -70,8 +70,9 @@ public class CasDB { Vector<String> names = new Vector<String>(); types = new String[v.size()]; - for (int i = 0; i < v.size(); i++) - names.add(v.get(i).getName()); + for (ProductType aV : v) { + names.add(aV.getName()); + } Collections.sort(names); names.toArray(types); @@ -98,8 +99,9 @@ public class CasDB { Vector<String> names = new Vector<String>(); elements = new String[v.size()]; - for (int i = 0; i < v.size(); i++) - names.add(v.get(i).getElementName()); + for (Element aV : v) { + names.add(aV.getElementName()); + } Collections.sort(names); names.toArray(elements); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java ---------------------------------------------------------------------- diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java index 47ab4e4..ec8f58d 100644 --- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java +++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java @@ -81,10 +81,10 @@ public class QueryBuilder { // for(int i=0;i<t.length;i++) // ((FreeTextQueryCriteria)casQuery.getCriteria().get(0)).addValue(t[i].text()); } else { - for (int i = 0; i < t.length; i++) { - String element = database.getElementID(t[i].field()); - if (!element.equals("") && !t[i].text().equals("")) { - casQ.addCriterion(new TermQueryCriteria(element, t[i].text())); + for (Term aT : t) { + String element = database.getElementID(aT.field()); + if (!element.equals("") && !aT.text().equals("")) { + casQ.addCriterion(new TermQueryCriteria(element, aT.text())); } } } @@ -99,8 +99,8 @@ public class QueryBuilder { } } else if (luceneQ instanceof BooleanQuery) { BooleanClause[] clauses = ((BooleanQuery) luceneQ).getClauses(); - for (int i = 0; i < clauses.length; i++) { - GenerateCASQuery(casQ, (clauses[i]).getQuery()); + for (BooleanClause clause : clauses) { + GenerateCASQuery(casQ, (clause).getQuery()); } } else { System.out.println("Error Parsing Query"); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 0fb1a68..d2061e0 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 @@ -675,15 +675,15 @@ public class GraphView extends DefaultTreeView { } private void shift(List<ModelGraph> graphs, Map nested, double x, double y) { - for (int i = 0; i < graphs.size(); i++) { - ModelGraph graph = graphs.get(i); + for (ModelGraph graph : graphs) { DefaultGraphCell cell = this.m_jgAdapter.getVertexCell(graph.getModel()); Rectangle2D bounds = (Rectangle2D) ((Map) nested.get(cell)) .get(GraphConstants.BOUNDS); ((Map) nested.get(cell)).put( GraphConstants.BOUNDS, new AttributeMap.SerializableRectangle2D(bounds.getX() + x, bounds - .getY() + y, bounds.getWidth(), bounds.getHeight())); + .getY() + y, bounds.getWidth(), + bounds.getHeight())); this.shift(graph.getChildren(), nested, x, y); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java index 50401fb..c523e8a 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java @@ -91,14 +91,14 @@ public class ParseException extends Exception { String eol = System.getProperty("line.separator", "\n"); StringBuilder expected = new StringBuilder(); int maxSize = 0; - for (int i = 0; i < expectedTokenSequences.length; i++) { - if (maxSize < expectedTokenSequences[i].length) { - maxSize = expectedTokenSequences[i].length; + for (int[] expectedTokenSequence : expectedTokenSequences) { + if (maxSize < expectedTokenSequence.length) { + maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequences[i].length; j++) { - expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' '); + for (int j = 0; j < expectedTokenSequence.length; j++) { + expected.append(tokenImage[expectedTokenSequence[j]]).append(' '); } - if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { + if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) { expected.append("..."); } expected.append(eol).append(" "); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 8150c10..f095c93 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 @@ -815,10 +815,12 @@ import java.util.Vector; jj_gen++; if (++jj_gc > 100) { jj_gc = 0; - for (int i = 0; i < jj_2_rtns.length; i++) { - JJCalls c = jj_2_rtns[i]; + for (JJCalls jj_2_rtn : jj_2_rtns) { + JJCalls c = jj_2_rtn; while (c != null) { - if (c.gen < jj_gen) c.first = null; + if (c.gen < jj_gen) { + c.first = null; + } c = c.next; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java index 7af2bcf..31cdb29 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java @@ -66,8 +66,8 @@ class SimpleNode implements Node { public void dump(String prefix) { System.out.println(toString(prefix)); if (children != null) { - for (int i = 0; i < children.length; ++i) { - SimpleNode n = (SimpleNode)children[i]; + for (Node aChildren : children) { + SimpleNode n = (SimpleNode) aChildren; if (n != null) { n.dump(prefix + " "); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 b67447b..79fb47c 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 @@ -1023,28 +1023,33 @@ public class CatalogServiceLocal implements CatalogService { // if (QueryLogicalGroup's operator is AND and is unbalanced or a child contains query results) if ((((QueryLogicalGroup) queryExpression).getOperator().equals(QueryLogicalGroup.Operator.AND) && containsUnbalancedCatalogInterest(childrenQueryResults)) || containsTranactionReceipts(childrenQueryResults)) { - - for (int i = 0; i < childrenQueryResults.size(); i++) { - QueryResult childQueryResult = childrenQueryResults.get(i); - - // if childQueryResult has not been used, use it - if (childQueryResult.getCatalogReceipts() == null) { - List<CatalogReceipt> catalogReceipts = new Vector<CatalogReceipt>(); - for (Catalog catalog : this.getCurrentCatalogList()) { - try { - if (childQueryResult.getInterestedCatalogs().contains(catalog.getId())) - catalogReceipts.addAll(catalog.query(this.reduceToUnderstoodExpressions(catalog, childQueryResult.getQueryExpression()))); - }catch (Exception e) { - if (this.oneCatalogFailsAllFail) - throw new CatalogServiceException("Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : " + e.getMessage(), e); - else - LOG.log(Level.WARNING, "Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : " + e.getMessage(), e); - } - } - childQueryResult.setCatalogReceipts(catalogReceipts); + + for (QueryResult childQueryResult : childrenQueryResults) { + // if childQueryResult has not been used, use it + if (childQueryResult.getCatalogReceipts() == null) { + List<CatalogReceipt> catalogReceipts = new Vector<CatalogReceipt>(); + for (Catalog catalog : this.getCurrentCatalogList()) { + try { + if (childQueryResult.getInterestedCatalogs().contains(catalog.getId())) { + catalogReceipts.addAll(catalog + .query(this.reduceToUnderstoodExpressions(catalog, childQueryResult.getQueryExpression()))); + } + } catch (Exception e) { + if (this.oneCatalogFailsAllFail) { + throw new CatalogServiceException( + "Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : " + + e.getMessage(), e); + } else { + LOG.log(Level.WARNING, + "Failed to query catalog '" + catalog.getId() + "' for query '" + queryExpression + "' : " + + e.getMessage(), e); + } } - + } + childQueryResult.setCatalogReceipts(catalogReceipts); } + + } // get intersection of results QueryResult queryResult = new QueryResult(queryExpression); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e142165..f805256 100644 --- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java +++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java @@ -117,13 +117,13 @@ public class Configuration { // Now find one. boolean found = false; - for (Iterator i = candidates.iterator(); i.hasNext();) { - file = (File) i.next(); - if (file.exists()) { - found = true; - break; - } + for (Object candidate : candidates) { + file = (File) candidate; + if (file.exists()) { + found = true; + break; } + } if (found && file == alt) System.err.println("WARNING: Using older config file " + alt + "; rename to " + homedirfile + " as soon as possible."); @@ -416,16 +416,17 @@ public class Configuration { Element programsNode = document.createElement("programs"); configurationNode.appendChild(programsNode); - for (Iterator i = execServers.iterator(); i.hasNext();) { - ExecServerConfig esc = (ExecServerConfig) i.next(); - Element execServerNode = document.createElement("execServer"); - programsNode.appendChild(execServerNode); - XML.add(execServerNode, "class", esc.getClassName()); - XML.add(execServerNode, "objectKey", esc.getObjectKey()); - XML.add(execServerNode, "host", esc.getPreferredHost().toString()); - if (esc.getProperties().size() > 0) - dumpProperties(esc.getProperties(), execServerNode); + for (Object execServer : execServers) { + ExecServerConfig esc = (ExecServerConfig) execServer; + Element execServerNode = document.createElement("execServer"); + programsNode.appendChild(execServerNode); + XML.add(execServerNode, "class", esc.getClassName()); + XML.add(execServerNode, "objectKey", esc.getObjectKey()); + XML.add(execServerNode, "host", esc.getPreferredHost().toString()); + if (esc.getProperties().size() > 0) { + dumpProperties(esc.getProperties(), execServerNode); } + } } return configurationNode; @@ -439,11 +440,12 @@ public class Configuration { * @param targetProps The target properties. */ public void mergeProperties(Properties targetProps) { - for (Iterator i = properties.entrySet().iterator(); i.hasNext();) { - Map.Entry entry = (Map.Entry) i.next(); - if (!targetProps.containsKey(entry.getKey())) - targetProps.put(entry.getKey(), entry.getValue()); + for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { + Map.Entry entry = (Map.Entry) objectObjectEntry; + if (!targetProps.containsKey(entry.getKey())) { + targetProps.put(entry.getKey(), entry.getValue()); } + } } /** Get the exec-server configurations. @@ -462,11 +464,12 @@ public class Configuration { public Collection getExecServerConfigs(Class clazz) { String className = clazz.getName(); Collection execServerConfigs = new ArrayList(); - for (Iterator i = execServers.iterator(); i.hasNext();) { - ExecServerConfig exec = (ExecServerConfig) i.next(); - if (className.equals(exec.getClassName())) - execServerConfigs.add(exec); - } + for (Object execServer : execServers) { + ExecServerConfig exec = (ExecServerConfig) execServer; + if (className.equals(exec.getClassName())) { + execServerConfigs.add(exec); + } + } return execServerConfigs; } @@ -611,11 +614,11 @@ public class Configuration { static void dumpProperties(Properties props, Node node) { Element propertiesElement = node.getOwnerDocument().createElement("properties"); node.appendChild(propertiesElement); - for (Iterator i = props.entrySet().iterator(); i.hasNext();) { - Map.Entry entry = (Map.Entry) i.next(); - XML.add(propertiesElement, "key", (String) entry.getKey()); - XML.add(propertiesElement, "value", (String) entry.getValue()); - } + for (Map.Entry<Object, Object> objectObjectEntry : props.entrySet()) { + Map.Entry entry = (Map.Entry) objectObjectEntry; + XML.add(propertiesElement, "key", (String) entry.getKey()); + XML.add(propertiesElement, "value", (String) entry.getValue()); + } } /** Create a new XML document with the configuration DTD. http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/ExecServer.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java index 6a61f3c..0d12531 100644 --- a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java +++ b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java @@ -267,13 +267,13 @@ public class ExecServer { */ public String getServerStatus() { // Update the status document with the current log. - for (Iterator i = LogInit.MEMORY_LOGGER.getMessages().iterator(); i.hasNext();) { - String message = (String) i.next(); - Element messageElement = statusDocument.createElement("message"); - messageElement.setAttribute("xml:space", "preserve"); - messageElement.appendChild(statusDocument.createTextNode(message)); - logElement.appendChild(messageElement); - } + for (Object o : LogInit.MEMORY_LOGGER.getMessages()) { + String message = (String) o; + Element messageElement = statusDocument.createElement("message"); + messageElement.setAttribute("xml:space", "preserve"); + messageElement.appendChild(statusDocument.createTextNode(message)); + logElement.appendChild(messageElement); + } // Serialize the document. String rc = XML.serialize(statusDocument); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java b/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java index c037cdf..53085c8 100644 --- a/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java +++ b/commons/src/main/java/org/apache/oodt/commons/ExecServerConfig.java @@ -86,10 +86,10 @@ public class ExecServerConfig extends Executable implements Documentable { commandLine[1] = "-Xms" + initialHeap; commandLine[2] = "-Xmx" + maxHeap; int index = 3; - for (Iterator i = properties.entrySet().iterator(); i.hasNext();) { - Map.Entry entry = (Map.Entry) i.next(); - commandLine[index++] = "-D" + entry.getKey() + "=" + entry.getValue(); - } + for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { + Map.Entry entry = (Map.Entry) objectObjectEntry; + commandLine[index++] = "-D" + entry.getKey() + "=" + entry.getValue(); + } commandLine[index++] = "org.apache.oodt.commons.ExecServer"; commandLine[index++] = className; commandLine[index++] = objectKey; http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/MultiServer.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java index 185aea9..ba8af6f 100644 --- a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java +++ b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java @@ -265,20 +265,23 @@ public class MultiServer { * @throws NamingException if an error occurs. */ static void startup() throws NamingException { - for (Iterator i = servers.values().iterator(); i.hasNext();) { - Server s = (Server) i.next(); - s.start(); - } + for (Object o : servers.values()) { + Server s = (Server) o; + s.start(); + } } /** * Stop each server. */ static void shutdown() { - for (Iterator i = servers.values().iterator(); i.hasNext();) try { - Server s = (Server) i.next(); - s.stop(); - } catch (NamingException ignore) {} + for (Object o : servers.values()) { + try { + Server s = (Server) o; + s.stop(); + } catch (NamingException ignore) { + } + } TIMER.cancel(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java b/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java index 4a01a6d..2a36a0f 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java @@ -104,8 +104,9 @@ public abstract class Activity { messageDigest.update((String.valueOf(addr) + nextNum + date).getBytes()); // Add the 1st 3 components byte[] sig = messageDigest.digest(bytes); // And add the random bytes StringBuilder output = new StringBuilder(); // Make space to store the hash as a string - for (int i = 0; i < sig.length; ++i) // For each byte in the hash - output.append(Integer.toHexString(((int)sig[i])&0xff));// Store it as a hex value + for (byte aSig : sig) { + output.append(Integer.toHexString(((int) aSig) & 0xff));// Store it as a hex value + } return output.toString(); // And return the string } catch (NoSuchAlgorithmException ex) { throw new IllegalStateException("MD5 algorithm not available"); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java b/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java index 70e52b0..a126790 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java @@ -1,19 +1,19 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.oodt.commons.activity; @@ -125,10 +125,10 @@ public class ActivityTracker { */ public Activity createActivity() { List activities = new ArrayList(); - for (Iterator i = factories.iterator(); i.hasNext();) { - ActivityFactory factory = (ActivityFactory) i.next(); - activities.add(factory.createActivity()); - } + for (Object factory1 : factories) { + ActivityFactory factory = (ActivityFactory) factory1; + activities.add(factory.createActivity()); + } return new CompositeActivity(activities); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java b/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java index 56fb788..fd021eb 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java @@ -1,19 +1,19 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.oodt.commons.activity; @@ -35,9 +35,11 @@ public class CompositeActivity extends Activity { public CompositeActivity(Collection activities) { if (activities == null) throw new IllegalArgumentException("Activities collection required"); - for (Iterator i = activities.iterator(); i.hasNext();) - if (!(i.next() instanceof Activity)) - throw new IllegalArgumentException("Non-Activity in activities collection"); + for (Object activity : activities) { + if (!(activity instanceof Activity)) { + throw new IllegalArgumentException("Non-Activity in activities collection"); + } + } this.activities = activities; } @@ -47,8 +49,9 @@ public class CompositeActivity extends Activity { * @param incident The {@link Incident} to record. */ public void recordIncident(Incident incident) { - for (Iterator i = activities.iterator(); i.hasNext();) - ((Activity) i.next()).recordIncident(incident); + for (Object activity : activities) { + ((Activity) activity).recordIncident(incident); + } } /** http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java index 005cb40..4879620 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java @@ -192,13 +192,15 @@ public class SQLDatabaseRetrieval implements Retrieval { try { SQLDatabaseRetrieval retrieval = new SQLDatabaseRetrieval(); List activities = retrieval.retrieve(); - for (Iterator i = activities.iterator(); i.hasNext();) { - StoredActivity activity = (StoredActivity) i.next(); + for (Object activity1 : activities) { + StoredActivity activity = (StoredActivity) activity1; System.out.println("Activity: " + activity.getActivityID()); List incidents = activity.getIncidents(); - for (Iterator j = incidents.iterator(); j.hasNext();) { - StoredIncident incident = (StoredIncident) j.next(); - System.out.println(" Incident: " + incident.getClassName() + ", " + incident.getOccurTime() + ", " + incident.getDetail()); + for (Object incident1 : incidents) { + StoredIncident incident = (StoredIncident) incident1; + System.out.println( + " Incident: " + incident.getClassName() + ", " + incident.getOccurTime() + ", " + incident + .getDetail()); } } System.exit(0); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 0aa6f2a..c1d1b06 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 @@ -135,17 +135,17 @@ public class SQLDatabaseStorage implements Storage { try { conn = this.ds.getConnection(); statement = conn.createStatement(); - for (Iterator i = incidents.iterator(); i.hasNext();) { - Incident incident = (Incident) i.next(); + for (Object incident1 : incidents) { + Incident incident = (Incident) incident1; statement .executeUpdate("insert into incidents (activityID, className, occurTime, detail) values ('" - + id - + "', '" - + incident.getClass().getName() - + "', " - + incident.getTime().getTime() - + ", '" - + escapeSingleQuote(incident.toString()) + "')"); + + id + + "', '" + + incident.getClass().getName() + + "', " + + incident.getTime().getTime() + + ", '" + + escapeSingleQuote(incident.toString()) + "')"); } } catch (SQLException e) { System.err http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java index 9d0c189..6d77e51 100644 --- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java +++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java @@ -48,13 +48,13 @@ public abstract class XMLStorage implements Storage { root.setAttribute("id", id); doc.appendChild(root); - for (Iterator i = incidents.iterator(); i.hasNext();) { - Incident incident = (Incident) i.next(); - Element e = doc.createElement(incident.getClass().getName()); - e.setAttribute("time", String.valueOf(incident.getTime().getTime())); - e.appendChild(doc.createTextNode(incident.toString())); - root.appendChild(e); - } + for (Object incident1 : incidents) { + Incident incident = (Incident) incident1; + Element e = doc.createElement(incident.getClass().getName()); + e.setAttribute("time", String.valueOf(incident.getTime().getTime())); + e.appendChild(doc.createTextNode(incident.toString())); + root.appendChild(e); + } saveDocument(doc); } catch (ParserConfigurationException ex) { throw new IllegalStateException("Unexpected ParserConfigurationException: " + ex.getMessage()); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 3a856be..09deb6e 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 @@ -137,8 +137,8 @@ public class SqlScript { doExecuteBatch(); } else { if (statementList != null && statementList.size() > 0) { - for (Iterator i = statementList.iterator(); i.hasNext();) { - String sqlStatement = (String) i.next(); + for (Object aStatementList : statementList) { + String sqlStatement = (String) aStatementList; doExecuteIndividual(sqlStatement); } @@ -218,8 +218,8 @@ public class SqlScript { conn = ds.getConnection(); statement = conn.createStatement(); - for (Iterator i = statementList.iterator(); i.hasNext();) { - String sqlStatement = (String) i.next(); + for (Object aStatementList : statementList) { + String sqlStatement = (String) aStatementList; statement.addBatch(sqlStatement); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java b/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java index 714a186..9e5d085 100644 --- a/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java +++ b/commons/src/main/java/org/apache/oodt/commons/io/LogFilter.java @@ -55,8 +55,9 @@ public class LogFilter implements LogListener { this.listener = listener; this.passThrough = passThrough; if (categories == null) return; - for (int i = 0; i < categories.length; ++i) - this.categories.put(categories[i], DUMMY); + for (Object category : categories) { + this.categories.put(category, DUMMY); + } } /** Create a log filter. http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java b/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java index 523d92f..6ed5e5d 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/CacheMap.java @@ -167,10 +167,10 @@ public class CacheMap implements Map { public void putAll(Map t) { // FXN: [ C, M := (keys(t) || C)[0..(c-1)], { (k_i, v_i) | k_i elem of (keys(t) || C)[0..(c-1)]} ] - for (Iterator i = t.entrySet().iterator(); i.hasNext();) { - Map.Entry entry = (Map.Entry) i.next(); - put(entry.getKey(), entry.getValue()); - } + for (Object o : t.entrySet()) { + Entry entry = (Entry) o; + put(entry.getKey(), entry.getValue()); + } } public void clear() { http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java index 8bbd907..bc91a10 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java @@ -138,10 +138,12 @@ public class EnterpriseEntityResolver implements EntityResolver { * or null if no directory in <var>dirs</var> contains a file named <var>filename</var>. */ static File findFile(List dirs, String filename) { - for (Iterator i = dirs.iterator(); i.hasNext();) { - File potentialFile = new File((String) i.next(), filename); - if (potentialFile.isFile()) return potentialFile; + for (Object dir : dirs) { + File potentialFile = new File((String) dir, filename); + if (potentialFile.isFile()) { + return potentialFile; } + } return null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java b/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java index af83375..7d519e9 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java @@ -44,31 +44,31 @@ public class LogEventMultiplexer implements LogListener { } public void messageLogged(LogEvent event) { - for (Iterator i = listeners.iterator(); i.hasNext();) { - LogListener listener = (LogListener) i.next(); - listener.messageLogged(event); - } + for (Object listener1 : listeners) { + LogListener listener = (LogListener) listener1; + listener.messageLogged(event); + } } public void streamStarted(LogEvent event) { - for (Iterator i = listeners.iterator(); i.hasNext();) { - LogListener listener = (LogListener) i.next(); - listener.streamStarted(event); - } + for (Object listener1 : listeners) { + LogListener listener = (LogListener) listener1; + listener.streamStarted(event); + } } public void streamStopped(LogEvent event) { - for (Iterator i = listeners.iterator(); i.hasNext();) { - LogListener listener = (LogListener) i.next(); - listener.streamStopped(event); - } + for (Object listener1 : listeners) { + LogListener listener = (LogListener) listener1; + listener.streamStopped(event); + } } public void propertyChange(PropertyChangeEvent event) { - for (Iterator i = listeners.iterator(); i.hasNext();) { - LogListener listener = (LogListener) i.next(); - listener.propertyChange(event); - } + for (Object listener1 : listeners) { + LogListener listener = (LogListener) listener1; + listener.propertyChange(event); + } } /** List of listeners to which I multiplex events. */ http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java b/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java index 55b6ab7..582fbda 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/PropertyMgr.java @@ -49,10 +49,10 @@ public class PropertyMgr { System.setProperty(key, value); if (!listeners.isEmpty()) { PropertyChangeEvent event = new PropertyChangeEvent(System.getProperties(), key, oldValue, value); - for (Iterator i = listeners.iterator(); i.hasNext();) { - PropertyChangeListener listener = (PropertyChangeListener) i.next(); - listener.propertyChange(event); - } + for (Object listener1 : listeners) { + PropertyChangeListener listener = (PropertyChangeListener) listener1; + listener.propertyChange(event); + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/main/java/org/apache/oodt/commons/util/Utility.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/Utility.java b/commons/src/main/java/org/apache/oodt/commons/util/Utility.java index 12b257f..60a7f6e 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/Utility.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/Utility.java @@ -162,9 +162,11 @@ public class Utility { public static boolean delete(File file) { if (file.isDirectory()) { File[] entries = file.listFiles(); - for (int i = 0; i < entries.length; ++i) - if (!delete(entries[i])) - return false; + for (File entry : entries) { + if (!delete(entry)) { + return false; + } + } } return file.delete(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e49c967..65439e3 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 @@ -353,8 +353,9 @@ public class XML { * @throws DOMException If a DOM error occurs. */ public static void add(Node node, String name, Collection values) throws DOMException { - for (Iterator i = values.iterator(); i.hasNext();) - add(node, name, i.next()); + for (Object value : values) { + add(node, name, value); + } } /** Add a child element with the given text to the given element. @@ -513,10 +514,10 @@ public class XML { public static void removeComments(Node node) { List commentNodes = new ArrayList(); findCommentNodes(commentNodes, node); - for (Iterator i = commentNodes.iterator(); i.hasNext();) { - Node commentNode = (Node) i.next(); - commentNode.getParentNode().removeChild(commentNode); - } + for (Object commentNode1 : commentNodes) { + Node commentNode = (Node) commentNode1; + commentNode.getParentNode().removeChild(commentNode); + } } /** The resolver for entities for the JPL enterprise. */ http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java index 839116c..fce3d9d 100644 --- a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java +++ b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java @@ -71,26 +71,30 @@ public class ConfigurationTest extends TestCase { assertEquals("/dir/1,/dir/2,/dir/one,/dir/two", System.getProperty(Configuration.ENTITY_DIRS_PROP)); Collection servers = c.getExecServerConfigs(); assertEquals(2, servers.size()); - for (Iterator each = servers.iterator(); each.hasNext();) { - ExecServerConfig esc = (ExecServerConfig) each.next(); - if (esc.getClassName().equals("test.Class1")) { - assertEquals("Name1", esc.getObjectKey()); - assertEquals(1, esc.getProperties().size()); - } else if (esc.getClassName().equals("test.Class2")) { - assertEquals("Name2", esc.getObjectKey()); - assertEquals(3, esc.getProperties().size()); - for (Iterator i = esc.getProperties().entrySet().iterator(); i.hasNext();) { - Map.Entry entry = (Map.Entry) i.next(); - if (entry.getKey().equals("localKey1")) - assertEquals("localKey2", entry.getValue()); - else if (entry.getKey().equals("globalKey2")) - assertEquals("local-override", entry.getValue()); - else if (entry.getKey().equals("org.apache.oodt.commons.Configuration.url")) - ; // This one's OK. - else fail("Unknown local property \"" + entry.getKey() + "\" in exec server"); - } - } else fail("Unknown ExecServerConfig \"" + esc.getClassName() + "\" in servers from Configuration"); + for (Object server : servers) { + ExecServerConfig esc = (ExecServerConfig) server; + if (esc.getClassName().equals("test.Class1")) { + assertEquals("Name1", esc.getObjectKey()); + assertEquals(1, esc.getProperties().size()); + } else if (esc.getClassName().equals("test.Class2")) { + assertEquals("Name2", esc.getObjectKey()); + assertEquals(3, esc.getProperties().size()); + for (Map.Entry<Object, Object> objectObjectEntry : esc.getProperties().entrySet()) { + Map.Entry entry = (Map.Entry) objectObjectEntry; + if (entry.getKey().equals("localKey1")) { + assertEquals("localKey2", entry.getValue()); + } else if (entry.getKey().equals("globalKey2")) { + assertEquals("local-override", entry.getValue()); + } else if (entry.getKey().equals("org.apache.oodt.commons.Configuration.url")) { + ; // This one's OK. + } else { + fail("Unknown local property \"" + entry.getKey() + "\" in exec server"); + } + } + } else { + fail("Unknown ExecServerConfig \"" + esc.getClassName() + "\" in servers from Configuration"); } + } } /** The temporary test configuration file. */ http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java index d8c0a20..232a63d 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java @@ -75,9 +75,9 @@ public class AutoDetectProductCrawler extends ProductCrawler implements Metadata metadata = new Metadata(); metadata.addMetadata(MIME_TYPES_HIERARCHY, mimeExtractorRepo.getMimeTypes(product)); - for (int i = 0; i < specs.size(); i++) { - Metadata m = specs.get(i).getMetExtractor() - .extractMetadata(product); + for (MetExtractorSpec spec : specs) { + Metadata m = spec.getMetExtractor() + .extractMetadata(product); if (m != null) { metadata.addMetadata(m.getHashtable(), true); } @@ -94,11 +94,11 @@ public class AutoDetectProductCrawler extends ProductCrawler implements if (this.getApplicationContext() != null) { PreCondEvalUtils evalUtils = new PreCondEvalUtils( this.getApplicationContext()); - for (int i = 0; i < specs.size(); i++) { - List<String> preCondComparatorIds = specs - .get(i).getPreCondComparatorIds(); - if (!evalUtils.eval(preCondComparatorIds, product)) + for (MetExtractorSpec spec : specs) { + List<String> preCondComparatorIds = spec.getPreCondComparatorIds(); + if (!evalUtils.eval(preCondComparatorIds, product)) { return false; + } } } return true; http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e9f4878..17d1eaa 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 @@ -103,15 +103,15 @@ public abstract class ProductCrawler extends ProductCrawlerBean { productFiles = dir.listFiles(FILE_FILTER); } - for (int j = 0; j < productFiles.length; j++) { - ingestStatus.add(handleFile(productFiles[j])); + for (File productFile : productFiles) { + ingestStatus.add(handleFile(productFile)); } if (!isNoRecur()) { File[] subdirs = dir.listFiles(DIR_FILTER); if (subdirs != null) { - for (int j = 0; j < subdirs.length; j++) { - stack.push(subdirs[j]); + for (File subdir : subdirs) { + stack.push(subdir); } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java index dc84ce8..44c84af 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java @@ -106,15 +106,15 @@ public class CurationService extends HttpServlet implements CuratorConfMetKeys { String f[] = getFilesInDirectory(startingPath, showFiles); List<Map<String, Object>> items = new ArrayList<Map<String, Object>>(); - for (int i = 0; i < f.length; i++) { + for (String aF : f) { Map<String, Object> entry = new HashMap<String, Object>(); - String children[] = getFilesInDirectory(startingPath + "/" + f[i], + String children[] = getFilesInDirectory(startingPath + "/" + aF, showFiles); - entry.put("text", f[i]); - entry.put("id", path + "/" + f[i]); + entry.put("text", aF); + entry.put("id", path + "/" + aF); entry.put("expanded", false); entry.put("hasChildren", children != null && (children.length > 0)); - entry.put("isFile", new File(startingPath + "/" + f[i]).isFile()); + entry.put("isFile", new File(startingPath + "/" + aF).isFile()); items.add(entry); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e469fb4..db3c449 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 @@ -105,24 +105,24 @@ public class DirectoryResource extends CurationService { // Loop through and list directories first. Nicer for UI to get these first if (f != null) { - for (int i = 0; i < f.length; i++) { - if (new File(startingPath + "/" + f[i]).isDirectory()) { + for (String aF1 : f) { + if (new File(startingPath + "/" + aF1).isDirectory()) { html.append(" <li class=\"directory collapsed\">"); html.append("<a href=\"#\" rel=\"").append(relativePath).append("/") - .append(f[i]).append("\">").append(f[i]).append("</a>"); + .append(aF1).append("\">").append(aF1).append("</a>"); html.append("</li>\r\n"); } } // If we are showing files now loop through and show files if (showFiles) { - for (int i = 0; i < f.length; i++) { - if (new File(startingPath + "/" + f[i]).isFile()) { - String filename = new File(startingPath + "/" + f[i]).getName(); + for (String aF : f) { + if (new File(startingPath + "/" + aF).isFile()) { + String filename = new File(startingPath + "/" + aF).getName(); String ext = filename.substring(filename.lastIndexOf('.') + 1); html.append(" <li class=\"file draggy ext_").append(ext) .append("\">"); html.append("<a href=\"#\" rel=\"").append(relativePath) - .append("/").append(f[i]).append("\">").append(f[i]) + .append("/").append(aF).append("\">").append(aF) .append("</a>"); html.append("</li>\r\n"); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 9e3a2c6..e092ed2 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 @@ -171,15 +171,15 @@ public class MetadataResource extends CurationService { protected String getExtractorConfigIdsAsHTML(String[] configIds, String current) { StringBuilder html = new StringBuilder(); - for (int i = 0; i < configIds.length; i++) { + for (String configId : configIds) { html.append("<option "); - if (configIds[i].equals(current)) { + if (configId.equals(current)) { html.append("selected "); } html.append("value=\""); - html.append(configIds[i]); + html.append(configId); html.append("\">"); - html.append(configIds[i]); + html.append(configId); html.append("</option>\r\n"); } return html.toString(); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java index 33f73fa..2a711e7 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java @@ -42,7 +42,7 @@ public class ExtractorConfigReader { List<File> files = new ArrayList<File>(); String[] fileList = props.getProperty(ExtractorConfig.PROP_CONFIG_FILES) .split(","); - for (int i = 0; i < fileList.length; i++) { + for (String aFileList : fileList) { files.add(new File(PathUtils.replaceEnvVariables(fileList[0]))); } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 44fd309..f72cb8d 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 @@ -585,30 +585,27 @@ public class DataSourceCatalog implements Catalog { conn.setAutoCommit(false); statement = conn.createStatement(); - for (Iterator<Reference> i = product.getProductReferences().iterator(); i - .hasNext();) { - Reference r = i.next(); - - String addRefSql = "INSERT INTO " - + productRefTable - + " " - + "(product_id, product_orig_reference, product_datastore_reference, product_reference_filesize, product_reference_mimetype) " - + "VALUES (" - + quoteIt(product.getProductId()) - + ", '" - + r.getOrigReference() - + "', '" - + r.getDataStoreReference() - + "', " - + r.getFileSize() - + ",'" - + ((r.getMimeType() == null) ? "" : r.getMimeType() - .getName()) + "')"; - - LOG.log(Level.FINE, "addProductReferences: Executing: " - + addRefSql); - statement.execute(addRefSql); - } + for (Reference r : product.getProductReferences()) { + String addRefSql = "INSERT INTO " + + productRefTable + + " " + + "(product_id, product_orig_reference, product_datastore_reference, product_reference_filesize, product_reference_mimetype) " + + "VALUES (" + + quoteIt(product.getProductId()) + + ", '" + + r.getOrigReference() + + "', '" + + r.getDataStoreReference() + + "', " + + r.getFileSize() + + ",'" + + ((r.getMimeType() == null) ? "" : r.getMimeType() + .getName()) + "')"; + + LOG.log(Level.FINE, "addProductReferences: Executing: " + + addRefSql); + statement.execute(addRefSql); + } conn.commit(); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java index 89b8f1b..86d4a59 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java @@ -1049,9 +1049,9 @@ public class LuceneCatalog implements Catalog { String[] elemValues = doc.getValues(name); if (elemValues != null && elemValues.length > 0) { - for (int j = 0; j < elemValues.length; j++) { - metadata.addMetadata(name, elemValues[j]); - } + for (String elemValue : elemValues) { + metadata.addMetadata(name, elemValue); + } } } } @@ -1169,20 +1169,18 @@ public class LuceneCatalog implements Catalog { } // add the product references - for (Iterator<Reference> i = product.getProductReferences().iterator(); i - .hasNext();) { - Reference r = i.next(); + for (Reference r : product.getProductReferences()) { doc.add(new Field("reference_orig", r.getOrigReference(), - Field.Store.YES, Field.Index.NO)); + Field.Store.YES, Field.Index.NO)); doc - .add(new Field("reference_data_store", r - .getDataStoreReference(), Field.Store.YES, - Field.Index.NO)); + .add(new Field("reference_data_store", r + .getDataStoreReference(), Field.Store.YES, + Field.Index.NO)); doc.add(new Field("reference_fileSize", String.valueOf(r - .getFileSize()), Field.Store.YES, Field.Index.NO)); + .getFileSize()), Field.Store.YES, Field.Index.NO)); doc.add(new Field("reference_mimeType", r.getMimeType() != null ? r - .getMimeType().getName() : "", Field.Store.YES, - Field.Index.UN_TOKENIZED)); + .getMimeType().getName() : "", Field.Store.YES, + Field.Index.UN_TOKENIZED)); } // add special field for all products http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java index cf1f1b7..6e87d28 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/LuceneQueryCliAction.java @@ -105,9 +105,9 @@ public class LuceneQueryCliAction extends AbstractQueryCliAction { } else { BooleanQueryCriteria bqc = new BooleanQueryCriteria(); bqc.setOperator(BooleanQueryCriteria.AND); - for (int i = 0; i < t.length; i++) { - bqc.addTerm(new TermQueryCriteria(t[i].field(), t[i] - .text())); + for (Term aT : t) { + bqc.addTerm(new TermQueryCriteria(aT.field(), aT + .text())); } return bqc; } @@ -120,11 +120,11 @@ public class LuceneQueryCliAction extends AbstractQueryCliAction { BooleanClause[] clauses = ((BooleanQuery) luceneQuery).getClauses(); BooleanQueryCriteria bqc = new BooleanQueryCriteria(); bqc.setOperator(BooleanQueryCriteria.AND); - for (int i = 0; i < clauses.length; i++) { - if (clauses[i].getOccur().equals(BooleanClause.Occur.SHOULD)) { + for (BooleanClause clause : clauses) { + if (clause.getOccur().equals(BooleanClause.Occur.SHOULD)) { bqc.setOperator(BooleanQueryCriteria.OR); } - bqc.addTerm(generateCASQuery(clauses[i].getQuery())); + bqc.addTerm(generateCASQuery(clause.getQuery())); } return bqc; } else { http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 de14832..0018916 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 @@ -114,39 +114,37 @@ public class RemoteDataTransferer implements DataTransfer { quietNotifyTransferProduct(product); // for each file reference, transfer the file to the remote file manager - for (Iterator<Reference> i = product.getProductReferences().iterator(); i - .hasNext();) { - Reference r = i.next(); - // test whether or not the reference is a directory or a file - File refFile = null; - try { - refFile = new File(new URI(r.getOrigReference())); - } catch (URISyntaxException e) { - LOG.log(Level.WARNING, - "Unable to test if reference: [" + r.getOrigReference() - + "] is a directory: skipping it"); - continue; - } + for (Reference r : product.getProductReferences()) { + // test whether or not the reference is a directory or a file + File refFile = null; + try { + refFile = new File(new URI(r.getOrigReference())); + } catch (URISyntaxException e) { + LOG.log(Level.WARNING, + "Unable to test if reference: [" + r.getOrigReference() + + "] is a directory: skipping it"); + continue; + } - if (!refFile.isDirectory()) { - LOG.log(Level.FINE, "Reference: [" + r.getOrigReference() - + "] is file: transferring it"); + if (!refFile.isDirectory()) { + LOG.log(Level.FINE, "Reference: [" + r.getOrigReference() + + "] is file: transferring it"); - try { - remoteTransfer(r, product); - } catch (URISyntaxException e) { - LOG.log(Level.WARNING, - "Error transferring file: [" + r.getOrigReference() - + "]: URISyntaxException: " + e.getMessage()); - } - } else { - LOG.log( - Level.FINE, - "RemoteTransfer: skipping reference: [" - + refFile.getAbsolutePath() + "] of product: [" - + product.getProductName() + "]: ref is a directory"); + try { + remoteTransfer(r, product); + } catch (URISyntaxException e) { + LOG.log(Level.WARNING, + "Error transferring file: [" + r.getOrigReference() + + "]: URISyntaxException: " + e.getMessage()); } - } + } else { + LOG.log( + Level.FINE, + "RemoteTransfer: skipping reference: [" + + refFile.getAbsolutePath() + "] of product: [" + + product.getProductName() + "]: ref is a directory"); + } + } quietNotifyProductTransferComplete(product); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 b277dbd..f743c65 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 @@ -86,22 +86,18 @@ public class TransferStatusTracker { public List<FileTransferStatus> getCurrentFileTransfers() { List<FileTransferStatus> currTransfers = new Vector<FileTransferStatus>(); - for (Iterator<String> i = currentProductTransfers.keySet().iterator(); i - .hasNext();) { - String productId = i.next(); + for (String productId : currentProductTransfers.keySet()) { Product p = (Product) currentProductTransfers.get(productId); // get its references List<Reference> refs = quietGetReferences(p); if (refs != null && refs.size() > 0) { - for (Iterator<Reference> j = refs.iterator(); j.hasNext();) { - Reference r = j.next(); - + for (Reference r : refs) { long bytesTransferred = getBytesTransferred(r); if (bytesTransferred > 0 - && bytesTransferred < r.getFileSize() && !isDir(r)) { + && bytesTransferred < r.getFileSize() && !isDir(r)) { FileTransferStatus status = new FileTransferStatus(); status.setBytesTransferred(bytesTransferred); status.setFileRef(r); @@ -122,9 +118,7 @@ public class TransferStatusTracker { long totalProductSize = 0L; if (refs.size() > 0) { - for (Iterator<Reference> j = refs.iterator(); j.hasNext();) { - Reference r = (Reference) j.next(); - + for (Reference r : refs) { long bytesTransferred = getBytesTransferred(r); if (!isDir(r)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 09ffe22..1e22209 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 @@ -118,26 +118,25 @@ public class StdIngester implements Ingester, CoreMetKeys { public void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor, File metConfFile) { if (prodFiles != null && prodFiles.size() > 0) { - for (Iterator<String> i = prodFiles.iterator(); i.hasNext();) { - String prodFilePath = i.next(); - String productID = null; - - try { - productID = ingest(fmUrl, new File(prodFilePath), - extractor, metConfFile); - LOG.log(Level.INFO, "Product: [" + prodFilePath - + "] ingested successfully! ID: [" + productID - + "]"); - } catch (IngestException e) { - LOG.log(Level.WARNING, - "IngestException handling product: [" - + prodFilePath - + "]: Exception: [" - + e.getMessage() - + "]: Continuing ingest of remainder of products."); - } - - } + for (String prodFilePath : prodFiles) { + String productID = null; + + try { + productID = ingest(fmUrl, new File(prodFilePath), + extractor, metConfFile); + LOG.log(Level.INFO, "Product: [" + prodFilePath + + "] ingested successfully! ID: [" + productID + + "]"); + } catch (IngestException e) { + LOG.log(Level.WARNING, + "IngestException handling product: [" + + prodFilePath + + "]: Exception: [" + + e.getMessage() + + "]: Continuing ingest of remainder of products."); + } + + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 023e9ca..2894f6b 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 @@ -131,13 +131,12 @@ public class XMLRepositoryManager implements RepositoryManager { */ public ProductType getProductTypeByName(String productTypeName) throws RepositoryManagerException { - for (Iterator<String> i = productTypeMap.keySet().iterator(); i.hasNext();) { - String typeId = (String) i.next(); - ProductType type = (ProductType) productTypeMap.get(typeId); - if (type.getName().equals(productTypeName)) { - return type; - } + for (String typeId : productTypeMap.keySet()) { + ProductType type = (ProductType) productTypeMap.get(typeId); + if (type.getName().equals(productTypeName)) { + return type; } + } LOG.log(Level.WARNING, "XMLRepositoryManager: Unable to find product type: [" @@ -156,103 +155,102 @@ public class XMLRepositoryManager implements RepositoryManager { } private void saveProductTypes() { - for (Iterator<String> i = productTypeHomeUris.iterator(); i.hasNext();) { - String dirUri = i.next(); - File productTypeDir = null; - - try { - productTypeDir = new File(new URI(dirUri)); - - if (!productTypeDir.isDirectory()) { - LOG - .log( - Level.WARNING, - "Product type directory: " - + dirUri - + " is not " - + "a directory: skipping product type saving to it."); - continue; - } - - String productTypeDirStr = productTypeDir.getAbsolutePath(); - if (!productTypeDirStr.endsWith("/")) { - productTypeDirStr += "/"; - } - - String productTypeXmlFile = productTypeDirStr - + "product-types.xml"; - XmlStructFactory.writeProductTypeXmlDocument(Arrays - .asList(productTypeMap.values().toArray(new ProductType[productTypeMap.values().size()])), - productTypeXmlFile); - } catch (URISyntaxException e) { - LOG.log(Level.WARNING, - "URISyntaxException when saving product " - + "type directory URI: " + dirUri - + ": Skipping Product Type saving" - + "for it: Message: " + e.getMessage()); - } + for (String dirUri : productTypeHomeUris) { + File productTypeDir = null; + try { + productTypeDir = new File(new URI(dirUri)); + + if (!productTypeDir.isDirectory()) { + LOG + .log( + Level.WARNING, + "Product type directory: " + + dirUri + + " is not " + + "a directory: skipping product type saving to it."); + continue; + } + + String productTypeDirStr = productTypeDir.getAbsolutePath(); + if (!productTypeDirStr.endsWith("/")) { + productTypeDirStr += "/"; + } + + String productTypeXmlFile = productTypeDirStr + + "product-types.xml"; + XmlStructFactory.writeProductTypeXmlDocument(Arrays + .asList(productTypeMap.values().toArray(new ProductType[productTypeMap.values().size()])), + productTypeXmlFile); + } catch (URISyntaxException e) { + LOG.log(Level.WARNING, + "URISyntaxException when saving product " + + "type directory URI: " + dirUri + + ": Skipping Product Type saving" + + "for it: Message: " + e.getMessage()); } + } + } private void loadProductTypes(List<String> dirUris) { - for (Iterator<String> i = dirUris.iterator(); i.hasNext();) { - File productTypeDir = null; - String dirUri = i.next(); - - try { - productTypeDir = new File(new URI(dirUri)); - - if (!productTypeDir.isDirectory()) { - LOG - .log( - Level.WARNING, - "Product type directory: " - + dirUri - + " is not " - + "a directory: skipping product type loading from it."); - continue; - } - - String productTypeDirStr = productTypeDir.getAbsolutePath(); - if (!productTypeDirStr.endsWith("/")) { - productTypeDirStr += "/"; - } - - String productTypeXmlFile = productTypeDirStr - + "product-types.xml"; - Document productTypeDoc = getDocumentRoot(productTypeXmlFile); - - // now load the product types from it - if (productTypeDoc != null) { - Element productTypeRoot = productTypeDoc - .getDocumentElement(); - - NodeList productTypeNodeList = productTypeRoot - .getElementsByTagName("type"); - - if (productTypeNodeList != null - && productTypeNodeList.getLength() > 0) { - for (int j = 0; j < productTypeNodeList.getLength(); j++) { - Node productTypeNode = productTypeNodeList.item(j); - ProductType type = XmlStructFactory - .getProductType(productTypeNode); - LOG.log(Level.FINE, - "XMLRepositoryManager: found product type: [" - + type.getName() + "]"); - productTypeMap.put(type.getProductTypeId(), type); - } - } - } - } catch (URISyntaxException e) { - LOG.log(Level.WARNING, - "URISyntaxException when loading product " - + "type directory URI: " + dirUri - + ": Skipping Product Type loading" - + "for it: Message: " + e.getMessage()); + for (String dirUri1 : dirUris) { + File productTypeDir = null; + String dirUri = dirUri1; + + try { + productTypeDir = new File(new URI(dirUri)); + + if (!productTypeDir.isDirectory()) { + LOG + .log( + Level.WARNING, + "Product type directory: " + + dirUri + + " is not " + + "a directory: skipping product type loading from it."); + continue; + } + + String productTypeDirStr = productTypeDir.getAbsolutePath(); + if (!productTypeDirStr.endsWith("/")) { + productTypeDirStr += "/"; + } + + String productTypeXmlFile = productTypeDirStr + + "product-types.xml"; + Document productTypeDoc = getDocumentRoot(productTypeXmlFile); + + // now load the product types from it + if (productTypeDoc != null) { + Element productTypeRoot = productTypeDoc + .getDocumentElement(); + + NodeList productTypeNodeList = productTypeRoot + .getElementsByTagName("type"); + + if (productTypeNodeList != null + && productTypeNodeList.getLength() > 0) { + for (int j = 0; j < productTypeNodeList.getLength(); j++) { + Node productTypeNode = productTypeNodeList.item(j); + ProductType type = XmlStructFactory + .getProductType(productTypeNode); + LOG.log(Level.FINE, + "XMLRepositoryManager: found product type: [" + + type.getName() + "]"); + productTypeMap.put(type.getProductTypeId(), type); + } } + } + } catch (URISyntaxException e) { + LOG.log(Level.WARNING, + "URISyntaxException when loading product " + + "type directory URI: " + dirUri + + ": Skipping Product Type loading" + + "for it: Message: " + e.getMessage()); } + } } private Document getDocumentRoot(String xmlFile) {
