You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/03 07:54:24 UTC
svn commit: r1636282 [12/20] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/content/config/ applications/content/data/
applications/humanres/src/org/ofbiz/humanres/
applications/humanres/webapp/humanres/WEB-INF/ applica...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Mon Nov 3 06:54:16 2014
@@ -20,7 +20,11 @@ package org.ofbiz.entityext.permission;
import static org.ofbiz.base.util.UtilGenerics.checkList;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -29,10 +33,6 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-import javolution.util.FastSet;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilMisc;
@@ -47,6 +47,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.model.ModelEntity;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.security.Security;
import org.ofbiz.service.ServiceUtil;
@@ -95,7 +96,7 @@ public class EntityPermissionChecker {
if (UtilValidate.isNotEmpty(targetOperationString)) {
List<String> operationsFromString = StringUtil.split(targetOperationString, "|");
if (targetOperationList == null) {
- targetOperationList = FastList.newInstance();
+ targetOperationList = new ArrayList<String>();
}
targetOperationList.addAll(operationsFromString);
}
@@ -111,7 +112,7 @@ public class EntityPermissionChecker {
if (UtilValidate.isNotEmpty(idString)) {
entityIdList = StringUtil.split(idString, "|");
} else {
- entityIdList = FastList.newInstance();
+ entityIdList = new LinkedList<String>();
}
String entityName = entityNameExdr.expandString(context);
HttpServletRequest request = (HttpServletRequest)context.get("request");
@@ -178,13 +179,13 @@ public class EntityPermissionChecker {
Security security, String entityAction,
String privilegeEnumId, String quickCheckContentId) {
- List<Object> entityIds = FastList.newInstance();
+ List<Object> entityIds = new LinkedList<Object>();
if (content != null) entityIds.add(content);
if (UtilValidate.isNotEmpty(quickCheckContentId)) {
List<String> quickList = StringUtil.split(quickCheckContentId, "|");
if (UtilValidate.isNotEmpty(quickList)) entityIds.addAll(quickList);
}
- Map<String, Object> results = FastMap.newInstance();
+ Map<String, Object> results = new HashMap<String, Object>();
boolean passed = false;
if (userLogin != null && entityAction != null) {
passed = security.hasEntityPermission("CONTENTMGR", entityAction, userLogin);
@@ -267,7 +268,7 @@ public class EntityPermissionChecker {
EntityCondition opCond = EntityCondition.makeCondition(lcEntityName + "OperationId", EntityOperator.IN, targetOperationList);
List<GenericValue> targetOperationEntityList = delegator.findList(modelOperationEntity.getEntityName(), opCond, null, null, null, true);
- Map<String, GenericValue> entities = FastMap.newInstance();
+ Map<String, GenericValue> entities = new HashMap<String, GenericValue>();
String pkFieldName = modelEntity.getFirstPkFieldName();
//TODO: privilegeEnumId test
@@ -276,7 +277,7 @@ public class EntityPermissionChecker {
int privilegeEnumSeq = -1;
if (UtilValidate.isNotEmpty(privilegeEnumId)) {
- GenericValue privEnum = delegator.findOne("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId), true);
+ GenericValue privEnum = EntityQuery.use(delegator).from("Enumeration").where("enumId", privilegeEnumId).cache().queryOne();
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
try {
@@ -296,7 +297,7 @@ public class EntityPermissionChecker {
String targetPrivilegeEnumId = entity.getString("privilegeEnumId");
if (UtilValidate.isNotEmpty(targetPrivilegeEnumId)) {
int targetPrivilegeEnumSeq = -1;
- GenericValue privEnum = delegator.findOne("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId), true);
+ GenericValue privEnum = EntityQuery.use(delegator).from("Enumeration").where("enumId", privilegeEnumId).cache().queryOne();
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
try {
@@ -318,8 +319,8 @@ public class EntityPermissionChecker {
// Note that "quickCheck" id come first in the list
// Check with no roles or purposes on the chance that the permission fields contain _NA_ s.
- Map<String, List<String>> purposes = FastMap.newInstance();
- Map<String, List<String>> roles = FastMap.newInstance();
+ Map<String, List<String>> purposes = new HashMap<String, List<String>>();
+ Map<String, List<String>> roles = new HashMap<String, List<String>>();
//List purposeList = null;
//List roleList = null;
for (Object id: entityIdList) {
@@ -418,7 +419,7 @@ public class EntityPermissionChecker {
if (entity == null) continue;
String entityId = entity.getString(pkFieldName);
- List<String> ownedContentIdList = FastList.newInstance();
+ List<String> ownedContentIdList = new LinkedList<String>();
getEntityOwners(delegator, entity, ownedContentIdList, "Content", "ownerContentId");
List<String> ownedContentRoleIds = getUserRolesFromList(delegator, ownedContentIdList, partyId, "contentId", "partyId", "roleTypeId", "ContentRole");
@@ -530,7 +531,7 @@ public class EntityPermissionChecker {
}
- Map<String, GenericValue> entities = FastMap.newInstance();
+ Map<String, GenericValue> entities = new HashMap<String, GenericValue>();
//List purposeList = null;
//List roleList = null;
for (Object id: entityIdList) {
@@ -629,7 +630,7 @@ public class EntityPermissionChecker {
boolean hasRoleOperation = false;
boolean hasNeed = false;
- List<String> newHasRoleList = FastList.newInstance();
+ List<String> newHasRoleList = new LinkedList<String>();
for (String roleOp: targetOperations) {
int idx1 = roleOp.indexOf("HAS_");
if (idx1 == 0) {
@@ -767,9 +768,9 @@ public class EntityPermissionChecker {
List<String> purposeIds = null;
if (passedPurposes == null) {
- purposeIds = FastList.newInstance();
+ purposeIds = new LinkedList<String>();
} else {
- purposeIds = FastList.newInstance();
+ purposeIds = new LinkedList<String>();
purposeIds.addAll(passedPurposes);
}
@@ -801,7 +802,7 @@ public class EntityPermissionChecker {
*/
public static List<String> getUserRoles(GenericValue entity, GenericValue userLogin, Delegator delegator) throws GenericEntityException {
- List<String> roles = FastList.newInstance();
+ List<String> roles = new LinkedList<String>();
if (entity == null) return roles;
String entityName = entity.getEntityName();
// TODO: Need to use ContentManagementWorker.getAuthorContent first
@@ -838,7 +839,7 @@ public class EntityPermissionChecker {
party = contentRole.getRelatedOne("Party", false);
partyTypeId = (String)party.get("partyTypeId");
if (partyTypeId != null && partyTypeId.equals("PARTY_GROUP")) {
- Map<String, Object> map = FastMap.newInstance();
+ Map<String, Object> map = new HashMap<String, Object>();
// At some point from/thru date will need to be added
map.put("partyIdFrom", partyId);
@@ -1001,7 +1002,7 @@ public class EntityPermissionChecker {
privilegeEnumId = currentValue.getString(this.privilegeFieldName);
}
if (UtilValidate.isNotEmpty(privilegeEnumId)) {
- GenericValue privEnum = delegator.findOne("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId), true);
+ GenericValue privEnum = EntityQuery.use(delegator).from("Enumeration").where("enumId", privilegeEnumId).cache().queryOne();
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
try {
@@ -1036,7 +1037,7 @@ public class EntityPermissionChecker {
}
public void clearList() {
- this.entityList = FastList.newInstance();
+ this.entityList = new LinkedList<GenericValue>();
}
public void init(Delegator delegator) throws GenericEntityException {
@@ -1133,7 +1134,7 @@ public class EntityPermissionChecker {
public static class StdAuxiliaryValueGetter implements AuxiliaryValueGetter {
- protected List<String> entityList = FastList.newInstance();
+ protected List<String> entityList = new LinkedList<String>();
protected String auxiliaryFieldName;
protected String entityName;
protected String entityIdName;
@@ -1164,7 +1165,7 @@ public class EntityPermissionChecker {
}
public void clearList() {
- this.entityList = FastList.newInstance();
+ this.entityList = new LinkedList<String>();
}
public void setList(List<String> lst) {
@@ -1174,7 +1175,7 @@ public class EntityPermissionChecker {
public void init(Delegator delegator, String entityId) throws GenericEntityException {
if (this.entityList == null) {
- this.entityList = FastList.newInstance();
+ this.entityList = new LinkedList<String>();
}
if (UtilValidate.isEmpty(this.entityName)) {
return;
@@ -1210,7 +1211,7 @@ public class EntityPermissionChecker {
public static class StdRelatedRoleGetter implements RelatedRoleGetter {
- protected List<String> roleIdList = FastList.newInstance();
+ protected List<String> roleIdList = new LinkedList<String>();
protected String roleTypeFieldName;
protected String partyFieldName;
protected String entityName;
@@ -1253,7 +1254,7 @@ public class EntityPermissionChecker {
}
public void clearList() {
- this.roleIdList = FastList.newInstance();
+ this.roleIdList = new LinkedList<String>();
}
public void setList(List<String> lst) {
@@ -1272,7 +1273,7 @@ public class EntityPermissionChecker {
public void initWithAncestors(Delegator delegator, GenericValue entity, String partyId) throws GenericEntityException {
- List<String> ownedContentIdList = FastList.newInstance();
+ List<String> ownedContentIdList = new LinkedList<String>();
getEntityOwners(delegator, entity, ownedContentIdList, this.entityName, this.ownerEntityFieldName);
if (ownedContentIdList.size() > 0) {
List<String> lst = getUserRolesFromList(delegator, ownedContentIdList, partyId, this.roleEntityIdName, this.partyFieldName, this.roleTypeFieldName, this.roleEntityName);
@@ -1293,7 +1294,7 @@ public class EntityPermissionChecker {
if (entity.get("createdByUserLogin") != null) {
String userLoginIdCB = (String)entity.get("createdByUserLogin");
try {
- GenericValue userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginIdCB), true);
+ GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginIdCB).cache().queryOne();
if (userLogin != null) {
String partyIdCB = userLogin.getString("partyId");
if (partyIdCB != null) {
@@ -1330,7 +1331,7 @@ public class EntityPermissionChecker {
EntityConditionList<EntityExpr> condList = EntityCondition.makeCondition(UtilMisc.toList(expr, expr2));
List<GenericValue> roleList = delegator.findList(entityName, condList, null, null, null, true);
List<GenericValue> roleListFiltered = EntityUtil.filterByDate(roleList);
- Set<String> distinctSet = FastSet.newInstance();
+ Set<String> distinctSet = new HashSet<String>();
for (GenericValue contentRole: roleListFiltered) {
String roleTypeId = contentRole.getString(roleTypeIdFieldName);
distinctSet.add(roleTypeId);
@@ -1358,7 +1359,7 @@ public class EntityPermissionChecker {
int privilegeEnumSeq = -1;
if (UtilValidate.isNotEmpty(privilegeEnumId)) {
- GenericValue privEnum = delegator.findOne("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId), true);
+ GenericValue privEnum = EntityQuery.use(delegator).from("Enumeration").where("enumId", privilegeEnumId).cache().queryOne();
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
try {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java Mon Nov 3 06:54:16 2014
@@ -21,6 +21,8 @@ package org.ofbiz.entityext.synchronizat
import java.io.IOException;
import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -28,10 +30,6 @@ import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-import javolution.util.FastSet;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
@@ -49,6 +47,7 @@ import org.ofbiz.entity.serialize.XmlSer
import org.ofbiz.entity.transaction.GenericTransactionException;
import org.ofbiz.entity.transaction.TransactionUtil;
import org.ofbiz.entity.util.EntityListIterator;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.entityext.EntityGroupUtil;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GeneralServiceException;
@@ -106,8 +105,8 @@ public class EntitySyncContext {
//results for a given time block, we will do a query to find the next create/update/remove
//time for that entity, and also keep track of a global next with the lowest future next value;
//using these we can skip a lot of queries and speed this up significantly
- public Map<String, Timestamp> nextEntityCreateTxTime = FastMap.newInstance();
- public Map<String, Timestamp> nextEntityUpdateTxTime = FastMap.newInstance();
+ public Map<String, Timestamp> nextEntityCreateTxTime = new HashMap<String, Timestamp>();
+ public Map<String, Timestamp> nextEntityUpdateTxTime = new HashMap<String, Timestamp>();
public Timestamp nextCreateTxTime = null;
public Timestamp nextUpdateTxTime = null;
public Timestamp nextRemoveTxTime = null;
@@ -163,7 +162,7 @@ public class EntitySyncContext {
}
try {
- this.entitySync = delegator.findOne("EntitySync", false, "entitySyncId", this.entitySyncId);
+ this.entitySync = EntityQuery.use(delegator).from("EntitySync").where("entitySyncId", this.entitySyncId).queryOne();
if (this.entitySync == null) {
throw new SyncAbortException("Not running EntitySync [" + entitySyncId + "], no record found with that ID.");
}
@@ -838,7 +837,7 @@ public class EntitySyncContext {
}
public Set<String> makeEntityNameToUseSet() {
- Set<String> entityNameToUseSet = FastSet.newInstance();
+ Set<String> entityNameToUseSet = new HashSet<String>();
for (ModelEntity modelEntity: this.entityModelToUseList) {
entityNameToUseSet.add(modelEntity.getEntityName());
}
@@ -1139,7 +1138,7 @@ public class EntitySyncContext {
@Override
public void saveSyncErrorInfo(EntitySyncContext esc) {
if (esc != null) {
- List<Object> errorList = FastList.newInstance();
+ List<Object> errorList = new LinkedList<Object>();
esc.saveSyncErrorInfo("ESR_OTHER_ERROR", errorList);
this.addErrorMessages(errorList);
}
@@ -1157,7 +1156,7 @@ public class EntitySyncContext {
@Override
public void saveSyncErrorInfo(EntitySyncContext esc) {
if (esc != null) {
- List<Object> errorList = FastList.newInstance();
+ List<Object> errorList = new LinkedList<Object>();
esc.saveSyncErrorInfo("ESR_DATA_ERROR", errorList);
this.addErrorMessages(errorList);
}
@@ -1175,7 +1174,7 @@ public class EntitySyncContext {
@Override
public void saveSyncErrorInfo(EntitySyncContext esc) {
if (esc != null) {
- List<Object> errorList = FastList.newInstance();
+ List<Object> errorList = new LinkedList<Object>();
esc.saveSyncErrorInfo("ESR_SERVICE_ERROR", errorList);
this.addErrorMessages(errorList);
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java Mon Nov 3 06:54:16 2014
@@ -27,14 +27,13 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
@@ -284,7 +283,7 @@ public class EntitySyncServices {
gotMoreData = false;
// call pullAndReportEntitySyncData, initially with no results, then with results from last loop
- Map<String, Object> remoteCallContext = FastMap.newInstance();
+ Map<String, Object> remoteCallContext = new HashMap<String, Object>();
remoteCallContext.put("entitySyncId", entitySyncId);
remoteCallContext.put("delegatorName", context.get("remoteDelegatorName"));
remoteCallContext.put("userLogin", context.get("userLogin"));
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelNotification.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelNotification.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelNotification.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelNotification.java Mon Nov 3 06:54:16 2014
@@ -19,18 +19,17 @@
package org.ofbiz.service;
-import org.ofbiz.service.config.ServiceConfigUtil;
-import org.ofbiz.base.config.GenericConfigException;
-import org.ofbiz.base.util.StringUtil;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilGenerics;
-import org.ofbiz.base.util.UtilValidate;
-
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastMap;
+import org.ofbiz.base.config.GenericConfigException;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.service.config.ServiceConfigUtil;
import org.ofbiz.service.config.model.NotificationGroup;
import org.ofbiz.service.config.model.Notify;
@@ -82,8 +81,8 @@ public class ModelNotification {
}
// template context
- Map<String, Object> notifyContext = FastMap.newInstance();
- Map<String, Object> bodyParams = FastMap.newInstance();
+ Map<String, Object> notifyContext = new HashMap<String, Object>();
+ Map<String, Object> bodyParams = new HashMap<String, Object>();
bodyParams.put("serviceContext", context);
bodyParams.put("serviceResult", result);
bodyParams.put("service", model);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java Mon Nov 3 06:54:16 2014
@@ -23,8 +23,11 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.AbstractMap;
import java.util.AbstractSet;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -56,9 +59,6 @@ import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.metrics.Metrics;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -84,7 +84,7 @@ import com.ibm.wsdl.extensions.soap.SOAP
@SuppressWarnings("serial")
public class ModelService extends AbstractMap<String, Object> implements Serializable {
private static final Field[] MODEL_SERVICE_FIELDS;
- private static final Map<String, Field> MODEL_SERVICE_FIELD_MAP = FastMap.newInstance();
+ private static final Map<String, Field> MODEL_SERVICE_FIELD_MAP = new LinkedHashMap<String, Field>();
static {
MODEL_SERVICE_FIELDS = ModelService.class.getFields();
for (Field field: MODEL_SERVICE_FIELDS) {
@@ -189,19 +189,19 @@ public class ModelService extends Abstra
public Set<ModelParam> overrideParameters = new LinkedHashSet<ModelParam>();
/** List of permission groups for service invocation */
- public List<ModelPermGroup> permissionGroups = FastList.newInstance();
+ public List<ModelPermGroup> permissionGroups = new LinkedList<ModelPermGroup>();
/** List of email-notifications for this service */
- public List<ModelNotification> notifications = FastList.newInstance();
+ public List<ModelNotification> notifications = new LinkedList<ModelNotification>();
/** Internal Service Group */
public GroupModel internalGroup = null;
/** Context Information, a Map of parameters used by the service, contains ModelParam objects */
- protected Map<String, ModelParam> contextInfo = FastMap.newInstance();
+ protected Map<String, ModelParam> contextInfo = new LinkedHashMap<String, ModelParam>();
/** Context Information, a List of parameters used by the service, contains ModelParam objects */
- protected List<ModelParam> contextParamList = FastList.newInstance();
+ protected List<ModelParam> contextParamList = new LinkedList<ModelParam>();
/** Flag to say if we have pulled in our addition parameters from our implemented service(s) */
protected boolean inheritedParameters = false;
@@ -490,8 +490,8 @@ public class ModelService extends Abstra
* @param locale the actual locale to use
*/
public void validate(Map<String, Object> context, String mode, Locale locale) throws ServiceValidationException {
- Map<String, String> requiredInfo = FastMap.newInstance();
- Map<String, String> optionalInfo = FastMap.newInstance();
+ Map<String, String> requiredInfo = new HashMap<String, String>();
+ Map<String, String> optionalInfo = new HashMap<String, String>();
boolean verboseOn = Debug.verboseOn();
if (verboseOn) Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : Validating context - " + context, module);
@@ -517,14 +517,14 @@ public class ModelService extends Abstra
}
// get the test values
- Map<String, Object> requiredTest = FastMap.newInstance();
- Map<String, Object> optionalTest = FastMap.newInstance();
+ Map<String, Object> requiredTest = new HashMap<String, Object>();
+ Map<String, Object> optionalTest = new HashMap<String, Object>();
- if (context == null) context = FastMap.newInstance();
+ if (context == null) context = new HashMap<String, Object>();
requiredTest.putAll(context);
- List<String> requiredButNull = FastList.newInstance();
- List<String> keyList = FastList.newInstance();
+ List<String> requiredButNull = new LinkedList<String>();
+ List<String> keyList = new LinkedList<String>();
keyList.addAll(requiredTest.keySet());
for (String key: keyList) {
Object value = requiredTest.get(key);
@@ -539,7 +539,7 @@ public class ModelService extends Abstra
// check for requiredButNull fields and return an error since null values are not allowed for required fields
if (requiredButNull.size() > 0) {
- List<String> missingMsg = FastList.newInstance();
+ List<String> missingMsg = new LinkedList<String>();
for (String missingKey: requiredButNull) {
String message = this.getParam(missingKey).getPrimaryFailMessage(locale);
if (message == null) {
@@ -578,7 +578,7 @@ public class ModelService extends Abstra
// required and type validation complete, do allow-html validation
if ("IN".equals(mode)) {
- List<String> errorMessageList = FastList.newInstance();
+ List<String> errorMessageList = new LinkedList<String>();
for (ModelParam modelParam : this.contextInfo.values()) {
// the param is a String, allow-html is not any, and we are looking at an IN parameter during input parameter validation
if (context.get(modelParam.name) != null && ("String".equals(modelParam.type) || "java.lang.String".equals(modelParam.type))
@@ -615,7 +615,7 @@ public class ModelService extends Abstra
Set<String> missing = new TreeSet<String>(keySet);
missing.removeAll(testSet);
- List<String> missingMsgs = FastList.newInstance();
+ List<String> missingMsgs = new LinkedList<String>();
for (String key: missing) {
String msg = model.getParam(key).getPrimaryFailMessage(locale);
if (msg == null) {
@@ -625,7 +625,7 @@ public class ModelService extends Abstra
missingMsgs.add(msg);
}
- List<String> missingCopy = FastList.newInstance();
+ List<String> missingCopy = new LinkedList<String>();
missingCopy.addAll(missing);
throw new ServiceValidationException(missingMsgs, model, missingCopy, null, mode);
}
@@ -635,7 +635,7 @@ public class ModelService extends Abstra
Set<String> extra = new TreeSet<String>(testSet);
extra.removeAll(keySet);
- List<String> extraMsgs = FastList.newInstance();
+ List<String> extraMsgs = new LinkedList<String>();
for (String key: extra) {
ModelParam param = model.getParam(key);
String msg = null;
@@ -648,13 +648,13 @@ public class ModelService extends Abstra
extraMsgs.add(msg);
}
- List<String> extraCopy = FastList.newInstance();
+ List<String> extraCopy = new LinkedList<String>();
extraCopy.addAll(extra);
throw new ServiceValidationException(extraMsgs, model, null, extraCopy, mode);
}
// * Validate types next
- List<String> typeFailMsgs = FastList.newInstance();
+ List<String> typeFailMsgs = new LinkedList<String>();
for (String key: testSet) {
ModelParam param = model.getParam(key);
@@ -775,7 +775,7 @@ public class ModelService extends Abstra
* @return List of parameter names
*/
public List<String> getParameterNames(String mode, boolean optional, boolean internal) {
- List<String> names = FastList.newInstance();
+ List<String> names = new LinkedList<String>();
if (!"IN".equals(mode) && !"OUT".equals(mode) && !"INOUT".equals(mode)) {
return names;
@@ -843,7 +843,7 @@ public class ModelService extends Abstra
* @param locale Locale to use to do some type conversion
*/
public Map<String, Object> makeValid(Map<String, ? extends Object> source, String mode, boolean includeInternal, List<Object> errorMessages, TimeZone timeZone, Locale locale) {
- Map<String, Object> target = FastMap.newInstance();
+ Map<String, Object> target = new HashMap<String, Object>();
if (source == null) {
return target;
@@ -919,7 +919,7 @@ public class ModelService extends Abstra
}
private Map<String, Object> makePrefixMap(Map<String, ? extends Object> source, ModelParam param) {
- Map<String, Object> paramMap = FastMap.newInstance();
+ Map<String, Object> paramMap = new HashMap<String, Object>();
for (Map.Entry<String, ? extends Object> entry: source.entrySet()) {
String key = entry.getKey();
if (key.startsWith(param.stringMapPrefix)) {
@@ -931,7 +931,7 @@ public class ModelService extends Abstra
}
private List<Object> makeSuffixList(Map<String, ? extends Object> source, ModelParam param) {
- List<Object> paramList = FastList.newInstance();
+ List<Object> paramList = new LinkedList<Object>();
for (Map.Entry<String, ? extends Object> entry: source.entrySet()) {
String key = entry.getKey();
if (key.endsWith(param.stringListSuffix)) {
@@ -1046,7 +1046,7 @@ public class ModelService extends Abstra
* @return A list of required IN parameters in the order which they were defined.
*/
public List<Object> getInParameterSequence(Map<String, ? extends Object> source) {
- List<Object> target = FastList.newInstance();
+ List<Object> target = new LinkedList<Object>();
if (source == null) {
return target;
}
@@ -1070,7 +1070,7 @@ public class ModelService extends Abstra
* the service was created.
*/
public List<ModelParam> getModelParamList() {
- List<ModelParam> newList = FastList.newInstance();
+ List<ModelParam> newList = new LinkedList<ModelParam>();
newList.addAll(this.contextParamList);
return newList;
}
@@ -1080,7 +1080,7 @@ public class ModelService extends Abstra
* the service was created.
*/
public List<ModelParam> getInModelParamList() {
- List<ModelParam> inList = FastList.newInstance();
+ List<ModelParam> inList = new LinkedList<ModelParam>();
for (ModelParam modelParam: this.contextParamList) {
// don't include OUT parameters in this list, only IN and INOUT
if ("OUT".equals(modelParam.mode)) continue;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java Mon Nov 3 06:54:16 2014
@@ -21,16 +21,15 @@ package org.ofbiz.service;
import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.base.config.ResourceHandler;
import org.ofbiz.base.metrics.MetricsFactory;
@@ -44,6 +43,7 @@ import org.ofbiz.entity.GenericEntityExc
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelField;
import org.ofbiz.entity.model.ModelFieldType;
+import org.ofbiz.service.ModelParam.ModelParamValidator;
import org.ofbiz.service.group.GroupModel;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -107,7 +107,7 @@ public class ModelServiceReader implemen
}
}
- Map<String, ModelService> modelServices = FastMap.newInstance();
+ Map<String, ModelService> modelServices = new HashMap<String, ModelService>();
if (this.isFromURL) {// utilTimer.timerString("Before getDocumentElement in file " + readerURL);
} else {// utilTimer.timerString("Before getDocumentElement in " + handler);
}
@@ -273,7 +273,7 @@ public class ModelServiceReader implemen
service.nameSpace = getCDATADef(serviceElement, "namespace");
// construct the context
- service.contextInfo = FastMap.newInstance();
+ service.contextInfo = new HashMap<String, ModelParam>();
this.createNotification(serviceElement, service);
this.createPermission(serviceElement, service);
this.createPermGroups(serviceElement, service);
@@ -690,7 +690,7 @@ public class ModelServiceReader implemen
List<? extends Element> validateElements = UtilXml.childElementList(attribute, "type-validate");
if (UtilValidate.isNotEmpty(validateElements)) {
// always clear out old ones; never append
- param.validators = FastList.newInstance();
+ param.validators = new LinkedList<ModelParamValidator>();
Element validate = validateElements.get(0);
String methodName = validate.getAttribute("method").intern();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceUtil.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceUtil.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceUtil.java Mon Nov 3 06:54:16 2014
@@ -20,6 +20,7 @@ package org.ofbiz.service;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -29,9 +30,6 @@ import java.util.TimeZone;
import javax.servlet.http.HttpServletRequest;
import javax.transaction.Transaction;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
@@ -49,6 +47,7 @@ import org.ofbiz.entity.transaction.Gene
import org.ofbiz.entity.transaction.TransactionUtil;
import org.ofbiz.entity.util.EntityFindOptions;
import org.ofbiz.entity.util.EntityListIterator;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.security.Security;
import org.ofbiz.service.config.ServiceConfigUtil;
@@ -118,7 +117,7 @@ public class ServiceUtil {
}
public static Map<String, Object> returnProblem(String returnType, String errorMessage, List<? extends Object> errorMessageList, Map<String, ? extends Object> errorMessageMap, Map<String, ? extends Object> nestedResult) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put(ModelService.RESPONSE_MESSAGE, returnType);
if (errorMessage != null) {
result.put(ModelService.ERROR_MESSAGE, errorMessage);
@@ -129,7 +128,7 @@ public class ServiceUtil {
errorList.addAll(errorMessageList);
}
- Map<String, Object> errorMap = FastMap.newInstance();
+ Map<String, Object> errorMap = new HashMap<String, Object>();
if (errorMessageMap != null) {
errorMap.putAll(errorMessageMap);
}
@@ -177,7 +176,7 @@ public class ServiceUtil {
* and what type of message that is should be determined by the RESPONSE_MESSAGE (and there's another annoyance, it should be RESPONSE_CODE)
*/
public static Map<String, Object> returnMessage(String code, String message) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if (code != null) result.put(ModelService.RESPONSE_MESSAGE, code);
if (message != null) result.put(ModelService.SUCCESS_MESSAGE, message);
return result;
@@ -478,7 +477,7 @@ public class ServiceUtil {
boolean beganTx3 = false;
GenericValue runtimeData = null;
EntityListIterator runTimeDataIt = null;
- List<GenericValue> runtimeDataToDelete = FastList.newInstance();
+ List<GenericValue> runtimeDataToDelete = new LinkedList<GenericValue>();
long jobsandBoxCount = 0;
try {
// begin this transaction
@@ -624,7 +623,7 @@ public class ServiceUtil {
Delegator delegator = dctx.getDelegator();
if (UtilValidate.isNotEmpty(runAsUser)) {
try {
- GenericValue runAs = delegator.findOne("UserLogin", true, "userLoginId", runAsUser);
+ GenericValue runAs = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", runAsUser).cache().queryOne();
if (runAs != null) {
userLogin = runAs;
}
@@ -710,7 +709,7 @@ public class ServiceUtil {
*/
public static Map<String, Object> setServiceFields(LocalDispatcher dispatcher, String serviceName, Map<String, Object> fromMap, GenericValue userLogin,
TimeZone timeZone, Locale locale) throws GeneralServiceException {
- Map<String, Object> outMap = FastMap.newInstance();
+ Map<String, Object> outMap = new HashMap<String, Object>();
ModelService modelService = null;
try {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java Mon Nov 3 06:54:16 2014
@@ -18,14 +18,14 @@
*******************************************************************************/
package org.ofbiz.service;
+import java.util.HashMap;
import java.util.Map;
+
import javax.transaction.Status;
import javax.transaction.Transaction;
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.transaction.GenericTransactionException;
@@ -295,7 +295,7 @@ public class ServiceXaWrapper extends Ge
if (model.validate) {
thisContext = model.makeValid(context, ModelService.IN_PARAM);
} else {
- thisContext = FastMap.newInstance();
+ thisContext = new HashMap<String, Object>();
thisContext.putAll(context);
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java Mon Nov 3 06:54:16 2014
@@ -21,20 +21,20 @@ package org.ofbiz.service.calendar;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import com.ibm.icu.util.Calendar;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javolution.util.FastSet;
-
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
+import com.ibm.icu.util.Calendar;
+
/** TemporalExpression UI artifacts worker. */
public class ExpressionUiHelper {
@@ -141,13 +141,13 @@ public class ExpressionUiHelper {
*/
public static Set<String> getCandidateIncludeIds(Delegator delegator, String tempExprId) throws GenericEntityException {
List<GenericValue> findList = delegator.findList("TemporalExpressionAssoc", EntityCondition.makeCondition("fromTempExprId", tempExprId), null, null, null, true);
- Set<String> excludedIds = FastSet.newInstance();
+ Set<String> excludedIds = new HashSet<String>();
for (GenericValue value : findList) {
excludedIds.add(value.getString("toTempExprId"));
}
excludedIds.add(tempExprId);
findList = delegator.findList("TemporalExpression", null, null, null, null, true);
- Set<String> candidateIds = FastSet.newInstance();
+ Set<String> candidateIds = new HashSet<String>();
for (GenericValue value : findList) {
candidateIds.add(value.getString("tempExprId"));
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java Mon Nov 3 06:54:16 2014
@@ -29,6 +29,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.util.EntityQuery;
/** TemporalExpression persistence worker. */
public class TemporalExpressionWorker {
@@ -61,7 +62,7 @@ public class TemporalExpressionWorker {
if (UtilValidate.isEmpty(tempExprId)) {
throw new IllegalArgumentException("tempExprId argument cannot be empty");
}
- GenericValue exprValue = delegator.findOne("TemporalExpression", UtilMisc.toMap("tempExprId", tempExprId), true);
+ GenericValue exprValue = EntityQuery.use(delegator).from("TemporalExpression").where("tempExprId", tempExprId).cache().queryOne();
if (UtilValidate.isEmpty(exprValue)) {
throw new IllegalArgumentException("tempExprId argument invalid - expression not found");
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Mon Nov 3 06:54:16 2014
@@ -18,12 +18,11 @@
*******************************************************************************/
package org.ofbiz.service.eca;
+import java.util.HashMap;
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.UtilGenerics;
import org.ofbiz.base.util.UtilValidate;
@@ -137,7 +136,7 @@ public class ServiceEcaAction implements
if (UtilValidate.isNotEmpty(resultMapName)) {
Map<String, Object> resultMap = UtilGenerics.checkMap(context.get(resultMapName));
if (resultMap == null) {
- resultMap = FastMap.newInstance();
+ resultMap = new HashMap<String, Object>();
}
resultMap.putAll(dctx.getModelService(this.serviceName).makeValid(actionResult, ModelService.OUT_PARAM, false, null));
context.put(resultMapName, resultMap);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java Mon Nov 3 06:54:16 2014
@@ -18,12 +18,12 @@
*******************************************************************************/
package org.ofbiz.service.eca;
+import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javolution.util.FastList;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
@@ -44,8 +44,8 @@ public final class ServiceEcaRule implem
protected final String eventName;
protected final boolean runOnFailure;
protected final boolean runOnError;
- protected final List<ServiceEcaCondition> conditions = FastList.newInstance();
- protected final List<Object> actionsAndSets = FastList.newInstance();
+ protected final List<ServiceEcaCondition> conditions = new ArrayList<ServiceEcaCondition>();
+ protected final List<Object> actionsAndSets = new ArrayList<Object>();
protected boolean enabled = true;
protected final String definitionLocation;
@@ -103,7 +103,7 @@ public final class ServiceEcaRule implem
}
public List<ServiceEcaAction> getEcaActionList() {
- List<ServiceEcaAction> actionList = FastList.newInstance();
+ List<ServiceEcaAction> actionList = new LinkedList<ServiceEcaAction>();
for (Object actionOrSet: this.actionsAndSets) {
if (actionOrSet instanceof ServiceEcaAction) {
actionList.add((ServiceEcaAction) actionOrSet);
@@ -113,7 +113,7 @@ public final class ServiceEcaRule implem
}
public List<ServiceEcaCondition> getEcaConditionList() {
- List<ServiceEcaCondition> condList = FastList.newInstance();
+ List<ServiceEcaCondition> condList = new LinkedList<ServiceEcaCondition>();
condList.addAll(this.conditions);
return condList;
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java Mon Nov 3 06:54:16 2014
@@ -19,15 +19,15 @@
package org.ofbiz.service.eca;
-import org.w3c.dom.Element;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.model.ModelUtil;
-
-import java.util.Map;
-import javolution.util.FastMap;
+import org.w3c.dom.Element;
/**
* ServiceEcaSetField
@@ -72,7 +72,7 @@ public class ServiceEcaSetField {
if (UtilValidate.isNotEmpty(this.mapName) && context.containsKey(this.mapName)) {
valueMap = UtilGenerics.checkMap(context.get(mapName));
} else {
- valueMap = FastMap.newInstance();
+ valueMap = new HashMap<String, Object>();
}
// process the context changes
Object newValue = null;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java Mon Nov 3 06:54:16 2014
@@ -19,16 +19,16 @@
package org.ofbiz.service.eca;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.component.ComponentConfig;
import org.ofbiz.base.concurrent.ExecutionPool;
import org.ofbiz.base.config.GenericConfigException;
@@ -51,7 +51,7 @@ public class ServiceEcaUtil {
public static final String module = ServiceEcaUtil.class.getName();
// using a cache is dangerous here because if someone clears it the ECAs won't run: public static UtilCache ecaCache = new UtilCache("service.ServiceECAs", 0, 0, false);
- public static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = FastMap.newInstance();
+ public static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = new ConcurrentHashMap<String, Map<String, List<ServiceEcaRule>>>();
public static void reloadConfig() {
ecaCache.clear();
@@ -64,7 +64,7 @@ public class ServiceEcaUtil {
return;
}
- List<Future<List<ServiceEcaRule>>> futures = FastList.newInstance();
+ List<Future<List<ServiceEcaRule>>> futures = new LinkedList<Future<List<ServiceEcaRule>>>();
List<ServiceEcas> serviceEcasList = null;
try {
serviceEcasList = ServiceConfigUtil.getServiceEngine().getServiceEcas();
@@ -102,7 +102,7 @@ public class ServiceEcaUtil {
}
private static List<ServiceEcaRule> getEcaDefinitions(ResourceHandler handler) {
- List<ServiceEcaRule> handlerRules = FastList.newInstance();
+ List<ServiceEcaRule> handlerRules = new LinkedList<ServiceEcaRule>();
Element rootElement = null;
try {
rootElement = handler.getDocument().getDocumentElement();
@@ -134,14 +134,14 @@ public class ServiceEcaUtil {
List<ServiceEcaRule> rules = null;
if (eventMap == null) {
- eventMap = FastMap.newInstance();
- rules = FastList.newInstance();
+ eventMap = new HashMap<String, List<ServiceEcaRule>>();
+ rules = new LinkedList<ServiceEcaRule>();
ecaCache.put(serviceName, eventMap);
eventMap.put(eventName, rules);
} else {
rules = eventMap.get(eventName);
if (rules == null) {
- rules = FastList.newInstance();
+ rules = new LinkedList<ServiceEcaRule>();
eventMap.put(eventName, rules);
}
}
@@ -160,7 +160,7 @@ public class ServiceEcaUtil {
if (event != null) {
return eventMap.get(event);
} else {
- List<ServiceEcaRule> rules = FastList.newInstance();
+ List<ServiceEcaRule> rules = new LinkedList<ServiceEcaRule>();
for (Collection<ServiceEcaRule> col: eventMap.values()) {
rules.addAll(col);
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java Mon Nov 3 06:54:16 2014
@@ -18,12 +18,11 @@
*/
package org.ofbiz.service.engine;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.UtilDateTime;
@@ -69,7 +68,7 @@ public final class EntityAutoEngine exte
// static java service methods should be: public Map<String, Object> methodName(DispatchContext dctx, Map<String, Object> context)
DispatchContext dctx = dispatcher.getLocalContext(localName);
Locale locale = (Locale) parameters.get("locale");
- Map<String, Object> localContext = FastMap.newInstance();
+ Map<String, Object> localContext = new HashMap<String, Object>();
localContext.put("parameters", parameters);
Map<String, Object> result = ServiceUtil.returnSuccess();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java Mon Nov 3 06:54:16 2014
@@ -19,15 +19,14 @@
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.base.util.UtilGenerics;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ServiceDispatcher;
import org.ofbiz.service.config.ServiceConfigUtil;
-import org.ofbiz.base.util.UtilGenerics;
/**
* Generic Engine Factory
@@ -39,7 +38,7 @@ public class GenericEngineFactory {
public GenericEngineFactory(ServiceDispatcher dispatcher) {
this.dispatcher = dispatcher;
- engines = FastMap.newInstance();
+ engines = new HashMap<String, GenericEngine>();
}
/**
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java Mon Nov 3 06:54:16 2014
@@ -23,14 +23,13 @@ import groovy.lang.GroovyClassLoader;
import groovy.lang.Script;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.script.ScriptContext;
-import javolution.util.FastMap;
-
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.runtime.InvokerHelper;
import org.ofbiz.base.config.GenericConfigException;
@@ -103,10 +102,10 @@ public final class GroovyEngine extends
if (UtilValidate.isEmpty(modelService.location)) {
throw new GenericServiceException("Cannot run Groovy service with empty location");
}
- Map<String, Object> params = FastMap.newInstance();
+ Map<String, Object> params = new HashMap<String, Object>();
params.putAll(context);
- Map<String, Object> gContext = FastMap.newInstance();
+ Map<String, Object> gContext = new HashMap<String, Object>();
gContext.putAll(context);
gContext.put(ScriptUtil.PARAMETERS_KEY, params);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/HttpEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Mon Nov 3 06:54:16 2014
@@ -20,13 +20,12 @@ package org.ofbiz.service.engine;
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;
@@ -66,7 +65,7 @@ public class HttpEngine extends GenericA
throw new GenericServiceException("Cannot serialize context.", e);
}
- Map<String, Object> parameters = FastMap.newInstance();
+ Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("serviceName", modelService.invoke);
if (xmlContext != null)
parameters.put("serviceContext", xmlContext);
@@ -115,7 +114,7 @@ public class HttpEngine extends GenericA
String serviceMode = request.getParameter("serviceMode");
String xmlContext = request.getParameter("serviceContext");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Map<String, Object> context = null;
if (serviceName == null)
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Mon Nov 3 06:54:16 2014
@@ -19,6 +19,7 @@
package org.ofbiz.service.engine;
import java.io.StringReader;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -26,8 +27,6 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import javolution.util.FastMap;
-
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -107,7 +106,7 @@ public final class SOAPClientEngine exte
int i = 0;
- Map<String, Object> parameterMap = FastMap.newInstance();
+ Map<String, Object> parameterMap = new HashMap<String, Object>();
for (ModelParam p: inModelParamList) {
if (Debug.infoOn()) Debug.logInfo("[SOAPClientEngine.invoke} : Parameter: " + p.name + " (" + p.mode + ") - " + i, module);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java Mon Nov 3 06:54:16 2014
@@ -21,6 +21,7 @@ package org.ofbiz.service.engine;
import static org.ofbiz.base.util.UtilGenerics.cast;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -28,8 +29,6 @@ import java.util.Set;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Assert;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.ScriptUtil;
@@ -74,7 +73,7 @@ public final class ScriptEngine extends
@Override
public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
Assert.notNull("localName", localName, "modelService.location", modelService.location, "context", context);
- Map<String, Object> params = FastMap.newInstance();
+ Map<String, Object> params = new HashMap<String, Object>();
params.putAll(context);
context.put(ScriptUtil.PARAMETERS_KEY, params);
DispatchContext dctx = dispatcher.getLocalContext(localName);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java Mon Nov 3 06:54:16 2014
@@ -20,11 +20,10 @@ package org.ofbiz.service.engine;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.ofbiz.base.config.GenericConfigException;
@@ -128,7 +127,7 @@ public class XMLRPCClientEngine extends
}
Map<String, Object> result = null;
- Map<String, Object> params = FastMap.newInstance();
+ Map<String, Object> params = new HashMap<String, Object>();
for (ModelParam modelParam: modelService.getModelParamList()) {
// don't include OUT parameters in this list, only IN and INOUT
if ("OUT".equals(modelParam.mode) || modelParam.internal) continue;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupModel.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupModel.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupModel.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupModel.java Mon Nov 3 06:54:16 2014
@@ -20,9 +20,7 @@ package org.ofbiz.service.group;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
-
-import javolution.util.FastMap;
+import java.util.*;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
@@ -58,19 +56,21 @@ public class GroupModel {
throw new IllegalArgumentException("Group Definition found with no name attribute! : " + group);
}
- for (Element service: UtilXml.childElementList(group, "invoke")) {
+ for (Element service : UtilXml.childElementList(group, "invoke")) {
services.add(new GroupServiceModel(service));
}
List<? extends Element> oldServiceTags = UtilXml.childElementList(group, "service");
if (oldServiceTags.size() > 0) {
- for (Element service: oldServiceTags) {
+ for (Element service : oldServiceTags) {
services.add(new GroupServiceModel(service));
}
- Debug.logWarning("Service Group Definition : [" + group.getAttribute("name") + "] found with OLD 'service' attribute, change to use 'invoke'", module);
+ Debug.logWarning("Service Group Definition : [" + group.getAttribute("name")
+ + "] found with OLD 'service' attribute, change to use 'invoke'", module);
}
- if (Debug.verboseOn()) Debug.logVerbose("Created Service Group Model --> " + this, module);
+ if (Debug.verboseOn())
+ Debug.logVerbose("Created Service Group Model --> " + this, module);
}
/**
@@ -109,6 +109,7 @@ public class GroupModel {
public List<GroupServiceModel> getServices() {
return this.services;
}
+
public boolean isOptional() {
return optional;
}
@@ -121,7 +122,8 @@ public class GroupModel {
* @return Map Result Map
* @throws GenericServiceException
*/
- public Map<String, Object> run(ServiceDispatcher dispatcher, String localName, Map<String, Object> context) throws GenericServiceException {
+ public Map<String, Object> run(ServiceDispatcher dispatcher, String localName, Map<String, Object> context)
+ throws GenericServiceException {
if (this.getSendMode().equals("all")) {
return runAll(dispatcher, localName, context);
} else if (this.getSendMode().equals("round-robin")) {
@@ -132,7 +134,7 @@ public class GroupModel {
} else if (this.getSendMode().equals("first-available")) {
return runOne(dispatcher, localName, context);
} else if (this.getSendMode().equals("none")) {
- return FastMap.newInstance();
+ return new HashMap<String, Object>();
} else {
throw new GenericServiceException("This mode is not currently supported");
}
@@ -152,13 +154,16 @@ public class GroupModel {
return str.toString();
}
- private Map<String, Object> runAll(ServiceDispatcher dispatcher, String localName, Map<String, Object> context) throws GenericServiceException {
+ private Map<String, Object> runAll(ServiceDispatcher dispatcher, String localName, Map<String, Object> context)
+ throws GenericServiceException {
Map<String, Object> runContext = UtilMisc.makeMapWritable(context);
- Map<String, Object> result = FastMap.newInstance();
- for (GroupServiceModel model: services) {
- if (Debug.verboseOn()) Debug.logVerbose("Using Context: " + runContext, module);
+ Map<String, Object> result = new HashMap<String, Object>();
+ for (GroupServiceModel model : services) {
+ if (Debug.verboseOn())
+ Debug.logVerbose("Using Context: " + runContext, module);
Map<String, Object> thisResult = model.invoke(dispatcher, localName, runContext);
- if (Debug.verboseOn()) Debug.logVerbose("Result: " + thisResult, module);
+ if (Debug.verboseOn())
+ Debug.logVerbose("Result: " + thisResult, module);
// make sure we didn't fail
if (ServiceUtil.isError(thisResult)) {
@@ -175,14 +180,16 @@ public class GroupModel {
return result;
}
- private Map<String, Object> runIndex(ServiceDispatcher dispatcher, String localName, Map<String, Object> context, int index) throws GenericServiceException {
+ private Map<String, Object> runIndex(ServiceDispatcher dispatcher, String localName, Map<String, Object> context, int index)
+ throws GenericServiceException {
GroupServiceModel model = services.get(index);
return model.invoke(dispatcher, localName, context);
}
- private Map<String, Object> runOne(ServiceDispatcher dispatcher, String localName, Map<String, Object> context) throws GenericServiceException {
+ private Map<String, Object> runOne(ServiceDispatcher dispatcher, String localName, Map<String, Object> context)
+ throws GenericServiceException {
Map<String, Object> result = null;
- for (GroupServiceModel model: services) {
+ for (GroupServiceModel model : services) {
try {
result = model.invoke(dispatcher, localName, context);
} catch (GenericServiceException e) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java Mon Nov 3 06:54:16 2014
@@ -18,16 +18,15 @@
*******************************************************************************/
package org.ofbiz.service.group;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastMap;
-
+import org.ofbiz.base.util.Debug;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceDispatcher;
-import org.ofbiz.base.util.Debug;
import org.w3c.dom.Element;
/**
@@ -117,7 +116,7 @@ public class GroupServiceModel {
return dispatcher.runSync(localName, model, thisContext);
} else {
dispatcher.runAsync(localName, model, thisContext, false);
- return FastMap.newInstance();
+ return new HashMap<String, Object>();
}
} else {
return dispatcher.runSync(localName, model, thisContext);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java Mon Nov 3 06:54:16 2014
@@ -20,8 +20,7 @@ package org.ofbiz.service.group;
import java.util.List;
import java.util.Map;
-
-import javolution.util.FastMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.ofbiz.base.component.ComponentConfig;
import org.ofbiz.base.config.GenericConfigException;
@@ -41,7 +40,7 @@ public class ServiceGroupReader {
public static final String module = ServiceGroupReader.class.getName();
// using a cache is dangerous here because if someone clears it the groups won't work at all: public static UtilCache groupsCache = new UtilCache("service.ServiceGroups", 0, 0, false);
- public static Map<String, GroupModel> groupsCache = FastMap.newInstance();
+ public static Map<String, GroupModel> groupsCache = new ConcurrentHashMap<String, GroupModel>();
public static void readConfig() {
List<ServiceGroups> serviceGroupsList = null;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Mon Nov 3 06:54:16 2014
@@ -21,10 +21,9 @@ package org.ofbiz.service.jms;
import java.lang.reflect.Constructor;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
@@ -45,8 +44,8 @@ public class JmsListenerFactory implemen
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<String, GenericMessageListener> listeners = FastMap.newInstance();
- protected static Map<String, Server> servers = FastMap.newInstance();
+ protected static Map<String, GenericMessageListener> listeners = new ConcurrentHashMap<String, GenericMessageListener>();
+ protected static Map<String, Server> servers = new ConcurrentHashMap<String, Server>();
private static final AtomicReference<JmsListenerFactory> jlFactoryRef = new AtomicReference<JmsListenerFactory>(null);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java Mon Nov 3 06:54:16 2014
@@ -19,6 +19,7 @@
package org.ofbiz.service.jms;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -43,8 +44,6 @@ import javax.naming.InitialContext;
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;
@@ -310,7 +309,7 @@ public class JmsServiceEngine extends Ab
JmsService serviceElement = getServiceElement(modelService);
List<Server> serverList = serviceElement.getServers();
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
for (Server server: serverList) {
String serverType = server.getType();
if (serverType.equals("topic"))
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Mon Nov 3 06:54:16 2014
@@ -21,12 +21,11 @@ package org.ofbiz.service.job;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
-import javolution.util.FastMap;
-
import org.apache.commons.lang.StringUtils;
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.base.util.Debug;
@@ -291,7 +290,7 @@ public class PersistedServiceJob extends
}
}
if (context == null) {
- context = FastMap.newInstance();
+ context = new HashMap<String, Object>();
}
// check the runAsUser
if (!UtilValidate.isEmpty(jobValue.getString("runAsUser"))) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Mon Nov 3 06:54:16 2014
@@ -50,6 +50,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceContainer;
@@ -108,7 +109,7 @@ public class JavaMailContainer implement
// load the userLogin object
String runAsUser = ContainerConfig.getPropertyValue(cfg, "run-as-user", "system");
try {
- this.userLogin = delegator.findOne("UserLogin", false, "userLoginId", runAsUser);
+ this.userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", runAsUser).queryOne();
} catch (GenericEntityException e) {
Debug.logError(e, "Unable to load run-as-user UserLogin; cannot start container", module);
return false;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/MimeMessageWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/MimeMessageWrapper.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/MimeMessageWrapper.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/MimeMessageWrapper.java Mon Nov 3 06:54:16 2014
@@ -18,12 +18,13 @@
*******************************************************************************/
package org.ofbiz.service.mail;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
+import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -36,8 +37,6 @@ import javax.mail.Part;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-import javolution.util.FastList;
-
import org.ofbiz.base.conversion.AbstractConverter;
import org.ofbiz.base.conversion.ConversionException;
import org.ofbiz.base.conversion.Converters;
@@ -248,7 +247,7 @@ public class MimeMessageWrapper implemen
}
public List<String> getAttachmentIndexes() {
- List<String> attachments = FastList.newInstance();
+ List<String> attachments = new LinkedList<String>();
if (getMainPartCount() == 0) { // single part message (no attachments)
return attachments;
} else {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/ServiceMcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/ServiceMcaAction.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/ServiceMcaAction.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/ServiceMcaAction.java Mon Nov 3 06:54:16 2014
@@ -18,18 +18,16 @@
*******************************************************************************/
package org.ofbiz.service.mail;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
-import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.LocalDispatcher;
-import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.GenericValue;
-
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
import org.w3c.dom.Element;
@SuppressWarnings("serial")
@@ -54,7 +52,7 @@ public class ServiceMcaAction implements
}
public boolean runAction(LocalDispatcher dispatcher, MimeMessageWrapper messageWrapper, GenericValue userLogin) throws GenericServiceException {
- Map<String, Object> serviceContext = FastMap.newInstance();
+ Map<String, Object> serviceContext = new HashMap<String, Object>();
serviceContext.putAll(UtilMisc.toMap("messageWrapper", messageWrapper, "userLogin", userLogin));
serviceContext.put("userLogin", ServiceUtil.getUserLogin(dispatcher.getDispatchContext(), serviceContext, runAsUser));