http://git-wip-us.apache.org/repos/asf/oodt/blob/0a3ff32c/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 164da18..5824f24 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 @@ -17,29 +17,20 @@ package org.apache.oodt.cas.workflow.system; //OODT static imports -import static org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory.getWorkflowEngineFromClassName; -import static org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory.getWorkflowRepositoryFromClassName; - -//Apache imports -import org.apache.xmlrpc.WebServer; +import com.google.common.base.Preconditions; -//OODT imports -import org.apache.oodt.cas.workflow.util.XmlRpcStructFactory; +import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory; import org.apache.oodt.cas.workflow.engine.WorkflowEngine; import org.apache.oodt.cas.workflow.repository.DataSourceWorkflowRepositoryFactory; import org.apache.oodt.cas.workflow.repository.WorkflowRepository; -import org.apache.oodt.cas.workflow.structs.Workflow; -import org.apache.oodt.cas.workflow.structs.WorkflowInstance; -import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage; -import org.apache.oodt.cas.workflow.structs.WorkflowTask; -import org.apache.oodt.cas.workflow.structs.WorkflowCondition; +import org.apache.oodt.cas.workflow.structs.*; import org.apache.oodt.cas.workflow.structs.exceptions.EngineException; import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException; import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException; -import org.apache.oodt.cas.metadata.Metadata; +import org.apache.oodt.cas.workflow.util.XmlRpcStructFactory; +import org.apache.xmlrpc.WebServer; -//JDK imports import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -48,15 +39,20 @@ import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory.getWorkflowEngineFromClassName; +import static org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory.getWorkflowRepositoryFromClassName; +//Apache imports +//OODT imports +//JDK imports //Google imports -import com.google.common.base.Preconditions; /** * An XML RPC-based Workflow manager. @@ -120,7 +116,7 @@ public class XmlRpcWorkflowManager { public String executeDynamicWorkflow(Vector<String> taskIds, Hashtable metadata) throws RepositoryException, EngineException { - if (taskIds == null || (taskIds != null && taskIds.size() == 0)) + if (taskIds == null || (taskIds.size() == 0)) throw new RepositoryException( "Must specify task identifiers to build dynamic workflows!");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0a3ff32c/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java index 1a38b06..3df9a49 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/Mapping.java @@ -64,10 +64,7 @@ public class Mapping { } public MappingField getFieldByLocalName(String localName) { - if (this.fields == null - || (this.fields != null && this.fields.keySet() == null) - || (this.fields != null && this.fields.keySet() != null && this.fields - .keySet().size() == 0)) { + if (this.fields == null || (this.fields.keySet().size() == 0)) { return null; } http://git-wip-us.apache.org/repos/asf/oodt/blob/0a3ff32c/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java index 96c30ca..345c02d 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java @@ -20,7 +20,6 @@ package org.apache.oodt.xmlps.mapping; //OODT imports import org.apache.oodt.xmlps.mapping.funcs.MappingFunc; -import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -59,7 +58,6 @@ public class MappingField { * @param scope * @param funcs * @param string - * @param appendTableName */ public MappingField(String name, FieldType type, String dbName, String tableName, String constantValue, FieldScope scope, @@ -195,34 +193,19 @@ public class MappingField { @Override public String toString() { - StringBuffer rStr = new StringBuffer("[name="); - rStr.append(this.name); - rStr.append(",dbname="); - rStr.append(this.dbName); - rStr.append(",constant_value="); - rStr.append(this.constantValue); - rStr.append(",table_name="); - rStr.append(this.tableName); - rStr.append(",scope="); - rStr.append(this.scope.equals(FieldScope.RETURN) ? "return" : "query"); - rStr.append(",type="); - rStr.append(this.type.equals(FieldType.CONSTANT) ? "constant" : "dynamic"); - rStr.append(",funcs="); - rStr.append(printClassNames(this.funcs)); - rStr.append(",string="); - rStr.append(String.valueOf(this.string)); - rStr.append("]"); - return rStr.toString(); + return "[name=" + this.name + ",dbname=" + this.dbName + ",constant_value=" + this.constantValue + ",table_name=" + + this.tableName + ",scope=" + (this.scope.equals(FieldScope.RETURN) ? "return" : "query") + ",type=" + ( + this.type.equals(FieldType.CONSTANT) ? "constant" : "dynamic") + ",funcs=" + printClassNames(this.funcs) + + ",string=" + String.valueOf(this.string) + "]"; } private String printClassNames(List<MappingFunc> funcs) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); - if (funcs == null || (funcs != null && funcs.size() == 0)) { + if (funcs == null || (funcs.size() == 0)) { return ""; } else { - for (Iterator<MappingFunc> i = funcs.iterator(); i.hasNext();) { - MappingFunc func = i.next(); + for (MappingFunc func : funcs) { buf.append(func.getClass().getName()); buf.append(","); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0a3ff32c/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java index bca4d6e..e24acd7 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java @@ -21,6 +21,7 @@ package org.apache.oodt.xmlps.mapping; import org.apache.oodt.commons.xml.XMLUtils; import org.apache.oodt.xmlps.mapping.funcs.MappingFunc; import org.apache.oodt.xmlps.util.GenericCDEObjectFactory; +import org.w3c.dom.*; import java.io.FileInputStream; import java.io.InputStream; @@ -29,12 +30,6 @@ import java.util.List; import java.util.Properties; import java.util.Vector; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - /** * * <p> @@ -83,7 +78,7 @@ public final class MappingReader implements MappingReaderMetKeys { String defaultTbl = tblsElem.getAttribute("default"); // make sure that the default attribute is set - if (defaultTbl == null || (defaultTbl != null && defaultTbl.equals(""))) { + if (defaultTbl == null || (defaultTbl.equals(""))) { throw new Exception("Unable to parse mapping XML file: [" + map.getName() + "]: reason: there needs to be a default table defined " + "by the \"default\" attribute!"); http://git-wip-us.apache.org/repos/asf/oodt/blob/0a3ff32c/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java b/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java index a8cc44d..4ec85fe 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java @@ -148,15 +148,14 @@ public class XMLPSProductHandler implements QueryHandler { protected List<QueryElement> getElemNamesFromQueryElemSet( List<QueryElement> origSet) { - if (origSet == null || (origSet != null && origSet.size() == 0)) + if (origSet == null || (origSet.size() == 0)) return Collections.emptyList(); List<QueryElement> newSet = new Vector<QueryElement>(); - for (Iterator<QueryElement> i = origSet.iterator(); i.hasNext();) { - QueryElement elem = i.next(); + for (QueryElement elem : origSet) { if (elem.getRole().equals(XMLQueryHelper.ROLE_ELEMNAME) - && !mapping.constantField(elem.getValue())) { + && !mapping.constantField(elem.getValue())) { newSet.add(elem); } @@ -169,15 +168,14 @@ public class XMLPSProductHandler implements QueryHandler { protected List<QueryElement> getConstElemNamesFromQueryElemSet( List<QueryElement> origSet) { - if (origSet == null || (origSet != null && origSet.size() == 0)) + if (origSet == null || (origSet.size() == 0)) return Collections.emptyList(); List<QueryElement> newSet = new Vector<QueryElement>(); - for (Iterator<QueryElement> i = origSet.iterator(); i.hasNext();) { - QueryElement elem = i.next(); + for (QueryElement elem : origSet) { if (elem.getRole().equals(XMLQueryHelper.ROLE_ELEMNAME) - && mapping.constantField(elem.getValue())) { + && mapping.constantField(elem.getValue())) { newSet.add(elem); } } @@ -195,7 +193,7 @@ public class XMLPSProductHandler implements QueryHandler { String querySelectNames = toSQLSelectColumns(selectNames); - StringBuffer sqlBuf = new StringBuffer("SELECT "); + StringBuilder sqlBuf = new StringBuilder("SELECT "); sqlBuf.append(querySelectNames); sqlBuf.append(" FROM "); sqlBuf.append(mapping.getDefaultTable()); @@ -258,7 +256,7 @@ public class XMLPSProductHandler implements QueryHandler { } private String toSQLSelectColumns(List<QueryElement> elems) { - if (elems == null || (elems != null && elems.size() == 0)) + if (elems == null || (elems.size() == 0)) return null; StringBuilder buf = new StringBuilder(); @@ -325,11 +323,9 @@ public class XMLPSProductHandler implements QueryHandler { + litElem.getRole() + " instead!"); } - for (Iterator<MappingFunc> j = fld.getFuncs().iterator(); j - .hasNext();) { - MappingFunc func = j.next(); + for (MappingFunc func : fld.getFuncs()) { CDEValue origVal = new CDEValue(fld.getName(), - litElem.getValue()); + litElem.getValue()); CDEValue newVal = func.inverseTranslate(origVal); litElem.setValue(newVal.getVal()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/0a3ff32c/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java index 21ba7a8..800dae7 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java @@ -95,9 +95,7 @@ public class CDEResult extends Result { CDERow row = createCDERow(); if (mapping != null) applyMappingFuncs(row); - if (this.constValues != null && - ((this.orderedFields == null) || - (this.orderedFields != null && this.orderedFields.size() == 0))){ + if (this.constValues != null && ((this.orderedFields == null) || (this.orderedFields.size() == 0))){ addConstValues(row); } // if there is some kind of configurable response writer,
