You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/04/10 22:22:59 UTC
svn commit: r1672752 [2/18] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz/accounting/finaccount/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/sr...
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Apr 10 20:22:54 2015
@@ -22,16 +22,15 @@ import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.accounting.invoice.InvoiceWorker;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -320,7 +319,7 @@ public class PaymentGatewayServices {
LocalDispatcher dispatcher = dctx.getDispatcher();
String orderId = (String) context.get("orderId");
Locale locale = (Locale) context.get("locale");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
boolean reAuth = false;
if (context.get("reAuth") != null) {
reAuth = ((Boolean)context.get("reAuth")).booleanValue();
@@ -362,7 +361,7 @@ public class PaymentGatewayServices {
// loop through and auth each order payment preference
int finished = 0;
int hadError = 0;
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
for (GenericValue paymentPref : paymentPrefs) {
if (reAuth && "PAYMENT_AUTHORIZED".equals(paymentPref.getString("statusId"))) {
String paymentConfig = null;
@@ -380,7 +379,7 @@ public class PaymentGatewayServices {
continue;
}
}
- Map<String, Object> authContext = FastMap.newInstance();
+ Map<String, Object> authContext = new HashMap<String, Object>();
authContext.put("orderPaymentPreferenceId", paymentPref.getString("orderPaymentPreferenceId"));
authContext.put("userLogin", context.get("userLogin"));
@@ -473,7 +472,7 @@ public class PaymentGatewayServices {
}
// make the process context
- Map<String, Object> processContext = FastMap.newInstance();
+ Map<String, Object> processContext = new HashMap<String, Object>();
// get the visit record to obtain the client's IP address
GenericValue orderHeader = orh.getOrderHeader();
@@ -757,7 +756,7 @@ public class PaymentGatewayServices {
}
// iterate over the prefs and release each one
- List<GenericValue> finished = FastList.newInstance();
+ List<GenericValue> finished = new LinkedList<GenericValue>();
for (GenericValue pPref : paymentPrefs) {
Map<String, Object> releaseContext = UtilMisc.toMap("userLogin", userLogin, "orderPaymentPreferenceId", pPref.getString("orderPaymentPreferenceId"));
Map<String, Object> releaseResult = null;
@@ -814,7 +813,7 @@ public class PaymentGatewayServices {
pgCredit.set("transactionDate", UtilDateTime.nowTimestamp());
pgCredit.set("currencyUomId", currencyUomId);
// create the internal messages
- List<GenericValue> messageEntities = FastList.newInstance();
+ List<GenericValue> messageEntities = new LinkedList<GenericValue>();
List<String> messages = UtilGenerics.cast(context.get("internalRespMsgs"));
if (UtilValidate.isNotEmpty(messages)) {
for (String message : messages) {
@@ -943,13 +942,13 @@ public class PaymentGatewayServices {
Debug.logWarning("No payment release settings found for - " + paymentPref.getString("paymentMethodTypeId"), module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder,
"AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale) + " " +
- paymentPref.getString("paymentMethodTypeId"));
+ paymentPref.getString("paymentMethodTypeId"));
}
if (UtilValidate.isEmpty(paymentConfig)) {
paymentConfig = "payment.properties";
}
GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(paymentPref);
- Map<String, Object> releaseContext = FastMap.newInstance();
+ Map<String, Object> releaseContext = new HashMap<String, Object>();
releaseContext.put("orderPaymentPreference", paymentPref);
releaseContext.put("releaseAmount", authTransaction.getBigDecimal("amount"));
releaseContext.put("currency", currency);
@@ -963,8 +962,7 @@ public class PaymentGatewayServices {
} catch (GenericServiceException e) {
Debug.logError(e,"Problem releasing payment", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder,
- "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale));
-
+ "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale));
}
// get the release result code
if (releaseResult != null && !ServiceUtil.isError(releaseResult)) {
@@ -1712,7 +1710,7 @@ public class PaymentGatewayServices {
}
// prepare the context for the capture service (must follow the ccCaptureInterface
- Map<String, Object> captureContext = FastMap.newInstance();
+ Map<String, Object> captureContext = new HashMap<String, Object>();
captureContext.put("userLogin", userLogin);
captureContext.put("orderPaymentPreference", paymentPref);
captureContext.put("paymentConfig", paymentConfig);
@@ -1786,7 +1784,7 @@ public class PaymentGatewayServices {
}
private static void saveError(LocalDispatcher dispatcher, GenericValue userLogin, GenericValue paymentPref, Map<String, Object> result, String serviceType, String transactionCode) {
- Map<String, Object> serviceContext = FastMap.newInstance();
+ Map<String, Object> serviceContext = new HashMap<String, Object>();
serviceContext.put("paymentServiceTypeEnumId", serviceType);
serviceContext.put("orderPaymentPreference", paymentPref);
serviceContext.put("transCodeEnumId", transactionCode);
@@ -1941,7 +1939,7 @@ public class PaymentGatewayServices {
if (Boolean.TRUE.equals(context.get("resultBadCardNumber"))) response.set("resultBadCardNumber", "Y");
// create the internal messages
- List<GenericValue> messageEntities = FastList.newInstance();
+ List<GenericValue> messageEntities = new LinkedList<GenericValue>();
List<String> messages = UtilGenerics.cast(context.get("internalRespMsgs"));
if (UtilValidate.isNotEmpty(messages)) {
Iterator<String> i = messages.iterator();
@@ -2385,7 +2383,7 @@ public class PaymentGatewayServices {
// call the service refundPayment
Map<String, Object> refundResponse = null;
try {
- Map<String, Object> serviceContext = FastMap.newInstance();
+ Map<String, Object> serviceContext = new HashMap<String, Object>();
serviceContext.put("orderPaymentPreference", orderPaymentPreference);
serviceContext.put("refundAmount", amount);
serviceContext.put("userLogin", userLogin);
@@ -2438,7 +2436,7 @@ public class PaymentGatewayServices {
paymentGatewayConfigId = paymentSettings.getString("paymentGatewayConfigId");
if (serviceName != null) {
- Map<String, Object> serviceContext = FastMap.newInstance();
+ Map<String, Object> serviceContext = new HashMap<String, Object>();
serviceContext.put("orderPaymentPreference", paymentPref);
serviceContext.put("paymentConfig", paymentConfig);
serviceContext.put("paymentGatewayConfigId", paymentGatewayConfigId);
@@ -2447,7 +2445,7 @@ public class PaymentGatewayServices {
// get the creditCard/address/email
String payToPartyId = null;
try {
- payToPartyId = getBillingInformation(orh, paymentPref, FastMap.<String, Object>newInstance());
+ payToPartyId = getBillingInformation(orh, paymentPref, new HashMap<String, Object>());
} catch (GenericEntityException e) {
Debug.logError(e, "Problems getting billing information", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -2701,7 +2699,7 @@ public class PaymentGatewayServices {
.where(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PAYMENT_NOT_AUTH"),
EntityCondition.makeCondition("processAttempt", EntityOperator.GREATER_THAN, Long.valueOf(0)))
.orderBy("orderId").queryIterator();
- List<String> processList = FastList.newInstance();
+ List<String> processList = new LinkedList<String>();
if (eli != null) {
Debug.logInfo("Processing failed order re-auth(s)", module);
GenericValue value = null;
@@ -2751,7 +2749,7 @@ public class PaymentGatewayServices {
EntityCondition.makeCondition(ModelEntity.STAMP_FIELD, EntityOperator.LESS_THAN_EQUAL_TO, oneWeekAgo))
.orderBy("orderId").queryIterator();
- List<String> processList = FastList.newInstance();
+ List<String> processList = new LinkedList<String>();
if (eli != null) {
Debug.logInfo("Processing failed order re-auth(s)", module);
GenericValue value = null;
@@ -3063,7 +3061,7 @@ public class PaymentGatewayServices {
}
// prepare the order payment preference (facade)
- GenericValue orderPaymentPref = delegator.makeValue("OrderPaymentPreference", FastMap.newInstance());
+ GenericValue orderPaymentPref = delegator.makeValue("OrderPaymentPreference", new HashMap());
orderPaymentPref.set("orderPaymentPreferenceId", "_NA_");
orderPaymentPref.set("orderId", "_NA_");
orderPaymentPref.set("presentFlag", "N");
@@ -3079,9 +3077,9 @@ public class PaymentGatewayServices {
String currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
// prepare the auth context
- Map<String, Object> authContext = FastMap.newInstance();
+ Map<String, Object> authContext = new HashMap<String, Object>();
authContext.put("orderId", "_NA_");
- authContext.put("orderItems", FastList.newInstance());
+ authContext.put("orderItems", new LinkedList());
authContext.put("orderPaymentPreference", orderPaymentPref);
authContext.put("creditCard", creditCard);
authContext.put("billToParty", billToParty);
@@ -3180,7 +3178,7 @@ public class PaymentGatewayServices {
"AccountingPaymentTransactionNotYetSupported", locale));
}
// transaction request context
- Map<String, Object> requestContext = FastMap.newInstance();
+ Map<String, Object> requestContext = new HashMap<String, Object>();
String paymentService = null;
String paymentConfig = null;
String paymentGatewayConfigId = null;
@@ -3326,7 +3324,7 @@ public class PaymentGatewayServices {
if (UtilValidate.isNotEmpty(amount)) {
BigDecimal authAmount = new BigDecimal(amount);
if (authAmount.compareTo(BigDecimal.ZERO) > 0) {
- Map<String, Object> ccAuthContext = FastMap.newInstance();
+ Map<String, Object> ccAuthContext = new HashMap<String, Object>();
ccAuthContext.put("paymentMethodId", paymentMethodId);
ccAuthContext.put("productStoreId", productStoreId);
ccAuthContext.put("amount", authAmount);
@@ -3359,7 +3357,7 @@ public class PaymentGatewayServices {
*/
public static Map<String, Object> testProcessor(DispatchContext dctx, Map<String, ? extends Object> context) {
Locale locale = (Locale) context.get("locale");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
BigDecimal processAmount = (BigDecimal) context.get("processAmount");
if (processAmount != null && processAmount.compareTo(new BigDecimal("100.00")) >= 0)
@@ -3389,7 +3387,7 @@ public class PaymentGatewayServices {
*/
public static Map<String, Object> testProcessorWithCapture(DispatchContext dctx, Map<String, ? extends Object> context) {
Locale locale = (Locale) context.get("locale");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
BigDecimal processAmount = (BigDecimal) context.get("processAmount");
if (processAmount != null && processAmount.compareTo(new BigDecimal("100.00")) >= 0)
@@ -3452,7 +3450,7 @@ public class PaymentGatewayServices {
*/
public static Map<String, Object> alwaysApproveProcessor(DispatchContext dctx, Map<String, ? extends Object> context) {
Locale locale = (Locale) context.get("locale");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Debug.logInfo("Test Processor Approving Credit Card", module);
String refNum = UtilDateTime.nowAsString();
@@ -3470,7 +3468,7 @@ public class PaymentGatewayServices {
public static Map<String, Object> alwaysApproveWithCapture(DispatchContext dctx, Map<String, ? extends Object> context) {
Locale locale = (Locale) context.get("locale");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String refNum = UtilDateTime.nowAsString();
Debug.logInfo("Test Processor Approving Credit Card with Capture", module);
@@ -3741,7 +3739,7 @@ public class PaymentGatewayServices {
public static boolean isReplacementOrder(GenericValue orderHeader) {
boolean replacementOrderFlag = false;
- List<GenericValue> returnItemResponses = FastList.newInstance();
+ List<GenericValue> returnItemResponses = new LinkedList<GenericValue>();
try {
returnItemResponses = orderHeader.getRelated("ReplacementReturnItemResponse", null, null, false);
} catch (GenericEntityException e) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Fri Apr 10 20:22:54 2015
@@ -19,13 +19,12 @@
package org.ofbiz.accounting.payment;
import java.sql.Timestamp;
+import java.util.HashMap;
+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.StringUtil;
import org.ofbiz.base.util.UtilDateTime;
@@ -61,7 +60,7 @@ public class PaymentMethodServices {
* @return Map with the result of the service, the output parameters
*/
public static Map<String, Object> deletePaymentMethod(DispatchContext ctx, Map<String, ? extends Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -111,7 +110,7 @@ public class PaymentMethodServices {
}
public static Map<String, Object> makeExpireDate(DispatchContext ctx, Map<String, ? extends Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String expMonth = (String) context.get("expMonth");
String expYear = (String) context.get("expYear");
@@ -132,7 +131,7 @@ public class PaymentMethodServices {
* @return Map with the result of the service, the output parameters
*/
public static Map<String, Object> createCreditCard(DispatchContext ctx, Map<String, Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -145,7 +144,7 @@ public class PaymentMethodServices {
if (result.size() > 0) return result;
// do some more complicated/critical validation...
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
// first remove all spaces from the credit card number
context.put("cardNumber", StringUtil.removeSpaces((String) context.get("cardNumber")));
@@ -166,7 +165,7 @@ public class PaymentMethodServices {
return ServiceUtil.returnError(messages);
}
- List<GenericValue> toBeStored = FastList.newInstance();
+ List<GenericValue> toBeStored = new LinkedList<GenericValue>();
GenericValue newPm = delegator.makeValue("PaymentMethod");
toBeStored.add(newPm);
@@ -254,7 +253,7 @@ public class PaymentMethodServices {
* @return Map with the result of the service, the output parameters
*/
public static Map<String, Object> updateCreditCard(DispatchContext ctx, Map<String, Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -266,7 +265,7 @@ public class PaymentMethodServices {
if (result.size() > 0) return result;
- List<GenericValue> toBeStored = FastList.newInstance();
+ List<GenericValue> toBeStored = new LinkedList<GenericValue>();
boolean isModified = false;
GenericValue paymentMethod = null;
@@ -295,7 +294,7 @@ public class PaymentMethodServices {
}
// do some more complicated/critical validation...
- List<String> messages = FastList.newInstance();
+ List<String> messages = new LinkedList<String>();
// first remove all spaces from the credit card number
String updatedCardNumber = StringUtil.removeSpaces((String) context.get("cardNumber"));
@@ -484,7 +483,7 @@ public class PaymentMethodServices {
}
public static Map<String, Object> createGiftCard(DispatchContext ctx, Map<String, ? extends Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -497,7 +496,7 @@ public class PaymentMethodServices {
if (result.size() > 0)
return result;
- List<GenericValue> toBeStored = FastList.newInstance();
+ List<GenericValue> toBeStored = new LinkedList<GenericValue>();
GenericValue newPm = delegator.makeValue("PaymentMethod");
toBeStored.add(newPm);
GenericValue newGc = delegator.makeValue("GiftCard");
@@ -541,7 +540,7 @@ public class PaymentMethodServices {
}
public static Map<String, Object> updateGiftCard(DispatchContext ctx, Map<String, Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -554,7 +553,7 @@ public class PaymentMethodServices {
if (result.size() > 0)
return result;
- List<GenericValue> toBeStored = FastList.newInstance();
+ List<GenericValue> toBeStored = new LinkedList<GenericValue>();
boolean isModified = false;
GenericValue paymentMethod = null;
@@ -675,7 +674,7 @@ public class PaymentMethodServices {
* @return Map with the result of the service, the output parameters
*/
public static Map<String, Object> createEftAccount(DispatchContext ctx, Map<String, ? extends Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -687,7 +686,7 @@ public class PaymentMethodServices {
if (result.size() > 0) return result;
- List<GenericValue> toBeStored = FastList.newInstance();
+ List<GenericValue> toBeStored = new LinkedList<GenericValue>();
GenericValue newPm = delegator.makeValue("PaymentMethod");
toBeStored.add(newPm);
@@ -774,7 +773,7 @@ public class PaymentMethodServices {
* @return Map with the result of the service, the output parameters
*/
public static Map<String, Object> updateEftAccount(DispatchContext ctx, Map<String, ? extends Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -786,7 +785,7 @@ public class PaymentMethodServices {
if (result.size() > 0) return result;
- List<GenericValue> toBeStored = FastList.newInstance();
+ List<GenericValue> toBeStored = new LinkedList<GenericValue>();
boolean isModified = false;
GenericValue paymentMethod = null;
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Fri Apr 10 20:22:54 2015
@@ -20,14 +20,13 @@ package org.ofbiz.accounting.payment;
import java.math.BigDecimal;
import java.math.MathContext;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletRequest;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilMisc;
@@ -58,14 +57,14 @@ public class PaymentWorker {
}
public static List<Map<String, GenericValue>> getPartyPaymentMethodValueMaps(Delegator delegator, String partyId, Boolean showOld) {
- List<Map<String, GenericValue>> paymentMethodValueMaps = FastList.newInstance();
+ List<Map<String, GenericValue>> paymentMethodValueMaps = new LinkedList<Map<String,GenericValue>>();
try {
List<GenericValue> paymentMethods = EntityQuery.use(delegator).from("PaymentMethod").where("partyId", partyId).queryList();
if (!showOld) paymentMethods = EntityUtil.filterByDate(paymentMethods, true);
for (GenericValue paymentMethod : paymentMethods) {
- Map<String, GenericValue> valueMap = FastMap.newInstance();
+ Map<String, GenericValue> valueMap = new HashMap<String, GenericValue>();
paymentMethodValueMaps.add(valueMap);
valueMap.put("paymentMethod", paymentMethod);
@@ -88,7 +87,7 @@ public class PaymentWorker {
public static Map<String, Object> getPaymentMethodAndRelated(ServletRequest request, String partyId) {
Delegator delegator = (Delegator) request.getAttribute("delegator");
- Map<String, Object> results = FastMap.newInstance();
+ Map<String, Object> results = new HashMap<String, Object>();
Boolean tryEntity = true;
if (request.getAttribute("_ERROR_MESSAGE_") != null) tryEntity = false;
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri Apr 10 20:22:54 2015
@@ -20,15 +20,14 @@ package org.ofbiz.accounting.tax;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.HashSet;
+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.UtilDateTime;
import org.ofbiz.base.util.UtilGenerics;
@@ -89,7 +88,7 @@ public class TaxAuthorityServices {
}
if ("Y".equals(productStore.getString("showPricesWithVatTax"))) {
- Set<GenericValue> taxAuthoritySet = FastSet.newInstance();
+ Set<GenericValue> taxAuthoritySet = new HashSet<GenericValue>();
if (productStore.get("vatTaxAuthPartyId") == null) {
List<GenericValue> taxAuthorityRawList = EntityQuery.use(delegator).from("TaxAuthority")
.where("taxAuthGeoId", productStore.get("vatTaxAuthGeoId")).cache().queryList();
@@ -191,7 +190,7 @@ public class TaxAuthorityServices {
}
// without knowing the TaxAuthority parties, just find all TaxAuthories for the set of IDs...
- Set<GenericValue> taxAuthoritySet = FastSet.newInstance();
+ Set<GenericValue> taxAuthoritySet = new HashSet<GenericValue>();
try {
getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet);
} catch (GenericEntityException e) {
@@ -200,8 +199,8 @@ public class TaxAuthorityServices {
}
// Setup the return lists.
- List<GenericValue> orderAdjustments = FastList.newInstance();
- List<List<GenericValue>> itemAdjustments = FastList.newInstance();
+ List<GenericValue> orderAdjustments = new LinkedList<GenericValue>();
+ List<List<GenericValue>> itemAdjustments = new LinkedList<List<GenericValue>>();
// Loop through the products; get the taxCategory; and lookup each in the cache.
for (int i = 0; i < itemProductList.size(); i++) {
@@ -234,7 +233,7 @@ public class TaxAuthorityServices {
}
private static void getTaxAuthorities(Delegator delegator, GenericValue shippingAddress, Set<GenericValue> taxAuthoritySet) throws GenericEntityException {
- Map<String, String> geoIdByTypeMap = FastMap.newInstance();
+ Map<String, String> geoIdByTypeMap = new HashMap<String, String>();
if (shippingAddress != null) {
if (UtilValidate.isNotEmpty(shippingAddress.getString("countryGeoId"))) {
geoIdByTypeMap.put("COUNTRY", shippingAddress.getString("countryGeoId"));
@@ -269,7 +268,7 @@ public class TaxAuthorityServices {
BigDecimal itemPrice, BigDecimal itemQuantity, BigDecimal itemAmount,
BigDecimal shippingAmount, BigDecimal orderPromotionsAmount) {
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
- List<GenericValue> adjustments = FastList.newInstance();
+ List<GenericValue> adjustments = new LinkedList<GenericValue>();
if (payToPartyId == null) {
if (productStore != null) {
@@ -289,7 +288,7 @@ public class TaxAuthorityServices {
}
// build the TaxAuthority expressions (taxAuthGeoId, taxAuthPartyId)
- List<EntityCondition> taxAuthCondOrList = FastList.newInstance();
+ List<EntityCondition> taxAuthCondOrList = new LinkedList<EntityCondition>();
// start with the _NA_ TaxAuthority...
taxAuthCondOrList.add(EntityCondition.makeCondition(
EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, "_NA_"),
@@ -315,7 +314,7 @@ public class TaxAuthorityServices {
if ("Y".equals(product.getString("isVariant"))) {
virtualProductId = ProductWorker.getVariantVirtualId(product);
}
- Set<String> productCategoryIdSet = FastSet.newInstance();
+ Set<String> productCategoryIdSet = new HashSet<String>();
EntityCondition productIdCond = null;
if (virtualProductId != null) {
productIdCond = EntityCondition.makeCondition(
@@ -464,7 +463,7 @@ public class TaxAuthorityServices {
if (UtilValidate.isNotEmpty(billToPartyId) && UtilValidate.isNotEmpty(taxAuthGeoId)) {
// see if partyId is a member of any groups, if so honor their tax exemptions
// look for PartyRelationship with partyRelationshipTypeId=GROUP_ROLLUP, the partyIdTo is the group member, so the partyIdFrom is the groupPartyId
- Set<String> billToPartyIdSet = FastSet.newInstance();
+ Set<String> billToPartyIdSet = new HashSet<String>();
billToPartyIdSet.add(billToPartyId);
List<GenericValue> partyRelationshipList = EntityQuery.use(delegator).from("PartyRelationship")
.where("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP")
@@ -528,7 +527,7 @@ public class TaxAuthorityServices {
}
} catch (GenericEntityException e) {
Debug.logError(e, "Problems looking up tax rates", module);
- return FastList.newInstance();
+ return new LinkedList<GenericValue>();
}
return adjustments;
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Fri Apr 10 20:22:54 2015
@@ -21,13 +21,12 @@ package org.ofbiz.accounting.thirdparty.
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import javolution.util.FastMap;
-
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.HttpClient;
@@ -82,7 +81,7 @@ public class AIMPaymentServices {
Delegator delegator = ctx.getDelegator();
Locale locale = (Locale) context.get("locale");
Map<String, Object> results = ServiceUtil.returnSuccess();
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
Properties props = buildAIMProperties(context, delegator);
buildMerchantInfo(context, props, request);
buildGatewayResponeConfig(context, props, request);
@@ -123,7 +122,7 @@ public class AIMPaymentServices {
context.put("creditCard", creditCard);
context.put("authTransaction", authTransaction);
Map<String, Object> results = ServiceUtil.returnSuccess();
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
Properties props = buildAIMProperties(context, delegator);
buildMerchantInfo(context, props, request);
buildGatewayResponeConfig(context, props, request);
@@ -171,7 +170,7 @@ public class AIMPaymentServices {
context.put("creditCard",creditCard);
context.put("authTransaction",authTransaction);
Map<String, Object> results = ServiceUtil.returnSuccess();
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
Properties props = buildAIMProperties(context, delegator);
buildMerchantInfo(context, props, request);
buildGatewayResponeConfig(context, props, request);
@@ -262,7 +261,7 @@ public class AIMPaymentServices {
Locale locale = (Locale) context.get("locale");
context.put("authTransaction", authTransaction);
Map<String, Object> results = ServiceUtil.returnSuccess();
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
Properties props = buildAIMProperties(context, delegator);
buildMerchantInfo(context, props, request);
buildGatewayResponeConfig(context, props, request);
@@ -279,7 +278,7 @@ public class AIMPaymentServices {
}
public static Map<String, Object> ccCredit(DispatchContext ctx, Map<String, Object> context) {
- Map<String, Object> results = FastMap.newInstance();
+ Map<String, Object> results = new HashMap<String, Object>();
results.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
results.put(ModelService.ERROR_MESSAGE, "Authorize.net ccCredit unsupported with version 3.1");
return results;
@@ -289,7 +288,7 @@ public class AIMPaymentServices {
Delegator delegator = ctx.getDelegator();
Locale locale = (Locale) context.get("locale");
Map<String, Object> results = ServiceUtil.returnSuccess();
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
Properties props = buildAIMProperties(context, delegator);
buildMerchantInfo(context, props, request);
buildGatewayResponeConfig(context, props, request);
@@ -315,7 +314,7 @@ public class AIMPaymentServices {
}
private static Map<String, Object> processCard(Map<String, Object> request, Properties props, Locale locale) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String url = props.getProperty("url");
if (UtilValidate.isEmpty(url)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -637,7 +636,7 @@ public class AIMPaymentServices {
}
private static Map<String, Object> validateRequest(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
return result;
}
@@ -699,7 +698,7 @@ public class AIMPaymentServices {
}
private static Map<String, Object> processRefundTransResult(Map<String, Object> request, Map<String, Object> reply) {
- Map<String, Object> results = FastMap.newInstance();
+ Map<String, Object> results = new HashMap<String, Object>();
AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
try {
Boolean captureResult = (Boolean) reply.get("authResult");
@@ -726,7 +725,7 @@ public class AIMPaymentServices {
}
private static Map<String, Object> processReleaseTransResult(Map<String, Object> request, Map<String, Object> reply) {
- Map<String, Object> results = FastMap.newInstance();
+ Map<String, Object> results = new HashMap<String, Object>();
AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
try {
Boolean captureResult = (Boolean) reply.get("authResult");
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java Fri Apr 10 20:22:54 2015
@@ -19,14 +19,13 @@
package org.ofbiz.accounting.thirdparty.authorizedotnet;
+import java.util.LinkedHashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
public class AIMRespPositions extends AuthorizeResponse.RespPositions {
// AIM v3.1 response positions
- private static Map<String, Integer> positions = FastMap.newInstance();
+ private static Map<String, Integer> positions = new LinkedHashMap<String, Integer>();
static {
positions.put(AuthorizeResponse.RESPONSE_CODE, 1);
positions.put(AuthorizeResponse.REASON_CODE, 3);
@@ -35,7 +34,7 @@ public class AIMRespPositions extends Au
positions.put(AuthorizeResponse.AVS_RESULT_CODE, 6);
positions.put(AuthorizeResponse.CVV_RESULT_CODE, 39);
positions.put(AuthorizeResponse.TRANSACTION_ID, 7);
- positions.put(AuthorizeResponse.AMOUNT, 10);
+ positions.put(AuthorizeResponse.AMOUNT, 10);
}
@Override
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java Fri Apr 10 20:22:54 2015
@@ -19,14 +19,13 @@
package org.ofbiz.accounting.thirdparty.authorizedotnet;
+import java.util.LinkedHashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
public class CPRespPositions extends AuthorizeResponse.RespPositions {
-
+
// Card-Present v1.0 response positions
- private static Map<String, Integer> positions = FastMap.newInstance();
+ private static Map<String, Integer> positions = new LinkedHashMap<String, Integer>();
static {
positions.put(AuthorizeResponse.RESPONSE_CODE, 2);
positions.put(AuthorizeResponse.REASON_CODE, 3);
@@ -35,9 +34,9 @@ public class CPRespPositions extends Aut
positions.put(AuthorizeResponse.AVS_RESULT_CODE, 6);
positions.put(AuthorizeResponse.CVV_RESULT_CODE, 7);
positions.put(AuthorizeResponse.TRANSACTION_ID, 8);
- positions.put(AuthorizeResponse.AMOUNT, 25);
+ positions.put(AuthorizeResponse.AMOUNT, 25);
}
-
+
@Override
public int getPosition(String name) {
if (positions.containsKey(name)) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Fri Apr 10 20:22:54 2015
@@ -19,13 +19,12 @@
package org.ofbiz.accounting.thirdparty.cybersource;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import javolution.util.FastMap;
-
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.SSLUtil;
@@ -304,7 +303,7 @@ public class IcsPaymentServices {
// make the request map
String capture = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "autoBill", configString, "payment.cybersource.autoBill", "false");
String orderId = (String) context.get("orderId");
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
request.put("ccAuthService_run", "true"); // run auth service
request.put("ccCaptureService_run", capture); // run capture service (i.e. sale)
request.put("merchantReferenceCode", orderId); // set the order ref number
@@ -325,7 +324,7 @@ public class IcsPaymentServices {
}
String merchantDesc = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "merchantDescr", configString, "payment.cybersource.merchantDescr", null);
String merchantCont = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "merchantContact", configString, "payment.cybersource.merchantContact", null);
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
request.put("ccCaptureService_run", "true");
request.put("ccCaptureService_authRequestID", authTransaction.getString("referenceNum"));
request.put("item_0_unitPrice", getAmountString(context, "captureAmount"));
@@ -345,7 +344,7 @@ public class IcsPaymentServices {
}
private static Map<String, Object> buildReleaseRequest(Map<String, ? extends Object> context, GenericValue authTransaction) {
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
String currency = (String) context.get("currency");
request.put("ccAuthReversalService_run", "true");
@@ -366,7 +365,7 @@ public class IcsPaymentServices {
String currency = (String) context.get("currency");
String merchantDesc = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "merchantDescr", configString, "payment.cybersource.merchantDescr", null);
String merchantCont = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "merchantContact", configString, "payment.cybersource.merchantContact", null);
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
request.put("ccCreditService_run", "true");
request.put("ccCreditService_captureRequestID", authTransaction.getString("referenceNum"));
request.put("item_0_unitPrice", getAmountString(context, "refundAmount"));
@@ -383,7 +382,7 @@ public class IcsPaymentServices {
private static Map<String, Object> buildCreditRequest(Map<String, ? extends Object> context) {
String refCode = (String) context.get("referenceCode");
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
request.put("ccCreditService_run", "true"); // run credit service
request.put("merchantReferenceCode", refCode); // set the ref number could be order id
appendFullBillingInfo(request, context); // add in all address info
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java Fri Apr 10 20:22:54 2015
@@ -19,10 +19,9 @@
package org.ofbiz.accounting.thirdparty.gosoftware;
import java.io.IOException;
+import java.util.HashMap;
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.HttpClient;
@@ -99,13 +98,13 @@ public class RitaApi {
protected int mode = 0;
public RitaApi(Map<String, String> document) {
- this.document = FastMap.newInstance();
+ this.document = new HashMap<String, String>();
this.document.putAll(document);
this.mode = MODE_OUT;
}
public RitaApi() {
- this.document = FastMap.newInstance();
+ this.document = new HashMap<String, String>();
this.mode = MODE_IN;
}
@@ -226,7 +225,7 @@ public class RitaApi {
br.close();
*/
- Map<String, String> docMap = FastMap.newInstance();
+ Map<String, String> docMap = new HashMap<String, String>();
String resp = null;
try {
resp = http.post(stream);
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java Fri Apr 10 20:22:54 2015
@@ -32,9 +32,6 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilDateTime;
@@ -140,7 +137,7 @@ public class IdealEvents {
return "error";
}
- List<String> descriptionList = FastList.newInstance();
+ List<String> descriptionList = new LinkedList<String>();
for (GenericValue orderItem : orderItemList) {
if (UtilValidate.isNotEmpty(orderItem.get("itemDescription"))){
descriptionList.add((String) orderItem.get("itemDescription"));
@@ -427,7 +424,7 @@ public class IdealEvents {
}
public static List<Issuer> getIssuerList() {
- List<Issuer> issuerList = FastList.newInstance();
+ List<Issuer> issuerList = new LinkedList<Issuer>();
try {
IdealConnector connector = new IdealConnector("payment");
Issuers issuers = connector.getIssuerList();
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Fri Apr 10 20:22:54 2015
@@ -19,11 +19,10 @@
package org.ofbiz.accounting.thirdparty.orbital;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilFormatOut;
@@ -260,7 +259,7 @@ public class OrbitalPaymentServices {
//TODO: Will move this to property file and then will read it from there.
String configFile = "/applications/accounting/config/linehandler.properties";
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
- Map<String, Object> buildConfiguratorContext = FastMap.newInstance();
+ Map<String, Object> buildConfiguratorContext = new HashMap<String, Object>();
try {
buildConfiguratorContext.put("OrbitalConnectionUsername", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "username"));
buildConfiguratorContext.put("OrbitalConnectionPassword", getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "connectionPassword"));
@@ -496,7 +495,7 @@ public class OrbitalPaymentServices {
}
private static Map<String, Object> processCard(RequestIF request) {
- Map<String, Object> processCardResult = FastMap.newInstance();
+ Map<String, Object> processCardResult = new HashMap<String, Object>();
try {
response = tp.process(request);
if (response.isApproved()) {
@@ -606,7 +605,7 @@ public class OrbitalPaymentServices {
}
private static void printTransResult(ResponseIF response) {
- Map<String, Object> generatedResponse = FastMap.newInstance();
+ Map<String, Object> generatedResponse = new HashMap<String, Object>();
generatedResponse.put("isGood", response.isGood());
generatedResponse.put("isError", response.isError());
generatedResponse.put("isQuickResponse", response.isQuickResponse());
@@ -650,7 +649,7 @@ public class OrbitalPaymentServices {
}
private static Map<String, Object> validateRequest(Map<String, Object> params, Map props, RequestIF request) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
return result;
}
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Fri Apr 10 20:22:54 2015
@@ -24,6 +24,8 @@ import java.io.UnsupportedEncodingExcept
import java.io.Writer;
import java.lang.ref.WeakReference;
import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -33,9 +35,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transaction;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.apache.commons.lang.StringUtils;
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.base.util.Debug;
@@ -192,7 +191,7 @@ public class PayPalServices {
// Since most if not all of the shipping estimate codes requires a persisted contactMechId we'll create one and
// then delete once we're done, now is not the time to worry about updating everything
String contactMechId = null;
- Map<String, Object> inMap = FastMap.newInstance();
+ Map<String, Object> inMap = new HashMap<String, Object>();
inMap.put("address1", paramMap.get("SHIPTOSTREET"));
inMap.put("address2", paramMap.get("SHIPTOSTREET2"));
inMap.put("city", paramMap.get("SHIPTOCITY"));
@@ -302,7 +301,7 @@ public class PayPalServices {
String ack = decoder.get("ACK");
Map<String, String> result = null;
if (!"Success".equals(ack)) {
- result = FastMap.newInstance();
+ result = new HashMap<String, Object>();
int i = 0;
while (UtilValidate.isNotEmpty(decoder.get("L_ERRORCODE" + i))) {
String errorCode = decoder.get("L_ERRORCODE" + i);
@@ -416,7 +415,7 @@ public class PayPalServices {
}
}
- Map<String, Object> inMap = FastMap.newInstance();
+ Map<String, Object> inMap = new HashMap<String, Object>();
Map<String, Object> outMap = null;
// Create the person if necessary
boolean newParty = false;
@@ -523,7 +522,7 @@ public class PayPalServices {
boolean needsShippingPurpose = true;
// if the cart for some reason already has a billing address, we'll leave it be
boolean needsBillingPurpose = (cart.getContactMech("BILLING_LOCATION") == null);
- Map<String, Object> postalMap = FastMap.newInstance();
+ Map<String, Object> postalMap = new HashMap<String, Object>();
postalMap.put("toName", decoder.get("SHIPTONAME"));
postalMap.put("address1", decoder.get("SHIPTOSTREET"));
postalMap.put("address2", decoder.get("SHIPTOSTREET2"));
@@ -731,7 +730,7 @@ public class PayPalServices {
return ServiceUtil.returnError(UtilMisc.toList(errorMessages.values()));
}
- Map<String, Object> inMap = FastMap.newInstance();
+ Map<String, Object> inMap = new HashMap<String, Object>();
inMap.put("userLogin", userLogin);
inMap.put("paymentMethodId", payPalPaymentMethod.get("paymentMethodId"));
inMap.put("transactionId", decoder.get("TRANSACTIONID"));
@@ -1035,7 +1034,7 @@ public class PayPalServices {
private static String parseStateProvinceGeoId(String payPalShipToState, String countryGeoId, Delegator delegator) {
String lookupField = "geoName";
- List<EntityCondition> conditionList = FastList.newInstance();
+ List<EntityCondition> conditionList = new LinkedList<EntityCondition>();
conditionList.add(EntityCondition.makeCondition("geoAssocTypeId", "REGIONS"));
if ("USA".equals(countryGeoId) || "CAN".equals(countryGeoId)) {
// PayPal returns two letter code for US and Canadian States/Provinces
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Fri Apr 10 20:22:54 2015
@@ -22,12 +22,11 @@ package org.ofbiz.accounting.thirdparty.
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
@@ -53,7 +52,7 @@ public class SagePayPaymentServices {
Debug.logInfo("SagePay - Entered buildCustomerBillingInfo", module);
Debug.logInfo("SagePay buildCustomerBillingInfo context : " + context, module);
- Map<String, String> billingInfo = FastMap.newInstance();
+ Map<String, String> billingInfo = new HashMap<String, String>();
String orderId = null;
BigDecimal processAmount = null;
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java Fri Apr 10 20:22:54 2015
@@ -31,8 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javolution.util.FastMap;
-
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
@@ -54,7 +52,7 @@ public class SagePayUtil
public static Map<String, Object> buildCardAuthorisationPaymentResponse
(Boolean authResult, String authCode, String authFlag, BigDecimal processAmount, String authRefNum, String authAltRefNum, String authMessage) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if(authResult != null) { result.put("authResult", authResult); }
if(authCode != null) { result.put("authCode", authCode); }
if(authFlag != null) { result.put("authFlag", authFlag); }
@@ -68,7 +66,7 @@ public class SagePayUtil
public static Map<String, Object> buildCardCapturePaymentResponse
(Boolean captureResult, String captureCode, String captureFlag, BigDecimal captureAmount, String captureRefNum, String captureAltRefNum, String captureMessage) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if(captureResult != null) { result.put("captureResult", captureResult); }
if(captureCode != null) { result.put("captureCode", captureCode); }
if(captureFlag != null) { result.put("captureFlag", captureFlag); }
@@ -82,7 +80,7 @@ public class SagePayUtil
public static Map<String, Object> buildCardReleasePaymentResponse
(Boolean releaseResult, String releaseCode, BigDecimal releaseAmount, String releaseRefNum, String releaseAltRefNum, String releaseMessage) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if(releaseResult != null) { result.put("releaseResult", releaseResult); }
if(releaseCode != null) { result.put("releaseCode", releaseCode); }
if(releaseAmount != null) { result.put("releaseAmount", releaseAmount); }
@@ -95,7 +93,7 @@ public class SagePayUtil
public static Map<String, Object> buildCardVoidPaymentResponse
(Boolean refundResult, BigDecimal refundAmount, String refundRefNum, String refundAltRefNum, String refundMessage) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if(refundResult != null) { result.put("refundResult", refundResult); }
if(refundAmount != null) { result.put("refundAmount", refundAmount); }
if(refundRefNum != null) { result.put("refundRefNum", refundRefNum); }
@@ -107,7 +105,7 @@ public class SagePayUtil
public static Map<String, Object> buildCardRefundPaymentResponse
(Boolean refundResult, String refundCode, BigDecimal refundAmount, String refundRefNum, String refundAltRefNum, String refundMessage) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if(refundResult != null) { result.put("refundResult", refundResult); }
if(refundCode != null) { result.put("refundCode", refundCode); }
if(refundAmount != null) { result.put("refundAmount", refundAmount); }
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Fri Apr 10 20:22:54 2015
@@ -32,6 +32,8 @@ import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -54,9 +56,6 @@ import javax.crypto.spec.DHPrivateKeySpe
import javax.crypto.spec.DHPublicKeySpec;
import javax.crypto.spec.IvParameterSpec;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.HttpClient;
import org.ofbiz.base.util.HttpClientException;
@@ -75,7 +74,7 @@ public class ValueLinkApi {
public static final String module = ValueLinkApi.class.getName();
// static object cache
- private static Map<String, Object> objectCache = FastMap.newInstance();
+ private static Map<String, Object> objectCache = new HashMap<String, Object>();
// instance variables
protected Delegator delegator = null;
@@ -696,7 +695,7 @@ public class ValueLinkApi {
* @return Map containing the inital request values
*/
public Map<String, Object> getInitialRequestMap(Map<String, Object> context) {
- Map<String, Object> request = FastMap.newInstance();
+ Map<String, Object> request = new HashMap<String, Object>();
// merchant information
request.put("MerchID", merchantId + terminalId);
@@ -941,7 +940,7 @@ public class ValueLinkApi {
subResponse = StringUtil.replaceString(subResponse, "</td>", "");
// make the map
- Map<String, Object> responseMap = FastMap.newInstance();
+ Map<String, Object> responseMap = new HashMap<String, Object>();
responseMap.putAll(StringUtil.strToMap(subResponse, true));
// add the raw html back in just in case we need it later
@@ -997,7 +996,7 @@ public class ValueLinkApi {
List<String> valueList = StringUtil.split(values, "&");
// create a List of Maps for each set of values
- List<Map<String, String>> valueMap = FastList.newInstance();
+ List<Map<String, String>> valueMap = new LinkedList<Map<String,String>>();
for (int i = 0; i < valueList.size(); i++) {
valueMap.add(StringUtil.createMap(StringUtil.split(keys, "|"), StringUtil.split(valueList.get(i), "|")));
}
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Fri Apr 10 20:22:54 2015
@@ -19,13 +19,12 @@
package org.ofbiz.accounting.thirdparty.valuelink;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.HttpClientException;
import org.ofbiz.base.util.StringUtil;
@@ -770,7 +769,7 @@ public class ValueLinkServices {
private static void setTimeoutReversal(DispatchContext dctx, Map<String, Object> ctx, Map<String, Object> request) {
String vlInterface = (String) request.get("Interface");
// clone the context
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
context.putAll(ctx);
// append the rollback interface
@@ -826,7 +825,7 @@ public class ValueLinkServices {
currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
- Map<String, Object> redeemCtx = FastMap.newInstance();
+ Map<String, Object> redeemCtx = new HashMap<String, Object>();
redeemCtx.put("userLogin", userLogin);
redeemCtx.put("paymentConfig", paymentConfig);
redeemCtx.put("cardNumber", giftCard.get("cardNumber"));
@@ -919,7 +918,7 @@ public class ValueLinkServices {
currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
- Map<String, Object> redeemCtx = FastMap.newInstance();
+ Map<String, Object> redeemCtx = new HashMap<String, Object>();
redeemCtx.put("userLogin", userLogin);
redeemCtx.put("paymentConfig", paymentConfig);
redeemCtx.put("cardNumber", giftCard.get("cardNumber"));
@@ -984,7 +983,7 @@ public class ValueLinkServices {
currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
- Map<String, Object> refundCtx = FastMap.newInstance();
+ Map<String, Object> refundCtx = new HashMap<String, Object>();
refundCtx.put("userLogin", userLogin);
refundCtx.put("paymentConfig", paymentConfig);
refundCtx.put("cardNumber", giftCard.get("cardNumber"));
@@ -1149,7 +1148,7 @@ public class ValueLinkServices {
}
// make a map of answer info
- Map<String, Object> answerMap = FastMap.newInstance();
+ Map<String, Object> answerMap = new HashMap<String, Object>();
if (responseAnswers != null) {
for (GenericValue answer : responseAnswers) {
GenericValue question = null;
@@ -1181,7 +1180,7 @@ public class ValueLinkServices {
int qtyLoop = quantity.intValue();
for (int i = 0; i < qtyLoop; i++) {
// activate a gift card
- Map<String, Object> activateCtx = FastMap.newInstance();
+ Map<String, Object> activateCtx = new HashMap<String, Object>();
activateCtx.put("paymentConfig", paymentConfig);
activateCtx.put("vlPromoCode", promoCode);
activateCtx.put("currency", currency);
@@ -1215,7 +1214,7 @@ public class ValueLinkServices {
}
// create the fulfillment record
- Map<String, Object> vlFulFill = FastMap.newInstance();
+ Map<String, Object> vlFulFill = new HashMap<String, Object>();
vlFulFill.put("typeEnumId", "GC_ACTIVATE");
vlFulFill.put("merchantId", EntityUtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId", delegator));
vlFulFill.put("partyId", partyId);
@@ -1271,7 +1270,7 @@ public class ValueLinkServices {
}
}
- Map<String, Object> emailCtx = FastMap.newInstance();
+ Map<String, Object> emailCtx = new HashMap<String, Object>();
String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation");
if (UtilValidate.isEmpty(bodyScreenLocation)) {
bodyScreenLocation = ProductStoreWorker.getDefaultProductStoreEmailScreenLocation(emailType);
@@ -1394,7 +1393,7 @@ public class ValueLinkServices {
}
// make a map of answer info
- Map<String, Object> answerMap = FastMap.newInstance();
+ Map<String, Object> answerMap = new HashMap<String, Object>();
if (responseAnswers != null) {
for (GenericValue answer : responseAnswers) {
GenericValue question = null;
@@ -1419,7 +1418,7 @@ public class ValueLinkServices {
String pinNumber = (String) answerMap.get(pinNumberKey);
// reload the gift card
- Map<String, Object> reloadCtx = FastMap.newInstance();
+ Map<String, Object> reloadCtx = new HashMap<String, Object>();
reloadCtx.put("paymentConfig", paymentConfig);
reloadCtx.put("currency", currency);
reloadCtx.put("partyId", partyId);
@@ -1439,7 +1438,7 @@ public class ValueLinkServices {
}
// create the fulfillment record
- Map<String, Object> vlFulFill = FastMap.newInstance();
+ Map<String, Object> vlFulFill = new HashMap<String, Object>();
vlFulFill.put("typeEnumId", "GC_RELOAD");
vlFulFill.put("merchantId", EntityUtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId", delegator));
vlFulFill.put("partyId", partyId);
@@ -1506,7 +1505,7 @@ public class ValueLinkServices {
if (productStoreEmail == null) {
Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module);
} else {
- Map<String, Object> emailCtx = FastMap.newInstance();
+ Map<String, Object> emailCtx = new HashMap<String, Object>();
answerMap.put("locale", locale);
String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation");
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Fri Apr 10 20:22:54 2015
@@ -21,13 +21,12 @@ package org.ofbiz.accounting.thirdparty.
import java.math.BigDecimal;
import java.util.Date;
import java.util.Iterator;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javolution.util.FastMap;
-
import org.apache.commons.lang.StringUtils;
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.base.util.Debug;
@@ -90,7 +89,7 @@ public class PayflowPro {
isPayPal = true;
}
- Map<String, String> data = FastMap.newInstance();
+ Map<String, String> data = new HashMap<String, Object>();
boolean isReAuth = false;
if (isPayPal) {
@@ -433,7 +432,7 @@ public class PayflowPro {
"AccountingPayPalShoppingCartIsEmpty", locale));
}
- Map<String, String> data = FastMap.newInstance();
+ Map<String, String> data = new HashMap<String, Object>();
data.put("TRXTYPE", "O");
data.put("TENDER", "P");
@@ -543,7 +542,7 @@ public class PayflowPro {
String paymentGatewayConfigId = payPalPaymentSetting.getString("paymentGatewayConfigId");
String configString = "payment.properties";
- Map<String, String> data = FastMap.newInstance();
+ Map<String, String> data = new HashMap<String, Object>();
data.put("TRXTYPE", "O");
data.put("TENDER", "P");
data.put("ACTION", "G");
@@ -576,7 +575,7 @@ public class PayflowPro {
"AccountingPayPalCommunicationError", locale));
}
- Map<String, Object> inMap = FastMap.newInstance();
+ Map<String, Object> inMap = new HashMap<String, Object>();
inMap.put("userLogin", cart.getUserLogin());
inMap.put("partyId", cart.getOrderPartyId());
inMap.put("contactMechId", cart.getShippingContactMechId());
@@ -622,7 +621,7 @@ public class PayflowPro {
}
BigDecimal processAmount = paymentPref.getBigDecimal("maxAmount");
- Map<String, String> data = FastMap.newInstance();
+ Map<String, String> data = new HashMap<String, Object>();
data.put("TRXTYPE", "O");
data.put("TENDER", "P");
data.put("PAYERID", payPalPaymentMethod.getString("payerId"));
@@ -650,7 +649,7 @@ public class PayflowPro {
Map<String, String> responseMap = parseResponse(resp);
- Map<String, Object> inMap = FastMap.newInstance();
+ Map<String, Object> inMap = new HashMap<String, Object>();
inMap.put("userLogin", userLogin);
inMap.put("paymentMethodId", payPalPaymentMethod.get("paymentMethodId"));
inMap.put("transactionId", responseMap.get("PNREF"));
@@ -670,7 +669,7 @@ public class PayflowPro {
private static Map<String, String> parseResponse(String resp) {
Debug.logInfo("Verisign response string: " + resp, module);
- Map<String, String> parameters = FastMap.newInstance();
+ Map<String, String> parameters = new HashMap<String, Object>();
List<String> params = StringUtil.split(resp, "&");
for (String str : params) {
if (str.length() > 0) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Fri Apr 10 20:22:54 2015
@@ -20,6 +20,7 @@ package org.ofbiz.accounting.thirdparty.
import java.io.IOException;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -28,8 +29,6 @@ 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.UtilDateTime;
import org.ofbiz.base.util.UtilFormatOut;
@@ -250,7 +249,7 @@ public class WorldPayEvents {
}
}
// create the redirect string
- Map<String, Object> parameters = FastMap.newInstance();
+ Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("instId", instId);
parameters.put("cartId", orderId);
parameters.put("currency", defCur);
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java Fri Apr 10 20:22:54 2015
@@ -20,10 +20,9 @@
package org.ofbiz.accounting.util;
import java.math.BigDecimal;
+import java.util.LinkedList;
import java.util.List;
-import javolution.util.FastList;
-
import org.ofbiz.accounting.AccountingException;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilNumber;
@@ -96,7 +95,7 @@ public class UtilAccounting {
}
public static List<String> getDescendantGlAccountClassIds(GenericValue glAccountClass) throws GenericEntityException {
- List<String> glAccountClassIds = FastList.newInstance();
+ List<String> glAccountClassIds = new LinkedList<String>();
getGlAccountClassChildren(glAccountClass, glAccountClassIds);
return glAccountClassIds;
}
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy Fri Apr 10 20:22:54 2015
@@ -18,7 +18,6 @@
*/
import org.ofbiz.base.util.UtilMisc;
-import javolution.util.FastList;
taxAuthorities = from('TaxAuthority').orderBy("taxAuthGeoId", "taxAuthPartyId").queryList();
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy Fri Apr 10 20:22:54 2015
@@ -28,9 +28,6 @@ import java.text.SimpleDateFormat;
import java.math.BigDecimal;
import java.math.MathContext;
import org.ofbiz.base.util.UtilNumber;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
invoiceId = parameters.get("invoiceId");
@@ -68,8 +65,8 @@ if (invoice) {
}
invoiceItems = invoice.getRelated("InvoiceItem", null, ["invoiceItemSeqId"], false);
- invoiceItemsConv = FastList.newInstance();
- vatTaxesByType = FastMap.newInstance();
+ invoiceItemsConv = [];
+ vatTaxesByType = [:];
invoiceItems.each { invoiceItem ->
invoiceItem.amount = invoiceItem.getBigDecimal("amount").multiply(conversionRate).setScale(decimals, rounding);
invoiceItemsConv.add(invoiceItem);
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy Fri Apr 10 20:22:54 2015
@@ -25,8 +25,6 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
-import javolution.util.FastList;
-
exprBldr = new EntityConditionBuilder();
invoice = context.invoice;
if (!invoice) return;
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy Fri Apr 10 20:22:54 2015
@@ -26,8 +26,6 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.entity.util.EntityFindOptions;
-import javolution.util.FastList;
-
exprBldr = new org.ofbiz.entity.condition.EntityConditionBuilder();
if (invoiceTypeId) {
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy Fri Apr 10 20:22:54 2015
@@ -19,7 +19,6 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.util.EntityUtil;
-import javolution.util.FastMap;
if (billingAccountId) {
orderPaymentPreferencesList = [];
@@ -28,7 +27,7 @@ if (billingAccountId) {
orderList.each { orderHeader ->
orderId = orderHeader.orderId;
orderBillingAcc = from("OrderHeaderAndPaymentPref").where("orderId", orderId).queryFirst();
- orderBillingAccMap = FastMap.newInstance();
+ orderBillingAccMap = [:];
if (orderBillingAcc.paymentMethodTypeId.equals("EXT_BILLACT") && orderBillingAcc.paymentStatusId.equals("PAYMENT_NOT_RECEIVED")) {
orderBillingAccMap.putAll(orderBillingAcc);
orderId = orderBillingAcc.orderId;