Author: doogie
Date: Mon May 14 21:02:19 2012
New Revision: 1338413
URL: http://svn.apache.org/viewvc?rev=1338413&view=rev
Log:
DEPRECATION: specialpurpose/ebay: findByAnd variants replaced with findByAnd
that takes a boolean useCache parameter.
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=1338413&r1=1338412&r2=1338413&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
(original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Mon May
14 21:02:19 2012
@@ -177,7 +177,7 @@ public class EbayHelper {
shipmentMethodTypeId =
ebayShippingMethod.getString("shipmentMethodTypeId");
} else {
//Find ebay shipping method on the basis of shipmentMethodName
so that we can create new record with productStorId, EbayShippingMethod data is
required for atleast one productStore
- List<GenericValue> ebayShippingMethods =
delegator.findByAnd("EbayShippingMethod", UtilMisc.toMap("shipmentMethodName",
shippingService));
+ List<GenericValue> ebayShippingMethods =
delegator.findByAnd("EbayShippingMethod", UtilMisc.toMap("shipmentMethodName",
shippingService), null, false);
ebayShippingMethod = EntityUtil.getFirst(ebayShippingMethods);
ebayShippingMethod.put("productStoreId", productStoreId);
delegator.create(ebayShippingMethod);
@@ -197,7 +197,7 @@ public class EbayHelper {
try {
Map<String, String> paymentFields = UtilMisc.toMap("orderId",
orderId, "statusId", "PAYMENT_RECEIVED",
"paymentMethodTypeId", "EXT_EBAY");
- paymentPreferences = delegator.findByAnd("OrderPaymentPreference",
paymentFields);
+ paymentPreferences = delegator.findByAnd("OrderPaymentPreference",
paymentFields, null, false);
if (UtilValidate.isNotEmpty(paymentPreferences)) {
Iterator<GenericValue> i = paymentPreferences.iterator();
@@ -210,7 +210,7 @@ public class EbayHelper {
} else {
paymentFields = UtilMisc.toMap("orderId", orderId, "statusId",
"PAYMENT_NOT_RECEIVED",
"paymentMethodTypeId", "EXT_EBAY");
- paymentPreferences =
delegator.findByAnd("OrderPaymentPreference", paymentFields);
+ paymentPreferences =
delegator.findByAnd("OrderPaymentPreference", paymentFields, null, false);
if (UtilValidate.isNotEmpty(paymentPreferences)) {
Iterator<GenericValue> i = paymentPreferences.iterator();
while (i.hasNext()) {
@@ -476,7 +476,7 @@ public class EbayHelper {
Debug.logInfo("geocode: " + geoCode, module);
geo = EntityUtil.getFirst(delegator.findByAnd("Geo",
UtilMisc.toMap("geoCode", geoCode.toUpperCase(),
- "geoTypeId", "COUNTRY")));
+ "geoTypeId", "COUNTRY"), null, false));
Debug.logInfo("Found a geo entity " + geo, module);
if (UtilValidate.isEmpty(geo)) {
geo = delegator.makeValue("Geo");
@@ -611,7 +611,7 @@ public class EbayHelper {
String productId = "";
try {
// First try to get an exact match: title == internalName
- List<GenericValue> products = delegator.findByAnd("Product",
UtilMisc.toMap("internalName", title));
+ List<GenericValue> products = delegator.findByAnd("Product",
UtilMisc.toMap("internalName", title), null, false);
if (UtilValidate.isNotEmpty(products) && products.size() == 1) {
productId = (String) (products.get(0)).get("productId");
}
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=1338413&r1=1338412&r2=1338413&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
(original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
Mon May 14 21:02:19 2012
@@ -1141,7 +1141,7 @@ public class EbayOrderServices {
// If matching party not found then try to find partyId from
PartyAttribute entity.
GenericValue partyAttribute = null;
if (UtilValidate.isNotEmpty(context.get("eiasTokenBuyer"))) {
- partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", (String) context.get("eiasTokenBuyer"))));
+ partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", (String) context.get("eiasTokenBuyer")), null,
false));
if (UtilValidate.isNotEmpty(partyAttribute)) {
partyId = (String) partyAttribute.get("partyId");
}
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=1338413&r1=1338412&r2=1338413&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
(original)
+++
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
Mon May 14 21:02:19 2012
@@ -728,7 +728,7 @@ public class ImportOrdersFromEbay {
String contactMechId = "";
GenericValue partyAttribute = null;
if (UtilValidate.isNotEmpty(parameters.get("eiasTokenBuyer")))
{
- partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", (String)parameters.get("eiasTokenBuyer"))));
+ partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", (String)parameters.get("eiasTokenBuyer")), null,
false));
}
// if we get a party, check its contact information.
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=1338413&r1=1338412&r2=1338413&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
(original)
+++
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
Mon May 14 21:02:19 2012
@@ -302,7 +302,7 @@ public class ProductsExportToEbay {
primaryCategoryId = categoryCode;
}
} else {
- GenericValue productCategoryValue =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryAndMember",
UtilMisc.toMap("productCategoryTypeId", "EBAY_CATEGORY", "productId",
prod.getString("productId")))));
+ GenericValue productCategoryValue =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryAndMember",
UtilMisc.toMap("productCategoryTypeId", "EBAY_CATEGORY", "productId",
prod.getString("productId")), null, false)));
if (UtilValidate.isNotEmpty(productCategoryValue)) {
primaryCategoryId =
productCategoryValue.getString("categoryName");
}
