svn commit: r1635897 [2/4] - in /ofbiz/branches/json-integrati
Locked
svn commit: r1635897 [2/4] - in /ofbiz/branches/json-integrati
 
|
Modified: ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FindServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FindServices.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FindServices.java Sat Nov 1 07:15:09 2014 @@ -23,15 +23,14 @@ import static org.ofbiz.base.util.UtilGe import java.sql.Timestamp; import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.StringUtil; @@ -70,7 +69,7 @@ public class FindServices { public static Map<String, EntityComparisonOperator<?, ?>> entityOperators; static { - entityOperators = FastMap.newInstance(); + entityOperators = new LinkedHashMap<String, EntityComparisonOperator<?, ?>>(); entityOperators.put("between", EntityOperator.BETWEEN); entityOperators.put("equals", EntityOperator.EQUALS); entityOperators.put("greaterThan", EntityOperator.GREATER_THAN); @@ -110,7 +109,7 @@ public class FindServices { // Note that "normalizedFields" will contain values other than those // Contained in the associated entity. // Those extra fields will be ignored in the second half of this method. - Map<String, Map<String, Map<String, Object>>> normalizedFields = FastMap.newInstance(); + Map<String, Map<String, Map<String, Object>>> normalizedFields = new LinkedHashMap<String, Map<String, Map<String, Object>>>(); //StringBuffer queryStringBuf = new StringBuffer(); for (String fieldNameRaw: inputFields.keySet()) { // The name as it appeas in the HTML form String fieldNameRoot = null; // The entity field name. Everything to the left of the first "_" if @@ -182,19 +181,19 @@ public class FindServices { } subMap = normalizedFields.get(fieldNameRoot); if (subMap == null) { - subMap = FastMap.newInstance(); + subMap = new LinkedHashMap<String, Map<String, Object>>(); normalizedFields.put(fieldNameRoot, subMap); } subMap2 = subMap.get(fieldPair); if (subMap2 == null) { - subMap2 = FastMap.newInstance(); + subMap2 = new LinkedHashMap<String, Object>(); subMap.put(fieldPair, subMap2); } subMap2.put(fieldMode, fieldValue); List<Object[]> origList = origValueMap.get(fieldNameRoot); if (origList == null) { - origList = FastList.newInstance(); + origList = new LinkedList<Object[]>(); origValueMap.put(fieldNameRoot, origList); } Object [] origValues = {fieldNameRaw, fieldValue}; @@ -214,13 +213,13 @@ public class FindServices { * @return returns an EntityCondition list */ public static List<EntityCondition> createConditionList(Map<String, ? extends Object> parameters, List<ModelField> fieldList, Map<String, Object> queryStringMap, Delegator delegator, Map<String, ?> context) { - Set<String> processed = FastSet.newInstance(); - Set<String> keys = FastSet.newInstance(); - Map<String, ModelField> fieldMap = FastMap.newInstance(); + Set<String> processed = new LinkedHashSet<String>(); + Set<String> keys = new LinkedHashSet<String>(); + Map<String, ModelField> fieldMap = new LinkedHashMap<String, ModelField>(); for (ModelField modelField : fieldList) { fieldMap.put(modelField.getName(), modelField); } - List<EntityCondition> result = FastList.newInstance(); + List<EntityCondition> result = new LinkedList<EntityCondition>(); for (Map.Entry<String, ? extends Object> entry : parameters.entrySet()) { String parameterName = entry.getKey(); if (processed.contains(parameterName)) { @@ -365,7 +364,7 @@ public class FindServices { Object fieldValue = null; // If it is a "value" field, it will be the value to be used in the query. // If it is an "op" field, it will be "equals", "greaterThan", etc. EntityCondition cond = null; - List<EntityCondition> tmpList = FastList.newInstance(); + List<EntityCondition> tmpList = new LinkedList<EntityCondition>(); String opString = null; boolean ignoreCase = false; List<ModelField> fields = modelEntity.getFieldsUnmodifiable(); @@ -548,7 +547,7 @@ public class FindServices { } Timestamp filterByDateValue = (Timestamp) context.get("filterByDateValue"); - Map<String, Object> queryStringMap = FastMap.newInstance(); + Map<String, Object> queryStringMap = new LinkedHashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); ModelEntity modelEntity = delegator.getModelEntity(entityName); List<EntityCondition> tmpList = createConditionList(inputFields, modelEntity.getFieldsUnmodifiable(), queryStringMap, delegator, context); @@ -665,7 +664,7 @@ public class FindServices { // Contained in the associated entity. // Those extra fields will be ignored in the second half of this method. ModelEntity modelEntity = delegator.getModelEntity(entityName); - Map<String, Object> normalizedFields = FastMap.newInstance(); + Map<String, Object> normalizedFields = new LinkedHashMap<String, Object>(); //StringBuffer queryStringBuf = new StringBuffer(); for (String fieldNameRaw: inputFields.keySet()) { // The name as it appeas in the HTML form String fieldNameRoot = null; // The entity field name. Everything to the left of the first "_" if Modified: ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FtpServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FtpServices.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FtpServices.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/FtpServices.java Sat Nov 1 07:15:09 2014 @@ -25,12 +25,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; - import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPReply; @@ -60,7 +59,7 @@ public class FtpServices { Debug.logError(ioe, "[putFile] Problem opening local file", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonFtpFileCannotBeOpen", locale)); } - List<String> errorList = FastList.newInstance(); + List<String> errorList = new LinkedList<String>(); FTPClient ftp = new FTPClient(); try { Integer defaultTimeout = (Integer) context.get("defaultTimeout"); @@ -145,7 +144,7 @@ public class FtpServices { Debug.logError(ioe, "[getFile] Problem opening local file", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonFtpFileCannotBeOpen", locale)); } - List<String> errorList = FastList.newInstance(); + List<String> errorList = new LinkedList<String>(); FTPClient ftp = new FTPClient(); try { Integer defaultTimeout = (Integer) context.get("defaultTimeout"); Modified: ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/EmailServices.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/NotificationServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/NotificationServices.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/NotificationServices.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/email/NotificationServices.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/geo/GeoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Sat Nov 1 07:15:09 2014 @@ -18,12 +18,11 @@ *******************************************************************************/ 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; @@ -52,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); @@ -60,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); @@ -90,7 +89,7 @@ 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) { @@ -99,7 +98,7 @@ public class GeoWorker { } } 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); Modified: ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/image/ImageTransform.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/login/LoginServices.java Sat Nov 1 07:15:09 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; @@ -91,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")); @@ -469,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")); @@ -653,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); @@ -701,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")); @@ -813,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"); Modified: ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusServices.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusServices.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusServices.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusWorker.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusWorker.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/status/StatusWorker.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/common/src/org/ofbiz/common/uom/UomWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/uom/UomWorker.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/uom/UomWorker.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/uom/UomWorker.java Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/entity/testdef/entitytests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/entity/testdef/entitytests.xml?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/entity/testdef/entitytests.xml (original) +++ ofbiz/branches/json-integration-refactoring/framework/entity/testdef/entitytests.xml Sat Nov 1 07:15:09 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/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelNotification.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelNotification.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelNotification.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelNotification.java Sat Nov 1 07:15:09 2014 @@ -19,18 +19,17 @@ package org.ofbiz.service; -import org.ofbiz.service.config.ServiceConfigUtil; -import org.ofbiz.base.config.GenericConfigException; -import org.ofbiz.base.util.StringUtil; -import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.UtilGenerics; -import org.ofbiz.base.util.UtilValidate; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; +import org.ofbiz.base.config.GenericConfigException; +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.StringUtil; +import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.service.config.ServiceConfigUtil; import org.ofbiz.service.config.model.NotificationGroup; import org.ofbiz.service.config.model.Notify; @@ -82,8 +81,8 @@ public class ModelNotification { } // template context - Map<String, Object> notifyContext = FastMap.newInstance(); - Map<String, Object> bodyParams = FastMap.newInstance(); + Map<String, Object> notifyContext = new HashMap<String, Object>(); + Map<String, Object> bodyParams = new HashMap<String, Object>(); bodyParams.put("serviceContext", context); bodyParams.put("serviceResult", result); bodyParams.put("service", model); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelService.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelService.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelService.java Sat Nov 1 07:15:09 2014 @@ -23,8 +23,11 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.AbstractMap; import java.util.AbstractSet; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -56,9 +59,6 @@ import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.metrics.Metrics; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -84,7 +84,7 @@ import com.ibm.wsdl.extensions.soap.SOAP @SuppressWarnings("serial") public class ModelService extends AbstractMap<String, Object> implements Serializable { private static final Field[] MODEL_SERVICE_FIELDS; - private static final Map<String, Field> MODEL_SERVICE_FIELD_MAP = FastMap.newInstance(); + private static final Map<String, Field> MODEL_SERVICE_FIELD_MAP = new LinkedHashMap<String, Field>(); static { MODEL_SERVICE_FIELDS = ModelService.class.getFields(); for (Field field: MODEL_SERVICE_FIELDS) { @@ -189,19 +189,19 @@ public class ModelService extends Abstra public Set<ModelParam> overrideParameters = new LinkedHashSet<ModelParam>(); /** List of permission groups for service invocation */ - public List<ModelPermGroup> permissionGroups = FastList.newInstance(); + public List<ModelPermGroup> permissionGroups = new LinkedList<ModelPermGroup>(); /** List of email-notifications for this service */ - public List<ModelNotification> notifications = FastList.newInstance(); + public List<ModelNotification> notifications = new LinkedList<ModelNotification>(); /** Internal Service Group */ public GroupModel internalGroup = null; /** Context Information, a Map of parameters used by the service, contains ModelParam objects */ - protected Map<String, ModelParam> contextInfo = FastMap.newInstance(); + protected Map<String, ModelParam> contextInfo = new LinkedHashMap<String, ModelParam>(); /** Context Information, a List of parameters used by the service, contains ModelParam objects */ - protected List<ModelParam> contextParamList = FastList.newInstance(); + protected List<ModelParam> contextParamList = new LinkedList<ModelParam>(); /** Flag to say if we have pulled in our addition parameters from our implemented service(s) */ protected boolean inheritedParameters = false; @@ -490,8 +490,8 @@ public class ModelService extends Abstra * @param locale the actual locale to use */ public void validate(Map<String, Object> context, String mode, Locale locale) throws ServiceValidationException { - Map<String, String> requiredInfo = FastMap.newInstance(); - Map<String, String> optionalInfo = FastMap.newInstance(); + Map<String, String> requiredInfo = new HashMap<String, String>(); + Map<String, String> optionalInfo = new HashMap<String, String>(); boolean verboseOn = Debug.verboseOn(); if (verboseOn) Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : Validating context - " + context, module); @@ -517,14 +517,14 @@ public class ModelService extends Abstra } // get the test values - Map<String, Object> requiredTest = FastMap.newInstance(); - Map<String, Object> optionalTest = FastMap.newInstance(); + Map<String, Object> requiredTest = new HashMap<String, Object>(); + Map<String, Object> optionalTest = new HashMap<String, Object>(); - if (context == null) context = FastMap.newInstance(); + if (context == null) context = new HashMap<String, Object>(); requiredTest.putAll(context); - List<String> requiredButNull = FastList.newInstance(); - List<String> keyList = FastList.newInstance(); + List<String> requiredButNull = new LinkedList<String>(); + List<String> keyList = new LinkedList<String>(); keyList.addAll(requiredTest.keySet()); for (String key: keyList) { Object value = requiredTest.get(key); @@ -539,7 +539,7 @@ public class ModelService extends Abstra // check for requiredButNull fields and return an error since null values are not allowed for required fields if (requiredButNull.size() > 0) { - List<String> missingMsg = FastList.newInstance(); + List<String> missingMsg = new LinkedList<String>(); for (String missingKey: requiredButNull) { String message = this.getParam(missingKey).getPrimaryFailMessage(locale); if (message == null) { @@ -578,7 +578,7 @@ public class ModelService extends Abstra // required and type validation complete, do allow-html validation if ("IN".equals(mode)) { - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); for (ModelParam modelParam : this.contextInfo.values()) { // the param is a String, allow-html is not any, and we are looking at an IN parameter during input parameter validation if (context.get(modelParam.name) != null && ("String".equals(modelParam.type) || "java.lang.String".equals(modelParam.type)) @@ -615,7 +615,7 @@ public class ModelService extends Abstra Set<String> missing = new TreeSet<String>(keySet); missing.removeAll(testSet); - List<String> missingMsgs = FastList.newInstance(); + List<String> missingMsgs = new LinkedList<String>(); for (String key: missing) { String msg = model.getParam(key).getPrimaryFailMessage(locale); if (msg == null) { @@ -625,7 +625,7 @@ public class ModelService extends Abstra missingMsgs.add(msg); } - List<String> missingCopy = FastList.newInstance(); + List<String> missingCopy = new LinkedList<String>(); missingCopy.addAll(missing); throw new ServiceValidationException(missingMsgs, model, missingCopy, null, mode); } @@ -635,7 +635,7 @@ public class ModelService extends Abstra Set<String> extra = new TreeSet<String>(testSet); extra.removeAll(keySet); - List<String> extraMsgs = FastList.newInstance(); + List<String> extraMsgs = new LinkedList<String>(); for (String key: extra) { ModelParam param = model.getParam(key); String msg = null; @@ -648,13 +648,13 @@ public class ModelService extends Abstra extraMsgs.add(msg); } - List<String> extraCopy = FastList.newInstance(); + List<String> extraCopy = new LinkedList<String>(); extraCopy.addAll(extra); throw new ServiceValidationException(extraMsgs, model, null, extraCopy, mode); } // * Validate types next - List<String> typeFailMsgs = FastList.newInstance(); + List<String> typeFailMsgs = new LinkedList<String>(); for (String key: testSet) { ModelParam param = model.getParam(key); @@ -775,7 +775,7 @@ public class ModelService extends Abstra * @return List of parameter names */ public List<String> getParameterNames(String mode, boolean optional, boolean internal) { - List<String> names = FastList.newInstance(); + List<String> names = new LinkedList<String>(); if (!"IN".equals(mode) && !"OUT".equals(mode) && !"INOUT".equals(mode)) { return names; @@ -843,7 +843,7 @@ public class ModelService extends Abstra * @param locale Locale to use to do some type conversion */ public Map<String, Object> makeValid(Map<String, ? extends Object> source, String mode, boolean includeInternal, List<Object> errorMessages, TimeZone timeZone, Locale locale) { - Map<String, Object> target = FastMap.newInstance(); + Map<String, Object> target = new HashMap<String, Object>(); if (source == null) { return target; @@ -919,7 +919,7 @@ public class ModelService extends Abstra } private Map<String, Object> makePrefixMap(Map<String, ? extends Object> source, ModelParam param) { - Map<String, Object> paramMap = FastMap.newInstance(); + Map<String, Object> paramMap = new HashMap<String, Object>(); for (Map.Entry<String, ? extends Object> entry: source.entrySet()) { String key = entry.getKey(); if (key.startsWith(param.stringMapPrefix)) { @@ -931,7 +931,7 @@ public class ModelService extends Abstra } private List<Object> makeSuffixList(Map<String, ? extends Object> source, ModelParam param) { - List<Object> paramList = FastList.newInstance(); + List<Object> paramList = new LinkedList<Object>(); for (Map.Entry<String, ? extends Object> entry: source.entrySet()) { String key = entry.getKey(); if (key.endsWith(param.stringListSuffix)) { @@ -1046,7 +1046,7 @@ public class ModelService extends Abstra * @return A list of required IN parameters in the order which they were defined. */ public List<Object> getInParameterSequence(Map<String, ? extends Object> source) { - List<Object> target = FastList.newInstance(); + List<Object> target = new LinkedList<Object>(); if (source == null) { return target; } @@ -1070,7 +1070,7 @@ public class ModelService extends Abstra * the service was created. */ public List<ModelParam> getModelParamList() { - List<ModelParam> newList = FastList.newInstance(); + List<ModelParam> newList = new LinkedList<ModelParam>(); newList.addAll(this.contextParamList); return newList; } @@ -1080,7 +1080,7 @@ public class ModelService extends Abstra * the service was created. */ public List<ModelParam> getInModelParamList() { - List<ModelParam> inList = FastList.newInstance(); + List<ModelParam> inList = new LinkedList<ModelParam>(); for (ModelParam modelParam: this.contextParamList) { // don't include OUT parameters in this list, only IN and INOUT if ("OUT".equals(modelParam.mode)) continue; Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelServiceReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ModelServiceReader.java Sat Nov 1 07:15:09 2014 @@ -21,16 +21,15 @@ package org.ofbiz.service; import java.io.IOException; import java.io.Serializable; import java.net.URL; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.ResourceHandler; import org.ofbiz.base.metrics.MetricsFactory; @@ -44,6 +43,7 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelField; import org.ofbiz.entity.model.ModelFieldType; +import org.ofbiz.service.ModelParam.ModelParamValidator; import org.ofbiz.service.group.GroupModel; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -107,7 +107,7 @@ public class ModelServiceReader implemen } } - Map<String, ModelService> modelServices = FastMap.newInstance(); + Map<String, ModelService> modelServices = new HashMap<String, ModelService>(); if (this.isFromURL) {// utilTimer.timerString("Before getDocumentElement in file " + readerURL); } else {// utilTimer.timerString("Before getDocumentElement in " + handler); } @@ -273,7 +273,7 @@ public class ModelServiceReader implemen service.nameSpace = getCDATADef(serviceElement, "namespace"); // construct the context - service.contextInfo = FastMap.newInstance(); + service.contextInfo = new HashMap<String, ModelParam>(); this.createNotification(serviceElement, service); this.createPermission(serviceElement, service); this.createPermGroups(serviceElement, service); @@ -690,7 +690,7 @@ public class ModelServiceReader implemen List<? extends Element> validateElements = UtilXml.childElementList(attribute, "type-validate"); if (UtilValidate.isNotEmpty(validateElements)) { // always clear out old ones; never append - param.validators = FastList.newInstance(); + param.validators = new LinkedList<ModelParamValidator>(); Element validate = validateElements.get(0); String methodName = validate.getAttribute("method").intern(); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceUtil.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceUtil.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceUtil.java Sat Nov 1 07:15:09 2014 @@ -20,6 +20,7 @@ package org.ofbiz.service; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -29,9 +30,6 @@ import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import javax.transaction.Transaction; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -119,7 +117,7 @@ public class ServiceUtil { } public static Map<String, Object> returnProblem(String returnType, String errorMessage, List<? extends Object> errorMessageList, Map<String, ? extends Object> errorMessageMap, Map<String, ? extends Object> nestedResult) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put(ModelService.RESPONSE_MESSAGE, returnType); if (errorMessage != null) { result.put(ModelService.ERROR_MESSAGE, errorMessage); @@ -130,7 +128,7 @@ public class ServiceUtil { errorList.addAll(errorMessageList); } - Map<String, Object> errorMap = FastMap.newInstance(); + Map<String, Object> errorMap = new HashMap<String, Object>(); if (errorMessageMap != null) { errorMap.putAll(errorMessageMap); } @@ -178,7 +176,7 @@ public class ServiceUtil { * and what type of message that is should be determined by the RESPONSE_MESSAGE (and there's another annoyance, it should be RESPONSE_CODE) */ public static Map<String, Object> returnMessage(String code, String message) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); if (code != null) result.put(ModelService.RESPONSE_MESSAGE, code); if (message != null) result.put(ModelService.SUCCESS_MESSAGE, message); return result; @@ -479,7 +477,7 @@ public class ServiceUtil { boolean beganTx3 = false; GenericValue runtimeData = null; EntityListIterator runTimeDataIt = null; - List<GenericValue> runtimeDataToDelete = FastList.newInstance(); + List<GenericValue> runtimeDataToDelete = new LinkedList<GenericValue>(); long jobsandBoxCount = 0; try { // begin this transaction @@ -711,7 +709,7 @@ public class ServiceUtil { */ public static Map<String, Object> setServiceFields(LocalDispatcher dispatcher, String serviceName, Map<String, Object> fromMap, GenericValue userLogin, TimeZone timeZone, Locale locale) throws GeneralServiceException { - Map<String, Object> outMap = FastMap.newInstance(); + Map<String, Object> outMap = new HashMap<String, Object>(); ModelService modelService = null; try { Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java Sat Nov 1 07:15:09 2014 @@ -18,14 +18,14 @@ *******************************************************************************/ package org.ofbiz.service; +import java.util.HashMap; import java.util.Map; + import javax.transaction.Status; import javax.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.transaction.GenericTransactionException; @@ -295,7 +295,7 @@ public class ServiceXaWrapper extends Ge if (model.validate) { thisContext = model.makeValid(context, ModelService.IN_PARAM); } else { - thisContext = FastMap.newInstance(); + thisContext = new HashMap<String, Object>(); thisContext.putAll(context); } Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java Sat Nov 1 07:15:09 2014 @@ -21,20 +21,20 @@ package org.ofbiz.service.calendar; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import com.ibm.icu.util.Calendar; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javolution.util.FastSet; - import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; +import com.ibm.icu.util.Calendar; + /** TemporalExpression UI artifacts worker. */ public class ExpressionUiHelper { @@ -141,13 +141,13 @@ public class ExpressionUiHelper { */ public static Set<String> getCandidateIncludeIds(Delegator delegator, String tempExprId) throws GenericEntityException { List<GenericValue> findList = delegator.findList("TemporalExpressionAssoc", EntityCondition.makeCondition("fromTempExprId", tempExprId), null, null, null, true); - Set<String> excludedIds = FastSet.newInstance(); + Set<String> excludedIds = new HashSet<String>(); for (GenericValue value : findList) { excludedIds.add(value.getString("toTempExprId")); } excludedIds.add(tempExprId); findList = delegator.findList("TemporalExpression", null, null, null, null, true); - Set<String> candidateIds = FastSet.newInstance(); + Set<String> candidateIds = new HashSet<String>(); for (GenericValue value : findList) { candidateIds.add(value.getString("tempExprId")); } Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Sat Nov 1 07:15:09 2014 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.service.eca; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilValidate; @@ -137,7 +136,7 @@ public class ServiceEcaAction implements if (UtilValidate.isNotEmpty(resultMapName)) { Map<String, Object> resultMap = UtilGenerics.checkMap(context.get(resultMapName)); if (resultMap == null) { - resultMap = FastMap.newInstance(); + resultMap = new HashMap<String, Object>(); } resultMap.putAll(dctx.getModelService(this.serviceName).makeValid(actionResult, ModelService.OUT_PARAM, false, null)); context.put(resultMapName, resultMap); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java Sat Nov 1 07:15:09 2014 @@ -18,12 +18,12 @@ *******************************************************************************/ package org.ofbiz.service.eca; +import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -44,8 +44,8 @@ public final class ServiceEcaRule implem protected final String eventName; protected final boolean runOnFailure; protected final boolean runOnError; - protected final List<ServiceEcaCondition> conditions = FastList.newInstance(); - protected final List<Object> actionsAndSets = FastList.newInstance(); + protected final List<ServiceEcaCondition> conditions = new ArrayList<ServiceEcaCondition>(); + protected final List<Object> actionsAndSets = new ArrayList<Object>(); protected boolean enabled = true; protected final String definitionLocation; @@ -103,7 +103,7 @@ public final class ServiceEcaRule implem } public List<ServiceEcaAction> getEcaActionList() { - List<ServiceEcaAction> actionList = FastList.newInstance(); + List<ServiceEcaAction> actionList = new LinkedList<ServiceEcaAction>(); for (Object actionOrSet: this.actionsAndSets) { if (actionOrSet instanceof ServiceEcaAction) { actionList.add((ServiceEcaAction) actionOrSet); @@ -113,7 +113,7 @@ public final class ServiceEcaRule implem } public List<ServiceEcaCondition> getEcaConditionList() { - List<ServiceEcaCondition> condList = FastList.newInstance(); + List<ServiceEcaCondition> condList = new LinkedList<ServiceEcaCondition>(); condList.addAll(this.conditions); return condList; } Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java Sat Nov 1 07:15:09 2014 @@ -19,15 +19,15 @@ package org.ofbiz.service.eca; -import org.w3c.dom.Element; +import java.util.HashMap; +import java.util.Map; + +import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.string.FlexibleStringExpander; import org.ofbiz.entity.model.ModelUtil; - -import java.util.Map; -import javolution.util.FastMap; +import org.w3c.dom.Element; /** * ServiceEcaSetField @@ -72,7 +72,7 @@ public class ServiceEcaSetField { if (UtilValidate.isNotEmpty(this.mapName) && context.containsKey(this.mapName)) { valueMap = UtilGenerics.checkMap(context.get(mapName)); } else { - valueMap = FastMap.newInstance(); + valueMap = new HashMap<String, Object>(); } // process the context changes Object newValue = null; Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java Sat Nov 1 07:15:09 2014 @@ -19,16 +19,16 @@ package org.ofbiz.service.eca; import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.concurrent.ExecutionPool; import org.ofbiz.base.config.GenericConfigException; @@ -51,7 +51,7 @@ public class ServiceEcaUtil { public static final String module = ServiceEcaUtil.class.getName(); // using a cache is dangerous here because if someone clears it the ECAs won't run: public static UtilCache ecaCache = new UtilCache("service.ServiceECAs", 0, 0, false); - public static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = FastMap.newInstance(); + public static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = new ConcurrentHashMap<String, Map<String, List<ServiceEcaRule>>>(); public static void reloadConfig() { ecaCache.clear(); @@ -64,7 +64,7 @@ public class ServiceEcaUtil { return; } - List<Future<List<ServiceEcaRule>>> futures = FastList.newInstance(); + List<Future<List<ServiceEcaRule>>> futures = new LinkedList<Future<List<ServiceEcaRule>>>(); List<ServiceEcas> serviceEcasList = null; try { serviceEcasList = ServiceConfigUtil.getServiceEngine().getServiceEcas(); @@ -102,7 +102,7 @@ public class ServiceEcaUtil { } private static List<ServiceEcaRule> getEcaDefinitions(ResourceHandler handler) { - List<ServiceEcaRule> handlerRules = FastList.newInstance(); + List<ServiceEcaRule> handlerRules = new LinkedList<ServiceEcaRule>(); Element rootElement = null; try { rootElement = handler.getDocument().getDocumentElement(); @@ -134,14 +134,14 @@ public class ServiceEcaUtil { List<ServiceEcaRule> rules = null; if (eventMap == null) { - eventMap = FastMap.newInstance(); - rules = FastList.newInstance(); + eventMap = new HashMap<String, List<ServiceEcaRule>>(); + rules = new LinkedList<ServiceEcaRule>(); ecaCache.put(serviceName, eventMap); eventMap.put(eventName, rules); } else { rules = eventMap.get(eventName); if (rules == null) { - rules = FastList.newInstance(); + rules = new LinkedList<ServiceEcaRule>(); eventMap.put(eventName, rules); } } @@ -160,7 +160,7 @@ public class ServiceEcaUtil { if (event != null) { return eventMap.get(event); } else { - List<ServiceEcaRule> rules = FastList.newInstance(); + List<ServiceEcaRule> rules = new LinkedList<ServiceEcaRule>(); for (Collection<ServiceEcaRule> col: eventMap.values()) { rules.addAll(col); } Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java Sat Nov 1 07:15:09 2014 @@ -18,12 +18,11 @@ */ package org.ofbiz.service.engine; +import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -69,7 +68,7 @@ public final class EntityAutoEngine exte // static java service methods should be: public Map<String, Object> methodName(DispatchContext dctx, Map<String, Object> context) DispatchContext dctx = dispatcher.getLocalContext(localName); Locale locale = (Locale) parameters.get("locale"); - Map<String, Object> localContext = FastMap.newInstance(); + Map<String, Object> localContext = new HashMap<String, Object>(); localContext.put("parameters", parameters); Map<String, Object> result = ServiceUtil.returnSuccess(); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java Sat Nov 1 07:15:09 2014 @@ -19,15 +19,14 @@ package org.ofbiz.service.engine; import java.lang.reflect.Constructor; +import java.util.HashMap; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.config.GenericConfigException; +import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ServiceDispatcher; import org.ofbiz.service.config.ServiceConfigUtil; -import org.ofbiz.base.util.UtilGenerics; /** * Generic Engine Factory @@ -39,7 +38,7 @@ public class GenericEngineFactory { public GenericEngineFactory(ServiceDispatcher dispatcher) { this.dispatcher = dispatcher; - engines = FastMap.newInstance(); + engines = new HashMap<String, GenericEngine>(); } /** Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java Sat Nov 1 07:15:09 2014 @@ -23,14 +23,13 @@ import groovy.lang.GroovyClassLoader; import groovy.lang.Script; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.script.ScriptContext; -import javolution.util.FastMap; - import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.runtime.InvokerHelper; import org.ofbiz.base.config.GenericConfigException; @@ -103,10 +102,10 @@ public final class GroovyEngine extends if (UtilValidate.isEmpty(modelService.location)) { throw new GenericServiceException("Cannot run Groovy service with empty location"); } - Map<String, Object> params = FastMap.newInstance(); + Map<String, Object> params = new HashMap<String, Object>(); params.putAll(context); - Map<String, Object> gContext = FastMap.newInstance(); + Map<String, Object> gContext = new HashMap<String, Object>(); gContext.putAll(context); gContext.put(ScriptUtil.PARAMETERS_KEY, params); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/HttpEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Sat Nov 1 07:15:09 2014 @@ -20,13 +20,12 @@ package org.ofbiz.service.engine; import java.io.IOException; import java.io.PrintWriter; +import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.HttpClient; import org.ofbiz.base.util.HttpClientException; @@ -66,7 +65,7 @@ public class HttpEngine extends GenericA throw new GenericServiceException("Cannot serialize context.", e); } - Map<String, Object> parameters = FastMap.newInstance(); + Map<String, Object> parameters = new HashMap<String, Object>(); parameters.put("serviceName", modelService.invoke); if (xmlContext != null) parameters.put("serviceContext", xmlContext); @@ -115,7 +114,7 @@ public class HttpEngine extends GenericA String serviceMode = request.getParameter("serviceMode"); String xmlContext = request.getParameter("serviceContext"); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> context = null; if (serviceName == null) Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Sat Nov 1 07:15:09 2014 @@ -19,6 +19,7 @@ package org.ofbiz.service.engine; import java.io.StringReader; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,8 +27,6 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; -import javolution.util.FastMap; - import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -107,7 +106,7 @@ public final class SOAPClientEngine exte int i = 0; - Map<String, Object> parameterMap = FastMap.newInstance(); + Map<String, Object> parameterMap = new HashMap<String, Object>(); for (ModelParam p: inModelParamList) { if (Debug.infoOn()) Debug.logInfo("[SOAPClientEngine.invoke} : Parameter: " + p.name + " (" + p.mode + ") - " + i, module); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/ScriptEngine.java Sat Nov 1 07:15:09 2014 @@ -21,6 +21,7 @@ package org.ofbiz.service.engine; import static org.ofbiz.base.util.UtilGenerics.cast; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -28,8 +29,6 @@ import java.util.Set; import javax.script.ScriptContext; import javax.script.ScriptException; -import javolution.util.FastMap; - import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ScriptUtil; @@ -74,7 +73,7 @@ public final class ScriptEngine extends @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { Assert.notNull("localName", localName, "modelService.location", modelService.location, "context", context); - Map<String, Object> params = FastMap.newInstance(); + Map<String, Object> params = new HashMap<String, Object>(); params.putAll(context); context.put(ScriptUtil.PARAMETERS_KEY, params); DispatchContext dctx = dispatcher.getLocalContext(localName); Modified: ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1635897&r1=1635896&r2=1635897&view=diff ============================================================================== --- ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java (original) +++ ofbiz/branches/json-integration-refactoring/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java Sat Nov 1 07:15:09 2014 @@ -20,11 +20,10 @@ package org.ofbiz.service.engine; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.ofbiz.base.config.GenericConfigException; @@ -128,7 +127,7 @@ public class XMLRPCClientEngine extends } Map<String, Object> result = null; - Map<String, Object> params = FastMap.newInstance(); + Map<String, Object> params = new HashMap<String, Object>(); for (ModelParam modelParam: modelService.getModelParamList()) { // don't include OUT parameters in this list, only IN and INOUT if ("OUT".equals(modelParam.mode) || modelParam.internal) continue; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |