http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 e665e59..a753dd7 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 @@ -57,8 +57,9 @@ public class FreeTextQueryCriteria extends QueryCriteria { values = new ArrayList<String>(); noiseWordHash = new HashSet<String>(); - for (int i = 0; i < noiseWords.length; i++) - noiseWordHash.add(noiseWords[i]); + for (String noiseWord : noiseWords) { + noiseWordHash.add(noiseWord); + } } /** @@ -72,8 +73,9 @@ public class FreeTextQueryCriteria extends QueryCriteria { values = v; noiseWordHash = new HashSet<String>(); - for (int i = 0; i < noiseWords.length; i++) - noiseWordHash.add(noiseWords[i]); + for (String noiseWord : noiseWords) { + noiseWordHash.add(noiseWord); + } } /** @@ -159,8 +161,9 @@ public class FreeTextQueryCriteria extends QueryCriteria { */ public String toString() { String serial = elementName + ":("; - for (int i = 0; i < values.size(); i++) - serial += "+" + (String) values.get(i); + for (String value : values) { + serial += "+" + (String) value; + } serial += ")"; return serial; }
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 fb089db..9ae6b4f 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 @@ -300,17 +300,15 @@ public class Product { if (this.getProductReferences() != null && this.getProductReferences().size() > 0) { Element refsElem = XMLUtils.addNode(doc, root, "references"); - for (Iterator<Reference> i = this.getProductReferences().iterator(); i - .hasNext();) { - Reference r = i.next(); + for (Reference r : this.getProductReferences()) { Element refElem = XMLUtils.addNode(doc, refsElem, - "reference"); + "reference"); XMLUtils.addAttribute(doc, refElem, "orig", r - .getOrigReference()); + .getOrigReference()); XMLUtils.addAttribute(doc, refElem, "dataStore", r - .getDataStoreReference()); + .getDataStoreReference()); XMLUtils.addAttribute(doc, refElem, "size", String - .valueOf(r.getFileSize())); + .valueOf(r.getFileSize())); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java index 2008c8e..bc0e087 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java @@ -62,11 +62,12 @@ public final class SecureWebServer extends org.apache.xmlrpc.WebServer */ public Object execute(String methodSpecifier, Vector params, String user, String password) throws Exception { - for (Iterator i = dispatchers.iterator(); i.hasNext();) { - Result rc = ((Dispatcher) i.next()).handleRequest(methodSpecifier, - params, user, password); - if (rc != null) + for (Object dispatcher : dispatchers) { + Result rc = ((Dispatcher) dispatcher).handleRequest(methodSpecifier, + params, user, password); + if (rc != null) { return rc.getValue(); + } } throw new IllegalStateException( "No request dispatcher was able to return a non-null value to the XML-RPC caller"); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 f6d8e1e..d4ea841 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 @@ -80,9 +80,9 @@ public class CatalogSearch { .println("Error getting available product types from the File Manager."); e.printStackTrace(); } - for (int i = 0; i < products.size(); i++) { - PostQuery(((ProductType) products.get(i)).getProductTypeId(), - casQuery); + for (Object product : products) { + PostQuery(((ProductType) product).getProductTypeId(), + casQuery); } } @@ -110,10 +110,10 @@ public class CatalogSearch { System.out.println("No Products Found Matching This Criteria."); } else { System.out.println("Products Matching Query"); - for (int i = 0; i < results.size(); i++) { - System.out.print(((Product) results.get(i)).getProductName() - + "\t"); - System.out.println(((Product) results.get(i)).getProductId()); + for (Object result : results) { + System.out.print(((Product) result).getProductName() + + "\t"); + System.out.println(((Product) result).getProductId()); } } } @@ -143,10 +143,10 @@ public class CatalogSearch { .println("Error getting available product types from the File Manager."); e.printStackTrace(); } - for (int i = 0; i < products.size(); i++) { - System.out.print(((ProductType) products.get(i)).getProductTypeId() - + "\t"); - System.out.println(((ProductType) products.get(i)).getName()); + for (Object product : products) { + System.out.print(((ProductType) product).getProductTypeId() + + "\t"); + System.out.println(((ProductType) product).getName()); } } @@ -154,8 +154,8 @@ public class CatalogSearch { Vector products = new Vector(); try { products = (Vector) client.getProductTypes(); - for (int i = 0; i < products.size(); i++) { - listElements(((ProductType) products.get(i)).getProductTypeId()); + for (Object product : products) { + listElements(((ProductType) product).getProductTypeId()); } } catch (RepositoryManagerException e) { System.out @@ -180,8 +180,8 @@ public class CatalogSearch { e.printStackTrace(); } - for (int i = 0; i < elements.size(); i++) { - Element e = (Element) elements.get(i); + for (Object element : elements) { + Element e = (Element) element; System.out.print(e.getElementId() + "\t"); System.out.println(e.getElementName()); } @@ -260,9 +260,10 @@ public class CatalogSearch { // 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++) - casQuery.addCriterion(new TermQueryCriteria(t[i].field(), - t[i].text())); + for (Term aT : t) { + casQuery.addCriterion(new TermQueryCriteria(aT.field(), + aT.text())); + } } } else if (luceneQuery instanceof RangeQuery) { Term startT = ((RangeQuery) luceneQuery).getLowerTerm(); @@ -271,8 +272,8 @@ public class CatalogSearch { .text(), endT.text())); } else if (luceneQuery instanceof BooleanQuery) { BooleanClause[] clauses = ((BooleanQuery) luceneQuery).getClauses(); - for (int i = 0; i < clauses.length; i++) { - GenerateCASQuery(casQuery, (clauses[i]).getQuery()); + for (BooleanClause clause : clauses) { + GenerateCASQuery(casQuery, (clause).getQuery()); } } else { System.out.println("Error Parsing Query"); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 16bb237..5609799 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 @@ -110,8 +110,8 @@ public class DeleteProduct { DeleteProduct remover = new DeleteProduct(fileManagerUrl, commitChanges); if (readFromStdIn) { List prodIds = readProdIdsFromStdin(); - for (Iterator i = prodIds.iterator(); i.hasNext();) { - String prodId = (String) i.next(); + for (Object prodId1 : prodIds) { + String prodId = (String) prodId1; remover.remove(prodId); } } else @@ -177,28 +177,28 @@ public class DeleteProduct { + e.getMessage()); } - for (int i = 0; i < refs.size(); i++) { - Reference ref = (Reference) refs.get(i); + for (Object ref1 : refs) { + Reference ref = (Reference) ref1; if (commit) { try { client.removeFile(new File(new URI(ref - .getDataStoreReference())).getAbsolutePath()); + .getDataStoreReference())).getAbsolutePath()); } catch (DataTransferException e) { LOG.log(Level.WARNING, "Unable to delete reference : [" - + ref.getDataStoreReference() + "] for product : [" - + productId + "] from file manager : [" - + client.getFileManagerUrl() + "]: Message: " - + e.getMessage()); + + ref.getDataStoreReference() + "] for product : [" + + productId + "] from file manager : [" + + client.getFileManagerUrl() + "]: Message: " + + e.getMessage()); } catch (URISyntaxException e) { LOG.log(Level.WARNING, - "uri syntax exception getting file absolute path from URI: [" - + ref.getDataStoreReference() - + "]: Message: " + e.getMessage()); + "uri syntax exception getting file absolute path from URI: [" + + ref.getDataStoreReference() + + "]: Message: " + e.getMessage()); } } else { LOG.log(Level.INFO, "Delete file: [" - + ref.getDataStoreReference() + "]"); + + ref.getDataStoreReference() + "]"); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java index db9b669..ac647e0 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java @@ -92,31 +92,30 @@ public class MetadataBasedProductMover { for (int i = 0; i < page.getTotalPages(); i++) { if (page.getPageProducts() != null && page.getPageProducts().size() > 0) { - for (Iterator j = page.getPageProducts().iterator(); j - .hasNext();) { - Product p = (Product) j.next(); + for (Product p : page.getPageProducts()) { p.setProductReferences(fmgrClient.getProductReferences(p)); Metadata met = fmgrClient.getMetadata(p); Reference r = ((Reference) p.getProductReferences().get(0)); String newLocPath = PathUtils.replaceEnvVariables( - this.pathSpec, met); - + this.pathSpec, met); + if (locationsMatch(r.getDataStoreReference(), newLocPath)) { - LOG.log(Level.INFO, "Current and New locations match. "+p.getProductName()+" was not moved."); - continue; + LOG.log(Level.INFO, + "Current and New locations match. " + p.getProductName() + " was not moved."); + continue; } - + LOG.log(Level.INFO, "Moving product: [" - + p.getProductName() + "] from: [" - + new File(new URI(r.getDataStoreReference())) - + "] to: [" + newLocPath + "]"); + + p.getProductName() + "] from: [" + + new File(new URI(r.getDataStoreReference())) + + "] to: [" + newLocPath + "]"); long timeBefore = System.currentTimeMillis(); fmgrClient.moveProduct(p, newLocPath); long timeAfter = System.currentTimeMillis(); double seconds = ((timeAfter - timeBefore) * 1.0) / (1000.0); LOG.log(Level.INFO, "Product: [" + p.getProductName() - + "] move successful: took: [" + seconds - + "] seconds"); + + "] move successful: took: [" + seconds + + "] seconds"); } if (!page.isLastPage()) { http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/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 c150025..01ad642 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 @@ -101,20 +101,20 @@ public final class QueryTool { List productTypes = safeGetProductTypes(); if (productTypes != null && productTypes.size() > 0) { - for (Iterator i = productTypes.iterator(); i.hasNext();) { - ProductType type = (ProductType) i.next(); + for (Object productType : productTypes) { + ProductType type = (ProductType) productType; try { products = client.query(query, type); if (products != null && products.size() > 0) { - for (Iterator j = products.iterator(); j.hasNext();) { - Product product = (Product) j.next(); + for (Object product1 : products) { + Product product = (Product) product1; prodIds.add(product.getProductId()); } } } catch (CatalogException e) { LOG.log(Level.WARNING, "Exception querying for: [" - + type.getName() + "] products: Message: " - + e.getMessage()); + + type.getName() + "] products: Message: " + + e.getMessage()); } } @@ -141,9 +141,10 @@ public final class QueryTool { if (t[0].field().equals(freeTextBlock)) { // nothing for now } else { - for (int i = 0; i < t.length; i++) + for (Term aT : t) { casQuery.addCriterion(new TermQueryCriteria( - t[i].field(), t[i].text())); + aT.field(), aT.text())); + } } } else if (luceneQuery instanceof RangeQuery) { Term startT = ((RangeQuery) luceneQuery).getLowerTerm(); @@ -152,8 +153,8 @@ public final class QueryTool { .field(), startT.text(), endT.text())); } else if (luceneQuery instanceof BooleanQuery) { BooleanClause[] clauses = ((BooleanQuery) luceneQuery).getClauses(); - for (int i = 0; i < clauses.length; i++) { - generateCASQuery(casQuery, (clauses[i]).getQuery()); + for (BooleanClause clause : clauses) { + generateCASQuery(casQuery, (clause).getQuery()); } } else { throw new RuntimeException( @@ -233,8 +234,8 @@ public final class QueryTool { List prodIds = queryTool.query(casQuery); if (prodIds != null && prodIds.size() > 0) { - for (Iterator i = prodIds.iterator(); i.hasNext();) { - String prodId = (String) i.next(); + for (Object prodId1 : prodIds) { + String prodId = (String) prodId1; System.out.println(prodId); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java index 86d6029..7572a40 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java @@ -213,8 +213,8 @@ public final class RangeQueryTester { List productFiles = queryTester.doRangeQuery(productTypeId); if (productFiles != null && productFiles.size() > 0) { - for (Iterator i = productFiles.iterator(); i.hasNext();) { - String productFile = (String) i.next(); + for (Object productFile1 : productFiles) { + String productFile = (String) productFile1; System.out.println(productFile); } } else http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java index bb3496a..284898b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java @@ -251,28 +251,26 @@ public final class XmlStructFactory { if(!allTypes.contains(type)) allTypes.add(type); } - - for (Iterator<String> i = allTypes.iterator(); i.hasNext();) { - String typeId = i.next(); + for (String typeId : allTypes) { Element typeElem = document.createElement("type"); typeElem.setAttribute("id", typeId); boolean hasParent = false; if (subToSuperMap.containsKey(typeId)) { typeElem.setAttribute("parent", subToSuperMap - .get(typeId)); + .get(typeId)); hasParent = true; } List<org.apache.oodt.cas.filemgr.structs.Element> elementIds = productTypeMap.get(typeId); - if(!hasParent && (elementIds == null || elementIds.size() == 0)) { + if (!hasParent && (elementIds == null || elementIds.size() == 0)) { // If no parent, and no elements, don't add this type to the xml continue; } - if(elementIds != null) { - for (Iterator<org.apache.oodt.cas.filemgr.structs.Element> j = elementIds.iterator(); j.hasNext();) { - String elementId = j.next().getElementId(); + if (elementIds != null) { + for (org.apache.oodt.cas.filemgr.structs.Element elementId1 : elementIds) { + String elementId = elementId1.getElementId(); Element elementElem = document.createElement("element"); elementElem.setAttribute("id", elementId); @@ -307,22 +305,21 @@ public final class XmlStructFactory { root.setAttribute("xmlns:cas", "http://oodt.jpl.nasa.gov/1.0/cas";); document.appendChild(root); - for (Iterator<org.apache.oodt.cas.filemgr.structs.Element> i = elements.iterator(); i.hasNext();) { - org.apache.oodt.cas.filemgr.structs.Element element = i.next(); + for (org.apache.oodt.cas.filemgr.structs.Element element : elements) { Element elementElem = document.createElement("element"); elementElem.setAttribute("id", friendlyXml(element.getElementId())); elementElem.setAttribute("name", friendlyXml(element.getElementName())); Element descriptionElem = document.createElement("description"); descriptionElem.appendChild(document.createTextNode(friendlyXml(element - .getDescription()))); + .getDescription()))); elementElem.appendChild(descriptionElem); Element dcElementElem = document.createElement("dcElement"); dcElementElem.appendChild(document.createTextNode(friendlyXml(element - .getDCElement()))); + .getDCElement()))); elementElem.appendChild(dcElementElem); - + root.appendChild(elementElem); } @@ -350,28 +347,26 @@ public final class XmlStructFactory { document.appendChild(root); // now add the set of metadata elements in the properties object - for (Iterator<ProductType> i = productTypes.iterator(); i.hasNext();) { - ProductType type = i.next(); - + for (ProductType type : productTypes) { Element typeElem = document.createElement("type"); typeElem.setAttribute("id", type.getProductTypeId()); typeElem.setAttribute("name", type.getName()); Element descriptionElem = document.createElement("description"); descriptionElem.appendChild(document.createTextNode(type - .getDescription())); + .getDescription())); typeElem.appendChild(descriptionElem); Element repositoryPathElem = document - .createElement("repository"); + .createElement("repository"); repositoryPathElem.setAttribute("path", type - .getProductRepositoryPath()); + .getProductRepositoryPath()); typeElem.appendChild(repositoryPathElem); Element versionerClassPathElem = document - .createElement("versioner"); + .createElement("versioner"); versionerClassPathElem.setAttribute("class", type - .getVersioner()); + .getVersioner()); typeElem.appendChild(versionerClassPathElem); // add extractor info @@ -380,41 +375,41 @@ public final class XmlStructFactory { ExtractorSpec spec = (ExtractorSpec) specObject; Element extractorElem = document.createElement("extractor"); extractorElem.setAttribute("class", spec.getClassName()); - + if (spec.getConfiguration() != null) { Element extractorConfigElem = document.createElement("configuration"); Enumeration e = spec.getConfiguration().propertyNames(); - + while (e.hasMoreElements()) { String key = (String) e.nextElement(); - + Element propertyElem = document.createElement("property"); propertyElem.setAttribute("name", key); propertyElem.setAttribute("value", spec.getConfiguration().getProperty(key)); - + extractorConfigElem.appendChild(propertyElem); } - + extractorElem.appendChild(extractorConfigElem); } - + metExtractorsElem.appendChild(extractorElem); } typeElem.appendChild(metExtractorsElem); - + // add type metadata Element metElem = document.createElement("metadata"); for (String key : type.getTypeMetadata().getAllKeys()) { Element keyValElem = document.createElement("keyval"); Element keyElem = document.createElement("key"); Element valElem = document.createElement("val"); - + keyElem.appendChild(document.createTextNode(key)); valElem.appendChild(document.createTextNode( - type.getTypeMetadata().getMetadata(key))); + type.getTypeMetadata().getMetadata(key))); keyValElem.appendChild(keyElem); keyValElem.appendChild(valElem); - + metElem.appendChild(keyValElem); } typeElem.appendChild(metElem); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java index 8627952..b87c0b5 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java @@ -153,14 +153,13 @@ public class XMLValidationLayer implements ValidationLayer { List<Element> elements = productTypeElementMap.get(type .getProductTypeId()); - for (Iterator<Element> i = elements.iterator(); i.hasNext();) { - Element elementObj = i.next(); - if (elementObj.getElementId().equals(element.getElementId())) { - elements.remove(elementObj); - saveElementsAndMappings(); - break; - } + for (Element elementObj : elements) { + if (elementObj.getElementId().equals(element.getElementId())) { + elements.remove(elementObj); + saveElementsAndMappings(); + break; } + } } @@ -201,13 +200,12 @@ public class XMLValidationLayer implements ValidationLayer { */ public Element getElementByName(String elementName) throws ValidationLayerException { - for (Iterator<String> i = elementMap.keySet().iterator(); i.hasNext();) { - String elementId = i.next(); - Element element = (Element) elementMap.get(elementId); - if (element.getElementName().equals(elementName)) { - return element; - } + for (String elementId : elementMap.keySet()) { + Element element = (Element) elementMap.get(elementId); + if (element.getElementName().equals(elementName)) { + return element; } + } return null; @@ -274,189 +272,188 @@ public class XMLValidationLayer implements ValidationLayer { private void saveElementsAndMappings() { - for (Iterator<String> i = xmlFileDirUris.iterator(); i.hasNext();) { - String dirUri = i.next(); - File elementDir = null; - - try { - elementDir = new File(new URI(dirUri)); - - if (!elementDir.isDirectory()) { - LOG - .log( - Level.WARNING, - "Element directory: " - + dirUri - + " is not " - + "a directory: skipping element and product type map saving to it."); - continue; - } - - String elementDirStr = elementDir.getAbsolutePath(); - if (!elementDirStr.endsWith("/")) { - elementDirStr += "/"; - } - - String elementXmlFile = elementDirStr + "elements.xml"; - - String productTypeMapXmlFile = elementDirStr - + "product-type-element-map.xml"; - - XmlStructFactory.writeElementXmlDocument(Arrays - .asList(elementMap.values().toArray( - new Element[elementMap.size()])), - elementXmlFile); - - XmlStructFactory.writeProductTypeMapXmLDocument( - productTypeElementMap, subToSuperMap, - productTypeMapXmlFile); - - } catch (URISyntaxException e) { - LOG - .log( - Level.WARNING, - "URISyntaxException when saving element " - + "directory URI: " - + dirUri - + ": Skipping Element and Product Type map saving" - + "for it: Message: " + e.getMessage()); - } + for (String dirUri : xmlFileDirUris) { + File elementDir = null; + try { + elementDir = new File(new URI(dirUri)); + + if (!elementDir.isDirectory()) { + LOG + .log( + Level.WARNING, + "Element directory: " + + dirUri + + " is not " + + "a directory: skipping element and product type map saving to it."); + continue; + } + + String elementDirStr = elementDir.getAbsolutePath(); + if (!elementDirStr.endsWith("/")) { + elementDirStr += "/"; + } + + String elementXmlFile = elementDirStr + "elements.xml"; + + String productTypeMapXmlFile = elementDirStr + + "product-type-element-map.xml"; + + XmlStructFactory.writeElementXmlDocument(Arrays + .asList(elementMap.values().toArray( + new Element[elementMap.size()])), + elementXmlFile); + + XmlStructFactory.writeProductTypeMapXmLDocument( + productTypeElementMap, subToSuperMap, + productTypeMapXmlFile); + + } catch (URISyntaxException e) { + LOG + .log( + Level.WARNING, + "URISyntaxException when saving element " + + "directory URI: " + + dirUri + + ": Skipping Element and Product Type map saving" + + "for it: Message: " + e.getMessage()); } + } + } private void loadElements(List<String> dirUris) { - for (Iterator<String> i = dirUris.iterator(); i.hasNext();) { - File elementDir = null; - String dirUri = i.next(); - - try { - elementDir = new File(new URI(dirUri)); - - if (!elementDir.isDirectory()) { - LOG.log(Level.WARNING, "Element directory: " + dirUri - + " is not " - + "a directory: skipping element loading from it."); - continue; - } - - String elementDirStr = elementDir.getAbsolutePath(); - if (!elementDirStr.endsWith("/")) { - elementDirStr += "/"; - } - - String elementXmlFile = elementDirStr + "elements.xml"; - Document elementDoc = getDocumentRoot(elementXmlFile); - - org.w3c.dom.Element elementRootElem = elementDoc - .getDocumentElement(); - - NodeList elementNodeList = elementRootElem - .getElementsByTagName("element"); - - if (elementNodeList != null && elementNodeList.getLength() > 0) { - for (int j = 0; j < elementNodeList.getLength(); j++) { - Node elementNode = elementNodeList.item(j); - Element element = XmlStructFactory - .getElement(elementNode); - elementMap.put(element.getElementId(), element); - } - } + for (String dirUri1 : dirUris) { + File elementDir = null; + String dirUri = dirUri1; - } catch (URISyntaxException e) { - LOG.log(Level.WARNING, - "URISyntaxException when loading element " - + "directory URI: " + dirUri - + ": Skipping element loading" - + "for it: Message: " + e.getMessage()); + try { + elementDir = new File(new URI(dirUri)); + + if (!elementDir.isDirectory()) { + LOG.log(Level.WARNING, "Element directory: " + dirUri + + " is not " + + "a directory: skipping element loading from it."); + continue; + } + + String elementDirStr = elementDir.getAbsolutePath(); + if (!elementDirStr.endsWith("/")) { + elementDirStr += "/"; + } + + String elementXmlFile = elementDirStr + "elements.xml"; + Document elementDoc = getDocumentRoot(elementXmlFile); + + org.w3c.dom.Element elementRootElem = elementDoc + .getDocumentElement(); + + NodeList elementNodeList = elementRootElem + .getElementsByTagName("element"); + + if (elementNodeList != null && elementNodeList.getLength() > 0) { + for (int j = 0; j < elementNodeList.getLength(); j++) { + Node elementNode = elementNodeList.item(j); + Element element = XmlStructFactory + .getElement(elementNode); + elementMap.put(element.getElementId(), element); } + } + + } catch (URISyntaxException e) { + LOG.log(Level.WARNING, + "URISyntaxException when loading element " + + "directory URI: " + dirUri + + ": Skipping element loading" + + "for it: Message: " + e.getMessage()); } + } } private void loadProductTypeMap(List<String> dirUris) { - for (Iterator<String> i = dirUris.iterator(); i.hasNext();) { - File elementDir = null; - String dirUri = i.next(); - - try { - elementDir = new File(new URI(dirUri)); - - if (!elementDir.isDirectory()) { - LOG - .log( - Level.WARNING, - "Element directory: " - + dirUri - + " is not " - + "a directory: skipping product type element map loading from it."); - continue; - } + for (String dirUri1 : dirUris) { + File elementDir = null; + String dirUri = dirUri1; - String elementDirStr = elementDir.getAbsolutePath(); - if (!elementDirStr.endsWith("/")) { - elementDirStr += "/"; - } - - String productTypeMapXmlFile = elementDirStr - + "product-type-element-map.xml"; - Document productTypeMapDoc = getDocumentRoot(productTypeMapXmlFile); - - org.w3c.dom.Element mapRootElem = productTypeMapDoc - .getDocumentElement(); - - NodeList typeNodeList = mapRootElem - .getElementsByTagName("type"); - - if (typeNodeList != null && typeNodeList.getLength() > 0) { - for (int j = 0; j < typeNodeList.getLength(); j++) { - org.w3c.dom.Element typeElement = (org.w3c.dom.Element) typeNodeList - .item(j); - String typeId = typeElement.getAttribute("id"); - - // get inheritance info - String typeParent = typeElement.getAttribute("parent"); - if (typeParent != null) { - subToSuperMap.put(typeId, typeParent); - } - - // get its element list - NodeList elementIdNodeList = typeElement - .getElementsByTagName("element"); - - // allow for 0 sized element list - List<Element> productTypeElementList = new Vector<Element>(); - - if (elementIdNodeList != null - && elementIdNodeList.getLength() > 0) { - productTypeElementList = new Vector<Element>( - elementIdNodeList.getLength()); - for (int k = 0; k < elementIdNodeList.getLength(); k++) { - org.w3c.dom.Element elementIdElement = (org.w3c.dom.Element) elementIdNodeList - .item(k); - String elementId = elementIdElement - .getAttribute("id"); - - if (elementMap.get(elementId) != null) { - productTypeElementList.add(elementMap - .get(elementId)); - } - } - } - - productTypeElementMap.put(typeId, - productTypeElementList); - } + try { + elementDir = new File(new URI(dirUri)); + + if (!elementDir.isDirectory()) { + LOG + .log( + Level.WARNING, + "Element directory: " + + dirUri + + " is not " + + "a directory: skipping product type element map loading from it."); + continue; + } + + String elementDirStr = elementDir.getAbsolutePath(); + if (!elementDirStr.endsWith("/")) { + elementDirStr += "/"; + } + + String productTypeMapXmlFile = elementDirStr + + "product-type-element-map.xml"; + Document productTypeMapDoc = getDocumentRoot(productTypeMapXmlFile); + + org.w3c.dom.Element mapRootElem = productTypeMapDoc + .getDocumentElement(); + + NodeList typeNodeList = mapRootElem + .getElementsByTagName("type"); + + if (typeNodeList != null && typeNodeList.getLength() > 0) { + for (int j = 0; j < typeNodeList.getLength(); j++) { + org.w3c.dom.Element typeElement = (org.w3c.dom.Element) typeNodeList + .item(j); + String typeId = typeElement.getAttribute("id"); + + // get inheritance info + String typeParent = typeElement.getAttribute("parent"); + if (typeParent != null) { + subToSuperMap.put(typeId, typeParent); + } + + // get its element list + NodeList elementIdNodeList = typeElement + .getElementsByTagName("element"); + + // allow for 0 sized element list + List<Element> productTypeElementList = new Vector<Element>(); + + if (elementIdNodeList != null + && elementIdNodeList.getLength() > 0) { + productTypeElementList = new Vector<Element>( + elementIdNodeList.getLength()); + for (int k = 0; k < elementIdNodeList.getLength(); k++) { + org.w3c.dom.Element elementIdElement = (org.w3c.dom.Element) elementIdNodeList + .item(k); + String elementId = elementIdElement + .getAttribute("id"); + + if (elementMap.get(elementId) != null) { + productTypeElementList.add(elementMap + .get(elementId)); + } } + } - } catch (URISyntaxException e) { - LOG.log(Level.WARNING, - "URISyntaxException when loading element " - + "directory URI: " + dirUri - + ": Skipping product type map loading" - + "for it: Message: " + e.getMessage()); + productTypeElementMap.put(typeId, + productTypeElementList); } + } + + } catch (URISyntaxException e) { + LOG.log(Level.WARNING, + "URISyntaxException when loading element " + + "directory URI: " + dirUri + + ": Skipping product type map loading" + + "for it: Message: " + e.getMessage()); } + } } private Document getDocumentRoot(String xmlFile) { http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java index b07bfab..21bbe4b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java @@ -105,44 +105,42 @@ public class DateTimeVersioner implements Versioner { // productTypeRepo/productName/fileName.productionDateTime // we'll use the format: yyyy.dd.MM.HH.mm.ss - for (Iterator<Reference> i = product.getProductReferences().iterator(); i - .hasNext();) { - Reference r = i.next(); - String dataStoreRef = null; - - try { - dataStoreRef = new File(new URI(product.getProductType() - .getProductRepositoryPath())).toURL() - .toExternalForm() - + "/" - + product.getProductName() - + "/" - + new File(new URI(r.getOrigReference())).getName() - + "." + productionDateTime; - LOG.log(Level.FINER, - "DateTimeVersioner: Generated dataStoreRef: " - + dataStoreRef + " from original ref: " - + r.getOrigReference()); - r.setDataStoreReference(dataStoreRef); - } catch (URISyntaxException e) { - LOG - .log( - Level.WARNING, - "DateTimeVersioner: Error generating URI to get name " - + "of original ref while generating data store ref for orig ref: " - + r.getOrigReference() - + ": Message: " + e.getMessage()); - // try and keep generating - } catch (MalformedURLException e) { - LOG.log(Level.WARNING, - "DateTimeVersioner: Error getting URL for product repository path " - + product.getProductType() - .getProductRepositoryPath() - + ": Message: " + e.getMessage()); - // try and keep generating - } + for (Reference r : product.getProductReferences()) { + String dataStoreRef = null; + try { + dataStoreRef = new File(new URI(product.getProductType() + .getProductRepositoryPath())).toURL() + .toExternalForm() + + "/" + + product.getProductName() + + "/" + + new File(new URI(r.getOrigReference())).getName() + + "." + productionDateTime; + LOG.log(Level.FINER, + "DateTimeVersioner: Generated dataStoreRef: " + + dataStoreRef + " from original ref: " + + r.getOrigReference()); + r.setDataStoreReference(dataStoreRef); + } catch (URISyntaxException e) { + LOG + .log( + Level.WARNING, + "DateTimeVersioner: Error generating URI to get name " + + "of original ref while generating data store ref for orig ref: " + + r.getOrigReference() + + ": Message: " + e.getMessage()); + // try and keep generating + } catch (MalformedURLException e) { + LOG.log(Level.WARNING, + "DateTimeVersioner: Error getting URL for product repository path " + + product.getProductType() + .getProductRepositoryPath() + + ": Message: " + e.getMessage()); + // try and keep generating } + + } } else if (product.getProductStructure().equals(Product.STRUCTURE_STREAM)) { VersioningUtils.createBasicDataStoreRefsStream(product.getProductName(), product.getProductType().getProductRepositoryPath(), product.getProductReferences(), productionDateTime); @@ -201,13 +199,12 @@ public class DateTimeVersioner implements Versioner { private void addProductDateTimeToReferences(List<Reference> references, String productionDateTime) { - for (Iterator<Reference> i = references.iterator(); i.hasNext();) { - Reference r = i.next(); - if (!r.getOrigReference().endsWith("/")) { - r.setDataStoreReference(r.getDataStoreReference() + "." - + productionDateTime); - } + for (Reference r : references) { + if (!r.getOrigReference().endsWith("/")) { + r.setDataStoreReference(r.getDataStoreReference() + "." + + productionDateTime); } + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java index 08f1b72..6334d0d 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java @@ -100,25 +100,25 @@ public final class VersioningUtils { File[] files = dir.listFiles(FILE_FILTER); - for (int i = 0; i < files.length; i++) { + for (File file : files) { // add the file references try { Reference r = new Reference(); - r.setOrigReference(files[i].toURL().toExternalForm()); - r.setFileSize(files[i].length()); + r.setOrigReference(file.toURL().toExternalForm()); + r.setFileSize(file.length()); references.add(r); } catch (MalformedURLException e) { e.printStackTrace(); LOG.log(Level.WARNING, - "MalformedURLException when generating reference for file: " - + files[i]); + "MalformedURLException when generating reference for file: " + + file); } } File[] subdirs = dir.listFiles(DIR_FILTER); if (subdirs != null) - for (int i = 0; i < subdirs.length; i++) { - stack.push(subdirs[i]); + for (File subdir : subdirs) { + stack.push(subdir); } } @@ -147,15 +147,15 @@ public final class VersioningUtils { File[] files = dir.listFiles(FILE_FILTER); - for (int i = 0; i < files.length; i++) { + for (File file : files) { // add the file references - uris.add(files[i].toURI().toString()); + uris.add(file.toURI().toString()); } File[] subdirs = dir.listFiles(DIR_FILTER); if (subdirs != null) - for (int i = 0; i < subdirs.length; i++) { - stack.push(subdirs[i]); + for (File subdir : subdirs) { + stack.push(subdir); } } @@ -177,9 +177,7 @@ public final class VersioningUtils { String origDirRef = references.get(0).getOrigReference(); String origDirRefName = new File(origDirRef).getName(); - for (Iterator<Reference> i = references.iterator(); i.hasNext();) { - Reference r = i.next(); - + for (Reference r : references) { // don't bother with the first one, because it's already set // correctly if (r.getOrigReference().equals(origDirRef)) { @@ -193,15 +191,15 @@ public final class VersioningUtils { String dataStoreRef = toDirRef; int firstOccurenceOfOrigDir = r.getOrigReference().indexOf( - origDirRefName); + origDirRefName); String tmpRef = r.getOrigReference().substring( - firstOccurenceOfOrigDir); + firstOccurenceOfOrigDir); LOG.log(Level.FINER, "tmpRef: " + tmpRef); int firstOccurenceSlash = tmpRef.indexOf("/"); dataStoreRef += tmpRef.substring(firstOccurenceSlash + 1); LOG.log(Level.FINE, "VersioningUtils: Generated data store ref: " - + dataStoreRef + " from origRef: " + r.getOrigReference()); + + dataStoreRef + " from origRef: " + r.getOrigReference()); r.setDataStoreReference(dataStoreRef); } @@ -209,46 +207,43 @@ public final class VersioningUtils { public static void createBasicDataStoreRefsFlat(String productName, String productRepoPath, List<Reference> references) { - for (Iterator<Reference> i = references.iterator(); i.hasNext();) { - Reference r = i.next(); - + for (Reference r : references) { String dataStoreRef = null; String productRepoPathRef = null; try { productRepoPathRef = new File(new URI(productRepoPath)).toURL() - .toExternalForm(); + .toExternalForm(); if (!productRepoPathRef.endsWith("/")) { productRepoPathRef += "/"; } dataStoreRef = productRepoPathRef - + URLEncoder.encode(productName, "UTF-8") + "/" - + new File(new URI(r.getOrigReference())).getName(); + + URLEncoder.encode(productName, "UTF-8") + "/" + + new File(new URI(r.getOrigReference())).getName(); } catch (IOException e) { LOG.log(Level.WARNING, - "VersioningUtils: Error generating dataStoreRef for " - + r.getOrigReference() + ": Message: " - + e.getMessage()); + "VersioningUtils: Error generating dataStoreRef for " + + r.getOrigReference() + ": Message: " + + e.getMessage()); } catch (URISyntaxException e) { LOG.log(Level.WARNING, - "VersioningUtils: Error generating dataStoreRef for " - + r.getOrigReference() + ": Message: " - + e.getMessage()); + "VersioningUtils: Error generating dataStoreRef for " + + r.getOrigReference() + ": Message: " + + e.getMessage()); } LOG.log(Level.FINE, "VersioningUtils: Generated data store ref: " - + dataStoreRef + " from origRef: " + r.getOrigReference()); + + dataStoreRef + " from origRef: " + r.getOrigReference()); r.setDataStoreReference(dataStoreRef); } } public static void createBasicDataStoreRefsStream(String productName, String productRepoPath, List<Reference> references,String postfix) { - for (Iterator<Reference> i = references.iterator(); i.hasNext();) { - Reference r = i.next(); - createDataStoreRefStream(productName,productRepoPath,r,postfix); + for (Reference r : references) { + createDataStoreRefStream(productName, productRepoPath, r, postfix); } } @@ -259,9 +254,9 @@ public final class VersioningUtils { } public static void addRefsFromUris(Product p, List<String> uris) { // add the refs to the Product - for (Iterator<String> i = uris.iterator(); i.hasNext();) { - String ref = i.next(); - Reference r = new Reference(ref, null, (p.getProductStructure().equals(Product.STRUCTURE_STREAM)?-1:quietGetFileSizeFromUri(ref))); + for (String ref : uris) { + Reference r = new Reference(ref, null, + (p.getProductStructure().equals(Product.STRUCTURE_STREAM) ? -1 : quietGetFileSizeFromUri(ref))); p.getProductReferences().add(r); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java index 04c5516..368bf94 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java @@ -169,8 +169,8 @@ public class TestDataSourceCatalog extends TestCase { File[] tmpFiles = tmpDir.listFiles(); if (tmpFiles != null && tmpFiles.length > 0) { - for (int i = 0; i < tmpFiles.length; i++) { - tmpFiles[i].delete(); + for (File tmpFile : tmpFiles) { + tmpFile.delete(); } tmpDir.delete(); http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java index d7c122a..78115bf 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java @@ -208,8 +208,8 @@ public class TestCachedIngester extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java index 92703b1..7e54081 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java @@ -220,8 +220,8 @@ public class TestLocalCache extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java index 5b4f71a..63978b7 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java @@ -236,8 +236,8 @@ public class TestRmiCache extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java index d1f4cfa..48d93ac 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java @@ -128,8 +128,8 @@ public class TestStdIngester extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java index 1a589f5..9954473 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java @@ -206,8 +206,8 @@ public class TestXMLRepositoryManager extends TestCase { List creatorValues = type.getTypeMetadata().getAllMetadata("Creator"); boolean hasFirstCreator = false, hasSecondCreator = false; - for (Iterator i = creatorValues.iterator(); i.hasNext();) { - String val = (String) i.next(); + for (Object creatorValue : creatorValues) { + String val = (String) creatorValue; if (val.equals("Chris Mattmann")) { hasFirstCreator = true; } else if (val.equals("Paul Ramirez")) { http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java index c4dfa38..6b5f6aa 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java @@ -260,8 +260,8 @@ public class TestTypeHandler extends TestCase { File[] tmpFiles = tmpDir.listFiles(); if (tmpFiles != null && tmpFiles.length > 0) { - for (int i = 0; i < tmpFiles.length; i++) { - tmpFiles[i].delete(); + for (File tmpFile : tmpFiles) { + tmpFile.delete(); } tmpDir.delete(); @@ -366,8 +366,8 @@ public class TestTypeHandler extends TestCase { if (productIds != null && productIds.size() > 0) { List products = new Vector(productIds.size()); - for (Iterator i = productIds.iterator(); i.hasNext();) { - String productId = (String) i.next(); + for (Object productId1 : productIds) { + String productId = (String) productId1; Product p = getProductById(productId); products.add(p); } @@ -460,64 +460,67 @@ public class TestTypeHandler extends TestCase { if (query.getCriteria() != null && query.getCriteria().size() > 0) { - for (Iterator i = query.getCriteria().iterator(); i - .hasNext();) { - QueryCriteria criteria = (QueryCriteria) i.next(); + for (QueryCriteria criteria : query.getCriteria()) { clauseNum++; String elementIdStr = null; if (fieldIdStringFlag) { - elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId() + "'"; + elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()) + .getElementId() + "'"; } else { - elementIdStr = this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId(); + elementIdStr = + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId(); } String clause = null; if (!gotFirstClause) { clause = "(p.element_id = " + elementIdStr - + " AND "; + + " AND "; if (criteria instanceof TermQueryCriteria) { clause += " metadata_value LIKE '%" - + ((TermQueryCriteria) criteria) - .getValue() + "%') "; + + ((TermQueryCriteria) criteria) + .getValue() + "%') "; } else if (criteria instanceof RangeQueryCriteria) { String startVal = ((RangeQueryCriteria) criteria) - .getStartValue(); + .getStartValue(); String endVal = ((RangeQueryCriteria) criteria) - .getEndValue(); + .getEndValue(); boolean inclusive = ((RangeQueryCriteria) criteria) - .getInclusive(); + .getInclusive(); if ((startVal != null && !startVal.equals("")) - || (endVal != null && !endVal - .equals(""))) { + || (endVal != null && !endVal + .equals(""))) { clause += " metadata_value "; boolean gotStart = false; if (startVal != null - && !startVal.equals("")) { - if (inclusive) + && !startVal.equals("")) { + if (inclusive) { clause += ">= '" + startVal + "'"; - else + } else { clause += "> '" + startVal + "'"; + } gotStart = true; } if (endVal != null && !endVal.equals("")) { if (gotStart) { - if (inclusive) + if (inclusive) { clause += " AND metadata_value <= '" - + endVal + "'"; - else + + endVal + "'"; + } else { clause += " AND metadata_value < '" - + endVal + "'"; - } else if (inclusive) + + endVal + "'"; + } + } else if (inclusive) { clause += "<= '" + endVal + "'"; - else + } else { clause += "< '" + endVal + "'"; + } } clause += ") "; @@ -529,17 +532,17 @@ public class TestTypeHandler extends TestCase { } else { String subSelectTblName = "p" + clauseNum; String subSelectQuery = subSelectQueryBase - + "WHERE (element_id = " + elementIdStr - + " AND "; + + "WHERE (element_id = " + elementIdStr + + " AND "; if (criteria instanceof TermQueryCriteria) { subSelectQuery += " metadata_value LIKE '%" - + ((TermQueryCriteria) criteria) - .getValue() + "%')"; + + ((TermQueryCriteria) criteria) + .getValue() + "%')"; } else if (criteria instanceof RangeQueryCriteria) { String startVal = ((RangeQueryCriteria) criteria) - .getStartValue(); + .getStartValue(); String endVal = ((RangeQueryCriteria) criteria) - .getEndValue(); + .getEndValue(); if (startVal != null || endVal != null) { subSelectQuery += " metadata_value "; @@ -547,19 +550,20 @@ public class TestTypeHandler extends TestCase { boolean gotStart = false; if (startVal != null - && !startVal.equals("")) { + && !startVal.equals("")) { subSelectQuery += ">= '" + startVal - + "'"; + + "'"; gotStart = true; } if (endVal != null && !endVal.equals("")) { if (gotStart) { subSelectQuery += " AND metadata_value <= '" - + endVal + "'"; - } else + + endVal + "'"; + } else { subSelectQuery += "<= '" + endVal - + "'"; + + "'"; + } } subSelectQuery += ") "; @@ -698,64 +702,67 @@ public class TestTypeHandler extends TestCase { if (query.getCriteria() != null && query.getCriteria().size() > 0) { - for (Iterator i = query.getCriteria().iterator(); i - .hasNext();) { - QueryCriteria criteria = (QueryCriteria) i.next(); + for (QueryCriteria criteria : query.getCriteria()) { clauseNum++; String elementIdStr = null; if (fieldIdStringFlag) { - elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId() + "'"; + elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()) + .getElementId() + "'"; } else { - elementIdStr = this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId(); + elementIdStr = + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId(); } String clause = null; if (!gotFirstClause) { clause = "(p.element_id = " + elementIdStr - + " AND "; + + " AND "; if (criteria instanceof TermQueryCriteria) { clause += " metadata_value LIKE '%" - + ((TermQueryCriteria) criteria) - .getValue() + "%') "; + + ((TermQueryCriteria) criteria) + .getValue() + "%') "; } else if (criteria instanceof RangeQueryCriteria) { String startVal = ((RangeQueryCriteria) criteria) - .getStartValue(); + .getStartValue(); String endVal = ((RangeQueryCriteria) criteria) - .getEndValue(); + .getEndValue(); boolean inclusive = ((RangeQueryCriteria) criteria) - .getInclusive(); + .getInclusive(); if ((startVal != null && !startVal.equals("")) - || (endVal != null && !endVal - .equals(""))) { + || (endVal != null && !endVal + .equals(""))) { clause += " metadata_value "; boolean gotStart = false; if (startVal != null - && !startVal.equals("")) { - if (inclusive) + && !startVal.equals("")) { + if (inclusive) { clause += ">= '" + startVal + "'"; - else + } else { clause += "> '" + startVal + "'"; + } gotStart = true; } if (endVal != null && !endVal.equals("")) { if (gotStart) { - if (inclusive) + if (inclusive) { clause += " AND metadata_value <= '" - + endVal + "'"; - else + + endVal + "'"; + } else { clause += " AND metadata_value < '" - + endVal + "'"; - } else if (inclusive) + + endVal + "'"; + } + } else if (inclusive) { clause += "<= '" + endVal + "'"; - else + } else { clause += "< '" + endVal + "'"; + } } clause += ") "; @@ -766,17 +773,17 @@ public class TestTypeHandler extends TestCase { } else { String subSelectTblName = "p" + clauseNum; String subSelectQuery = subSelectQueryBase - + "WHERE (element_id = " + elementIdStr - + " AND "; + + "WHERE (element_id = " + elementIdStr + + " AND "; if (criteria instanceof TermQueryCriteria) { subSelectQuery += " metadata_value LIKE '%" - + ((TermQueryCriteria) criteria) - .getValue() + "%')"; + + ((TermQueryCriteria) criteria) + .getValue() + "%')"; } else if (criteria instanceof RangeQueryCriteria) { String startVal = ((RangeQueryCriteria) criteria) - .getStartValue(); + .getStartValue(); String endVal = ((RangeQueryCriteria) criteria) - .getEndValue(); + .getEndValue(); if (startVal != null || endVal != null) { subSelectQuery += " metadata_value "; @@ -784,19 +791,20 @@ public class TestTypeHandler extends TestCase { boolean gotStart = false; if (startVal != null - && !startVal.equals("")) { + && !startVal.equals("")) { subSelectQuery += ">= '" + startVal - + "'"; + + "'"; gotStart = true; } if (endVal != null && !endVal.equals("")) { if (gotStart) { subSelectQuery += " AND metadata_value <= '" - + endVal + "'"; - } else + + endVal + "'"; + } else { subSelectQuery += "<= '" + endVal - + "'"; + + "'"; + } } subSelectQuery += ") "; http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java index 166c33d..4129f67 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java @@ -198,8 +198,8 @@ public class TestXmlRpcFileManager extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java index 0d0aba4..d67e3c4 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java @@ -244,8 +244,8 @@ public class TestXmlRpcFileManagerClient extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java index 53b07e0..18096a9 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java @@ -91,8 +91,8 @@ public class TestExpImpCatalog extends TestCase { int countProds = 0; - for (Iterator i = prods.iterator(); i.hasNext();) { - Product p = (Product) i.next(); + for (Object prod : prods) { + Product p = (Product) prod; if (p.getProductName().equals("test.txt")) { countProds++; } @@ -134,8 +134,8 @@ public class TestExpImpCatalog extends TestCase { int countProds = 0; - for (Iterator i = prods.iterator(); i.hasNext();) { - Product p = (Product) i.next(); + for (Object prod : prods) { + Product p = (Product) prod; if (p.getProductName().equals("test.txt")) { countProds++; } @@ -256,8 +256,8 @@ public class TestExpImpCatalog extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java index 42e50e0..028f9ab 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java @@ -141,13 +141,13 @@ public class TestMetadataBasedProductMover extends TestCase { File[] dirFiles = startDirFile.listFiles(); if (dirFiles != null && dirFiles.length > 0) { - for (int i = 0; i < dirFiles.length; i++) { - if (dirFiles[i].isDirectory()) { - deleteAllFilesRecursive(dirFiles[i].getAbsolutePath()); + for (File dirFile : dirFiles) { + if (dirFile.isDirectory()) { + deleteAllFilesRecursive(dirFile.getAbsolutePath()); // all dir files deleted, now delete dir - dirFiles[i].delete(); + dirFile.delete(); } else { - dirFiles[i].delete(); + dirFile.delete(); } } } @@ -162,8 +162,8 @@ public class TestMetadataBasedProductMover extends TestCase { File[] delFiles = startDirFile.listFiles(); if (delFiles != null && delFiles.length > 0) { - for (int i = 0; i < delFiles.length; i++) { - delFiles[i].delete(); + for (File delFile : delFiles) { + delFile.delete(); } }
