You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 17:21:54 UTC
[09/16] oodt git commit: OODT-905 swap for for foreach...
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java b/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
index 9df69e1..1c27311 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
@@ -66,15 +66,15 @@ public final class JobSubmitter {
File[] jobFiles = jobFileDir.listFiles(JOB_FILE_FILTER);
if (jobFiles != null && jobFiles.length > 0) {
- for (int i = 0; i < jobFiles.length; i++) {
+ for (File jobFile : jobFiles) {
try {
- String id = submitJobFile(jobFiles[i]);
+ String id = submitJobFile(jobFile);
LOG.log(Level.INFO, "Job Submitted: id: [" + id + "]");
} catch (Exception e) {
e.printStackTrace();
LOG.log(Level.WARNING, "Exception submitting job file: ["
- + jobFiles[i] + "]: Message: " + e.getMessage());
+ + jobFile + "]: Message: " + e.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
index b3467fc..021e146 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
@@ -73,10 +73,10 @@ public final class XmlRpcStructFactory {
Vector jobVector = new Vector();
if(jobs != null && jobs.size() > 0){
- for(Iterator i = jobs.iterator(); i.hasNext();){
- Job job = (Job)i.next();
- jobVector.add(getXmlRpcJob(job));
- }
+ for (Object job1 : jobs) {
+ Job job = (Job) job1;
+ jobVector.add(getXmlRpcJob(job));
+ }
}
return jobVector;
@@ -86,10 +86,10 @@ public final class XmlRpcStructFactory {
List jobs = new Vector();
if(jobVector != null && jobVector.size() > 0){
- for(Iterator i = jobVector.iterator(); i.hasNext(); ){
- Hashtable jobHash = (Hashtable)i.next();
- jobs.add(getJobFromXmlRpc(jobHash));
- }
+ for (Object aJobVector : jobVector) {
+ Hashtable jobHash = (Hashtable) aJobVector;
+ jobs.add(getJobFromXmlRpc(jobHash));
+ }
}
return jobs;
@@ -99,10 +99,10 @@ public final class XmlRpcStructFactory {
Vector resNodeVector = new Vector();
if (resNodes != null && resNodes.size() > 0) {
- for (Iterator i = resNodes.iterator(); i.hasNext();) {
- ResourceNode node = (ResourceNode) i.next();
- resNodeVector.add(getXmlRpcResourceNode(node));
- }
+ for (Object resNode : resNodes) {
+ ResourceNode node = (ResourceNode) resNode;
+ resNodeVector.add(getXmlRpcResourceNode(node));
+ }
}
return resNodeVector;
@@ -112,10 +112,10 @@ public final class XmlRpcStructFactory {
List resNodes = new Vector();
if (resNodeVector != null && resNodeVector.size() > 0) {
- for (Iterator i = resNodeVector.iterator(); i.hasNext();) {
- Hashtable resNodeHash = (Hashtable) i.next();
- resNodes.add(getResourceNodeFromXmlRpc(resNodeHash));
- }
+ for (Object aResNodeVector : resNodeVector) {
+ Hashtable resNodeHash = (Hashtable) aResNodeVector;
+ resNodes.add(getResourceNodeFromXmlRpc(resNodeHash));
+ }
}
return resNodes;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java b/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
index 5368e71..6514cd2 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
@@ -93,13 +93,13 @@ public class TestAssignmentMonitor extends TestCase {
boolean hasNode1 = false;
- for (Iterator i = resNodes.iterator(); i.hasNext();) {
- ResourceNode node = (ResourceNode) i.next();
+ for (Object resNode : resNodes) {
+ ResourceNode node = (ResourceNode) resNode;
assertNotNull(node);
if (node.getNodeId().equals("localhost")) {
hasNode1 = true;
assertEquals(node.getIpAddr().toExternalForm(),
- "http://localhost:2001");
+ "http://localhost:2001");
}
assertEquals(node.getCapacity(), 8);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java b/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
index e2c0307..342194e 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManager.java
@@ -107,8 +107,8 @@ public class TestXmlRpcResourceManager 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/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
index d9f3052..b3a22a1 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
@@ -126,8 +126,7 @@ public class WorkflowViewer extends Panel {
String[] words = orig.split(" ");
StringBuilder summarizedString = new StringBuilder();
- for (int i = 0; i < words.length; i++) {
- String word = words[i];
+ for (String word : words) {
summarizedString.append(word.substring(0, Math.min(wordThreshhold, word
.length())));
summarizedString.append(" ");
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
index aa2eadf..5941922 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
@@ -94,20 +94,19 @@ public final class DataUtils implements DataDeliveryKeys {
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
datasetZipFilePath));
- for (int i = 0; i < productZipFiles.length; i++) {
- String filename = productZipFiles[i].getName();
- FileInputStream in = new FileInputStream(productZipFiles[i]
+ for (File productZipFile : productZipFiles) {
+ String filename = productZipFile.getName();
+ FileInputStream in = new FileInputStream(productZipFile
.getAbsoluteFile());
addZipEntryFromStream(in, out, filename);
in.close();
-
- if (!productZipFiles[i].delete()) {
+
+ if (!productZipFile.delete()) {
LOG.log(Level.WARNING, "Unable to remove tempoary product zip file: ["
- + productZipFiles[i].getAbsolutePath() + "]");
- }
- else{
+ + productZipFile.getAbsolutePath() + "]");
+ } else {
LOG.log(Level.INFO, "Deleting original product zip file: ["
- + productZipFiles[i].getAbsolutePath() + "]");
+ + productZipFile.getAbsolutePath() + "]");
}
}
@@ -138,15 +137,13 @@ public final class DataUtils implements DataDeliveryKeys {
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
productZipFilePath));
- for (Iterator i = product.getProductReferences().iterator(); i.hasNext();) {
- Reference r = (Reference) i.next();
-
+ for (Reference r : product.getProductReferences()) {
try {
File prodFile = new File(new URI(r.getDataStoreReference()));
if (prodFile.isDirectory()) {
- LOG.log(Level.WARNING, "Data store reference is a directory. Not adding directory to the zip file: ["
- + r.getDataStoreReference() + "]");
- continue;
+ LOG.log(Level.WARNING, "Data store reference is a directory. Not adding directory to the zip file: ["
+ + r.getDataStoreReference() + "]");
+ continue;
}
String filename = prodFile.getName();
FileInputStream in = new FileInputStream(prodFile.getAbsoluteFile());
@@ -154,7 +151,7 @@ public final class DataUtils implements DataDeliveryKeys {
in.close();
} catch (URISyntaxException e) {
LOG.log(Level.WARNING, "Unable to get filename from uri: ["
- + r.getDataStoreReference() + "]");
+ + r.getDataStoreReference() + "]");
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
index 5b4eb3b..5d69e85 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
@@ -200,29 +200,23 @@ public class RDFDatasetServlet extends HttpServlet {
Element rdf = XMLUtils.addNode(doc, doc, "rdf:RDF");
RDFUtils.addNamespaces(doc, rdf, this.rdfConf);
- for (Iterator<ProductType> i = productTypes.iterator(); i.hasNext();) {
- ProductType type = i.next();
-
+ for (ProductType type : productTypes) {
Element productTypeRdfDesc = XMLUtils.addNode(doc, rdf, this.rdfConf
- .getTypeNs(type.getName())
- + ":" + type.getName());
+ .getTypeNs(type.getName())
+ + ":" + type.getName());
XMLUtils.addAttribute(doc, productTypeRdfDesc, "rdf:about", base
- + "?typeID=" + type.getProductTypeId());
+ + "?typeID=" + type.getProductTypeId());
// for all of its metadata keys and values, loop through them
// and add RDF nodes underneath the RdfDesc for this product
if (type.getTypeMetadata() != null) {
- for (Iterator<String> j = type.getTypeMetadata().getHashtable().keySet()
- .iterator(); j.hasNext();) {
- String key = (String) j.next();
-
+ for (String key : type.getTypeMetadata().getHashtable().keySet()) {
List<String> vals = type.getTypeMetadata().getAllMetadata(key);
if (vals != null && vals.size() > 0) {
- for (Iterator<String> k = vals.iterator(); k.hasNext();) {
- String val = (String) k.next();
+ for (String val : vals) {
//OODT-665 fix, take keys like
//PRODUCT Experiment Type
//and transform it into ProductExperimentType
@@ -231,7 +225,7 @@ public class RDFDatasetServlet extends HttpServlet {
outputKey = StringUtils.join(WordUtils.capitalizeFully(outputKey).split(
" "));
}
-
+
val = StringEscapeUtils.escapeXml(val);
Element rdfElem = RDFUtils.getRDFElement(outputKey, val,
this.rdfConf, doc);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
index d2fb2ac..1b3a53c 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
@@ -205,9 +205,7 @@ public class RDFProductServlet extends HttpServlet {
Element rdf = XMLUtils.addNode(doc, doc, "rdf:RDF");
RDFUtils.addNamespaces(doc, rdf, this.rdfConf);
- for (Iterator<Product> i = products.iterator(); i.hasNext();) {
- Product p = i.next();
-
+ for (Product p : products) {
String productTypeIdStr = p.getProductType().getProductTypeId();
ProductType productType = null;
@@ -220,8 +218,8 @@ public class RDFProductServlet extends HttpServlet {
e.printStackTrace();
LOG.log(Level.SEVERE,
"Unable to obtain product type from product type id: ["
- + ((Product) products.get(0)).getProductType()
- .getProductTypeId() + "]: Message: " + e.getMessage());
+ + ((Product) products.get(0)).getProductType()
+ .getProductTypeId() + "]: Message: " + e.getMessage());
return;
}
}
@@ -229,10 +227,10 @@ public class RDFProductServlet extends HttpServlet {
p.setProductType(productType);
Element productRdfDesc = XMLUtils.addNode(doc, rdf, this.rdfConf
- .getTypeNs(productType.getName())
- + ":" + productType.getName());
+ .getTypeNs(productType.getName())
+ + ":" + productType.getName());
XMLUtils.addAttribute(doc, productRdfDesc, "rdf:about", base
- + "?productID=" + p.getProductId());
+ + "?productID=" + p.getProductId());
// now add all its metadata
Metadata prodMetadata = safeGetMetadata(p);
@@ -241,22 +239,18 @@ public class RDFProductServlet extends HttpServlet {
// and add RDF nodes underneath the RdfDesc for this product
if (prodMetadata != null) {
- for (Iterator<String> j = prodMetadata.getHashtable().keySet()
- .iterator(); j.hasNext();) {
- String key = (String) j.next();
-
+ for (String key : prodMetadata.getHashtable().keySet()) {
List<String> vals = prodMetadata.getAllMetadata(key);
if (vals != null && vals.size() > 0) {
- for (Iterator<String> k = vals.iterator(); k.hasNext();) {
- String val = (String) k.next();
+ for (String val : vals) {
String outputKey = key;
if (outputKey.contains(" ")) {
outputKey = StringUtils.join(WordUtils.capitalizeFully(outputKey).split(
" "));
- }
-
+ }
+
val = StringEscapeUtils.escapeXml(val);
Element rdfElem = RDFUtils.getRDFElement(outputKey, val,
this.rdfConf, doc);
@@ -292,9 +286,7 @@ public class RDFProductServlet extends HttpServlet {
if (types != null && types.size() > 0) {
products = new Vector<Product>();
- for (Iterator<ProductType> i = types.iterator(); i.hasNext();) {
- ProductType type = i.next();
-
+ for (ProductType type : types) {
ProductPage page = null;
try {
@@ -306,8 +298,9 @@ public class RDFProductServlet extends HttpServlet {
products.addAll(page.getPageProducts());
if (!page.isLastPage()) {
page = fClient.getNextPage(type, page);
- } else
+ } else {
break;
+ }
}
}
} catch (Exception ignore) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
index 0804592..6598724 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
@@ -68,9 +68,7 @@ public final class RDFUtils {
}
public static void addNamespaces(Document doc, Element rdf, RDFConfig rdfConf) {
- for (Iterator<String> i = rdfConf.getNsMap().keySet().iterator(); i
- .hasNext();) {
- String nsName = i.next();
+ for (String nsName : rdfConf.getNsMap().keySet()) {
String nsUrl = rdfConf.getNsMap().get(nsName);
XMLUtils.addAttribute(doc, rdf, "xmlns:" + nsName, nsUrl);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
index 34b5f11..065d619 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
@@ -223,8 +223,8 @@ public class RSSProductServlet extends HttpServlet {
XMLUtils.addNode(doc, channel, "generator", "CAS File Manager");
XMLUtils.addNode(doc, channel, "lastBuildDate", buildPubDate);
- for (Iterator i = products.iterator(); i.hasNext();) {
- Product p = (Product) i.next();
+ for (Object product : products) {
+ Product p = (Product) product;
String productTypeIdStr = p.getProductType().getProductTypeId();
ProductType productType = null;
@@ -235,8 +235,8 @@ public class RSSProductServlet extends HttpServlet {
e.printStackTrace();
LOG.log(Level.SEVERE,
"Unable to obtain product type from product type id: ["
- + ((Product) products.get(0)).getProductType()
- .getProductTypeId() + "]: Message: " + e.getMessage());
+ + ((Product) products.get(0)).getProductType()
+ .getProductTypeId() + "]: Message: " + e.getMessage());
return;
}
@@ -247,9 +247,9 @@ public class RSSProductServlet extends HttpServlet {
XMLUtils.addNode(doc, item, "title", p.getProductName());
XMLUtils.addNode(doc, item, "description", p.getProductType()
- .getName());
+ .getName());
XMLUtils.addNode(doc, item, "link", base + "/data?productID="
- + p.getProductId());
+ + p.getProductId());
Metadata m = this.safeGetMetadata(p);
String productReceivedTime = m.getMetadata("CAS.ProductReceivedTime");
@@ -269,7 +269,7 @@ public class RSSProductServlet extends HttpServlet {
if (p.getProductReferences() != null
&& p.getProductReferences().size() == 1) {
m.addMetadata("FileSize", String.valueOf(p.getProductReferences()
- .get(0).getFileSize()));
+ .get(0).getFileSize()));
}
// add additional elements from the RSSConfig
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
index 65150dd..a516226 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
@@ -207,58 +207,58 @@ public class RSSProductTransferServlet extends HttpServlet {
XMLUtils.addNode(doc, channel, "generator", "CAS File Manager");
XMLUtils.addNode(doc, channel, "lastBuildDate", buildPubDate);
- for (Iterator i = currentTransfers.iterator(); i.hasNext();) {
- FileTransferStatus status = (FileTransferStatus) i.next();
-
- Element item = XMLUtils.addNode(doc, channel, "item");
-
- XMLUtils.addNode(doc, item, "title", status
- .getParentProduct().getProductName());
- XMLUtils.addNode(doc, item, "description", status
- .getParentProduct().getProductType().getName());
- XMLUtils.addNode(doc, item, "link", base
- + "/viewTransfer?ref="
- + status.getFileRef().getOrigReference() + "&size="
- + status.getFileRef().getFileSize());
-
- Metadata m = null;
-
- try {
- m = fClient.getMetadata(status.getParentProduct());
-
- String productReceivedTime = m
- .getMetadata("CAS.ProductReceivedTime");
- Date receivedTime = null;
-
- try {
- receivedTime = DateConvert
- .isoParse(productReceivedTime);
- } catch (ParseException ignore) {
- }
-
- if (receivedTime != null) {
- XMLUtils.addNode(doc, item, "pubDate",
- dateFormatter.format(receivedTime));
- }
-
- // set product transfer metadata
- m.addMetadata("BytesTransferred",
- "" + status.getBytesTransferred());
- m.addMetadata("TotalBytes",
- "" + status.getFileRef().getFileSize());
- m.addMetadata("PercentComplete",
- "" + status.computePctTransferred());
-
- } catch (CatalogException ignore) {
- }
-
- // add additional elements from the RSSConfig
- for (RSSTag tag : rssconf.getTags()) {
- item.appendChild(RSSUtils.emitRSSTag(tag, m, doc, item));
- }
+ for (Object currentTransfer : currentTransfers) {
+ FileTransferStatus status = (FileTransferStatus) currentTransfer;
+
+ Element item = XMLUtils.addNode(doc, channel, "item");
+
+ XMLUtils.addNode(doc, item, "title", status
+ .getParentProduct().getProductName());
+ XMLUtils.addNode(doc, item, "description", status
+ .getParentProduct().getProductType().getName());
+ XMLUtils.addNode(doc, item, "link", base
+ + "/viewTransfer?ref="
+ + status.getFileRef().getOrigReference() + "&size="
+ + status.getFileRef().getFileSize());
+
+ Metadata m = null;
+
+ try {
+ m = fClient.getMetadata(status.getParentProduct());
+
+ String productReceivedTime = m
+ .getMetadata("CAS.ProductReceivedTime");
+ Date receivedTime = null;
+
+ try {
+ receivedTime = DateConvert
+ .isoParse(productReceivedTime);
+ } catch (ParseException ignore) {
+ }
+
+ if (receivedTime != null) {
+ XMLUtils.addNode(doc, item, "pubDate",
+ dateFormatter.format(receivedTime));
+ }
+
+ // set product transfer metadata
+ m.addMetadata("BytesTransferred",
+ "" + status.getBytesTransferred());
+ m.addMetadata("TotalBytes",
+ "" + status.getFileRef().getFileSize());
+ m.addMetadata("PercentComplete",
+ "" + status.computePctTransferred());
+
+ } catch (CatalogException ignore) {
+ }
+ // add additional elements from the RSSConfig
+ for (RSSTag tag : rssconf.getTags()) {
+ item.appendChild(RSSUtils.emitRSSTag(tag, m, doc, item));
}
+ }
+
DOMSource source = new DOMSource(doc);
TransformerFactory transFactory = TransformerFactory
.newInstance();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
index 8831ecc..aee4f90 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
@@ -39,10 +39,12 @@ public class GetTaskByIdCliAction extends WorkflowCliAction {
WorkflowTask task = getClient().getTaskById(taskId);
String requiredMetFields = "";
- for (Iterator i = task.getRequiredMetFields().iterator(); i.hasNext();) {
- if (requiredMetFields.length()>0) requiredMetFields += ", ";
- requiredMetFields += (String) i.next();
- }
+ for (Object o : task.getRequiredMetFields()) {
+ if (requiredMetFields.length() > 0) {
+ requiredMetFields += ", ";
+ }
+ requiredMetFields += (String) o;
+ }
printer.println("Task: [id=" + task.getTaskId()
+ ", name=" + task.getTaskName()
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
index 0bd1eef..edc69ed 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
@@ -177,8 +177,8 @@ public abstract class AbstractPaginatibleInstanceRepository implements
if (wInstIds != null && wInstIds.size() > 0) {
List workflowInstances = new Vector(wInstIds.size());
- for (Iterator i = wInstIds.iterator(); i.hasNext();) {
- String workflowInstId = (String) i.next();
+ for (Object wInstId : wInstIds) {
+ String workflowInstId = (String) wInstId;
WorkflowInstance inst = getWorkflowInstanceById(workflowInstId);
workflowInstances.add(inst);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
index 94b3081..2d5f377 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
@@ -563,22 +563,20 @@ public class LuceneWorkflowInstanceRepository extends
private void addInstanceMetadataToDoc(Document doc, Metadata met) {
if (met != null && met.getHashtable().keySet().size() > 0) {
- for (Iterator i = met.getHashtable().keySet().iterator(); i
- .hasNext();) {
- String metKey = (String) i.next();
+ for (String metKey : met.getHashtable().keySet()) {
List metVals = met.getAllMetadata(metKey);
if (metVals != null && metVals.size() > 0) {
- for (Iterator j = metVals.iterator(); j.hasNext();) {
- String metVal = (String) j.next();
+ for (Object metVal1 : metVals) {
+ String metVal = (String) metVal1;
doc.add(new Field(metKey, metVal, Field.Store.YES,
- Field.Index.UN_TOKENIZED));
+ Field.Index.UN_TOKENIZED));
}
// now index the field name so that we can use it to
// look it up when converting from doc to
// WorkflowInstance
doc.add(new Field("workflow_inst_met_flds", metKey,
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
}
}
@@ -587,18 +585,18 @@ public class LuceneWorkflowInstanceRepository extends
private void addTasksToDoc(Document doc, List tasks) {
if (tasks != null && tasks.size() > 0) {
- for (Iterator i = tasks.iterator(); i.hasNext();) {
- WorkflowTask task = (WorkflowTask) i.next();
+ for (Object task1 : tasks) {
+ WorkflowTask task = (WorkflowTask) task1;
doc.add(new Field("task_id", task.getTaskId(), Field.Store.YES,
- Field.Index.UN_TOKENIZED));
+ Field.Index.UN_TOKENIZED));
doc.add(new Field("task_name", task.getTaskName(),
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
doc.add(new Field("task_order",
- String.valueOf(task.getOrder()), Field.Store.YES,
- Field.Index.NO));
+ String.valueOf(task.getOrder()), Field.Store.YES,
+ Field.Index.NO));
doc.add(new Field("task_class",
- task.getTaskInstanceClassName(), Field.Store.YES,
- Field.Index.NO));
+ task.getTaskInstanceClassName(), Field.Store.YES,
+ Field.Index.NO));
addConditionsToDoc(task.getTaskId(), task.getConditions(), doc);
addTaskConfigToDoc(task.getTaskId(), task.getTaskConfig(), doc);
@@ -609,15 +607,14 @@ public class LuceneWorkflowInstanceRepository extends
private void addTaskConfigToDoc(String taskId,
WorkflowTaskConfiguration config, Document doc) {
if (config != null) {
- for (Iterator i = config.getProperties().keySet().iterator(); i
- .hasNext();) {
- String propName = (String) i.next();
+ for (Object o : config.getProperties().keySet()) {
+ String propName = (String) o;
String propValue = config.getProperty(propName);
doc.add(new Field(taskId + "_config_property_name", propName,
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
doc.add(new Field(taskId + "_config_property_value", propValue,
- Field.Store.YES, Field.Index.NO));
+ Field.Store.YES, Field.Index.NO));
}
}
}
@@ -625,21 +622,21 @@ public class LuceneWorkflowInstanceRepository extends
private void addConditionsToDoc(String taskId, List conditionList,
Document doc) {
if (conditionList != null && conditionList.size() > 0) {
- for (Iterator i = conditionList.iterator(); i.hasNext();) {
- WorkflowCondition cond = (WorkflowCondition) i.next();
- doc.add(new Field(taskId + "_condition_name", cond.getConditionName(),
- Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId + "_condition_id", cond.getConditionId(),
- Field.Store.YES, Field.Index.UN_TOKENIZED));
- doc.add(new Field(taskId + "_condition_class", cond
- .getConditionInstanceClassName(), Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId + "_condition_order", String.valueOf(cond
- .getOrder()), Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId + "_condition_timeout", String.valueOf(cond
- .getTimeoutSeconds()), Field.Store.YES, Field.Index.NO));
- doc.add(new Field(taskId+"_condition_optional", String.valueOf(cond.isOptional()),
- Field.Store.YES, Field.Index.NO));
- }
+ for (Object aConditionList : conditionList) {
+ WorkflowCondition cond = (WorkflowCondition) aConditionList;
+ doc.add(new Field(taskId + "_condition_name", cond.getConditionName(),
+ Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_id", cond.getConditionId(),
+ Field.Store.YES, Field.Index.UN_TOKENIZED));
+ doc.add(new Field(taskId + "_condition_class", cond
+ .getConditionInstanceClassName(), Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_order", String.valueOf(cond
+ .getOrder()), Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_timeout", String.valueOf(cond
+ .getTimeoutSeconds()), Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(taskId + "_condition_optional", String.valueOf(cond.isOptional()),
+ Field.Store.YES, Field.Index.NO));
+ }
}
}
@@ -683,12 +680,11 @@ public class LuceneWorkflowInstanceRepository extends
Metadata sharedContext = new Metadata();
String[] instMetFields = doc.getValues("workflow_inst_met_flds");
if (instMetFields != null && instMetFields.length > 0) {
- for (int i = 0; i < instMetFields.length; i++) {
- String fldName = instMetFields[i];
+ for (String fldName : instMetFields) {
String[] vals = doc.getValues(fldName);
if (vals != null && vals.length > 0) {
- for (int j = 0; j < vals.length; j++) {
- sharedContext.addMetadata(fldName, vals[j]);
+ for (String val : vals) {
+ sharedContext.addMetadata(fldName, val);
}
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
index b5d7afc..4e6c462 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
@@ -137,10 +137,10 @@ public class MemoryWorkflowInstanceRepository extends
throws InstanceRepositoryException {
List instances = new Vector();
- for (Iterator i = workflowInstMap.keySet().iterator(); i.hasNext();) {
- String workflowInstId = (String) i.next();
+ for (Object o : workflowInstMap.keySet()) {
+ String workflowInstId = (String) o;
WorkflowInstance inst = (WorkflowInstance) workflowInstMap
- .get(workflowInstId);
+ .get(workflowInstId);
if (inst.getStatus().equals(status)) {
instances.add(inst);
}
@@ -208,11 +208,10 @@ public class MemoryWorkflowInstanceRepository extends
if (this.workflowInstMap != null
&& this.workflowInstMap.keySet() != null
&& this.workflowInstMap.keySet().size() > 0) {
- for (Iterator i = this.workflowInstMap.keySet().iterator(); i
- .hasNext();) {
- String wInstId = (String) i.next();
+ for (Object o : this.workflowInstMap.keySet()) {
+ String wInstId = (String) o;
WorkflowInstance inst = (WorkflowInstance) this.workflowInstMap
- .get(wInstId);
+ .get(wInstId);
if (inst.getStatus().equals(status)) {
cnt++;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
index 5bce6d3..3705080 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
@@ -51,8 +51,8 @@ public final class WorkflowInstanceMetMap implements WorkflowInstanceMetMapKeys{
public void addWorkflowToMap(String id, List fields) {
if (fields != null && fields.size() > 0) {
- for (Iterator i = fields.iterator(); i.hasNext();) {
- String fld = (String) i.next();
+ for (Object field : fields) {
+ String fld = (String) field;
addFieldToWorkflow(id, fld);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
index 2443b25..602b958 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
@@ -169,10 +169,10 @@ public class WorkflowLifecycle {
@Deprecated
public WorkflowLifecycleStage getStageForWorkflow(String status) {
if (this.stages != null && this.stages.size() > 0) {
- for (Iterator i = this.stages.iterator(); i.hasNext();) {
- WorkflowLifecycleStage stage = (WorkflowLifecycleStage) i.next();
- for(WorkflowState state: stage.getStates()){
- if(state.getName().equals(status)){
+ for (Object stage1 : this.stages) {
+ WorkflowLifecycleStage stage = (WorkflowLifecycleStage) stage1;
+ for (WorkflowState state : stage.getStates()) {
+ if (state.getName().equals(status)) {
return stage;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
index 05b7780..8c6e4ae 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
@@ -155,11 +155,11 @@ public class WorkflowLifecycleManager {
WorkflowLifecycle defaultLifecycle = null;
if (this.lifecycles != null && this.lifecycles.size() > 0) {
- for (Iterator i = this.lifecycles.iterator(); i.hasNext();) {
- WorkflowLifecycle lifecycle = (WorkflowLifecycle) i.next();
+ for (Object lifecycle1 : this.lifecycles) {
+ WorkflowLifecycle lifecycle = (WorkflowLifecycle) lifecycle1;
if (lifecycle.getName().equals(
- WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
+ WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
defaultLifecycle = lifecycle;
}
}
@@ -183,14 +183,14 @@ public class WorkflowLifecycleManager {
WorkflowLifecycle defaultLifecycle = null;
if (this.lifecycles != null && this.lifecycles.size() > 0) {
- for (Iterator i = this.lifecycles.iterator(); i.hasNext();) {
- WorkflowLifecycle lifecycle = (WorkflowLifecycle) i.next();
+ for (Object lifecycle1 : this.lifecycles) {
+ WorkflowLifecycle lifecycle = (WorkflowLifecycle) lifecycle1;
if (lifecycle.getWorkflowId().equals(workflow.getId())) {
return lifecycle;
}
if (lifecycle.getName().equals(
- WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
+ WorkflowLifecycle.DEFAULT_LIFECYCLE)) {
defaultLifecycle = lifecycle;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 7477b91..71d9a94 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -152,14 +152,14 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
public Workflow getWorkflowByName(String workflowName)
throws RepositoryException {
- for (Iterator i = workflowMap.keySet().iterator(); i.hasNext();) {
- String workflowId = (String) i.next();
- Workflow w = (Workflow) workflowMap.get(workflowId);
+ for (Object o : workflowMap.keySet()) {
+ String workflowId = (String) o;
+ Workflow w = (Workflow) workflowMap.get(workflowId);
- if (w.getName().equals(workflowName)) {
- return w;
- }
+ if (w.getName().equals(workflowName)) {
+ return w;
}
+ }
return null;
}
@@ -222,12 +222,12 @@ public class XMLWorkflowRepository implements WorkflowRepository {
*/
public List getConditionsByTaskName(String taskName)
throws RepositoryException {
- for (Iterator i = taskMap.values().iterator(); i.hasNext();) {
- WorkflowTask t = (WorkflowTask) i.next();
- if (t.getTaskName().equals(taskName)) {
- return t.getConditions();
- }
+ for (Object o : taskMap.values()) {
+ WorkflowTask t = (WorkflowTask) o;
+ if (t.getTaskName().equals(taskName)) {
+ return t.getConditions();
}
+ }
return null;
}
@@ -357,11 +357,11 @@ public class XMLWorkflowRepository implements WorkflowRepository {
uris = new Vector(args.length);
- for (int i = 0; i < args.length; i++) {
- if (args[i] != null) {
- uris.add(args[i]);
- }
+ for (String arg : args) {
+ if (arg != null) {
+ uris.add(arg);
}
+ }
XMLWorkflowRepository repo = new XMLWorkflowRepository(uris);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
index 2d4c9db..f0c46bd 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
@@ -148,9 +148,9 @@ public class XmlRpcWorkflowManager {
events = repo.getRegisteredEvents();
if (events != null) {
- for (Iterator i = events.iterator(); i.hasNext();) {
- eventsVector.add(i.next());
- }
+ for (Object event : events) {
+ eventsVector.add(event);
+ }
}
@@ -260,12 +260,12 @@ public class XmlRpcWorkflowManager {
workflows = repo.getWorkflowsForEvent(eventName);
if (workflows != null) {
- for (Iterator i = workflows.iterator(); i.hasNext();) {
- Workflow w = (Workflow) i.next();
- Hashtable workflow = XmlRpcStructFactory
- .getXmlRpcWorkflow(w);
- workflowList.add(workflow);
- }
+ for (Object workflow1 : workflows) {
+ Workflow w = (Workflow) workflow1;
+ Hashtable workflow = XmlRpcStructFactory
+ .getXmlRpcWorkflow(w);
+ workflowList.add(workflow);
+ }
}
return workflowList;
@@ -294,24 +294,24 @@ public class XmlRpcWorkflowManager {
}
if (workflows != null) {
- for (Iterator i = workflows.iterator(); i.hasNext();) {
- Workflow w = (Workflow) i.next();
- LOG.log(Level.INFO, "WorkflowManager: Workflow " + w.getName()
- + " retrieved for event " + eventName);
-
- Metadata m = new Metadata();
- m.addMetadata(metadata);
-
- try {
- engine.startWorkflow(w, m);
- } catch (Exception e) {
- e.printStackTrace();
- throw new EngineException(
- "Engine exception when starting workflow: "
- + w.getName() + ": Message: "
- + e.getMessage());
- }
+ for (Object workflow : workflows) {
+ Workflow w = (Workflow) workflow;
+ LOG.log(Level.INFO, "WorkflowManager: Workflow " + w.getName()
+ + " retrieved for event " + eventName);
+
+ Metadata m = new Metadata();
+ m.addMetadata(metadata);
+
+ try {
+ engine.startWorkflow(w, m);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new EngineException(
+ "Engine exception when starting workflow: "
+ + w.getName() + ": Message: "
+ + e.getMessage());
}
+ }
return true;
} else
return false;
@@ -390,25 +390,25 @@ public class XmlRpcWorkflowManager {
+ workflowInsts.size() + " instances");
try {
- for (Iterator i = workflowInsts.iterator(); i.hasNext();) {
- WorkflowInstance wInst = (WorkflowInstance) i.next();
- // pick up the description of the workflow
- Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
- .getId());
- // TODO: hack for now, fix this, we shouldn't have to cast
- // here, bad
- // design
- if(wDesc == null){
- //Possible dynamic workflow for instance
- //reconsitute it from cache
- wDesc = wInst.getWorkflow();
- repo.addWorkflow(wDesc);
- }
- wInst.setWorkflow(wDesc);
- Hashtable workflowInstance = XmlRpcStructFactory
- .getXmlRpcWorkflowInstance(wInst);
- workflowInstances.add(workflowInstance);
+ for (Object workflowInst : workflowInsts) {
+ WorkflowInstance wInst = (WorkflowInstance) workflowInst;
+ // pick up the description of the workflow
+ Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
+ .getId());
+ // TODO: hack for now, fix this, we shouldn't have to cast
+ // here, bad
+ // design
+ if (wDesc == null) {
+ //Possible dynamic workflow for instance
+ //reconsitute it from cache
+ wDesc = wInst.getWorkflow();
+ repo.addWorkflow(wDesc);
}
+ wInst.setWorkflow(wDesc);
+ Hashtable workflowInstance = XmlRpcStructFactory
+ .getXmlRpcWorkflowInstance(wInst);
+ workflowInstances.add(workflowInstance);
+ }
} catch (Exception e) {
e.printStackTrace();
throw new EngineException(
@@ -441,27 +441,27 @@ public class XmlRpcWorkflowManager {
+ workflowInsts.size() + " instances");
try {
- for (Iterator i = workflowInsts.iterator(); i.hasNext();) {
- WorkflowInstance wInst = (WorkflowInstance) i.next();
- // pick up the description of the workflow
- Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
- .getId());
- if(wDesc == null){
- //possible dynamic workflow
- //reconsitute it from cached instance
- wDesc = wInst.getWorkflow();
- //now save it
- repo.addWorkflow(wDesc);
-
- }
- // TODO: hack for now, fix this, we shouldn't have to cast
- // here, bad
- // design
- wInst.setWorkflow(wDesc);
- Hashtable workflowInstance = XmlRpcStructFactory
- .getXmlRpcWorkflowInstance(wInst);
- workflowInstances.add(workflowInstance);
+ for (Object workflowInst : workflowInsts) {
+ WorkflowInstance wInst = (WorkflowInstance) workflowInst;
+ // pick up the description of the workflow
+ Workflow wDesc = repo.getWorkflowById(wInst.getWorkflow()
+ .getId());
+ if (wDesc == null) {
+ //possible dynamic workflow
+ //reconsitute it from cached instance
+ wDesc = wInst.getWorkflow();
+ //now save it
+ repo.addWorkflow(wDesc);
+
}
+ // TODO: hack for now, fix this, we shouldn't have to cast
+ // here, bad
+ // design
+ wInst.setWorkflow(wDesc);
+ Hashtable workflowInstance = XmlRpcStructFactory
+ .getXmlRpcWorkflowInstance(wInst);
+ workflowInstances.add(workflowInstance);
+ }
return workflowInstances;
} catch (Exception e) {
e.printStackTrace();
@@ -482,12 +482,12 @@ public class XmlRpcWorkflowManager {
+ workflowList.size() + " workflows");
try {
- for (Iterator i = workflowList.iterator(); i.hasNext();) {
- Workflow w = (Workflow) i.next();
- Hashtable workflow = XmlRpcStructFactory
- .getXmlRpcWorkflow(w);
- workflows.add(workflow);
- }
+ for (Object aWorkflowList : workflowList) {
+ Workflow w = (Workflow) aWorkflowList;
+ Hashtable workflow = XmlRpcStructFactory
+ .getXmlRpcWorkflow(w);
+ workflows.add(workflow);
+ }
return workflows;
} catch (Exception e) {
@@ -676,30 +676,30 @@ public class XmlRpcWorkflowManager {
private void populateWorkflows(List wInsts) {
if (wInsts != null && wInsts.size() > 0) {
- for (Iterator i = wInsts.iterator(); i.hasNext();) {
- WorkflowInstance wInst = (WorkflowInstance) i.next();
- if(wInst.getWorkflow() == null ||
- (wInst.getWorkflow() != null &&
- (wInst.getWorkflow().getName() == null ||
- wInst.getWorkflow().getId() == null))){
- wInst.setWorkflow(safeGetWorkflowById(wInst.getWorkflow()
- .getId()));
+ for (Object wInst1 : wInsts) {
+ WorkflowInstance wInst = (WorkflowInstance) wInst1;
+ if (wInst.getWorkflow() == null ||
+ (wInst.getWorkflow() != null &&
+ (wInst.getWorkflow().getName() == null ||
+ wInst.getWorkflow().getId() == null))) {
+ wInst.setWorkflow(safeGetWorkflowById(wInst.getWorkflow()
+ .getId()));
+ } else {
+ // check to see if the workflow exists in the
+ // repo
+ try {
+ if (repo.getWorkflowById(wInst.getWorkflow().getId()) == null) {
+ repo.addWorkflow(wInst.getWorkflow());
}
- else{
- // check to see if the workflow exists in the
- // repo
- try {
- if(repo.getWorkflowById(wInst.getWorkflow().getId()) == null){
- repo.addWorkflow(wInst.getWorkflow());
- }
- } catch (RepositoryException e) {
- LOG.log(Level.WARNING, "Attempting to look up workflow: ["+wInst.getWorkflow()
- .getId()+"] in populate workflows. Message: "+e.getMessage());
- e.printStackTrace();
- }
+ } catch (RepositoryException e) {
+ LOG.log(Level.WARNING, "Attempting to look up workflow: [" + wInst.getWorkflow()
+ .getId()
+ + "] in populate workflows. Message: " + e.getMessage());
+ e.printStackTrace();
+ }
- }
}
+ }
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
index fa21018..a7b1e40 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
@@ -251,12 +251,12 @@ public class XmlRpcWorkflowManagerClient {
"workflowmgr.getWorkflowsByEvent", argList);
if (workflowVector != null) {
- for (Iterator i = workflowVector.iterator(); i.hasNext();) {
- Hashtable workflowHash = (Hashtable) i.next();
- Workflow w = XmlRpcStructFactory
- .getWorkflowFromXmlRpc(workflowHash);
- workflows.add(w);
- }
+ for (Object aWorkflowVector : workflowVector) {
+ Hashtable workflowHash = (Hashtable) aWorkflowVector;
+ Workflow w = XmlRpcStructFactory
+ .getWorkflowFromXmlRpc(workflowHash);
+ workflows.add(w);
+ }
}
return workflows;
@@ -560,12 +560,12 @@ public class XmlRpcWorkflowManagerClient {
if (works != null) {
workflows = new Vector(works.size());
- for (Iterator i = works.iterator(); i.hasNext();) {
- Hashtable workflw = (Hashtable) i.next();
- Workflow w = XmlRpcStructFactory
- .getWorkflowFromXmlRpc(workflw);
- workflows.add(w);
- }
+ for (Object work : works) {
+ Hashtable workflw = (Hashtable) work;
+ Workflow w = XmlRpcStructFactory
+ .getWorkflowFromXmlRpc(workflw);
+ workflows.add(w);
+ }
return workflows;
} else
@@ -628,12 +628,12 @@ public class XmlRpcWorkflowManagerClient {
"workflowmgr.getWorkflowInstancesByStatus", argList);
if (insts != null) {
instsUnpacked = new Vector(insts.size());
- for (Iterator i = insts.iterator(); i.hasNext();) {
- Hashtable hWinst = (Hashtable) i.next();
- WorkflowInstance inst = XmlRpcStructFactory
- .getWorkflowInstanceFromXmlRpc(hWinst);
- instsUnpacked.add(inst);
- }
+ for (Object inst1 : insts) {
+ Hashtable hWinst = (Hashtable) inst1;
+ WorkflowInstance inst = XmlRpcStructFactory
+ .getWorkflowInstanceFromXmlRpc(hWinst);
+ instsUnpacked.add(inst);
+ }
return instsUnpacked;
} else
return null;
@@ -657,12 +657,12 @@ public class XmlRpcWorkflowManagerClient {
argList);
if (insts != null) {
instsUnpacked = new Vector(insts.size());
- for (Iterator i = insts.iterator(); i.hasNext();) {
- Hashtable hWinst = (Hashtable) i.next();
- WorkflowInstance inst = XmlRpcStructFactory
- .getWorkflowInstanceFromXmlRpc(hWinst);
- instsUnpacked.add(inst);
- }
+ for (Object inst1 : insts) {
+ Hashtable hWinst = (Hashtable) inst1;
+ WorkflowInstance inst = XmlRpcStructFactory
+ .getWorkflowInstanceFromXmlRpc(hWinst);
+ instsUnpacked.add(inst);
+ }
return instsUnpacked;
} else
return null;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
index e3a3824..bcc61f7 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
@@ -372,11 +372,11 @@ public final class GenericWorkflowObjectFactory {
public static List copyWorkflows(List workflows){
if(workflows != null){
List newWorkflows = new Vector(workflows.size());
- for(Iterator i = workflows.iterator(); i.hasNext(); ){
- Workflow w = (Workflow)i.next();
- Workflow newWorkflow = copyWorkflow(w);
- newWorkflows.add(newWorkflow);
- }
+ for (Object workflow : workflows) {
+ Workflow w = (Workflow) workflow;
+ Workflow newWorkflow = copyWorkflow(w);
+ newWorkflows.add(newWorkflow);
+ }
return newWorkflows;
}
@@ -420,11 +420,11 @@ public final class GenericWorkflowObjectFactory {
List newTaskList = new Vector(taskList.size());
- for(Iterator i = taskList.iterator(); i.hasNext(); ){
- WorkflowTask t = (WorkflowTask)i.next();
- WorkflowTask newTask = copyTask(t);
- newTaskList.add(newTask);
- }
+ for (Object aTaskList : taskList) {
+ WorkflowTask t = (WorkflowTask) aTaskList;
+ WorkflowTask newTask = copyTask(t);
+ newTaskList.add(newTask);
+ }
return newTaskList;
}
@@ -454,11 +454,11 @@ public final class GenericWorkflowObjectFactory {
if(conditionList != null){
List newConditionList = new Vector(conditionList.size());
- for(Iterator i = conditionList.iterator(); i.hasNext(); ){
- WorkflowCondition c = (WorkflowCondition)i.next();
- WorkflowCondition newCondition = copyCondition(c);
- newConditionList.add(newCondition);
- }
+ for (Object aConditionList : conditionList) {
+ WorkflowCondition c = (WorkflowCondition) aConditionList;
+ WorkflowCondition newCondition = copyCondition(c);
+ newConditionList.add(newCondition);
+ }
return newConditionList;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
index e964ad0..1361f20 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
@@ -97,8 +97,8 @@ public class ScriptFile {
rStr += "#!" + commandShell + "\n";
- for (Iterator i = commands.iterator(); i.hasNext();) {
- String cmd = (String) i.next();
+ for (Object command : commands) {
+ String cmd = (String) command;
rStr += cmd + "\n";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
index 31f2128..cf0d706 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
@@ -180,8 +180,8 @@ public final class XmlRpcStructFactory {
List wInsts = new Vector();
if (instsVector != null && instsVector.size() > 0) {
- for (Iterator i = instsVector.iterator(); i.hasNext();) {
- Hashtable wInstHash = (Hashtable) i.next();
+ for (Object anInstsVector : instsVector) {
+ Hashtable wInstHash = (Hashtable) anInstsVector;
WorkflowInstance inst = getWorkflowInstanceFromXmlRpc(wInstHash);
wInsts.add(inst);
}
@@ -203,8 +203,8 @@ public final class XmlRpcStructFactory {
Vector instsVector = new Vector();
if (wInsts != null && wInsts.size() > 0) {
- for (Iterator i = wInsts.iterator(); i.hasNext();) {
- WorkflowInstance inst = (WorkflowInstance) i.next();
+ for (Object wInst : wInsts) {
+ WorkflowInstance inst = (WorkflowInstance) wInst;
instsVector.add(getXmlRpcWorkflowInstance(inst));
}
}
@@ -295,8 +295,8 @@ public final class XmlRpcStructFactory {
return wTasks;
}
- for (Iterator i = tasks.iterator(); i.hasNext();) {
- WorkflowTask t = (WorkflowTask) i.next();
+ for (Object task1 : tasks) {
+ WorkflowTask t = (WorkflowTask) task1;
Hashtable task = getXmlRpcWorkflowTask(t);
wTasks.add(task);
}
@@ -345,8 +345,8 @@ public final class XmlRpcStructFactory {
public static List getWorkflowTasksFromXmlRpc(Vector tsks) {
List tasks = new Vector();
- for (Iterator i = tsks.iterator(); i.hasNext();) {
- Hashtable taskHashtable = (Hashtable) i.next();
+ for (Object tsk : tsks) {
+ Hashtable taskHashtable = (Hashtable) tsk;
WorkflowTask task = getWorkflowTaskFromXmlRpc(taskHashtable);
tasks.add(task);
@@ -420,8 +420,8 @@ public final class XmlRpcStructFactory {
return wConditions;
}
- for (Iterator i = conditions.iterator(); i.hasNext();) {
- WorkflowCondition c = (WorkflowCondition) i.next();
+ for (Object condition1 : conditions) {
+ WorkflowCondition c = (WorkflowCondition) condition1;
Hashtable condition = getXmlRpcWorkflowCondition(c);
wConditions.add(condition);
}
@@ -445,8 +445,8 @@ public final class XmlRpcStructFactory {
return reqFields;
}
- for (Iterator i = fields.iterator(); i.hasNext();) {
- String reqField = (String) i.next();
+ for (Object field : fields) {
+ String reqField = (String) field;
reqFields.add(reqField);
}
@@ -468,8 +468,8 @@ public final class XmlRpcStructFactory {
return fields;
}
- for (Iterator i = metFields.iterator(); i.hasNext();) {
- String reqFieldName = (String) i.next();
+ for (Object metField : metFields) {
+ String reqFieldName = (String) metField;
fields.add(reqFieldName);
}
@@ -534,8 +534,8 @@ public final class XmlRpcStructFactory {
List conditions = new Vector();
if (conds != null && conds.size() > 0) {
- for (Iterator i = conds.iterator(); i.hasNext();) {
- Hashtable cond = (Hashtable) i.next();
+ for (Object cond1 : conds) {
+ Hashtable cond = (Hashtable) cond1;
WorkflowCondition condition = getWorkflowConditionFromXmlRpc(cond);
conditions.add(condition);
}
@@ -560,8 +560,8 @@ public final class XmlRpcStructFactory {
WorkflowTaskConfiguration config) {
Hashtable configuration = new Hashtable();
- for (Iterator i = config.getProperties().keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
+ for (Object o : config.getProperties().keySet()) {
+ String name = (String) o;
String value = (String) config.getProperties().get(name);
configuration.put(name, value);
}
@@ -582,8 +582,8 @@ public final class XmlRpcStructFactory {
Hashtable config) {
WorkflowTaskConfiguration configuration = new WorkflowTaskConfiguration();
- for (Iterator i = config.keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
+ for (Object o : config.keySet()) {
+ String name = (String) o;
String value = (String) config.get(name);
configuration.getProperties().put(name, value);
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
index 68b5b1c..4e5ef23 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
@@ -160,8 +160,8 @@ public class TestAsynchronousLocalEngineRunner 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/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
index aecdb34..36389d9 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/TestTaskRunner.java
@@ -119,8 +119,8 @@ public class TestTaskRunner 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/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
index 323e4cf..b5c6558 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
@@ -229,9 +229,8 @@ public class TestLuceneWorkflowInstanceRepository extends TestCase implements
boolean gotVal1 = false, gotVal2 = false;
- for (Iterator i = foundInst.getSharedContext().getAllMetadata(
- "TestKey1").iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (String val : foundInst.getSharedContext().getAllMetadata(
+ "TestKey1")) {
if (val.equals("TestVal1")) {
gotVal1 = true;
} else if (val.equals("TestVal2")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
index 7f1bf8d..485d61a 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
@@ -142,8 +142,7 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase {
// check key-values for key1
boolean checkVal1 = false, checkVal2 = false, checkVal3 = false;
- for (Iterator i = met.getAllMetadata("key1").iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (String val : met.getAllMetadata("key1")) {
if (val.equals("val1")) {
checkVal1 = true;
} else if (val.equals("val2")) {
@@ -158,8 +157,7 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase {
// check key-values for key2
boolean checkVal4 = false, checkVal5 = false;
- for (Iterator i = met.getAllMetadata("key2").iterator(); i.hasNext();) {
- String val = (String) i.next();
+ for (String val : met.getAllMetadata("key2")) {
if (val.equals("val4")) {
checkVal4 = true;
} else if (val.equals("val5")) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
index 240ee3a..abe299e 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
@@ -58,9 +58,7 @@ public class DatabaseTableGroup {
public List<String> getTableNames() {
List<String> names = new Vector<String>();
- for (Iterator<DatabaseTable> i = this.orderedGroup.iterator(); i
- .hasNext();) {
- DatabaseTable tbl = i.next();
+ for (DatabaseTable tbl : this.orderedGroup) {
names.add(tbl.getName());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
index b26acf4..39cbcc7 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
@@ -131,8 +131,7 @@ public class DBMSExecutor {
Metadata met = new Metadata();
- for (Iterator<String> i = map.getFieldNames().iterator(); i.hasNext();) {
- String fldName = i.next();
+ for (String fldName : map.getFieldNames()) {
MappingField fld = map.getFieldByName(fldName);
ProfileElement elem = new EnumeratedProfileElement(profile);
elem.setName(fld.getName());
@@ -142,8 +141,7 @@ public class DBMSExecutor {
elem.getValues().add(fld.getConstantValue());
} else {
String elemDbVal = rs.getString(fld.getDbName());
- for (Iterator<MappingFunc> j = fld.getFuncs().iterator(); j.hasNext();) {
- MappingFunc func = j.next();
+ for (MappingFunc func : fld.getFuncs()) {
CDEValue origVal = new CDEValue(fld.getName(), elemDbVal);
CDEValue newVal = func.translate(origVal);
elemDbVal = newVal.getVal();
@@ -154,8 +152,8 @@ public class DBMSExecutor {
} catch (SQLException e) {
e.printStackTrace();
LOG.log(Level.WARNING, "Unable to obtain field: ["
- + fld.getLocalName() + "] from result set: message: "
- + e.getMessage());
+ + fld.getLocalName() + "] from result set: message: "
+ + e.getMessage());
}
met.addMetadata(elem.getName(), (String) elem.getValues().get(0));
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
index eeb3081..03e9719 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
@@ -155,10 +155,10 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements
sqlBuf.append(" ");
if (mapping.getNumTables() > 0) {
- for (Iterator<String> i = mapping.getTableNames().iterator(); i
- .hasNext();) {
- String tableName = i.next();
- if(tableName.equals(mapping.getDefaultTable())) continue;
+ for (String tableName : mapping.getTableNames()) {
+ if (tableName.equals(mapping.getDefaultTable())) {
+ continue;
+ }
DatabaseTable tbl = mapping.getTableByName(tableName);
sqlBuf.append("INNER JOIN ");
sqlBuf.append(tbl.getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
index a49d429..a98c835 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
@@ -117,8 +117,8 @@ public class HandlerQueryParser implements ParseConstants {
Stack<QueryElement> ret = new Stack<QueryElement>();
- for (int i = 0; i < l.size(); i++) {
- ret.push(l.get(i));
+ for (QueryElement aL : l) {
+ ret.push(aL);
}
return ret;
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
index 67704cb..a882583 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
@@ -43,8 +43,7 @@ public class CDERow {
public String toString() {
StringBuilder rStr = new StringBuilder();
if (vals != null && vals.size() > 0) {
- for (Iterator<CDEValue> i = vals.iterator(); i.hasNext();) {
- CDEValue v = i.next();
+ for (CDEValue v : vals) {
rStr.append(v.getVal()).append(COL_SEPARATOR);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
----------------------------------------------------------------------
diff --git a/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java b/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
index cc2451c..906222b 100644
--- a/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
+++ b/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
@@ -107,8 +107,7 @@ public class TestXMLPSProductHandler extends TestCase {
assertEquals(1, elemNames.size()); // only 1 b/c one field is constant
boolean gotSpecCollected = false;
- for (Iterator<QueryElement> i = elemNames.iterator(); i.hasNext();) {
- QueryElement elem = i.next();
+ for (QueryElement elem : elemNames) {
if (elem.getValue().equals("specimen.specimen_collected")) {
gotSpecCollected = true;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
index 2267b92..1cce6bc 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
@@ -88,10 +88,10 @@ public class QueryResult implements Serializable, Cloneable, Documentable {
public Node toXML(Document doc) throws DOMException {
Element root = doc.createElement("queryResultSet");
- for (Iterator i = list.iterator(); i.hasNext();) {
- Result r = (Result) i.next();
- root.appendChild(r.toXML(doc));
- }
+ for (Object aList : list) {
+ Result r = (Result) aList;
+ root.appendChild(r.toXML(doc));
+ }
return root;
}
@@ -121,18 +121,18 @@ public class QueryResult implements Serializable, Cloneable, Documentable {
}
public void setRetriever(Retriever retriever) {
- for (Iterator i = list.iterator(); i.hasNext();) {
- Result r = (Result) i.next();
- r.setRetriever(retriever);
- }
+ for (Object aList : list) {
+ Result r = (Result) aList;
+ r.setRetriever(retriever);
+ }
}
public long getSize() {
long size = 0;
- for (Iterator i = list.iterator(); i.hasNext();) {
- Result r = (Result) i.next();
- size += r.getSize();
- }
+ for (Object aList : list) {
+ Result r = (Result) aList;
+ size += r.getSize();
+ }
return size;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
index afbc65d..8e4b90e 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java
@@ -87,11 +87,11 @@ public class Result implements Serializable, Cloneable, Documentable {
+ " Result.INFINITE to indicate no expiration");
if (!codecs.containsKey(mimeType))
throw new IllegalArgumentException("MIME type \"" + mimeType + "\" unknown");
- for (Iterator i = headers.iterator(); i.hasNext();) {
- Object header = i.next();
- if (!(header instanceof Header))
- throw new IllegalArgumentException("List of headers doesn't contain Header object");
+ for (Object header : headers) {
+ if (!(header instanceof Header)) {
+ throw new IllegalArgumentException("List of headers doesn't contain Header object");
}
+ }
this.id = id;
this.mimeType = mimeType;
@@ -261,10 +261,10 @@ public class Result implements Serializable, Cloneable, Documentable {
XML.add(root, "identifier", resourceID);
Element resultHeader = doc.createElement("resultHeader");
root.appendChild(resultHeader);
- for (Iterator i = headers.iterator(); i.hasNext();) {
- Header header = (Header) i.next();
- resultHeader.appendChild(header.toXML(doc));
- }
+ for (Object header1 : headers) {
+ Header header = (Header) header1;
+ resultHeader.appendChild(header.toXML(doc));
+ }
Codec codec = (Codec) codecs.get(mimeType);
if (codec == null) throw new IllegalStateException("No codec available for supposedly valid MIME type \""
+ mimeType + "\"");
@@ -394,10 +394,10 @@ public class Result implements Serializable, Cloneable, Documentable {
Properties props = new Properties();
props.load(in);
in.close();
- for (Iterator i = props.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- codecs.put(entry.getKey(), CodecFactory.createCodec((String) entry.getValue()));
- }
+ for (Map.Entry<Object, Object> objectObjectEntry : props.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ codecs.put(entry.getKey(), CodecFactory.createCodec((String) entry.getValue()));
+ }
} catch (IOException ex) {
System.err.println("I/O exception WHILE reading mime.properties: " + ex.getMessage());
ex.printStackTrace();
http://git-wip-us.apache.org/repos/asf/oodt/blob/82cc2da5/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
index 1b6710c..514b13a 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -531,12 +531,11 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
*/
private static boolean isFromToken (String s1)
{
- for (int i = 0; i < FROM_TOKENS.length; i++)
- {
- if (s1.compareTo(FROM_TOKENS[i]) == 0) {
- return true;
- }
- }
+ for (String FROM_TOKEN : FROM_TOKENS) {
+ if (s1.compareTo(FROM_TOKEN) == 0) {
+ return true;
+ }
+ }
return false;
}
@@ -714,36 +713,36 @@ public class XMLQuery implements java.io.Serializable, Cloneable {
// create and load queryStatistics
elem = doc.createElement("queryStatistics");
query.appendChild(elem);
- for (Iterator i = statistics.iterator(); i.hasNext();) {
- Statistic s = (Statistic) i.next();
- elem.appendChild(s.toXML(doc));
- }
+ for (Object statistic : statistics) {
+ Statistic s = (Statistic) statistic;
+ elem.appendChild(s.toXML(doc));
+ }
// create and load querySelectSet
elem = doc.createElement("querySelectSet");
query.appendChild(elem);
- for (Iterator i = selectElementSet.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
- elem.appendChild(queryElement.toXML(doc));
- }
+ for (Object aSelectElementSet : selectElementSet) {
+ QueryElement queryElement = (QueryElement) aSelectElementSet;
+ elem.appendChild(queryElement.toXML(doc));
+ }
// create and load queryFromSet
elem = doc.createElement("queryFromSet");
query.appendChild(elem);
- for (Iterator i = fromElementSet.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
- elem.appendChild(queryElement.toXML(doc));
- }
+ for (Object aFromElementSet : fromElementSet) {
+ QueryElement queryElement = (QueryElement) aFromElementSet;
+ elem.appendChild(queryElement.toXML(doc));
+ }
// create and load queryWhereSet
elem = doc.createElement("queryWhereSet");
query.appendChild(elem);
- for (Iterator i = whereElementSet.iterator(); i.hasNext();) {
- QueryElement queryElement = (QueryElement) i.next();
- elem.appendChild(queryElement.toXML(doc));
- }
+ for (Object aWhereElementSet : whereElementSet) {
+ QueryElement queryElement = (QueryElement) aWhereElementSet;
+ elem.appendChild(queryElement.toXML(doc));
+ }
query.appendChild(result.toXML(doc));
}