Author: adrianc
Date: Sat Nov 1 09:31:06 2014
New Revision: 1635906
URL: http://svn.apache.org/r1635906
Log:
Remove Javolution from the entityext component.
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java
Sat Nov 1 09:31:06 2014
@@ -18,13 +18,12 @@
*******************************************************************************/
package org.ofbiz.entityext;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import javolution.util.FastList;
-import javolution.util.FastSet;
-
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
@@ -40,7 +39,7 @@ public class EntityGroupUtil {
public static final String module = EntityGroupUtil.class.getName();
public static Set<String> getEntityNamesByGroup(String entityGroupId,
Delegator delegator, boolean requireStampFields) throws GenericEntityException {
- Set<String> entityNames = FastSet.newInstance();
+ Set<String> entityNames = new HashSet<String>();
List<GenericValue> entitySyncGroupIncludes =
delegator.findByAnd("EntityGroupEntry", UtilMisc.toMap("entityGroupId",
entityGroupId), null, false);
@@ -53,7 +52,7 @@ public class EntityGroupUtil {
}
public static List<ModelEntity>
getModelEntitiesFromRecords(List<GenericValue> entityGroupEntryValues,
Delegator delegator, boolean requireStampFields) throws GenericEntityException {
- List<ModelEntity> entityModelToUseList = FastList.newInstance();
+ List<ModelEntity> entityModelToUseList = new LinkedList<ModelEntity>();
for (String entityName: delegator.getModelReader().getEntityNames()) {
ModelEntity modelEntity = delegator.getModelEntity(entityName);
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
Sat Nov 1 09:31:06 2014
@@ -24,12 +24,11 @@ import java.net.URL;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
-import javolution.util.FastList;
-
import org.ofbiz.base.component.ComponentConfig;
import org.ofbiz.base.container.Container;
import org.ofbiz.base.container.ContainerConfig;
@@ -66,7 +65,7 @@ public class EntityDataLoadContainer imp
protected String configFile = null;
protected String readers = null;
protected String directory = null;
- protected List<String> files = FastList.newInstance();
+ protected List<String> files = new LinkedList<String>();
protected String component = null;
protected boolean useDummyFks = false;
protected boolean maintainTxs = false;
@@ -222,7 +221,7 @@ public class EntityDataLoadContainer imp
if (delegator == null) {
throw new ContainerException("Invalid delegator name!");
}
- List<EntityExpr> expr = FastList.newInstance();
+ List<EntityExpr> expr = new LinkedList<EntityExpr>();
expr.add(EntityCondition.makeCondition("disabled",
EntityOperator.EQUALS, "N"));
expr.add(EntityCondition.makeCondition("disabled",
EntityOperator.EQUALS, null));
List<GenericValue> tenantList;
@@ -264,7 +263,7 @@ public class EntityDataLoadContainer imp
List<String> readerNames = null;
if (this.readers != null && !"none".equalsIgnoreCase(this.readers)) {
if (this.readers.indexOf(",") == -1) {
- readerNames = FastList.newInstance();
+ readerNames = new LinkedList<String>();
readerNames.add(this.readers);
} else {
readerNames = StringUtil.split(this.readers, ",");
@@ -317,7 +316,7 @@ public class EntityDataLoadContainer imp
}
}
// load specify components
- List<String> loadComponents = FastList.newInstance();
+ List<String> loadComponents = new LinkedList<String>();
if (UtilValidate.isNotEmpty(delegator.getDelegatorTenantId()) &&
EntityUtil.isMultiTenantEnabled()) {
try {
List<EntityExpr> exprs = new ArrayList<EntityExpr>();
@@ -353,7 +352,7 @@ public class EntityDataLoadContainer imp
}
// check for drop index/fks
if (dropConstraints) {
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
Debug.logImportant("Dropping foreign key indcies...", module);
for (String entityName : modelEntityNames) {
@@ -390,7 +389,7 @@ public class EntityDataLoadContainer imp
// drop pks
if (dropPks) {
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
Debug.logImportant("Dropping primary keys...", module);
for (String entityName : modelEntityNames) {
ModelEntity modelEntity = modelEntities.get(entityName);
@@ -410,11 +409,11 @@ public class EntityDataLoadContainer imp
// repair columns
if (repairColumns) {
- List<String> fieldsToRepair = FastList.newInstance();
- List<String> messages = FastList.newInstance();
+ List<String> fieldsToRepair = new LinkedList<String>();
+ List<String> messages = new LinkedList<String>();
dbUtil.checkDb(modelEntities, fieldsToRepair, messages, false,
false, false, false);
if (fieldsToRepair.size() > 0) {
- messages = FastList.newInstance();
+ messages = new LinkedList<String>();
dbUtil.repairColumnSizeChanges(modelEntities, fieldsToRepair,
messages);
if (messages.size() > 0) {
if (Debug.infoOn()) {
@@ -427,7 +426,7 @@ public class EntityDataLoadContainer imp
}
// get the reader name URLs first
- List<URL> urlList = FastList.newInstance();
+ List<URL> urlList = null;
if (UtilValidate.isNotEmpty(loadComponents)) {
if (UtilValidate.isNotEmpty(readerNames)) {
urlList =
EntityDataLoader.getUrlByComponentList(helperInfo.getHelperBaseName(),
loadComponents, readerNames);
@@ -443,7 +442,7 @@ public class EntityDataLoadContainer imp
}
// need a list if it is empty
if (urlList == null) {
- urlList = FastList.newInstance();
+ urlList = new LinkedList<URL>();
}
// add in the defined extra files
@@ -478,8 +477,8 @@ public class EntityDataLoadContainer imp
changedFormat.setMinimumIntegerDigits(5);
changedFormat.setGroupingUsed(false);
- List<Object> errorMessages = FastList.newInstance();
- List<String> infoMessages = FastList.newInstance();
+ List<Object> errorMessages = new LinkedList<Object>();
+ List<String> infoMessages = new LinkedList<String>();
int totalRowsChanged = 0;
if (UtilValidate.isNotEmpty(urlList)) {
Debug.logImportant("=-=-=-=-=-=-= Doing a data load using
delegator '" + delegator.getDelegatorName() + "' with the following files:",
module);
@@ -520,7 +519,7 @@ public class EntityDataLoadContainer imp
// create primary keys
if (createPks) {
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
Debug.logImportant("Creating primary keys...", module);
for (String entityName : modelEntityNames) {
@@ -540,7 +539,7 @@ public class EntityDataLoadContainer imp
// create constraints
if (createConstraints) {
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
Debug.logImportant("Creating foreign keys...", module);
for (String entityName : modelEntityNames) {
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
Sat Nov 1 09:31:06 2014
@@ -18,39 +18,38 @@
*******************************************************************************/
package org.ofbiz.entityext.data;
-import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.LocalDispatcher;
-import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.security.Security;
-import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.datasource.GenericHelperInfo;
-import org.ofbiz.entity.jdbc.DatabaseUtil;
-import org.ofbiz.entity.model.ModelEntity;
-import org.ofbiz.entity.util.EntityListIterator;
-import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.FileUtil;
-import org.ofbiz.base.util.UtilURL;
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.base.util.UtilValidate;
-
-import javolution.util.FastList;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
-import java.net.URL;
import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.FileUtil;
+import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilURL;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.datasource.GenericHelperInfo;
+import org.ofbiz.entity.jdbc.DatabaseUtil;
+import org.ofbiz.entity.model.ModelEntity;
+import org.ofbiz.entity.util.EntityListIterator;
+import org.ofbiz.security.Security;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
/**
* Entity Data Import/Export Services
@@ -161,7 +160,7 @@ public class EntityDataServices {
}
private static List<File> getFileList(File root) {
- List<File> fileList = FastList.newInstance();
+ List<File> fileList = new LinkedList<File>();
// check for a file list file
File listFile = new File(root, "FILELIST.txt");
@@ -330,7 +329,7 @@ public class EntityDataServices {
String groupName = (String) context.get("groupName");
Boolean fixSizes = (Boolean) context.get("fixColSizes");
if (fixSizes == null) fixSizes = Boolean.FALSE;
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
GenericHelperInfo helperInfo = delegator.getGroupHelperInfo(groupName);
DatabaseUtil dbUtil = new DatabaseUtil(helperInfo);
@@ -369,7 +368,7 @@ public class EntityDataServices {
// step 5 - repair field sizes
if (fixSizes.booleanValue()) {
Debug.logImportant("Updating column field size changes", module);
- List<String> fieldsWrongSize = FastList.newInstance();
+ List<String> fieldsWrongSize = new LinkedList<String>();
dbUtil.checkDb(modelEntities, fieldsWrongSize, messages, true,
true, true, true);
if (fieldsWrongSize.size() > 0) {
dbUtil.repairColumnSizeChanges(modelEntities, fieldsWrongSize,
messages);
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java
Sat Nov 1 09:31:06 2014
@@ -18,10 +18,9 @@
*******************************************************************************/
package org.ofbiz.entityext.eca;
+import java.util.LinkedList;
import java.util.List;
-import javolution.util.FastList;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.ObjectType;
import org.ofbiz.entity.GenericEntity;
@@ -75,7 +74,7 @@ public final class EntityEcaCondition im
if (Debug.verboseOn()) Debug.logVerbose("Comparing : " + lhsValue + "
" + operator + " " + rhsValue, module);
// evaluate the condition & invoke the action(s)
- List<Object> messages = FastList.newInstance();
+ List<Object> messages = new LinkedList<Object>();
Boolean cond = ObjectType.doRealCompare(lhsValue, rhsValue, operator,
compareType, format, messages, null, dctx.getClassLoader(), constant);
// if any messages were returned send them out
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java
Sat Nov 1 09:31:06 2014
@@ -20,12 +20,11 @@ package org.ofbiz.entityext.eca;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.entity.GenericEntity;
@@ -118,7 +117,7 @@ public final class EntityEcaRule impleme
return;
}
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
context.putAll(value);
boolean allCondTrue = true;
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
Sat Nov 1 09:31:06 2014
@@ -19,14 +19,13 @@
package org.ofbiz.entityext.eca;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
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;
@@ -37,7 +36,10 @@ import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.cache.UtilCache;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityConfException;
-import org.ofbiz.entity.config.model.*;
+import org.ofbiz.entity.config.model.DelegatorElement;
+import org.ofbiz.entity.config.model.EntityConfig;
+import org.ofbiz.entity.config.model.EntityEcaReader;
+import org.ofbiz.entity.config.model.Resource;
import org.w3c.dom.Element;
/**
@@ -52,7 +54,8 @@ public class EntityEcaUtil {
public static Map<String, Map<String, List<EntityEcaRule>>>
getEntityEcaCache(String entityEcaReaderName) {
Map<String, Map<String, List<EntityEcaRule>>> ecaCache =
entityEcaReaders.get(entityEcaReaderName);
if (ecaCache == null) {
- ecaCache = FastMap.newInstance();
+ // FIXME: Collections are not thread safe
+ ecaCache = new HashMap<String, Map<String, List<EntityEcaRule>>>();
readConfig(entityEcaReaderName, ecaCache);
ecaCache = entityEcaReaders.putIfAbsentAndGet(entityEcaReaderName,
ecaCache);
}
@@ -85,7 +88,7 @@ public class EntityEcaUtil {
return;
}
- List<Future<List<EntityEcaRule>>> futures = FastList.newInstance();
+ List<Future<List<EntityEcaRule>>> futures = new
LinkedList<Future<List<EntityEcaRule>>>();
for (Resource eecaResourceElement :
entityEcaReaderInfo.getResourceList()) {
ResourceHandler handler = new
MainResourceHandler(EntityConfig.ENTITY_ENGINE_XML_FILENAME,
eecaResourceElement.getLoader(), eecaResourceElement.getLocation());
futures.add(ExecutionPool.GLOBAL_FORK_JOIN.submit(createEcaLoaderCallable(handler)));
@@ -105,14 +108,14 @@ public class EntityEcaUtil {
Map<String, List<EntityEcaRule>> eventMap =
ecaCache.get(entityName);
List<EntityEcaRule> rules = null;
if (eventMap == null) {
- eventMap = FastMap.newInstance();
- rules = FastList.newInstance();
+ eventMap = new HashMap<String, List<EntityEcaRule>>();
+ rules = new LinkedList<EntityEcaRule>();
ecaCache.put(entityName, eventMap);
eventMap.put(eventName, rules);
} else {
rules = eventMap.get(eventName);
if (rules == null) {
- rules = FastList.newInstance();
+ rules = new LinkedList<EntityEcaRule>();
eventMap.put(eventName, rules);
}
}
@@ -122,7 +125,7 @@ public class EntityEcaUtil {
}
private static List<EntityEcaRule> getEcaDefinitions(ResourceHandler
handler) {
- List<EntityEcaRule> rules = FastList.newInstance();
+ List<EntityEcaRule> rules = new LinkedList<EntityEcaRule>();
Element rootElement = null;
try {
rootElement = handler.getDocument().getDocumentElement();
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
Sat Nov 1 09:31:06 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;
@@ -96,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);
}
@@ -112,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");
@@ -179,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);
@@ -268,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
@@ -319,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) {
@@ -419,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");
@@ -531,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) {
@@ -630,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) {
@@ -768,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);
}
@@ -802,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
@@ -839,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);
@@ -1037,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 {
@@ -1134,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;
@@ -1165,7 +1165,7 @@ public class EntityPermissionChecker {
}
public void clearList() {
- this.entityList = FastList.newInstance();
+ this.entityList = new LinkedList<String>();
}
public void setList(List<String> lst) {
@@ -1175,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;
@@ -1211,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;
@@ -1254,7 +1254,7 @@ public class EntityPermissionChecker {
}
public void clearList() {
- this.roleIdList = FastList.newInstance();
+ this.roleIdList = new LinkedList<String>();
}
public void setList(List<String> lst) {
@@ -1273,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);
@@ -1331,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);
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
Sat Nov 1 09:31:06 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;
@@ -107,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;
@@ -839,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());
}
@@ -1140,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);
}
@@ -1158,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);
}
@@ -1176,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/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=1635906&r1=1635905&r2=1635906&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
Sat Nov 1 09:31:06 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"));
