You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/07/08 08:35:32 UTC
svn commit: r1801266 - in /ofbiz/ofbiz-framework/trunk:
applications/content/src/main/java/org/apache/ofbiz/content/
applications/content/src/main/java/org/apache/ofbiz/content/survey/
applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/ ap...
Author: deepak
Date: Sat Jul 8 08:35:32 2017
New Revision: 1801266
URL: http://svn.apache.org/viewvc?rev=1801266&view=rev
Log:
Improved: Remove hard-coded instances of "IN" with ModelService.IN_PARAM (OFBIZ-9434)
Thanks Devanshu and Pawan for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java
Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java Sat Jul 8 08:35:32 2017
@@ -280,7 +280,7 @@ public class ContentManagementServices {
if (contentExists) {
Map<String, Object> contentContext = new HashMap<String, Object>();
ModelService contentModel = dispatcher.getDispatchContext().getModelService("updateContent");
- contentContext.putAll(contentModel.makeValid(content, "IN"));
+ contentContext.putAll(contentModel.makeValid(content, ModelService.IN_PARAM));
contentContext.put("userLogin", userLogin);
contentContext.put("displayFailCond", bDisplayFailCond);
contentContext.put("skipPermissionCheck", context.get("skipPermissionCheck"));
@@ -292,7 +292,7 @@ public class ContentManagementServices {
} else {
Map<String, Object> contentContext = new HashMap<String, Object>();
ModelService contentModel = dispatcher.getDispatchContext().getModelService("createContent");
- contentContext.putAll(contentModel.makeValid(content, "IN"));
+ contentContext.putAll(contentModel.makeValid(content, ModelService.IN_PARAM));
contentContext.put("userLogin", userLogin);
contentContext.put("displayFailCond", bDisplayFailCond);
contentContext.put("skipPermissionCheck", context.get("skipPermissionCheck"));
@@ -358,7 +358,7 @@ public class ContentManagementServices {
GenericValue contentAssocExisting = EntityQuery.use(delegator).from("ContentAssoc").where(contentAssoc.getPrimaryKey()).queryOne();
if (contentAssocExisting == null) {
ModelService contentAssocModel = dispatcher.getDispatchContext().getModelService("createContentAssoc");
- Map<String, Object> ctx = contentAssocModel.makeValid(contentAssoc, "IN");
+ Map<String, Object> ctx = contentAssocModel.makeValid(contentAssoc, ModelService.IN_PARAM);
contentAssocContext.putAll(ctx);
thisResult = dispatcher.runSync("createContentAssoc", contentAssocContext);
String errMsg = ServiceUtil.getErrorMessage(thisResult);
@@ -378,7 +378,7 @@ public class ContentManagementServices {
contentAssocExisting.put("thruDate", (Timestamp)context.get("thruDate"));
}
ModelService contentAssocModel = dispatcher.getDispatchContext().getModelService("updateContentAssoc");
- Map<String, Object> ctx = contentAssocModel.makeValid(contentAssocExisting, "IN");
+ Map<String, Object> ctx = contentAssocModel.makeValid(contentAssocExisting, ModelService.IN_PARAM);
contentAssocContext.putAll(ctx);
thisResult = dispatcher.runSync("updateContentAssoc", contentAssocContext);
String errMsg = ServiceUtil.getErrorMessage(thisResult);
@@ -505,7 +505,7 @@ public class ContentManagementServices {
Map<String, Object> result = new HashMap<String, Object>();
try {
ModelService checkPermModel = dispatcher.getDispatchContext().getModelService("checkContentPermission");
- Map<String, Object> ctx = checkPermModel.makeValid(context, "IN");
+ Map<String, Object> ctx = checkPermModel.makeValid(context, ModelService.IN_PARAM);
Map<String, Object> thisResult = dispatcher.runSync("checkContentPermission", ctx);
String permissionStatus = (String)thisResult.get("permissionStatus");
if (UtilValidate.isNotEmpty(permissionStatus) && permissionStatus.equalsIgnoreCase("granted")) {
@@ -570,7 +570,7 @@ public class ContentManagementServices {
}
GenericValue userLogin = (GenericValue) context.get("userLogin");
ModelService dataResourceModel = dispatcher.getDispatchContext().getModelService("updateDataResource");
- Map<String, Object> ctx = dataResourceModel.makeValid(dataResource, "IN");
+ Map<String, Object> ctx = dataResourceModel.makeValid(dataResource, ModelService.IN_PARAM);
newDrContext.putAll(ctx);
newDrContext.put("userLogin", userLogin);
newDrContext.put("skipPermissionCheck", context.get("skipPermissionCheck"));
@@ -922,7 +922,7 @@ public class ContentManagementServices {
contentClone.set("contentId", null);
ModelService modelService = dctx.getModelService("persistContentAndAssoc");
- Map<String, Object> serviceIn = modelService.makeValid(contentClone, "IN");
+ Map<String, Object> serviceIn = modelService.makeValid(contentClone, ModelService.IN_PARAM);
serviceIn.put("userLogin", userLogin);
serviceIn.put("contentIdTo", contentId);
serviceIn.put("contentAssocTypeId", "SUB_CONTENT");
@@ -1406,7 +1406,7 @@ public class ContentManagementServices {
context.put("useRoleTypeId", productContent.get("useRoleTypeId"));
context.put("contentId", productContent.get("contentId"));
ModelService subscriptionModel = dispatcher.getDispatchContext().getModelService("updateContentSubscription");
- Map<String, Object> ctx = subscriptionModel.makeValid(context, "IN");
+ Map<String, Object> ctx = subscriptionModel.makeValid(context, ModelService.IN_PARAM);
result = dispatcher.runSync("updateContentSubscription", ctx);
return result;
}
@@ -1452,7 +1452,7 @@ public class ContentManagementServices {
if (productContentCount > 0) {
context.put("productId", productId);
context.put("quantity", Integer.valueOf(qty.intValue()));
- Map<String, Object> ctx = subscriptionModel.makeValid(context, "IN");
+ Map<String, Object> ctx = subscriptionModel.makeValid(context, ModelService.IN_PARAM);
dispatcher.runSync("updateContentSubscriptionByProduct", ctx);
}
}
@@ -1545,7 +1545,7 @@ public class ContentManagementServices {
try {
ModelService persistContentAndAssocModel = dispatcher.getDispatchContext().getModelService("persistContentAndAssoc");
- Map<String, Object> ctx = persistContentAndAssocModel.makeValid(context, "IN");
+ Map<String, Object> ctx = persistContentAndAssocModel.makeValid(context, ModelService.IN_PARAM);
if (dataResource != null) {
ctx.remove("dataResourceId");
ctx.remove("drDataResourceId");
Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java Sat Jul 8 08:35:32 2017
@@ -543,7 +543,7 @@ public class PdfSurveyServices {
try {
ModelService modelService = dispatcher.getDispatchContext().getModelService("setAcroFields");
- Map<String, Object> ctx = modelService.makeValid(context, "IN");
+ Map<String, Object> ctx = modelService.makeValid(context, ModelService.IN_PARAM);
ctx.put("acroFieldMap", acroFieldMap);
ctx.put("contentId", acroFormContentId);
Map<String, Object> map = dispatcher.runSync("setAcroFields", ctx);
Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java Sat Jul 8 08:35:32 2017
@@ -50,6 +50,7 @@ import org.apache.ofbiz.party.party.Part
import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.LocalDispatcher;
+import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;
import ezvcard.Ezvcard;
@@ -211,7 +212,7 @@ public class VCard {
if (formattedName != null) {
//store the origin creation
- Map<String, Object> createPartyIdentificationMap = dctx.makeValidContext("createPartyIdentification", "IN", context);
+ Map<String, Object> createPartyIdentificationMap = dctx.makeValidContext("createPartyIdentification", ModelService.IN_PARAM, context);
createPartyIdentificationMap.put("partyId", resp.get("partyId"));
createPartyIdentificationMap.put("partyIdentificationTypeId", "VCARD_FN_ORIGIN");
createPartyIdentificationMap.put("idValue", formattedName.getValue());
Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java Sat Jul 8 08:35:32 2017
@@ -2507,7 +2507,7 @@ public class OrderReturnServices {
String serviceName = UtilValidate.isNotEmpty(orderItemSeqId) ? "createReturnItem" : "createReturnAdjustment";
Debug.logInfo("serviceName:" + serviceName, module);
try {
- Map<String, Object> inMap = dctx.makeValidContext(serviceName, "IN", context);
+ Map<String, Object> inMap = dctx.makeValidContext(serviceName, ModelService.IN_PARAM, context);
if ("createReturnItem".equals(serviceName)) {
// we don't want to automatically include the adjustments
// when the return item is created because they are selectable by the user
@@ -2530,7 +2530,7 @@ public class OrderReturnServices {
String serviceName = UtilValidate.isEmpty(returnAdjustmentId) ? "updateReturnItem" : "updateReturnAdjustment";
Debug.logInfo("serviceName:" + serviceName, module);
try {
- return dispatcher.runSync(serviceName, dctx.makeValidContext(serviceName, "IN", context));
+ return dispatcher.runSync(serviceName, dctx.makeValidContext(serviceName, ModelService.IN_PARAM, context));
} catch (org.apache.ofbiz.service.GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -2586,7 +2586,7 @@ public class OrderReturnServices {
*/
@Deprecated
public static Map<String, Object> filterServiceContext(DispatchContext dctx, String serviceName, Map<String, ? extends Object> context) throws GenericServiceException {
- return dctx.makeValidContext(serviceName, "IN", context);
+ return dctx.makeValidContext(serviceName, ModelService.IN_PARAM, context);
}
/**
Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Sat Jul 8 08:35:32 2017
@@ -440,7 +440,7 @@ public class OrderServices {
}
if (UtilValidate.isEmpty(orderId)) {
try {
- getNextOrderIdContext = ctx.makeValidContext("getNextOrderId", "IN", getNextOrderIdContext);
+ getNextOrderIdContext = ctx.makeValidContext("getNextOrderId", ModelService.IN_PARAM, getNextOrderIdContext);
Map<String, Object> getNextOrderIdResult = dispatcher.runSync("getNextOrderId", getNextOrderIdContext);
if (ServiceUtil.isError(getNextOrderIdResult)) {
String errMsg = UtilProperties.getMessage(resource_error,
@@ -5690,7 +5690,7 @@ public class OrderServices {
String mainErrorMessage = UtilProperties.getMessage(resource_error, "OrderUnableToAddOISGToOrder", locale);
Map<String, Object> createOrderItemShipGroupMap = null;
try {
- createOrderItemShipGroupMap = dctx.makeValidContext("createOrderItemShipGroup", "IN", context);
+ createOrderItemShipGroupMap = dctx.makeValidContext("createOrderItemShipGroup", ModelService.IN_PARAM, context);
} catch (GenericServiceException gse) {
String errMsg = mainErrorMessage + gse.toString();
return ServiceUtil.returnError(errMsg);
@@ -5828,7 +5828,7 @@ public class OrderServices {
//by default create a new orderItemShipGroup if null with default carrier and contact from the first OISG
if ("new".equals(shipGroupSeqId)) {
try {
- Map<String, Object> addOrderItemShipGroupMap = dctx.makeValidContext("addOrderItemShipGroup", "IN", context);
+ Map<String, Object> addOrderItemShipGroupMap = dctx.makeValidContext("addOrderItemShipGroup", ModelService.IN_PARAM, context);
addOrderItemShipGroupMap.remove("shipGroupSeqId");
//get default OrderItemShipGroup value for carrier and contact data
List<GenericValue> oisgas = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false);
@@ -5949,10 +5949,10 @@ public class OrderServices {
return ServiceUtil.returnError(errMsg);
}
try {
- Map<String, Object> cancelOrderInventoryReservationMap = dctx.makeValidContext("cancelOrderInventoryReservation", "IN", context);
+ Map<String, Object> cancelOrderInventoryReservationMap = dctx.makeValidContext("cancelOrderInventoryReservation", ModelService.IN_PARAM, context);
Map<String, Object> localResult = dispatcher.runSync("cancelOrderInventoryReservation", cancelOrderInventoryReservationMap);
if (ServiceUtil.isError(localResult)) return localResult;
- Map<String, Object> deleteOrderItemShipGroupAssocMap = dctx.makeValidContext("deleteOrderItemShipGroupAssoc", "IN", context);
+ Map<String, Object> deleteOrderItemShipGroupAssocMap = dctx.makeValidContext("deleteOrderItemShipGroupAssoc", ModelService.IN_PARAM, context);
localResult = dispatcher.runSync("deleteOrderItemShipGroupAssoc", deleteOrderItemShipGroupAssocMap);
if (ServiceUtil.isError(localResult)) return localResult;
} catch (GenericServiceException e) {
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java Sat Jul 8 08:35:32 2017
@@ -107,7 +107,7 @@ public class PromoServices {
}
}
try {
- Map<String, Object> newContext = dctx.makeValidContext("createProductPromoCode", "IN", context);
+ Map<String, Object> newContext = dctx.makeValidContext("createProductPromoCode", ModelService.IN_PARAM, context);
newContext.put("productPromoCodeId", newPromoCodeId);
createProductPromoCodeMap = dispatcher.runSync("createProductPromoCode", newContext);
} catch (GenericServiceException err) {
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java Sat Jul 8 08:35:32 2017
@@ -507,7 +507,7 @@ public class UpsServices {
UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", dimensionUom.getString("abbreviation").toUpperCase(), shipmentConfirmRequestDoc);
} else {
// I guess we'll default to inches...
- UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", "IN", shipmentConfirmRequestDoc);
+ UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", ModelService.IN_PARAM, shipmentConfirmRequestDoc);
}
BigDecimal boxLength = shipmentBoxType.getBigDecimal("boxLength");
BigDecimal boxWidth = shipmentBoxType.getBigDecimal("boxWidth");
@@ -524,7 +524,7 @@ public class UpsServices {
if (dimensionUom != null) {
UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", dimensionUom.getString("abbreviation").toUpperCase(), shipmentConfirmRequestDoc);
} else {
- UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", "IN", shipmentConfirmRequestDoc);
+ UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", ModelService.IN_PARAM, shipmentConfirmRequestDoc);
}
UtilXml.addChildElementValue(dimensionsElement, "Length", ""+shipmentPackage.getBigDecimal("boxLength").intValue(), shipmentConfirmRequestDoc);
UtilXml.addChildElementValue(dimensionsElement, "Width", ""+shipmentPackage.getBigDecimal("boxWidth").intValue(), shipmentConfirmRequestDoc);
@@ -2902,7 +2902,7 @@ public class UpsServices {
if (dimensionUom != null) {
UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", dimensionUom.getString("abbreviation").toUpperCase(), rateRequestDoc);
} else {
- UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", "IN", rateRequestDoc);
+ UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", ModelService.IN_PARAM, rateRequestDoc);
}
BigDecimal boxLength = shipmentBoxType.getBigDecimal("boxLength");
BigDecimal boxWidth = shipmentBoxType.getBigDecimal("boxWidth");
@@ -2916,7 +2916,7 @@ public class UpsServices {
UtilValidate.isNotEmpty(shipmentPackage.get("boxHeight"))) {
Element dimensionsElement = UtilXml.addChildElement(packageElement, "Dimensions", rateRequestDoc);
Element unitOfMeasurementElement = UtilXml.addChildElement(dimensionsElement, "UnitOfMeasurement", rateRequestDoc);
- UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", "IN", rateRequestDoc);
+ UtilXml.addChildElementValue(unitOfMeasurementElement, "Code", ModelService.IN_PARAM, rateRequestDoc);
BigDecimal length = (BigDecimal) shipmentPackage.get("boxLength");
BigDecimal width = (BigDecimal) shipmentPackage.get("boxWidth");
BigDecimal height = (BigDecimal) shipmentPackage.get("boxHeight");
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java Sat Jul 8 08:35:32 2017
@@ -125,7 +125,7 @@ public final class ScriptHelperImpl impl
Debug.logWarning(e, errMsg, module);
throw new ScriptException(errMsg);
}
- toMap.putAll(modelService.makeValid(inputMap, "IN", true, UtilGenerics.checkList(ctxHelper.getErrorMessages()), ctxHelper.getTimeZone(), ctxHelper.getLocale()));
+ toMap.putAll(modelService.makeValid(inputMap, ModelService.IN_PARAM, true, UtilGenerics.checkList(ctxHelper.getErrorMessages()), ctxHelper.getTimeZone(), ctxHelper.getLocale()));
return toMap;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java Sat Jul 8 08:35:32 2017
@@ -716,7 +716,7 @@ public final class ServiceUtil {
Debug.logError(e, errMsg, module);
throw new GeneralServiceException(e);
}
- outMap.putAll(modelService.makeValid(fromMap, "IN", true, null, timeZone, locale));
+ outMap.putAll(modelService.makeValid(fromMap, ModelService.IN_PARAM, true, null, timeZone, locale));
if (userLogin != null && modelService.auth) {
outMap.put("userLogin", userLogin);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java?rev=1801266&r1=1801265&r2=1801266&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java Sat Jul 8 08:35:32 2017
@@ -29,8 +29,8 @@ import org.apache.ofbiz.base.util.UtilPr
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.GenericServiceException;
+import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;
-
/**
* XmlRpcTests
*/
@@ -84,7 +84,7 @@ public class XmlRpcTests extends Abstrac
Integer num1 = 125;
Integer num2 = 365;
try {
- Map<String, Object> localMap = dctx.makeValidContext("testXmlRpcLocalEngine", "IN", context);
+ Map<String, Object> localMap = dctx.makeValidContext("testXmlRpcLocalEngine", ModelService.IN_PARAM, context);
localMap.put("num1", num1);
localMap.put("num2", num2);
result = dctx.getDispatcher().runSync("testXmlRpcLocalEngine", localMap);