http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 020b489..913d49f 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 @@ -41,7 +41,7 @@ import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; -import java.util.Hashtable; +import java.util.Map; import java.util.List; import java.util.Vector; import java.util.logging.Level; @@ -108,7 +108,7 @@ public class XmlRpcWorkflowManager { return true; } - public String executeDynamicWorkflow(Vector<String> taskIds, Hashtable metadata) + public String executeDynamicWorkflow(Vector<String> taskIds, Map metadata) throws RepositoryException, EngineException { if (taskIds == null || (taskIds.size() == 0)) { throw new RepositoryException( @@ -162,7 +162,7 @@ public class XmlRpcWorkflowManager { } - public Hashtable getFirstPage() { + public Map getFirstPage() { WorkflowInstancePage page = engine.getInstanceRepository() .getFirstPage(); if (page != null) { @@ -175,7 +175,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getNextPage(Hashtable currentPage) { + public Map getNextPage(Map currentPage) { // first unpack current page WorkflowInstancePage currPage = XmlRpcStructFactory .getWorkflowInstancePageFromXmlRpc(currentPage); @@ -191,7 +191,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getPrevPage(Hashtable currentPage) { + public Map getPrevPage(Map currentPage) { // first unpack current page WorkflowInstancePage currPage = XmlRpcStructFactory .getWorkflowInstancePageFromXmlRpc(currentPage); @@ -207,7 +207,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getLastPage() { + public Map getLastPage() { WorkflowInstancePage page = engine.getInstanceRepository() .getLastPage(); if (page != null) { @@ -220,7 +220,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable paginateWorkflowInstances(int pageNum, String status) + public Map paginateWorkflowInstances(int pageNum, String status) throws InstanceRepositoryException { WorkflowInstancePage page = engine.getInstanceRepository() .getPagedWorkflows(pageNum, status); @@ -235,7 +235,7 @@ public class XmlRpcWorkflowManager { } - public Hashtable paginateWorkflowInstances(int pageNum) + public Map paginateWorkflowInstances(int pageNum) throws InstanceRepositoryException { WorkflowInstancePage page = engine.getInstanceRepository() .getPagedWorkflows(pageNum); @@ -249,9 +249,9 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getWorkflowInstanceMetadata(String wInstId) { + public Map getWorkflowInstanceMetadata(String wInstId) { Metadata met = engine.getWorkflowInstanceMetadata(wInstId); - return met.getHashtable(); + return met.getMap(); } public Vector getWorkflowsByEvent(String eventName) @@ -265,7 +265,7 @@ public class XmlRpcWorkflowManager { if (workflows != null) { for (Object workflow1 : workflows) { Workflow w = (Workflow) workflow1; - Hashtable workflow = XmlRpcStructFactory + Map workflow = XmlRpcStructFactory .getXmlRpcWorkflow(w); workflowList.add(workflow); } @@ -281,7 +281,7 @@ public class XmlRpcWorkflowManager { } } - public boolean handleEvent(String eventName, Hashtable metadata) + public boolean handleEvent(String eventName, Map metadata) throws RepositoryException, EngineException { LOG.log(Level.INFO, "WorkflowManager: Received event: " + eventName); @@ -321,7 +321,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getWorkflowInstanceById(String wInstId) { + public Map getWorkflowInstanceById(String wInstId) { WorkflowInstance inst; try { @@ -409,7 +409,7 @@ public class XmlRpcWorkflowManager { repo.addWorkflow(wDesc); } wInst.setWorkflow(wDesc); - Hashtable workflowInstance = XmlRpcStructFactory + Map workflowInstance = XmlRpcStructFactory .getXmlRpcWorkflowInstance(wInst); workflowInstances.add(workflowInstance); } @@ -462,7 +462,7 @@ public class XmlRpcWorkflowManager { // here, bad // design wInst.setWorkflow(wDesc); - Hashtable workflowInstance = XmlRpcStructFactory + Map workflowInstance = XmlRpcStructFactory .getXmlRpcWorkflowInstance(wInst); workflowInstances.add(workflowInstance); } @@ -489,7 +489,7 @@ public class XmlRpcWorkflowManager { try { for (Object aWorkflowList : workflowList) { Workflow w = (Workflow) aWorkflowList; - Hashtable workflow = XmlRpcStructFactory + Map workflow = XmlRpcStructFactory .getXmlRpcWorkflow(w); workflows.add(workflow); } @@ -508,7 +508,7 @@ public class XmlRpcWorkflowManager { } - public Hashtable getTaskById(String taskId) throws RepositoryException { + public Map getTaskById(String taskId) throws RepositoryException { try { WorkflowTask t = repo.getWorkflowTaskById(taskId); return XmlRpcStructFactory.getXmlRpcWorkflowTask(t); @@ -520,7 +520,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getConditionById(String conditionId) + public Map getConditionById(String conditionId) throws RepositoryException { try { WorkflowCondition c = repo.getWorkflowConditionById(conditionId); @@ -533,7 +533,7 @@ public class XmlRpcWorkflowManager { } } - public Hashtable getWorkflowById(String workflowId) + public Map getWorkflowById(String workflowId) throws RepositoryException { try { Workflow workflow = repo.getWorkflowById(workflowId); @@ -547,13 +547,13 @@ public class XmlRpcWorkflowManager { } public synchronized boolean updateMetadataForWorkflow( - String workflowInstId, Hashtable metadata) { + String workflowInstId, Map metadata) { Metadata met = new Metadata(); met.addMetadata(metadata); return this.engine.updateMetadata(workflowInstId, met); } - public synchronized boolean updateWorkflowInstance(Hashtable workflowInst) { + public synchronized boolean updateWorkflowInstance(Map workflowInst) { WorkflowInstance wInst = XmlRpcStructFactory .getWorkflowInstanceFromXmlRpc(workflowInst); return doUpdateWorkflowInstance(wInst);
http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 c208ec8..388a572 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 @@ -34,7 +34,7 @@ import org.apache.xmlrpc.XmlRpcException; import java.io.IOException; import java.net.URL; -import java.util.Hashtable; +import java.util.Map; import java.util.List; import java.util.Vector; import java.util.logging.Level; @@ -93,7 +93,7 @@ public class XmlRpcWorkflowManagerClient { String instId; argList.add(taskIdVector); - argList.add(metadata.getHashtable()); + argList.add(metadata.getMap()); instId = (String) client.execute("workflowmgr.executeDynamicWorkflow", argList); @@ -113,9 +113,9 @@ public class XmlRpcWorkflowManagerClient { public WorkflowInstancePage getFirstPage() throws XmlRpcException, IOException { Vector argList = new Vector(); - Hashtable pageHash; + Map pageHash; - pageHash = (Hashtable) client.execute("workflowmgr.getFirstPage", + pageHash = (Map) client.execute("workflowmgr.getFirstPage", argList); return XmlRpcStructFactory.getWorkflowInstancePageFromXmlRpc(pageHash); @@ -126,9 +126,9 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(XmlRpcStructFactory .getXmlRpcWorkflowInstancePage(currentPage)); - Hashtable pageHash; + Map pageHash; - pageHash = (Hashtable) client.execute("workflowmgr.getNextPage", + pageHash = (Map) client.execute("workflowmgr.getNextPage", argList); @@ -140,10 +140,10 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(XmlRpcStructFactory .getXmlRpcWorkflowInstancePage(currentPage)); - Hashtable pageHash; + Map pageHash; try { - pageHash = (Hashtable) client.execute("workflowmgr.getPrevPage", + pageHash = (Map) client.execute("workflowmgr.getPrevPage", argList); } catch (XmlRpcException e) { LOG.log(Level.SEVERE, e.getMessage()); @@ -157,9 +157,9 @@ public class XmlRpcWorkflowManagerClient { public WorkflowInstancePage getLastPage() throws XmlRpcException, IOException { Vector argList = new Vector(); - Hashtable pageHash; + Map pageHash; - pageHash = (Hashtable) client.execute("workflowmgr.getLastPage", + pageHash = (Map) client.execute("workflowmgr.getLastPage", argList); @@ -171,9 +171,9 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(pageNum); argList.add(status); - Hashtable pageHash; + Map pageHash; - pageHash = (Hashtable) client.execute( + pageHash = (Map) client.execute( "workflowmgr.paginateWorkflowInstances", argList); @@ -184,9 +184,9 @@ public class XmlRpcWorkflowManagerClient { throws XmlRpcException, IOException { Vector argList = new Vector(); argList.add(pageNum); - Hashtable pageHash; + Map pageHash; - pageHash = (Hashtable) client.execute( + pageHash = (Map) client.execute( "workflowmgr.paginateWorkflowInstances", argList); @@ -205,7 +205,7 @@ public class XmlRpcWorkflowManagerClient { if (workflowVector != null) { for (Object aWorkflowVector : workflowVector) { - Hashtable workflowHash = (Hashtable) aWorkflowVector; + Map workflowHash = (Map) aWorkflowVector; Workflow w = XmlRpcStructFactory .getWorkflowFromXmlRpc(workflowHash); workflows.add(w); @@ -221,7 +221,7 @@ public class XmlRpcWorkflowManagerClient { argList.add(wInstId); Metadata met; - Hashtable instMetHash = (Hashtable) client.execute( + Map instMetHash = (Map) client.execute( "workflowmgr.getWorkflowInstanceMetadata", argList); met = new Metadata(); met.addMetadata(instMetHash); @@ -333,7 +333,7 @@ public class XmlRpcWorkflowManagerClient { String workflowInstId, Metadata metadata) throws XmlRpcException, IOException { Vector argList = new Vector(); argList.add(workflowInstId); - argList.add(metadata.getHashtable()); + argList.add(metadata.getMap()); return (Boolean) client.execute( "workflowmgr.updateMetadataForWorkflow", argList); @@ -345,7 +345,7 @@ public class XmlRpcWorkflowManagerClient { throws XmlRpcException, IOException { Vector argList = new Vector(); argList.add(eventName); - argList.add(metadata.getHashtable()); + argList.add(metadata.getMap()); return (Boolean) client .execute("workflowmgr.handleEvent", argList); @@ -356,7 +356,7 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(taskId); - Hashtable t = (Hashtable) client.execute("workflowmgr.getTaskById", + Map t = (Map) client.execute("workflowmgr.getTaskById", argList); return XmlRpcStructFactory.getWorkflowTaskFromXmlRpc(t); @@ -367,7 +367,7 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(conditionId); - Hashtable c = (Hashtable) client.execute( + Map c = (Map) client.execute( "workflowmgr.getConditionById", argList); return XmlRpcStructFactory.getWorkflowConditionFromXmlRpc(c); @@ -378,7 +378,7 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(wInstId); - Hashtable workflowInstance = (Hashtable) client.execute( + Map workflowInstance = (Map) client.execute( "workflowmgr.getWorkflowInstanceById", argList); return XmlRpcStructFactory .getWorkflowInstanceFromXmlRpc(workflowInstance); @@ -389,7 +389,7 @@ public class XmlRpcWorkflowManagerClient { Vector argList = new Vector(); argList.add(workflowId); - Hashtable workflow = (Hashtable) client.execute( + Map workflow = (Map) client.execute( "workflowmgr.getWorkflowById", argList); return XmlRpcStructFactory.getWorkflowFromXmlRpc(workflow); @@ -407,7 +407,7 @@ public class XmlRpcWorkflowManagerClient { workflows = new Vector(works.size()); for (Object work : works) { - Hashtable workflw = (Hashtable) work; + Map workflw = (Map) work; Workflow w = XmlRpcStructFactory .getWorkflowFromXmlRpc(workflw); workflows.add(w); @@ -455,7 +455,7 @@ public class XmlRpcWorkflowManagerClient { if (insts != null) { instsUnpacked = new Vector(insts.size()); for (Object inst1 : insts) { - Hashtable hWinst = (Hashtable) inst1; + Map hWinst = (Map) inst1; WorkflowInstance inst = XmlRpcStructFactory .getWorkflowInstanceFromXmlRpc(hWinst); instsUnpacked.add(inst); @@ -478,7 +478,7 @@ public class XmlRpcWorkflowManagerClient { if (insts != null) { instsUnpacked = new Vector(insts.size()); for (Object inst1 : insts) { - Hashtable hWinst = (Hashtable) inst1; + Map hWinst = (Map) inst1; WorkflowInstance inst = XmlRpcStructFactory .getWorkflowInstanceFromXmlRpc(hWinst); instsUnpacked.add(inst); http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 00245d1..7b72996 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 @@ -18,21 +18,24 @@ package org.apache.oodt.cas.workflow.util; //JDK imports -import java.util.List; -import java.util.Hashtable; -import java.util.Set; -import java.util.Vector; -//OODT imports import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.workflow.structs.Priority; import org.apache.oodt.cas.workflow.structs.Workflow; +import org.apache.oodt.cas.workflow.structs.WorkflowCondition; import org.apache.oodt.cas.workflow.structs.WorkflowConditionConfiguration; +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.WorkflowTaskConfiguration; -import org.apache.oodt.cas.workflow.structs.WorkflowCondition; -import org.apache.oodt.cas.workflow.structs.WorkflowInstance; + +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Vector; + +//OODT imports /** * @@ -83,7 +86,7 @@ public final class XmlRpcStructFactory { * {@link Hashtable} provided represents. */ public static WorkflowInstancePage getWorkflowInstancePageFromXmlRpc( - Hashtable pageHash) { + Map pageHash) { WorkflowInstancePage page = new WorkflowInstancePage(); page.setPageNum(Integer.parseInt((String) pageHash.get("pageNum"))); page.setPageSize(Integer.parseInt((String) pageHash.get("pageSize"))); @@ -127,7 +130,7 @@ public final class XmlRpcStructFactory { .getCurrentTaskEndDateTimeIsoStr() : ""); workflowInstance.put("sharedContext", wInst.getSharedContext() != null ? wInst.getSharedContext() - .getHashtable() : new Hashtable()); + .getMap() : new Hashtable()); workflowInstance.put( "priority", wInst.getPriority() != null ? String.valueOf(wInst.getPriority() @@ -136,7 +139,7 @@ public final class XmlRpcStructFactory { } public static WorkflowInstance getWorkflowInstanceFromXmlRpc( - Hashtable workflowInstance) { + Map workflowInstance) { WorkflowInstance wInst = new WorkflowInstance(); wInst.setCurrentTaskId((String) workflowInstance.get("current_task_id")); wInst.setStatus((String) workflowInstance.get("status")); @@ -237,7 +240,7 @@ public final class XmlRpcStructFactory { * The Hashtable to obtain a Workflow from. * @return a {@link Workflow} from the XML-RPC {@link Hashtable} version. */ - public static Workflow getWorkflowFromXmlRpc(Hashtable w) { + public static Workflow getWorkflowFromXmlRpc(Map w) { Workflow workflow = new Workflow(); workflow.setName((String) w.get("name")); workflow.setId((String) w.get("id")); @@ -311,7 +314,7 @@ public final class XmlRpcStructFactory { * @return a {@link WorkflowTask} from an XML-RPC {@link Hashtable} sent over * the wire. */ - public static WorkflowTask getWorkflowTaskFromXmlRpc(Hashtable task) { + public static WorkflowTask getWorkflowTaskFromXmlRpc(Map task) { WorkflowTask t = new WorkflowTask(); t.setTaskInstanceClassName((String) task.get("class")); t.setTaskId((String) task.get("id")); @@ -481,7 +484,7 @@ public final class XmlRpcStructFactory { * The Hashtable to turn into a real WorkflowCondition. * @return a {@link WorkflowCondition} from an XML-RPC {@link Hashtable}. */ - public static WorkflowCondition getWorkflowConditionFromXmlRpc(Hashtable cond) { + public static WorkflowCondition getWorkflowConditionFromXmlRpc(Map cond) { WorkflowCondition condition = new WorkflowCondition(); condition.setConditionInstanceClassName((String) cond.get("class")); condition.setConditionId((String) cond.get("id")); @@ -545,7 +548,7 @@ public final class XmlRpcStructFactory { * Gets a {@link Hashtable} representation of the passed in * {@link WorkflowTaskConfiguration}'s {@link Properties} to be sent across * the XML-RPC wire. - * </p> + * </p>t * * @param config * The WorkflowTaskConfiguration to convert to a Hashtable. @@ -575,7 +578,7 @@ public final class XmlRpcStructFactory { * {@link Hashtable}. */ public static WorkflowTaskConfiguration getWorkflowTaskConfigurationFromXmlRpc( - Hashtable config) { + Map config) { WorkflowTaskConfiguration configuration = new WorkflowTaskConfiguration(); for (Object o : config.keySet()) { http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 aaf290b..19147a8 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 @@ -219,8 +219,8 @@ public class TestLuceneWorkflowInstanceRepository extends TestCase implements assertNotNull(foundInst); assertEquals(foundInst.getId(), wInstId); assertNotNull(foundInst.getSharedContext()); - assertNotNull(foundInst.getSharedContext().getHashtable()); - assertEquals(2, foundInst.getSharedContext().getHashtable().keySet() + assertNotNull(foundInst.getSharedContext().getMap()); + assertEquals(2, foundInst.getSharedContext().getMap().keySet() .size()); assertNotNull(foundInst.getSharedContext().getAllMetadata("TestKey1")); assertEquals(2, foundInst.getSharedContext().getAllMetadata("TestKey1") http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/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 b5c8bb2..95aae66 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 @@ -131,8 +131,8 @@ public class TestXmlRpcWorkflowManagerClient extends TestCase { met = WInst.getSharedContext(); assertNotNull(met); - assertNotNull(met.getHashtable()); - assertEquals(2, met.getHashtable().keySet().size()); + assertNotNull(met.getMap()); + assertEquals(2, met.getMap().keySet().size()); assertNotNull(met.getAllMetadata("key1")); assertEquals(3, met.getAllMetadata("key1").size()); assertNotNull(met.getAllMetadata("key2")); http://git-wip-us.apache.org/repos/asf/oodt/blob/e43e8f07/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java index e6407ef..8505cbe 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java @@ -18,16 +18,18 @@ package org.apache.oodt.xmlquery; -import java.io.Serializable; -import java.net.URI; import org.apache.oodt.commons.util.Documentable; import org.apache.oodt.commons.util.XML; + import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import java.io.Serializable; +import java.net.URI; + /** Header of a query * * @author Kelly @@ -88,9 +90,7 @@ public class QueryHeader implements Serializable, Cloneable, Documentable { } else if ("querySecurityType".equals(child.getNodeName())) { securityType = XML.unwrappedText(child); } else if ("queryParentId".equals(child.getNodeName())) { - ; // ignore } else if ("queryChildId".equals(child.getNodeName())) { - ; // ignore } else if ("queryRevisionNote".equals(child.getNodeName())) { revisionNote = XML.unwrappedText(child); } else if ("queryDataDictId".equals(child.getNodeName())) {
