You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2007/10/18 06:09:51 UTC
svn commit: r585852 - in
/ofbiz/trunk/framework/service/src/org/ofbiz/service: ./ eca/ engine/
group/ jms/ job/ rmi/
Author: doogie
Date: Wed Oct 17 21:09:50 2007
New Revision: 585852
URL: http://svn.apache.org/viewvc?rev=585852&view=rev
Log:
Switch from HashMap to FastMap.
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/ExampleRemoteClient.java
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Wed Oct 17 21:09:50 2007
@@ -749,7 +749,7 @@
* @param locale Locale to use to do some type conversion
*/
public Map makeValid(Map source, String mode, boolean includeInternal, List errorMessages, TimeZone timeZone, Locale locale) {
- Map target = new HashMap();
+ Map target = FastMap.newInstance();
if (source == null) {
return target;
@@ -828,7 +828,7 @@
}
private Map makePrefixMap(Map source, ModelParam param) {
- Map paramMap = new HashMap();
+ Map paramMap = FastMap.newInstance();
Set sourceSet = source.keySet();
Iterator i = sourceSet.iterator();
while (i.hasNext()) {
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Wed Oct 17 21:09:50 2007
@@ -21,6 +21,8 @@
import java.util.*;
import javax.transaction.xa.XAException;
+import javolution.util.FastMap;
+
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
@@ -117,7 +119,7 @@
if (resultMapName != null && resultMapName.length() > 0) {
Map resultMap = (Map) context.get(resultMapName);
if (resultMap == null) {
- resultMap = new HashMap();
+ resultMap = FastMap.newInstance();
}
resultMap.putAll(dctx.getModelService(this.serviceName).makeValid(actionResult, ModelService.OUT_PARAM, false, null));
context.put(resultMapName, resultMap);
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java Wed Oct 17 21:09:50 2007
@@ -18,7 +18,6 @@
*******************************************************************************/
package org.ofbiz.service.eca;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -103,7 +102,7 @@
List rules = null;
if (eventMap == null) {
- eventMap = new HashMap();
+ eventMap = FastMap.newInstance();
rules = new LinkedList();
ecaCache.put(serviceName, eventMap);
eventMap.put(eventName, rules);
@@ -146,7 +145,7 @@
}
public static void evalRules(String serviceName, Map eventMap, String event, DispatchContext dctx, Map context, Map result, boolean isError, boolean isFailure) throws GenericServiceException {
- // if the eventMap is passed we save a HashMap lookup, but if not that's okay we'll just look it up now
+ // if the eventMap is passed we save a Map lookup, but if not that's okay we'll just look it up now
if (eventMap == null) eventMap = getServiceEventMap(serviceName);
if (eventMap == null || eventMap.size() == 0) {
return;
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java Wed Oct 17 21:09:50 2007
@@ -19,9 +19,10 @@
package org.ofbiz.service.engine;
import java.lang.reflect.Constructor;
-import java.util.HashMap;
import java.util.Map;
+import javolution.util.FastMap;
+
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ServiceDispatcher;
@@ -39,7 +40,7 @@
public GenericEngineFactory(ServiceDispatcher dispatcher) {
this.dispatcher = dispatcher;
- engines = new HashMap();
+ engines = FastMap.newInstance();
}
/**
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Wed Oct 17 21:09:50 2007
@@ -20,12 +20,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javolution.util.FastMap;
+
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.HttpClient;
import org.ofbiz.base.util.HttpClientException;
@@ -63,7 +64,7 @@
throw new GenericServiceException("Cannot serialize context.", e);
}
- Map parameters = new HashMap();
+ Map parameters = FastMap.newInstance();
parameters.put("serviceName", modelService.invoke);
if (xmlContext != null)
parameters.put("serviceContext", xmlContext);
@@ -111,7 +112,7 @@
String serviceMode = request.getParameter("serviceMode");
String xmlContext = request.getParameter("serviceContext");
- Map result = new HashMap();
+ Map result = FastMap.newInstance();
Map context = null;
if (serviceName == null)
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java Wed Oct 17 21:09:50 2007
@@ -18,9 +18,10 @@
*******************************************************************************/
package org.ofbiz.service.engine;
-import java.util.HashMap;
import java.util.Map;
+import javolution.util.FastMap;
+
import org.ofbiz.service.GenericRequester;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelService;
@@ -51,7 +52,7 @@
* @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, org.ofbiz.service.GenericRequester, boolean)
*/
public void runAsync(String localName, ModelService modelService, Map context, GenericRequester requester, boolean persist) throws GenericServiceException {
- requester.receiveResult(new HashMap());
+ requester.receiveResult(FastMap.newInstance());
}
/**
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Wed Oct 17 21:09:50 2007
@@ -21,7 +21,6 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -30,6 +29,8 @@
import javax.xml.rpc.ParameterMode;
import javax.xml.rpc.ServiceException;
+import javolution.util.FastMap;
+
import org.apache.axis.Message;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
@@ -71,7 +72,7 @@
if (result == null)
throw new GenericServiceException("Service did not return expected result");
if (!(result instanceof Map)) {
- Map newResult = new HashMap();
+ Map newResult = FastMap.newInstance();
newResult.put("result", result);
return newResult;
@@ -159,7 +160,7 @@
}
private Map getResponseParams(Message respMessage) {
- Map mRet = new HashMap();
+ Map mRet = FastMap.newInstance();
try {
SOAPEnvelope resEnv = respMessage.getSOAPEnvelope();
List bodies = resEnv.getBodyElements();
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java Wed Oct 17 21:09:50 2007
@@ -18,13 +18,15 @@
*******************************************************************************/
package org.ofbiz.service.group;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javolution.util.FastMap;
+
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ServiceDispatcher;
@@ -136,7 +138,7 @@
} else if (this.getSendMode().equals("first-available")) {
return runOne(dispatcher, localName, context);
} else if (this.getSendMode().equals("none")) {
- return new HashMap();
+ return FastMap.newInstance();
} else {
throw new GenericServiceException("This mode is not currently supported");
}
@@ -156,8 +158,8 @@
}
private Map runAll(ServiceDispatcher dispatcher, String localName, Map context) throws GenericServiceException {
- Map runContext = new HashMap(context);
- Map result = new HashMap();
+ Map runContext = UtilMisc.makeMapWritable(context);
+ Map result = FastMap.newInstance();
Iterator i = services.iterator();
while (i.hasNext()) {
GroupServiceModel model = (GroupServiceModel) i.next();
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java Wed Oct 17 21:09:50 2007
@@ -18,10 +18,11 @@
*******************************************************************************/
package org.ofbiz.service.group;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javolution.util.FastMap;
+
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelService;
@@ -116,7 +117,7 @@
return dispatcher.runSync(localName, model, thisContext);
} else {
dispatcher.runAsync(localName, model, thisContext, false);
- return new HashMap();
+ return FastMap.newInstance();
}
} else {
return dispatcher.runSync(localName, model, thisContext);
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Wed Oct 17 21:09:50 2007
@@ -19,16 +19,18 @@
package org.ofbiz.service.jms;
import java.lang.reflect.Constructor;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import javolution.util.FastMap;
+
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ServiceDispatcher;
import org.ofbiz.service.config.ServiceConfigUtil;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilXml;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -43,8 +45,8 @@
public static final String TOPIC_LISTENER_CLASS = "org.ofbiz.service.jms.JmsTopicListener";
public static final String QUEUE_LISTENER_CLASS = "org.ofbiz.service.jms.JmsQueueListener";
- protected static Map listeners = new HashMap();
- protected static Map servers = new HashMap();
+ protected static Map listeners = FastMap.newInstance();
+ protected static Map servers = FastMap.newInstance();
protected ServiceDispatcher dispatcher;
protected boolean firstPass = true;
@@ -226,7 +228,7 @@
* @return Map of JMS Listeners
*/
public Map getJMSListeners() {
- return new HashMap(listeners);
+ return UtilMisc.makeMapWritable(listeners);
}
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java Wed Oct 17 21:09:50 2007
@@ -19,7 +19,6 @@
package org.ofbiz.service.jms;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -45,6 +44,8 @@
import javax.naming.NamingException;
import javax.transaction.xa.XAResource;
+import javolution.util.FastMap;
+
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -318,7 +319,7 @@
Element serviceElement = getServiceElement(modelService);
List serverList = serverList(serviceElement);
- Map result = new HashMap();
+ Map result = FastMap.newInstance();
Iterator i = serverList.iterator();
while (i.hasNext()) {
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java Wed Oct 17 21:09:50 2007
@@ -20,6 +20,8 @@
import java.util.*;
+import javolution.util.FastMap;
+
import org.ofbiz.service.config.ServiceConfigUtil;
import org.ofbiz.base.util.Debug;
@@ -121,7 +123,7 @@
Iterator i = this.pool.iterator();
while (i.hasNext()) {
JobInvoker invoker = (JobInvoker) i.next();
- Map stateMap = new HashMap();
+ Map stateMap = FastMap.newInstance();
stateMap.put("threadName", invoker.getName());
stateMap.put("jobName", invoker.getJobName());
stateMap.put("serviceName", invoker.getServiceName());
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Wed Oct 17 21:09:50 2007
@@ -22,11 +22,12 @@
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
+import javolution.util.FastMap;
+
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
@@ -239,7 +240,7 @@
}
if (context == null) {
- context = new HashMap();
+ context = FastMap.newInstance();
}
// check the runAsUser
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/ExampleRemoteClient.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/ExampleRemoteClient.java?rev=585852&r1=585851&r2=585852&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/ExampleRemoteClient.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/ExampleRemoteClient.java Wed Oct 17 21:09:50 2007
@@ -23,7 +23,8 @@
import java.rmi.RemoteException;
import java.net.MalformedURLException;
import java.util.Map;
-import java.util.HashMap;
+
+import javolution.util.FastMap;
import org.ofbiz.service.rmi.RemoteDispatcher;
import org.ofbiz.service.GenericServiceException;
@@ -61,7 +62,7 @@
}
public Map runTestService() throws RemoteException, GenericServiceException {
- Map context = new HashMap();
+ Map context = FastMap.newInstance();
context.put("message", "Remote Service Test");
return rd.runSync("testScv", context);
}