http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/tools/pdi_plugin/src/org/apache/oodt/filemgrget/OODTProcesses.java ---------------------------------------------------------------------- diff --git a/tools/pdi_plugin/src/org/apache/oodt/filemgrget/OODTProcesses.java b/tools/pdi_plugin/src/org/apache/oodt/filemgrget/OODTProcesses.java index b1b47ad..4da706f 100644 --- a/tools/pdi_plugin/src/org/apache/oodt/filemgrget/OODTProcesses.java +++ b/tools/pdi_plugin/src/org/apache/oodt/filemgrget/OODTProcesses.java @@ -61,7 +61,7 @@ public class OODTProcesses { throw new Exception("FileManager returned null product page"); } - Map<String, Map<String, String>> o = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> o = new ConcurrentHashMap<String, Map<String, String>>(); for (int pid = 0; pid < firstPage.getTotalPages(); pid++) { if (pid > 0) { @@ -70,7 +70,7 @@ public class OODTProcesses { for (Product p : firstPage.getPageProducts()) { Metadata met = client.getMetadata(p); - Map<String, String> h = new HashMap<String, String>(); + Map<String, String> h = new ConcurrentHashMap<String, String>(); h.put("name", p.getProductName()); h.put("type", p.getProductType().getName()); h.put("structure", p.getProductStructure());
http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.java ---------------------------------------------------------------------- diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.java index 5ab2a05..24cb598 100644 --- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.java +++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.java @@ -17,7 +17,7 @@ package org.apache.oodt.cas.webcomponents.curation.workbench; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -45,7 +45,7 @@ public class Workbench extends Panel { Set<String> resources = new Reflections(packageName, new ResourcesScanner()) .getResources(pattern); Set<String> filteredResources = new HashSet<String>(); - Map<String, Boolean> resMap = new HashMap<String, Boolean>(); + Map<String, Boolean> resMap = new ConcurrentHashMap<String, Boolean>(); for (String res : resources) { String resName = new File(res).getName(); if (!resMap.containsKey(resName)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java index 7e79c98..bb932b6 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java @@ -30,7 +30,7 @@ import org.apache.oodt.cas.metadata.util.PathUtils; import java.io.*; import java.net.MalformedURLException; import java.net.URL; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -137,7 +137,7 @@ public class DatasetDeliveryServlet extends HttpServlet implements + type.getName() + "]"); } - Map productHash = new HashMap(); + Map productHash = new ConcurrentHashMap(); do { for (Product product : page.getPageProducts()) { http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java index 8244333..ed0ab53 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/configurations/RdfConfiguration.java @@ -20,7 +20,7 @@ package org.apache.oodt.cas.product.jaxrs.configurations; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.Map; import org.apache.commons.lang.StringEscapeUtils; @@ -63,11 +63,11 @@ public class RdfConfiguration private static final String TYPE_VALUE = "ns"; private static final String TYPE_DEFAULT = "default"; - private Map<String, String> nsMap = new HashMap<String, String>(); - private Map<String, String> rewriteMap = new HashMap<String, String>(); - private Map<String, String> resLinkMap = new HashMap<String, String>(); - private Map<String, String> keyNsMap = new HashMap<String, String>(); - private Map<String, String> typesNsMap = new HashMap<String, String>(); + private Map<String, String> nsMap = new ConcurrentHashMap<String, String>(); + private Map<String, String> rewriteMap = new ConcurrentHashMap<String, String>(); + private Map<String, String> resLinkMap = new ConcurrentHashMap<String, String>(); + private Map<String, String> keyNsMap = new ConcurrentHashMap<String, String>(); + private Map<String, String> typesNsMap = new ConcurrentHashMap<String, String>(); private String defaultKeyNs = null; private String defaultTypeNs = null; @@ -114,7 +114,7 @@ public class RdfConfiguration private Map<String, String> readConfiguration(Element element, String outerTag, String innerTag, String key, String value) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new ConcurrentHashMap<String, String>(); Element outer = XMLUtils.getFirstElement(outerTag, element); NodeList nodeList = outer.getElementsByTagName(innerTag); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/BackwardsCompatibleInterceptor.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/BackwardsCompatibleInterceptor.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/BackwardsCompatibleInterceptor.java index c470ae5..3a6d5eb 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/BackwardsCompatibleInterceptor.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/BackwardsCompatibleInterceptor.java @@ -18,7 +18,7 @@ package org.apache.oodt.cas.product.jaxrs.filters; import java.nio.charset.Charset; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Map; @@ -60,7 +60,7 @@ public class BackwardsCompatibleInterceptor extends // Parse the query string into a map of parameters. // [Note: this will overwrite multiple parameters that have the same name.] List<NameValuePair> params = URLEncodedUtils.parse(query, Charset.forName("UTF-8")); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new ConcurrentHashMap<String, String>(); for (NameValuePair pair : params) { map.put(pair.getName(), pair.getValue()); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java index 9dc4c28..f4bf619 100755 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/servlets/CasProductJaxrsServlet.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.Enumeration; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -167,9 +167,9 @@ public class CasProductJaxrsServlet extends CXFNonSpringJaxrsServlet public void initializeConfigurations(ServletContext context) { Map<String, RdfConfiguration> rdfConfigurations = - new HashMap<String, RdfConfiguration>(); + new ConcurrentHashMap<String, RdfConfiguration>(); Map<String, RssConfiguration> rssConfigurations = - new HashMap<String, RssConfiguration>(); + new ConcurrentHashMap<String, RssConfiguration>(); Enumeration<String> enumeration = context.getInitParameterNames(); while (enumeration.hasMoreElements()) http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java index 9bf336e..57a22d8 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java @@ -19,7 +19,7 @@ package org.apache.oodt.cas.product.rdf; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.Map; /** @@ -50,11 +50,11 @@ public class RDFConfig { * Default constructor. */ public RDFConfig() { - this.nsMap = new HashMap<String, String>(); - this.rewriteMap = new HashMap<String, String>(); - this.resLinkMap = new HashMap<String, String>(); - this.keyNsMap = new HashMap<String, String>(); - this.typesNsMap = new HashMap<String, String>(); + this.nsMap = new ConcurrentHashMap<String, String>(); + this.rewriteMap = new ConcurrentHashMap<String, String>(); + this.resLinkMap = new ConcurrentHashMap<String, String>(); + this.keyNsMap = new ConcurrentHashMap<String, String>(); + this.typesNsMap = new ConcurrentHashMap<String, String>(); this.defaultKeyNs = null; this.defaultTypeNs = null; } http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java index e3d8a1a..b431da3 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java @@ -43,7 +43,7 @@ import java.net.UnknownHostException; import java.util.Date; import java.util.Iterator; import java.util.Map; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -104,7 +104,7 @@ public class IterativeWorkflowProcessorThread implements WorkflowStatus, private static Logger LOG = Logger .getLogger(IterativeWorkflowProcessorThread.class.getName()); - private Map CONDITION_CACHE = new HashMap(); + private Map CONDITION_CACHE = new ConcurrentHashMap(); /* the parent workflow manager url that executed this processor thread */ private URL wmgrParentUrl = null; @@ -510,7 +510,7 @@ public class IterativeWorkflowProcessorThread implements WorkflowStatus, // see if we've already cached this condition instance if (CONDITION_CACHE.get(taskId) != null) { - HashMap conditionMap = (HashMap) CONDITION_CACHE.get(taskId); + ConcurrentHashMap conditionMap = (ConcurrentHashMap) CONDITION_CACHE.get(taskId); /* * okay we have some conditions cached for this task, see if we have the @@ -530,7 +530,7 @@ public class IterativeWorkflowProcessorThread implements WorkflowStatus, } /* no conditions cached yet, so set everything up */ else { - HashMap conditionMap = new HashMap(); + ConcurrentHashMap conditionMap = new ConcurrentHashMap(); cInst = GenericWorkflowObjectFactory.getConditionObjectFromClassName(c .getConditionInstanceClassName()); conditionMap.put(c.getConditionId(), cInst); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java index 8e5ed4a..baf0314 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java @@ -34,7 +34,7 @@ import org.apache.oodt.commons.util.DateConvert; import java.net.URL; import java.text.ParseException; import java.util.Date; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -61,7 +61,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus private PooledExecutor pool = null; /* our worker thread hash mapping worker threads to workflow instance ids */ - private HashMap workerMap = null; + private ConcurrentHashMap workerMap = null; /* our log stream */ private static final Logger LOG = Logger @@ -116,7 +116,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus pool.setMinimumPoolSize(minPoolSize); pool.setKeepAliveTime(1000 * 60 * threadKeepAliveTime); - workerMap = new HashMap(); + workerMap = new ConcurrentHashMap(); if (resUrl != null) { rClient = new XmlRpcResourceManagerClient(resUrl); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java index dd4b9ba..aac3ab1 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java @@ -28,7 +28,7 @@ import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryExcepti import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException; //JDK imports -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Map; import java.util.Vector; @@ -62,7 +62,7 @@ public class WorkflowProcessorQueue { this.repo = repo; this.lifecycle = lifecycle; this.modelRepo = modelRepo; - this.processorCache = new HashMap<String, WorkflowProcessor>(); + this.processorCache = new ConcurrentHashMap<String, WorkflowProcessor>(); } /** http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java index 51ed79d..1a1fde4 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java @@ -26,7 +26,7 @@ import org.apache.oodt.cas.workflow.structs.WorkflowTask; import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance; import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.ExecutorService; @@ -59,7 +59,7 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase { public AsynchronousLocalEngineRunner(int numThreads) { super(); this.executor = Executors.newFixedThreadPool(numThreads); - this.workerMap = new HashMap<String, Thread>(); + this.workerMap = new ConcurrentHashMap<String, Thread>(); } /* http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/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 32d53bc..5ee9b95 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 @@ -26,7 +26,7 @@ import org.apache.oodt.commons.util.DateConvert; //JDK imports import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Date; import java.util.Arrays; @@ -47,7 +47,7 @@ public class MemoryWorkflowInstanceRepository extends AbstractPaginatibleInstanceRepository { /* our workflow instance map: maps workfllowInstId to WorkflowInstance */ - private HashMap workflowInstMap = null; + private ConcurrentHashMap workflowInstMap = null; /* our log stream */ private static final Logger LOG = Logger @@ -59,7 +59,7 @@ public class MemoryWorkflowInstanceRepository extends * </p> */ public MemoryWorkflowInstanceRepository(int pageSize) { - workflowInstMap = new HashMap(); + workflowInstMap = new ConcurrentHashMap(); this.pageSize = pageSize; } http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java index a93a619..b835163 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java @@ -44,7 +44,7 @@ import java.io.File; import java.text.ParseException; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -385,11 +385,11 @@ public class PackagedWorkflowRepository implements WorkflowRepository { } private void init() throws RepositoryException { - this.workflows = new HashMap<String, ParentChildWorkflow>(); - this.tasks = new HashMap<String, WorkflowTask>(); - this.conditions = new HashMap<String, WorkflowCondition>(); - this.eventWorkflowMap = new HashMap<String, List<ParentChildWorkflow>>(); - this.globalConfGroups = new HashMap<String, Metadata>(); + this.workflows = new ConcurrentHashMap<String, ParentChildWorkflow>(); + this.tasks = new ConcurrentHashMap<String, WorkflowTask>(); + this.conditions = new ConcurrentHashMap<String, WorkflowCondition>(); + this.eventWorkflowMap = new ConcurrentHashMap<String, List<ParentChildWorkflow>>(); + this.globalConfGroups = new ConcurrentHashMap<String, Metadata>(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder parser; http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/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 d4e2160..0b67db2 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 @@ -19,6 +19,7 @@ package org.apache.oodt.cas.workflow.repository; //OODT imports + import org.apache.oodt.cas.workflow.examples.NoOpTask; import org.apache.oodt.cas.workflow.structs.Workflow; import org.apache.oodt.cas.workflow.structs.WorkflowCondition; @@ -26,25 +27,33 @@ import org.apache.oodt.cas.workflow.structs.WorkflowTask; import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration; import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException; import org.apache.oodt.cas.workflow.util.XmlStructFactory; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -//JDK imports import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +//JDK imports + /** * @author mattmann @@ -78,16 +87,16 @@ public class XMLWorkflowRepository implements WorkflowRepository { .getName()); /* our task map */ - private static HashMap taskMap = new HashMap(); + private static ConcurrentHashMap taskMap = new ConcurrentHashMap(); /* our condition map */ - private static HashMap conditionMap = new HashMap(); + private static ConcurrentHashMap conditionMap = new ConcurrentHashMap(); /* our workflow map */ - private static HashMap workflowMap = new HashMap(); + private static ConcurrentHashMap workflowMap = new ConcurrentHashMap(); /* our event map */ - private static HashMap eventMap = new HashMap(); + private static ConcurrentHashMap eventMap = new ConcurrentHashMap(); private static FileFilter workflowXmlFilter = new FileFilter() { public boolean accept(File pathname) { http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java index da80781..f4deb7d 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java @@ -29,7 +29,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.Map; import java.util.Properties; @@ -112,7 +112,7 @@ public class TaskJobInput implements JobInput { */ public Object write() { // need to create a Map with the task metadata and the task config - Map outHash = new HashMap(); + Map outHash = new ConcurrentHashMap(); outHash.put("task.config", XmlRpcStructFactory .getXmlRpcWorkflowTaskConfiguration(this.taskConfig)); outHash.put("task.metadata", this.dynMetadata.getMap()); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java index 5e9704d..3b22d1c 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java @@ -33,7 +33,7 @@ import org.w3c.dom.Text; import java.text.ParseException; import java.util.Arrays; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Properties; import java.util.Vector; @@ -66,15 +66,15 @@ public final class XmlStructFactory { * @param node * The XML node to construct the Workflow from. * @param tasks - * The {@link HashMap} of existing {@link WorkflowTask}s. + * The {@link ConcurrentHashMap} of existing {@link WorkflowTask}s. * * @param conditions - * The {@link HashMap} of existing {@link WorkflowCondition}s. + * The {@link ConcurrentHashMap} of existing {@link WorkflowCondition}s. * * @return A new {@link Workflow} created from the XML node. */ - public static Workflow getWorkflow(Node node, HashMap tasks, - HashMap conditions) { + public static Workflow getWorkflow(Node node, ConcurrentHashMap tasks, + ConcurrentHashMap conditions) { Element workflowRoot = (Element) node; String id = workflowRoot.getAttribute("id"); @@ -100,17 +100,17 @@ public final class XmlStructFactory { /** * <p> * Constructs a new {@link WorkflowTask} from the given XML node and - * {@link HashMap} of {@link WorkflowCondition}s. + * {@link ConcurrentHashMap} of {@link WorkflowCondition}s. * </p> * * @param node * The XML node to construct the {@link WorkflowTask} from. * @param conditions - * The {@link HashMap} of {@link WorkflowCondition}s to use when + * The {@link ConcurrentHashMap} of {@link WorkflowCondition}s to use when * constructing the WorkflowTask. * @return A new {@link WorkflowTask} created from the given XML node. */ - public static WorkflowTask getWorkflowTask(Node node, HashMap conditions) { + public static WorkflowTask getWorkflowTask(Node node, ConcurrentHashMap conditions) { Element taskNode = (Element) node; String taskClassName = taskNode.getAttribute("class"); @@ -257,7 +257,7 @@ public final class XmlStructFactory { return curMetadata; } - private static List<WorkflowTask> getTasks(Element rootNode, HashMap tasks) { + private static List<WorkflowTask> getTasks(Element rootNode, ConcurrentHashMap tasks) { NodeList taskList = rootNode.getElementsByTagName("task"); List<WorkflowTask> workflowTasks = null; @@ -289,7 +289,7 @@ public final class XmlStructFactory { } private static List<WorkflowCondition> getConditions(Element rootNode, - HashMap conditions) { + ConcurrentHashMap conditions) { List<WorkflowCondition> conditionList = new Vector<WorkflowCondition>(); NodeList conditionNodes = rootNode.getElementsByTagName("condition"); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java index 1a684aa..4782e0c 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java @@ -17,8 +17,6 @@ package org.apache.oodt.cas.workflow.system; -//JDK imports - import org.apache.commons.io.FileUtils; import org.apache.oodt.cas.metadata.Metadata; @@ -32,8 +30,6 @@ import java.util.logging.Logger; import junit.framework.TestCase; -//Junit imports -//OODT imports /** * http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/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 0f92082..6a725d6 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 @@ -31,7 +31,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Map; import java.util.Vector; @@ -113,7 +113,7 @@ public class CDEResult extends Result { CDERow row = new CDERow(); ResultSetMetaData met = rs.getMetaData(); int count = met.getColumnCount(); - Map<String, CDEValue> dbValMap = new HashMap<String, CDEValue>(); + Map<String, CDEValue> dbValMap = new ConcurrentHashMap<String, CDEValue>(); Map<String, CDEValue> constValMap = cdeListToMap(this.constValues); List<CDEValue> orderedDbVals = new Vector<CDEValue>(); @@ -165,7 +165,7 @@ public class CDEResult extends Result { } private Map<String, CDEValue> cdeListToMap(List<CDEValue> vals){ - Map<String, CDEValue> map = new HashMap<String, CDEValue>(); + Map<String, CDEValue> map = new ConcurrentHashMap<String, CDEValue>(); if(vals != null){ for(CDEValue val: vals){ map.put(val.getCdeName(), val); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java index 0aedbda..658617c 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java @@ -18,7 +18,8 @@ package org.apache.oodt.xmlquery; -import java.util.*; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** A factory for codecs. * @@ -55,5 +56,5 @@ class CodecFactory { } /** Cachec codecs; the mapping is from {@link String} class name to {@link Codec} object. */ - private static Map codecs = new HashMap(); + private static Map codecs = new ConcurrentHashMap(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/fb5cd1f0/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 eee06c5..f893348 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java @@ -18,13 +18,26 @@ package org.apache.oodt.xmlquery; -import java.io.*; -import java.util.*; - -import org.apache.oodt.commons.util.*; -import org.w3c.dom.*; +import org.apache.oodt.commons.util.Documentable; +import org.apache.oodt.commons.util.XML; import org.apache.oodt.product.Retriever; + +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.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; /** A single result. * @@ -405,7 +418,7 @@ public class Result implements Serializable, Cloneable, Documentable { /** Initialize the set of valid MIME types. */ static { - codecs = new HashMap(); + codecs = new ConcurrentHashMap(); try { java.io.InputStream inp = Result.class.getResourceAsStream("mime.properties"); BufferedInputStream in = new BufferedInputStream(inp);
