Repository: oodt Updated Branches: refs/heads/master 2f1f39ed6 -> b83208af8
OODT-917 replace hashtable with its modern equivilant Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/b83208af Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/b83208af Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/b83208af Branch: refs/heads/master Commit: b83208af85f39a5b21fcfae69319ea62fb4f410f Parents: 2f1f39e Author: Tom Barber <[email protected]> Authored: Thu Nov 5 10:30:34 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Thu Nov 5 10:30:34 2015 +0000 ---------------------------------------------------------------------- .../resource/system/XmlRpcResourceManager.java | 53 +++++++++------ .../workflow/system/XmlRpcWorkflowManager.java | 71 +++++++------------- 2 files changed, 58 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/b83208af/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java index dbba32c..4a7e2da 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java @@ -41,8 +41,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collections; import java.util.Date; -import java.util.Map; +import java.util.Hashtable; import java.util.List; +import java.util.Map; import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; @@ -155,82 +156,83 @@ public class XmlRpcResourceManager { return XmlRpcStructFactory.getXmlRpcJob(spec.getJob()); } - public String handleJob(Map jobHash, Map jobIn) + + public String handleJob(Hashtable jobHash, Map jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, int jobIn) + public String handleJob(Hashtable jobHash, int jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, boolean jobIn) + public String handleJob(Hashtable jobHash, boolean jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, String jobIn) + public String handleJob(Hashtable jobHash, String jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, double jobIn) + public String handleJob(Hashtable jobHash, double jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, Date jobIn) + public String handleJob(Hashtable jobHash, Date jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, Vector jobIn) + public String handleJob(Hashtable jobHash, Vector jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public String handleJob(Map jobHash, byte[] jobIn) + public String handleJob(Hashtable jobHash, byte[] jobIn) throws SchedulerException { return genericHandleJob(jobHash, jobIn); } - public boolean handleJob(Map jobHash, Map jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, Hashtable jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, int jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, int jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, boolean jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, boolean jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, String jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, String jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, double jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, double jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, Date jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, Date jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, Vector jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, Vector jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } - public boolean handleJob(Map jobHash, byte[] jobIn, String urlStr) + public boolean handleJob(Hashtable jobHash, byte[] jobIn, String urlStr) throws JobExecutionException { return genericHandleJob(jobHash, jobIn, urlStr); } @@ -282,8 +284,11 @@ public class XmlRpcResourceManager { this.scheduler.getQueueManager().removeQueue(queueName); return true; } - - public boolean addNode(Map hashNode) throws MonitorException { + + public boolean addNode(Hashtable hashNode) throws MonitorException { + this.addNodeCore(hashNode); + } + public boolean addNodeCore(Map hashNode) throws MonitorException { this.scheduler.getMonitor().addNode(XmlRpcStructFactory.getResourceNodeFromXmlRpc(hashNode)); return true; } @@ -459,7 +464,11 @@ public class XmlRpcResourceManager { return true; } - private String genericHandleJob(Map jobHash, Object jobIn) + private String genericHandleJob(Hashtable jobHash, Object jobIn) + throws SchedulerException { + return this.genericHandleJobCore(jobHash, jobIn); + } + private String genericHandleJobCore(Map jobHash, Object jobIn) throws SchedulerException { Job exec = XmlRpcStructFactory.getJobFromXmlRpc(jobHash); @@ -485,6 +494,10 @@ public class XmlRpcResourceManager { } private boolean genericHandleJob(Map jobHash, Object jobIn, + String urlStr) throws JobExecutionException { + return this.genericHandleJobCore(jobHash,jobIn,urlStr); + } + private boolean genericHandleJobCore(Map jobHash, Object jobIn, String urlStr) throws JobExecutionException { Job exec = XmlRpcStructFactory.getJobFromXmlRpc(jobHash); JobInput in = GenericResourceManagerObjectFactory http://git-wip-us.apache.org/repos/asf/oodt/blob/b83208af/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 2d7c931..fdf58ca 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 @@ -109,7 +109,12 @@ public class XmlRpcWorkflowManager { return true; } - public String executeDynamicWorkflow(Vector<String> taskIds, Map metadata) + public String executeDynamicWorkflow(Vector<String> taskIds, Hashtable metadata) + throws RepositoryException, EngineException { + return this.executeDynamicWorkflowCore(taskIds, metadata); + } + + public String executeDynamicWorkflowCore(Vector<String> taskIds, Map metadata) throws RepositoryException, EngineException { if (taskIds == null || (taskIds.size() == 0)) { throw new RepositoryException( @@ -176,7 +181,10 @@ public class XmlRpcWorkflowManager { } } - public Map getNextPage(Map currentPage) { + public Map getNextPage(Hashtable currentPage) { + return this.getNextPageCore(currentPage); + } + public Map getNextPageCore(Map currentPage) { // first unpack current page WorkflowInstancePage currPage = XmlRpcStructFactory .getWorkflowInstancePageFromXmlRpc(currentPage); @@ -192,7 +200,11 @@ public class XmlRpcWorkflowManager { } } - public Map getPrevPage(Map currentPage) { + public Map getPrevPage(Hashtable currentPage) { + return this.getNextPageCore(currentPage); + } + + public Map getPrevPageCore(Map currentPage) { // first unpack current page WorkflowInstancePage currPage = XmlRpcStructFactory .getWorkflowInstancePageFromXmlRpc(currentPage); @@ -281,8 +293,11 @@ public class XmlRpcWorkflowManager { + " from repository: Message: " + e.getMessage()); } } - - public boolean handleEvent(String eventName, Map metadata) + public boolean handleEvent(String eventName, Hashtable metadata) + throws RepositoryException, EngineException { + return this.handleEventCore(eventName, metadata); + } + public boolean handleEventCore(String eventName, Map metadata) throws RepositoryException, EngineException { LOG.log(Level.INFO, "WorkflowManager: Received event: " + eventName); @@ -322,45 +337,6 @@ public class XmlRpcWorkflowManager { } } - public boolean handleEvent(String eventName, Hashtable metadata) - throws RepositoryException, EngineException { - LOG.log(Level.INFO, "WorkflowManager: Received event: " + eventName); - - List workflows; - - try { - workflows = repo.getWorkflowsForEvent(eventName); - } catch (Exception e) { - LOG.log(Level.SEVERE, e.getMessage()); - throw new RepositoryException( - "Exception getting workflows associated with event: " - + eventName + ": Message: " + e.getMessage()); - } - - if (workflows != null) { - 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) { - LOG.log(Level.SEVERE, e.getMessage()); - throw new EngineException( - "Engine exception when starting workflow: " - + w.getName() + ": Message: " - + e.getMessage()); - } - } - return true; - } else { - return false; - } - } public Map getWorkflowInstanceById(String wInstId) { WorkflowInstance inst; @@ -587,13 +563,16 @@ public class XmlRpcWorkflowManager { } public synchronized boolean updateMetadataForWorkflow( - String workflowInstId, Map metadata) { + String workflowInstId, Hashtable metadata) { Metadata met = new Metadata(); met.addMetadata(metadata); return this.engine.updateMetadata(workflowInstId, met); } - public synchronized boolean updateWorkflowInstance(Map workflowInst) { + public synchronized boolean updateWorkflowInstance(Hashtable workflowInst) { + return this.updateWorkflowInstanceCore(workflowInst); + } + public synchronized boolean updateWorkflowInstanceCore(Map workflowInst) { WorkflowInstance wInst = XmlRpcStructFactory .getWorkflowInstanceFromXmlRpc(workflowInst); return doUpdateWorkflowInstance(wInst);
