svn commit: r1636282 [11/20] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1636282 [11/20] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Mon Nov 3 06:54:16 2014 @@ -23,12 +23,11 @@ import java.io.File; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.apache.commons.io.FileUtils; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; @@ -48,10 +47,10 @@ public class JsLanguageFileMappingCreato String encoding = (String) context.get("encoding"); // default value: UTF-8 List<Locale> localeList = UtilMisc.availableLocales(); - Map<String, Object> jQueryLocaleFile = FastMap.newInstance(); - Map<String, String> dateJsLocaleFile = FastMap.newInstance(); - Map<String, String> validationLocaleFile = FastMap.newInstance(); - Map<String, String> dateTimePickerLocaleFile = FastMap.newInstance(); + Map<String, Object> jQueryLocaleFile = new LinkedHashMap<String, Object>(); + Map<String, String> dateJsLocaleFile = new LinkedHashMap<String, String>(); + Map<String, String> validationLocaleFile = new LinkedHashMap<String, String>(); + Map<String, String> dateTimePickerLocaleFile = new LinkedHashMap<String, String>(); // setup some variables to locate the js files String componentRoot = "component://images/webapp"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Mon Nov 3 06:54:16 2014 @@ -20,10 +20,9 @@ package org.ofbiz.common; +import java.util.LinkedHashMap; import java.util.Map; -import javolution.util.FastMap; - public final class JsLanguageFilesMapping { @@ -32,7 +31,7 @@ public final class JsLanguageFilesMappin public static class datejs { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultDateJs = "/images/jquery/plugins/datejs/date-en-US.js"; static { @@ -200,7 +199,7 @@ public final class JsLanguageFilesMappin } public static class jquery { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultDateJs = "/images/jquery/ui/i18n/jquery.ui.datepicker-en.js"; static { @@ -368,7 +367,7 @@ public final class JsLanguageFilesMappin } public static class validation { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; static { @@ -535,7 +534,7 @@ public final class JsLanguageFilesMappin } public static class dateTime { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultDateTime = "/images/webapp/images/jquery/ui/i18n/jquery.ui.datepicker-en.js"; static { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java Mon Nov 3 06:54:16 2014 @@ -19,14 +19,13 @@ package org.ofbiz.common; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; @@ -209,7 +208,7 @@ public class KeywordSearchUtil { } public static Set<String> fixKeywordsForSearch(Set<String> keywordSet, boolean anyPrefix, boolean anySuffix, boolean removeStems, boolean isAnd) { - Map<String, Long> keywords = FastMap.newInstance(); + Map<String, Long> keywords = new LinkedHashMap<String, Long>(); fixupKeywordSet(keywordSet, keywords, getStopWordBagAnd(), getStopWordBagOr(), removeStems, getStemSet(), true, anyPrefix, anySuffix, isAnd); return keywords.keySet(); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java Mon Nov 3 06:54:16 2014 @@ -38,6 +38,7 @@ import org.ofbiz.entity.DelegatorFactory import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.webapp.control.ContextFilter; import org.ofbiz.webapp.website.WebSiteWorker; @@ -154,7 +155,7 @@ public class UrlServletHelper extends Co // check path alias GenericValue pathAlias = null; try { - pathAlias = delegator.findOne("WebSitePathAlias", UtilMisc.toMap("webSiteId", webSiteId, "pathAlias", pathInfo), true); + pathAlias = EntityQuery.use(delegator).from("WebSitePathAlias").where("webSiteId", webSiteId, "pathAlias", pathInfo).cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java Mon Nov 3 06:54:16 2014 @@ -31,6 +31,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.security.Security; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -50,9 +52,6 @@ import javax.mail.internet.MimeMultipart import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.stream.StreamSource; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.apache.fop.apps.Fop; import org.apache.fop.apps.MimeConstants; import org.ofbiz.base.util.Debug; @@ -334,7 +333,7 @@ public class EmailServices { } catch (SendFailedException e) { // message code prefix may be used by calling services to determine the cause of the failure Debug.logError(e, "[ADDRERR] Address error when sending message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc + "] bcc [" + sendBcc + "] subject [" + subject + "]", module); - List<SMTPAddressFailedException> failedAddresses = FastList.newInstance(); + List<SMTPAddressFailedException> failedAddresses = new LinkedList<SMTPAddressFailedException>(); Exception nestedException = null; while ((nestedException = e.getNextException()) != null && nestedException instanceof MessagingException) { if (nestedException instanceof SMTPAddressFailedException) { @@ -430,8 +429,8 @@ public class EmailServices { List<String> xslfoAttachScreenLocationListParam = UtilGenerics.checkList(serviceContext.remove("xslfoAttachScreenLocationList")); List<String> attachmentNameListParam = UtilGenerics.checkList(serviceContext.remove("attachmentNameList")); - List<String> xslfoAttachScreenLocationList = FastList.newInstance(); - List<String> attachmentNameList = FastList.newInstance(); + List<String> xslfoAttachScreenLocationList = new LinkedList<String>(); + List<String> attachmentNameList = new LinkedList<String>(); if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationParam)) xslfoAttachScreenLocationList.add(xslfoAttachScreenLocationParam); if (UtilValidate.isNotEmpty(attachmentNameParam)) attachmentNameList.add(attachmentNameParam); if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationListParam)) xslfoAttachScreenLocationList.addAll(xslfoAttachScreenLocationListParam); @@ -488,7 +487,7 @@ public class EmailServices { // check if attachment screen location passed in if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationList)) { - List<Map<String, ? extends Object>> bodyParts = FastList.newInstance(); + List<Map<String, ? extends Object>> bodyParts = new LinkedList<Map<String, ? extends Object>>(); if (bodyText != null) { bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", "text/html")); @@ -636,7 +635,7 @@ public class EmailServices { public static void sendFailureNotification(DispatchContext dctx, Map<String, ? extends Object> context, MimeMessage message, List<SMTPAddressFailedException> failures) { Locale locale = (Locale) context.get("locale"); - Map<String, Object> newContext = FastMap.newInstance(); + Map<String, Object> newContext = new LinkedHashMap<String, Object>(); newContext.put("userLogin", context.get("userLogin")); newContext.put("sendFailureNotification", false); newContext.put("sendFrom", context.get("sendFrom")); @@ -653,9 +652,9 @@ public class EmailServices { } sb.append(UtilProperties.getMessage(resource, "CommonEmailDeliveryOriginalMessage", locale)); sb.append("/n/n"); - List<Map<String, Object>> bodyParts = FastList.newInstance(); + List<Map<String, Object>> bodyParts = new LinkedList<Map<String, Object>>(); bodyParts.add(UtilMisc.<String, Object>toMap("content", sb.toString(), "type", "text/plain")); - Map<String, Object> bodyPart = FastMap.newInstance(); + Map<String, Object> bodyPart = new LinkedHashMap<String, Object>(); bodyPart.put("content", sb.toString()); bodyPart.put("type", "text/plain"); try { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/NotificationServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/NotificationServices.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/NotificationServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/NotificationServices.java Mon Nov 3 06:54:16 2014 @@ -22,11 +22,10 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.net.URL; +import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.component.ComponentConfig.WebappInfo; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; @@ -143,7 +142,7 @@ public class NotificationServices { // make sure we have a valid body before sending if (body != null) { // retain only the required attributes for the sendMail service - Map<String, Object> emailContext = FastMap.newInstance(); + Map<String, Object> emailContext = new LinkedHashMap<String, Object>(); emailContext.put("sendTo", context.get("sendTo")); emailContext.put("body", body); emailContext.put("sendCc", context.get("sendCc")); @@ -191,7 +190,7 @@ public class NotificationServices { Locale locale = (Locale) context.get("locale"); Map<String, Object> result = null; if (templateData == null) { - templateData = FastMap.newInstance(); + templateData = new LinkedHashMap<String, Object>(); } try { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/geo/GeoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Mon Nov 3 06:54:16 2014 @@ -18,18 +18,18 @@ *******************************************************************************/ package org.ofbiz.common.geo; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; 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.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; /** @@ -42,7 +42,7 @@ public class GeoWorker { public static List<GenericValue> expandGeoGroup(String geoId, Delegator delegator) { GenericValue geo = null; try { - geo = delegator.findOne("Geo", UtilMisc.toMap("geoId", geoId), true); + geo = EntityQuery.use(delegator).from("Geo").where("geoId", geoId).cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Unable to look up Geo from geoId : " + geoId, module); } @@ -51,7 +51,7 @@ public class GeoWorker { public static List<GenericValue> expandGeoGroup(GenericValue geo) { if (geo == null) { - return FastList.newInstance(); + return new LinkedList<GenericValue>(); } if (!"GROUP".equals(geo.getString("geoTypeId"))) { return UtilMisc.toList(geo); @@ -59,7 +59,7 @@ public class GeoWorker { //Debug.logInfo("Expanding geo : " + geo, module); - List<GenericValue> geoList = FastList.newInstance(); + List<GenericValue> geoList = new LinkedList<GenericValue>(); List<GenericValue> thisGeoAssoc = null; try { thisGeoAssoc = geo.getRelated("AssocGeoAssoc", UtilMisc.toMap("geoAssocTypeId", "GROUP_MEMBER"), null, false); @@ -89,16 +89,16 @@ public class GeoWorker { if (UtilValidate.isEmpty(geoIdByTypeMapOrig)) { return geoIdByTypeMapOrig; } - Map<String, String> geoIdByTypeMapTemp = FastMap.newInstance(); + Map<String, String> geoIdByTypeMapTemp = new LinkedHashMap<String, String>(); for (Map.Entry<String, String> geoIdByTypeEntry: geoIdByTypeMapOrig.entrySet()) { List<GenericValue> geoAssocList = delegator.findByAnd("GeoAssoc", UtilMisc.toMap("geoIdTo", geoIdByTypeEntry.getValue(), "geoAssocTypeId", "REGIONS"), null, true); for (GenericValue geoAssoc: geoAssocList) { - GenericValue newGeo = delegator.findOne("Geo", true, "geoId", geoAssoc.getString("geoId")); + GenericValue newGeo = EntityQuery.use(delegator).from("Geo").where("geoId", geoAssoc.get("geoId")).cache().queryOne(); geoIdByTypeMapTemp.put(newGeo.getString("geoTypeId"), newGeo.getString("geoId")); } } geoIdByTypeMapTemp = expandGeoRegionDeep(geoIdByTypeMapTemp, delegator); - Map<String, String> geoIdByTypeMapNew = FastMap.newInstance(); + Map<String, String> geoIdByTypeMapNew = new LinkedHashMap<String, String>(); // add the temp Map first, then the original over top of it, ie give the original priority over the sub/expanded values geoIdByTypeMapNew.putAll(geoIdByTypeMapTemp); geoIdByTypeMapNew.putAll(geoIdByTypeMapOrig); @@ -108,7 +108,7 @@ public class GeoWorker { public static boolean containsGeo(List<GenericValue> geoList, String geoId, Delegator delegator) { GenericValue geo = null; try { - geo = delegator.findOne("Geo", UtilMisc.toMap("geoId", geoId), true); + geo = EntityQuery.use(delegator).from("Geo").where("geoId", geoId).cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Unable to look up Geo from geoId : " + geoId, module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/image/ImageTransform.java Mon Nov 3 06:54:16 2014 @@ -24,6 +24,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -32,14 +33,10 @@ import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilXml; - import org.xml.sax.SAXException; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -73,7 +70,7 @@ public class ImageTransform { /* VARIABLES */ BufferedImage bufImg; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); /* BUFFERED IMAGE */ try { @@ -113,7 +110,7 @@ public class ImageTransform { /* VARIABLES */ BufferedImage bufNewImg; double defaultHeight, defaultWidth, scaleFactor; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); /* DIMENSIONS from ImageProperties */ // A missed dimension is authorized @@ -220,8 +217,8 @@ public class ImageTransform { /* VARIABLES */ Document document; Element rootElt; - Map<String, Map<String, String>> valueMap = FastMap.newInstance(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Map<String, String>> valueMap = new LinkedHashMap<String, Map<String, String>>(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); /* PARSING */ try { @@ -255,10 +252,10 @@ public class ImageTransform { /* get NAME and VALUE */ List<? extends Element> children = UtilXml.childElementList(rootElt); // FIXME : despite upgrading to jdom 1.1, it seems that getChildren is pre 1.5 java code (ie getChildren does not retun List<Element> but only List) for (Element currentElt : children) { - Map<String, String> eltMap = FastMap.newInstance(); + Map<String, String> eltMap = new LinkedHashMap<String, String>(); List<? extends Element> children2 = UtilXml.childElementList(currentElt); if (children2.size() > 0) { - Map<String, String> childMap = FastMap.newInstance(); + Map<String, String> childMap = new LinkedHashMap<String, String>(); // loop over Children 1st level for (Element currentChild : children2) { childMap.put(currentChild.getAttribute("name"), currentChild.getAttribute("value")); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Nov 3 06:54:16 2014 @@ -20,6 +20,8 @@ package org.ofbiz.common.login; import java.sql.Timestamp; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -28,9 +30,6 @@ import java.util.regex.Pattern; import javax.transaction.Transaction; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.crypto.HashCrypt; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -50,6 +49,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.DispatchContext; import org.ofbiz.service.LocalDispatcher; @@ -90,7 +90,7 @@ public class LoginServices { } } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); @@ -468,11 +468,11 @@ public class LoginServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createUserLogin(DispatchContext ctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); Locale locale = (Locale) context.get("locale"); boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); @@ -493,7 +493,7 @@ public class LoginServices { GenericValue party = null; try { - party = delegator.findOne("Party", false, "partyId", partyId); + party = EntityQuery.use(delegator).from("Party").where("partyId", partyId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, "", module); } @@ -609,7 +609,7 @@ public class LoginServices { GenericValue userLoginToUpdate = null; try { - userLoginToUpdate = delegator.findOne("UserLogin", false, "userLoginId", userLoginId); + userLoginToUpdate = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne(); } catch (GenericEntityException e) { Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.getMessage()); errMsg = UtilProperties.getMessage(resource,"loginservices.could_not_change_password_read_failure", messageMap, locale); @@ -652,7 +652,7 @@ public class LoginServices { newPasswordVerify = newPasswordVerify.toLowerCase(); } - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); if (newPassword != null) { checkNewPassword(userLoginToUpdate, currentPassword, newPassword, newPasswordVerify, passwordHint, errorMessageList, adminUser, locale); @@ -700,10 +700,10 @@ public class LoginServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updateUserLoginId(DispatchContext ctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); Locale locale = (Locale) context.get("locale"); //boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); @@ -724,7 +724,7 @@ public class LoginServices { if (UtilValidate.isNotEmpty(partyId)) { //GenericValue party = null; //try { - // party = delegator.findOne("Party", UtilMisc.toMap("partyId", partyId), false); + // party = EntityQuery.use(delegator).from("Party").where("partyId", partyId).queryOne(); //} catch (GenericEntityException e) { // Debug.logWarning(e, "", module); //} @@ -746,7 +746,7 @@ public class LoginServices { // check to see if there's a matching login and use it if it's for the same party try { - newUserLogin = delegator.findOne("UserLogin", false, "userLoginId", userLoginId); + newUserLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, "", module); Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.getMessage()); @@ -812,7 +812,7 @@ public class LoginServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updateUserLoginSecurity(DispatchContext ctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); @@ -834,7 +834,7 @@ public class LoginServices { GenericValue userLoginToUpdate = null; try { - userLoginToUpdate = delegator.findOne("UserLogin", false, "userLoginId", userLoginId); + userLoginToUpdate = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne(); } catch (GenericEntityException e) { Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.getMessage()); errMsg = UtilProperties.getMessage(resource,"loginservices.could_not_change_password_read_failure", messageMap, locale); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java Mon Nov 3 06:54:16 2014 @@ -18,11 +18,10 @@ *******************************************************************************/ package org.ofbiz.common.preferences; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilMisc; @@ -132,7 +131,7 @@ public class PreferenceWorker { * @return user preference map */ public static Map<String, Object> createUserPrefMap(GenericValue rec) throws GeneralException { - return addPrefToMap(rec, FastMap.<String, Object>newInstance()); + return addPrefToMap(rec, new LinkedHashMap<String, Object>()); } /** @@ -142,7 +141,7 @@ public class PreferenceWorker { * @return user preference map */ public static Map<String, Object> createUserPrefMap(List<GenericValue> recList) throws GeneralException { - Map<String, Object> userPrefMap = FastMap.newInstance(); + Map<String, Object> userPrefMap = new LinkedHashMap<String, Object>(); if (recList != null) { for (GenericValue value: recList) { addPrefToMap(value, userPrefMap); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java Mon Nov 3 06:54:16 2014 @@ -19,6 +19,8 @@ package org.ofbiz.common.scripting; import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.Locale; import java.util.List; import java.util.Map; @@ -29,9 +31,6 @@ import javax.script.ScriptEngine; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.ScriptUtil; import org.ofbiz.base.util.UtilGenerics; @@ -115,13 +114,13 @@ public final class ContextHelper { if (isService()) { errorMessages = UtilGenerics.checkList(getResults().get(ModelService.ERROR_MESSAGE_LIST)); if (errorMessages == null) { - errorMessages = FastList.newInstance(); + errorMessages = new LinkedList<String>(); getResults().put(ModelService.ERROR_MESSAGE_LIST, errorMessages); } } else { errorMessages = UtilGenerics.checkList(getResults().get("_error_message_list_")); if (errorMessages == null) { - errorMessages = FastList.newInstance(); + errorMessages = new LinkedList<String>(); getResults().put("_error_message_list_", errorMessages); } } @@ -143,7 +142,7 @@ public final class ContextHelper { public Map<String, Object> getParameters() { Map<String, Object> parameters = UtilGenerics.checkMap(this.context.getAttribute(ScriptUtil.PARAMETERS_KEY)); if (parameters == null) { - parameters = FastMap.newInstance(); + parameters = new LinkedHashMap<String, Object>(); this.context.setAttribute(ScriptUtil.PARAMETERS_KEY, parameters, ScriptContext.ENGINE_SCOPE); } return parameters; @@ -164,7 +163,7 @@ public final class ContextHelper { public Map<String, Object> getResults() { Map<String, Object> results = UtilGenerics.checkMap(this.context.getAttribute(ScriptUtil.RESULT_KEY)); if (results == null) { - results = FastMap.newInstance(); + results = new LinkedHashMap<String, Object>(); this.context.setAttribute(ScriptUtil.RESULT_KEY, results, ScriptContext.ENGINE_SCOPE); } return results; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusServices.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusServices.java Mon Nov 3 06:54:16 2014 @@ -18,18 +18,18 @@ *******************************************************************************/ package org.ofbiz.common.status; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import static org.ofbiz.base.util.UtilGenerics.checkList; + import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; @@ -53,7 +53,7 @@ public class StatusServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonStatusMandatory", locale)); } - List<GenericValue> statusItems = FastList.newInstance(); + List<GenericValue> statusItems = new LinkedList<GenericValue>(); for (String statusTypeId: statusTypes) { try { List<GenericValue> myStatusItems = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", statusTypeId), UtilMisc.toList("sequenceId"), true); @@ -62,7 +62,7 @@ public class StatusServices { Debug.logError(e, module); } } - Map<String, Object> ret = FastMap.newInstance(); + Map<String, Object> ret = new LinkedHashMap<String, Object>(); ret.put("statusItems",statusItems); return ret; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusWorker.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/status/StatusWorker.java Mon Nov 3 06:54:16 2014 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.common.status; +import java.util.LinkedList; import java.util.List; import javax.servlet.jsp.PageContext; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.Delegator; @@ -52,7 +51,7 @@ public class StatusWorker { public static void getStatusItems(PageContext pageContext, String attributeName, String statusTypeIdOne, String statusTypeIdTwo) { Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); - List<GenericValue> statusItems = FastList.newInstance(); + List<GenericValue> statusItems = new LinkedList<GenericValue>(); try { List<GenericValue> calItems = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", statusTypeIdOne), UtilMisc.toList("sequenceId"), true); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/uom/UomWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/uom/UomWorker.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/uom/UomWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/uom/UomWorker.java Mon Nov 3 06:54:16 2014 @@ -21,10 +21,9 @@ package org.ofbiz.common.uom; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.LinkedHashMap; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -100,12 +99,12 @@ public class UomWorker { if (originalValue == null || uomId == null || uomIdTo == null) return null; if (uomId.equals(uomIdTo)) return originalValue; - Map<String, Object> svcInMap = FastMap.newInstance(); + Map<String, Object> svcInMap = new LinkedHashMap<String, Object>(); svcInMap.put("originalValue", originalValue); svcInMap.put("uomId", uomId); svcInMap.put("uomIdTo", uomIdTo); - Map<String, Object> svcOutMap = FastMap.newInstance(); + Map<String, Object> svcOutMap = new LinkedHashMap<String, Object>(); try { svcOutMap = dispatcher.runSync("convertUom", svcInMap); } catch (GenericServiceException ex) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityCryptoTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityCryptoTestSuite.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityCryptoTestSuite.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityCryptoTestSuite.java Mon Nov 3 06:54:16 2014 @@ -26,6 +26,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityConditionSubSelect; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.testtools.EntityTestCase; +import org.ofbiz.entity.util.EntityQuery; public class EntityCryptoTestSuite extends EntityTestCase { public EntityCryptoTestSuite(String name) { @@ -40,11 +41,11 @@ public class EntityCryptoTestSuite exten // Ensure that null values are passed thru unencrypted. delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "1", "testingCryptoTypeId", "BASIC")); - GenericValue entity = delegator.findOne("TestingCrypto", UtilMisc.toMap("testingCryptoId", "1"), false); + GenericValue entity = EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoId", "1").queryOne(); assertNull(entity.getString("unencryptedValue")); assertNull(entity.getString("encryptedValue")); assertNull(entity.getString("saltedEncryptedValue")); - GenericValue view = delegator.findOne("TestingCryptoRawView", UtilMisc.toMap("testingCryptoId", "1"), false); + GenericValue view = EntityQuery.use(delegator).from("TestingCryptoRawView").where("testingCryptoId", "1").queryOne(); assertNull(view.getString("unencryptedValue")); assertNull(view.getString("encryptedValue")); assertNull(view.getString("saltedEncryptedValue")); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java Mon Nov 3 06:54:16 2014 @@ -37,7 +37,9 @@ import java.util.concurrent.atomic.Atomi import javax.sql.rowset.serial.SerialBlob; import org.ofbiz.base.concurrent.ExecutionPool; +import org.ofbiz.base.lang.JSON; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.Observable; import org.ofbiz.base.util.Observer; import org.ofbiz.base.util.UtilDateTime; @@ -1209,6 +1211,23 @@ public class EntityTestSuite extends Ent assertTrue("One big transaction was not faster than several small ones", totalTimeOneTransaction < totalTimeSeveralSmallTransactions); } + public void testConverters() throws Exception { + // Must use the default delegator because the deserialized GenericValue can't + // find the randomized one. + Delegator localDelegator = DelegatorFactory.getDelegator("default"); + GenericValue testValue = localDelegator.create("Testing", "testingId", "JSON_TEST", "testingTypeId", "TEST-UPDATE-1", + "description", "Testing JSON Converters", "testingSize", (long) 123, "testingDate", + new Timestamp(System.currentTimeMillis())); + assertNotNull("Created GenericValue not null", testValue); + JSON json = (JSON) ObjectType.simpleTypeConvert(testValue, "org.ofbiz.base.lang.JSON", null, null); + assertNotNull("JSON instance not null", json); + GenericValue convertedValue = (GenericValue) ObjectType.simpleTypeConvert(json, "org.ofbiz.entity.GenericValue", null, + null); + assertNotNull("GenericValue converted from JSON not null", convertedValue); + assertEquals("GenericValue converted from JSON equals original value", testValue, convertedValue); + testValue.remove(); + } + private final class TestObserver implements Observer { private Observable observable; private Object arg; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/Converters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/Converters.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/Converters.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/Converters.java Mon Nov 3 06:54:16 2014 @@ -18,19 +18,79 @@ *******************************************************************************/ package org.ofbiz.entity.util; +import java.io.IOException; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Set; import org.ofbiz.base.conversion.AbstractConverter; import org.ofbiz.base.conversion.ConversionException; import org.ofbiz.base.conversion.ConverterLoader; +import org.ofbiz.base.lang.JSON; +import org.ofbiz.base.util.ObjectType; +import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.DelegatorFactory; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.model.ModelField; +import org.ofbiz.entity.model.ModelFieldType; /** Entity Engine <code>Converter</code> classes. */ public class Converters implements ConverterLoader { + + public static class JSONToGenericValue extends AbstractConverter<JSON, GenericValue> { + public JSONToGenericValue() { + super(JSON.class, GenericValue.class); + } + + public GenericValue convert(JSON obj) throws ConversionException { + Map<String, Object> fieldMap; + try { + fieldMap = UtilGenerics.<Map<String, Object>>cast(obj.toObject(Map.class)); + String delegatorName = (String) fieldMap.remove("_DELEGATOR_NAME_"); + String entityName = (String) fieldMap.remove("_ENTITY_NAME_"); + if (delegatorName == null || entityName == null) { + throw new ConversionException("Invalid JSON object"); + } + Delegator delegator = DelegatorFactory.getDelegator(delegatorName); + GenericValue value = delegator.makeValue(entityName); + for (Map.Entry<String, Object> entry : fieldMap.entrySet()) { + String fieldName = entry.getKey(); + Object fieldValue = entry.getValue(); + ModelField field = value.getModelEntity().getField(fieldName); + ModelFieldType type = delegator.getEntityFieldType(value.getModelEntity(), field.getType()); + value.set(fieldName, ObjectType.simpleTypeConvert(fieldValue, type.getJavaType(), null, null)); + } + return value; + } catch (ConversionException e) { + throw e; + } catch (Exception e) { + throw new ConversionException(e); + } + } + } + + public static class GenericValueToJSON extends AbstractConverter<GenericValue, JSON> { + public GenericValueToJSON() { + super(GenericValue.class, JSON.class); + } + + public JSON convert(GenericValue obj) throws ConversionException { + Map<String, Object> fieldMap = new HashMap<String, Object>(obj); + fieldMap.put("_DELEGATOR_NAME_", obj.getDelegator().getDelegatorName()); + fieldMap.put("_ENTITY_NAME_", obj.getEntityName()); + try { + return JSON.from(fieldMap); + } catch (IOException e) { + throw new ConversionException(e); + } + } + } + public static class GenericValueToList extends AbstractConverter<GenericValue, List<GenericValue>> { public GenericValueToList() { super(GenericValue.class, List.class); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java Mon Nov 3 06:54:16 2014 @@ -161,7 +161,7 @@ public final class EntityCrypto { GenericValue keyValue = null; try { - keyValue = delegator.findOne("EntityKeyStore", false, "keyName", hashedKeyName); + keyValue = EntityQuery.use(delegator).from("EntityKeyStore").where("keyName", hashedKeyName).queryOne(); } catch (GenericEntityException e) { throw new EntityCryptoException(e); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java Mon Nov 3 06:54:16 2014 @@ -55,7 +55,7 @@ public class EntityUtilProperties implem // find system property try { - GenericValue systemProperty = delegator.findOne("SystemProperty", UtilMisc.toMap("systemResourceId", resource, "systemPropertyId", name), true); + GenericValue systemProperty = EntityQuery.use(delegator).from("SystemProperty").where("systemResourceId", resource, "systemPropertyId", name).cache().queryOne(); if (systemProperty != null) { String systemPropertyValue = systemProperty.getString("systemPropertyValue"); if (UtilValidate.isNotEmpty(systemPropertyValue)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/testdef/entitytests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/testdef/entitytests.xml?rev=1636282&r1=1636281&r2=1636282&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/testdef/entitytests.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/testdef/entitytests.xml Mon Nov 3 06:54:16 2014 @@ -23,6 +23,7 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"> <test-case case-name="entity-tests"><junit-test-suite class-name="org.ofbiz.entity.test.EntityTestSuite"/></test-case> <test-case case-name="entity-crypto-tests"><junit-test-suite class-name="org.ofbiz.entity.test.EntityCryptoTestSuite"/></test-case> + <test-case case-name="entity-query-tests"><junit-test-suite class-name="org.ofbiz.entity.test.EntityQueryTestSuite"/></test-case> <test-case case-name="entity-util-properties-tests"> <simple-method-test location="component://entity/script/org/ofbiz/entity/test/EntityUtilPropertiesTests.xml"/> </test-case> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.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/EntityGroupUtil.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java Mon Nov 3 06:54:16 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.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/cache/EntityCacheServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java Mon Nov 3 06:54:16 2014 @@ -29,6 +29,7 @@ import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.util.DistributedCacheClear; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entityext.EntityServiceFactory; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; @@ -57,7 +58,7 @@ public class EntityCacheServices impleme public GenericValue getAuthUserLogin() { GenericValue userLogin = null; try { - userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), true); + userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Error finding the userLogin for distributed cache clear", module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.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/data/EntityDataLoadContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Mon Nov 3 06:54:16 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.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/data/EntityDataServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java Mon Nov 3 06:54:16 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.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/eca/EntityEcaCondition.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java Mon Nov 3 06:54:16 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.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/eca/EntityEcaRule.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java Mon Nov 3 06:54:16 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.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/eca/EntityEcaUtil.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java Mon Nov 3 06:54:16 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(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |