svn commit: r1863500 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1863500 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Author: mthl
Date: Sat Jul 20 16:32:34 2019 New Revision: 1863500 URL: http://svn.apache.org/viewvc?rev=1863500&view=rev Log: Improved: Inline ‘UtilGenerics#checkMap’ (OFBIZ-11141) Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.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/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/test/StockMovesTest.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.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/eca/ServiceEcaAction.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java Sat Jul 20 16:32:34 2019 @@ -40,7 +40,7 @@ public class GeneralLedgerServices { Map<String, Object> createGlAcctCatMemFromCostCentersMap = null; String glAccountId = (String) context.get("glAccountId"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, String> amountPercentageMap = UtilGenerics.checkMap(context.get("amountPercentageMap")); + Map<String, String> amountPercentageMap = UtilGenerics.cast(context.get("amountPercentageMap")); BigDecimal totalAmountPercentage = GeneralLedgerServices.calculateCostCenterTotal(amountPercentageMap); Map<String, Object> result = ServiceUtil.returnSuccess(); for (Map.Entry<String, String> rowEntry : amountPercentageMap.entrySet()) { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Sat Jul 20 16:32:34 2019 @@ -706,7 +706,7 @@ public class CCPaymentServices { // TODO: determine if adding OrderItemList is worthwhile - JFE 2004.02.14 - Map<String, Object> pbOrder = UtilGenerics.checkMap(context.get("pbOrder")); + Map<String, Object> pbOrder = UtilGenerics.cast(context.get("pbOrder")); if (pbOrder != null) { if (Debug.verboseOn()) { Debug.logVerbose("pbOrder Map not empty:" + pbOrder.toString(), module); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java Sat Jul 20 16:32:34 2019 @@ -81,7 +81,7 @@ public final class ContentManagementWork return; } - Map<String, LifoSet<Object>> lookupCaches = UtilGenerics.checkMap(session.getAttribute("lookupCaches")); + Map<String, LifoSet<Object>> lookupCaches = UtilGenerics.cast(session.getAttribute("lookupCaches")); if (lookupCaches == null) { lookupCaches = new HashMap<>(); session.setAttribute("lookupCaches", lookupCaches); @@ -154,7 +154,7 @@ public final class ContentManagementWork public static void setCurrentEntityMap(HttpServletRequest request, String entityName, GenericEntity ent) { HttpSession session = request.getSession(); - Map<String, GenericEntity> currentEntityMap = UtilGenerics.checkMap(session.getAttribute("currentEntityMap")); + Map<String, GenericEntity> currentEntityMap = UtilGenerics.cast(session.getAttribute("currentEntityMap")); if (currentEntityMap == null) { currentEntityMap = new HashMap<>(); session.setAttribute("currentEntityMap", currentEntityMap); @@ -183,7 +183,7 @@ public final class ContentManagementWork public static void getCurrentValue(HttpServletRequest request, Delegator delegator) { HttpSession session = request.getSession(); - Map<String, GenericPK> currentEntityMap = UtilGenerics.checkMap(session.getAttribute("currentEntityMap")); + Map<String, GenericPK> currentEntityMap = UtilGenerics.cast(session.getAttribute("currentEntityMap")); if (currentEntityMap == null) { currentEntityMap = new HashMap<>(); session.setAttribute("currentEntityMap", currentEntityMap); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java Sat Jul 20 16:32:34 2019 @@ -145,7 +145,7 @@ public class ContentServices { if (ServiceUtil.isError(thisResults)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResults)); } - Map<String, Object> nodeMap = UtilGenerics.checkMap(thisResults.get("nodeMap")); + Map<String, Object> nodeMap = UtilGenerics.cast(thisResults.get("nodeMap")); walkParentTree(nodeMap, parentList); } catch (GenericServiceException e) { return ServiceUtil.returnFailure(e.getMessage()); @@ -385,7 +385,7 @@ public class ContentServices { Map<String, Object> results = new HashMap<>(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String,Object> templateContext = UtilGenerics.checkMap(context.get("templateContext")); + Map<String,Object> templateContext = UtilGenerics.cast(context.get("templateContext")); String contentId = (String) context.get("contentId"); if (templateContext != null && UtilValidate.isEmpty(contentId)) { @@ -436,7 +436,7 @@ public class ContentServices { LocalDispatcher dispatcher = dctx.getDispatcher(); Writer out = (Writer) context.get("outWriter"); - Map<String,Object> templateContext = UtilGenerics.checkMap(context.get("templateContext")); + Map<String,Object> templateContext = UtilGenerics.cast(context.get("templateContext")); String contentId = (String) context.get("contentId"); if (templateContext != null && UtilValidate.isEmpty(contentId)) { contentId = (String) templateContext.get("contentId"); @@ -558,7 +558,7 @@ public class ContentServices { public static Map<String, Object> getPrefixedMembers(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map<String, Object> result = new HashMap<>(); - Map<String, Object> mapIn = UtilGenerics.checkMap(context.get("mapIn")); + Map<String, Object> mapIn = UtilGenerics.cast(context.get("mapIn")); String prefix = (String)context.get("prefix"); Map<String, Object> mapOut = new HashMap<>(); result.put("mapOut", mapOut); @@ -602,7 +602,7 @@ public class ContentServices { public static Map<String, Object> urlEncodeArgs(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map<String, Object> result = new HashMap<>(); Map<String, Object> mapFiltered = new HashMap<>(); - Map<String, Object> mapIn = UtilGenerics.checkMap(context.get("mapIn")); + Map<String, Object> mapIn = UtilGenerics.cast(context.get("mapIn")); if (mapIn != null) { Set<Map.Entry<String, Object>> entrySet = mapIn.entrySet(); for (Map.Entry<String, Object> entry : entrySet) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java Sat Jul 20 16:32:34 2019 @@ -201,7 +201,7 @@ public class ContentWorker implements or if (service != null) { //put all requestParameters into templateContext to use them as IN service parameters Map<String,Object> tempTemplateContext = new HashMap<>(); - tempTemplateContext.putAll(UtilGenerics.<String,Object>checkMap(templateContext.get("requestParameters"))); + tempTemplateContext.putAll(UtilGenerics.cast(templateContext.get("requestParameters"))); tempTemplateContext.putAll(templateContext); Map<String,Object> serviceCtx = service.makeValid(tempTemplateContext, ModelService.IN_PARAM); Map<String,Object> serviceRes; @@ -702,7 +702,7 @@ public class ContentWorker implements or String contentTypeId = (String) ctx.get("contentTypeId"); String mapKey = (String) ctx.get("mapKey"); String parentContentId = (String) parentContent.get("contentId"); - Map<String, Object> whenMap = UtilGenerics.checkMap(ctx.get("whenMap")); + Map<String, Object> whenMap = UtilGenerics.cast(ctx.get("whenMap")); List<Map<String, Object>> kids = new LinkedList<>(); currentNode.put("kids", kids); String direction = (String) ctx.get("direction"); @@ -1595,7 +1595,7 @@ public class ContentWorker implements or indent.setLength(indent.length() - 1); } else if (obj instanceof Map<?, ?>) { indent.append(' '); - logMap(s, "MAP[" + key + "]", UtilGenerics.<String, Object>checkMap(obj), indent); + logMap(s, "MAP[" + key + "]", UtilGenerics.cast(obj), indent); indent.setLength(indent.length() - 1); } else if (obj != null) { s.append(obj).append(sep).append(obj.getClass()).append(eol); @@ -1639,7 +1639,7 @@ public class ContentWorker implements or indent.setLength(indent.length() - 1); } else if (obj instanceof Map<?, ?>) { indent.append(' '); - logMap(s, "MAP[]", UtilGenerics.<String, Object>checkMap(obj), indent); + logMap(s, "MAP[]", UtilGenerics.cast(obj), indent); indent.setLength(indent.length() - 1); } else if (obj != null) { s.append(obj).append(sep).append(obj.getClass()).append(eol); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java Sat Jul 20 16:32:34 2019 @@ -793,7 +793,7 @@ public class DataResourceWorker impleme } } else if ("FORM_COMBINED".equals(dataTemplateTypeId)){ try { - Map<String, Object> context = UtilGenerics.checkMap(templateContext.get("globalContext")); + Map<String, Object> context = UtilGenerics.cast(templateContext.get("globalContext")); context.put("locale", locale); context.put("simpleEncoder", UtilCodec.getEncoder(modelTheme.getEncoder("screen"))); HttpServletRequest request = (HttpServletRequest) context.get("request"); @@ -838,7 +838,7 @@ public class DataResourceWorker impleme public static void writeDataResourceText(GenericValue dataResource, String mimeTypeId, Locale locale, Map<String, Object> templateContext, Delegator delegator, Appendable out, boolean cache) throws IOException, GeneralException { - Map<String, Object> context = UtilGenerics.checkMap(templateContext.get("context")); + Map<String, Object> context = UtilGenerics.cast(templateContext.get("context")); if (context == null) { context = new HashMap<>(); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java Sat Jul 20 16:32:34 2019 @@ -469,7 +469,7 @@ public class DataServices { Map<String, Object> results = new HashMap<>(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Writer out = (Writer) context.get("outWriter"); - Map<String, Object> templateContext = UtilGenerics.checkMap(context.get("templateContext")); + Map<String, Object> templateContext = UtilGenerics.cast(context.get("templateContext")); //GenericValue userLogin = (GenericValue) context.get("userLogin"); String dataResourceId = (String) context.get("dataResourceId"); if (templateContext != null && UtilValidate.isEmpty(dataResourceId)) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java Sat Jul 20 16:32:34 2019 @@ -66,7 +66,7 @@ public class LayoutEvents { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); HttpSession session = request.getSession(); Map<String, Object> uploadResults = LayoutWorker.uploadImageAndParameters(request, "imageData"); - Map<String, Object> formInput = UtilGenerics.checkMap(uploadResults.get("formInput")); + Map<String, Object> formInput = UtilGenerics.cast(uploadResults.get("formInput")); Map<String, Object> context = new HashMap<>(); ByteBuffer byteWrap = (ByteBuffer) uploadResults.get("imageData"); if (byteWrap == null) { @@ -177,7 +177,7 @@ public class LayoutEvents { Delegator delegator = (Delegator) request.getAttribute("delegator"); HttpSession session = request.getSession(); Map<String, Object> uploadResults = LayoutWorker.uploadImageAndParameters(request, "imageData"); - Map<String, Object> context = UtilGenerics.checkMap(uploadResults.get("formInput")); + Map<String, Object> context = UtilGenerics.cast(uploadResults.get("formInput")); ByteBuffer byteWrap = (ByteBuffer) uploadResults.get("imageData"); if (byteWrap == null) { String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.image_data_null", locale); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java Sat Jul 20 16:32:34 2019 @@ -94,7 +94,7 @@ public class OutputServices { visualTheme = ThemeFactory.resolveVisualTheme(null); } String screenLocation = (String) serviceContext.remove("screenLocation"); - Map<String, Object> screenContext = UtilGenerics.checkMap(serviceContext.remove("screenContext")); + Map<String, Object> screenContext = UtilGenerics.cast(serviceContext.remove("screenContext")); String contentType = (String) serviceContext.remove("contentType"); String printerContentType = (String) serviceContext.remove("printerContentType"); @@ -212,7 +212,7 @@ public class OutputServices { visualTheme = ThemeFactory.resolveVisualTheme(null); } String screenLocation = (String) serviceContext.remove("screenLocation"); - Map<String, Object> screenContext = UtilGenerics.checkMap(serviceContext.remove("screenContext")); + Map<String, Object> screenContext = UtilGenerics.cast(serviceContext.remove("screenContext")); String contentType = (String) serviceContext.remove("contentType"); String filePath = (String) serviceContext.remove("filePath"); String fileName = (String) serviceContext.remove("fileName"); 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=1863500&r1=1863499&r2=1863500&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 20 16:32:34 2019 @@ -89,7 +89,7 @@ public class PdfSurveyServices { PdfReader pdfReader = new PdfReader(byteBuffer.array()); PdfStamper pdfStamper = new PdfStamper(pdfReader, os); AcroFields acroFields = pdfStamper.getAcroFields(); - Map<String, Object> acroFieldMap = UtilGenerics.checkMap(acroFields.getFields()); + Map<String, Object> acroFieldMap = UtilGenerics.cast(acroFields.getFields()); String contentId = (String) context.get("contentId"); GenericValue survey = null; @@ -246,7 +246,7 @@ public class PdfSurveyServices { PdfReader r = new PdfReader(byteBuffer.array()); PdfStamper s = new PdfStamper(r,os); AcroFields fs = s.getAcroFields(); - Map<String, Object> hm = UtilGenerics.checkMap(fs.getFields()); + Map<String, Object> hm = UtilGenerics.cast(fs.getFields()); s.setFormFlattening(true); for (String fieldName : hm.keySet()) { //AcroFields.Item item = fs.getFieldItem(fieldName); @@ -291,7 +291,7 @@ public class PdfSurveyServices { PdfReader r = new PdfReader(byteBuffer.array()); PdfStamper s = new PdfStamper(r,os); AcroFields fs = s.getAcroFields(); - Map<String, Object> map = UtilGenerics.checkMap(fs.getFields()); + Map<String, Object> map = UtilGenerics.cast(fs.getFields()); s.setFormFlattening(true); for (String fieldName : map.keySet()) { @@ -315,13 +315,13 @@ public class PdfSurveyServices { Map<String, Object> results = ServiceUtil.returnSuccess(); Delegator delegator = dctx.getDelegator(); try { - Map<String, Object> acroFieldMap = UtilGenerics.checkMap(context.get("acroFieldMap")); + Map<String, Object> acroFieldMap = UtilGenerics.cast(context.get("acroFieldMap")); ByteBuffer byteBuffer = getInputByteBuffer(context, delegator); PdfReader r = new PdfReader(byteBuffer.array()); ByteArrayOutputStream baos = new ByteArrayOutputStream(); PdfStamper s = new PdfStamper(r, baos); AcroFields fs = s.getAcroFields(); - Map<String, Object> map = UtilGenerics.checkMap(fs.getFields()); + Map<String, Object> map = UtilGenerics.cast(fs.getFields()); s.setFormFlattening(true); for (String fieldName : map.keySet()) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Sat Jul 20 16:32:34 2019 @@ -150,7 +150,7 @@ public class EditRenderSubContentCacheTr if (UtilValidate.isNotEmpty(wrapTemplateId)) { templateCtx.put("wrappedContent", wrappedContent); Map<String, Object> templateRoot = null; - Map<String, Object> templateRootTemplate = UtilGenerics.checkMap(templateCtx.get("templateRootTemplate")); + Map<String, Object> templateRootTemplate = UtilGenerics.cast(templateCtx.get("templateRootTemplate")); if (templateRootTemplate == null) { Map<String, Object> templateRootTmp = FreeMarkerWorker.createEnvironmentMap(env); templateRoot = UtilMisc.makeMapWritable(templateRootTmp); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Sat Jul 20 16:32:34 2019 @@ -220,7 +220,7 @@ public class LimitedSubContentCacheTrans String mimeTypeId = ContentWorker.getMimeTypeId(delegator, view, ctx); Map<String, Object> trailNode = ContentWorker.makeNode(view); - Map<String, Object> whenMap = UtilGenerics.checkMap(ctx.get("whenMap")); + Map<String, Object> whenMap = UtilGenerics.cast(ctx.get("whenMap")); ContentWorker.checkConditions(delegator, trailNode, null, whenMap); Boolean isReturnBeforeObj = (Boolean) trailNode.get("isReturnBefore"); Boolean isPickObj = (Boolean) trailNode.get("isPick"); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Sat Jul 20 16:32:34 2019 @@ -140,7 +140,7 @@ public class RenderSubContentCacheTransf if (view != null) { thisView = view; } else if (passedGlobalNodeTrail.size() > 0) { - Map<String, ? extends Object> map = UtilGenerics.checkMap(passedGlobalNodeTrail.get(passedGlobalNodeTrail.size() - 1)); + Map<String, ? extends Object> map = UtilGenerics.cast(passedGlobalNodeTrail.get(passedGlobalNodeTrail.size() - 1)); if (Debug.infoOn()) { Debug.logInfo("in Render(3), map ." + map , module); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Sat Jul 20 16:32:34 2019 @@ -153,9 +153,9 @@ public class TraverseSubContentCacheTran if (globalNodeTrail.size() > 0) { int sz = globalNodeTrail.size() ; nodeTrail = new LinkedList<>(); - node = UtilGenerics.checkMap(globalNodeTrail.get(sz - 1)); + node = UtilGenerics.cast(globalNodeTrail.get(sz - 1)); Boolean checkedObj = (Boolean)node.get("checked"); - Map<String, Object> whenMap = UtilGenerics.checkMap(templateRoot.get("whenMap")); + Map<String, Object> whenMap = UtilGenerics.cast(templateRoot.get("whenMap")); if (checkedObj == null || !checkedObj) { ContentWorker.checkConditions(delegator, node, null, whenMap); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Sat Jul 20 16:32:34 2019 @@ -248,7 +248,7 @@ public class TraverseSubContentTransform return false; } assocContext.put("typeAncestry", contentTypeAncestry); - Map<String, Object> whenMap = UtilGenerics.checkMap(traverseContext.get("whenMap")); + Map<String, Object> whenMap = UtilGenerics.cast(traverseContext.get("whenMap")); List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail")); int indentSz = indent + nodeTrail.size(); assocContext.put("indentObj", indentSz); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Sat Jul 20 16:32:34 2019 @@ -160,7 +160,7 @@ public class WrapSubContentCacheTransfor if (UtilValidate.isNotEmpty(wrapTemplateId)) { templateCtx.put("wrappedContent", wrappedContent); Map<String, Object> templateRoot = null; - Map<String, Object> templateRootTemplate = UtilGenerics.checkMap(templateCtx.get("templateRootTemplate")); + Map<String, Object> templateRootTemplate = UtilGenerics.cast(templateCtx.get("templateRootTemplate")); if (templateRootTemplate == null) { Map<String, Object> templateRootTmp = FreeMarkerWorker.createEnvironmentMap(env); templateRoot = UtilMisc.makeMapWritable(templateRootTmp); Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java Sat Jul 20 16:32:34 2019 @@ -168,7 +168,7 @@ public class HumanResEvents { String hrefString = (String) params.get("hrefString"); String hrefString2 = (String) params.get("hrefString2"); - Map<String , Object> partyGroup = UtilGenerics.checkMap(params.get("partyGroup")); + Map<String , Object> partyGroup = UtilGenerics.cast(params.get("partyGroup")); List<Map<String, Object>> resultList = new ArrayList<>(); List<GenericValue> childOfComs = null; Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java Sat Jul 20 16:32:34 2019 @@ -543,7 +543,7 @@ public class BOMServices { for (Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); for (int i = 0; i < orderShipmentReadMapList.size(); i++) { - Map<String, Object> orderShipmentReadMap = UtilGenerics.checkMap(orderShipmentReadMapList.get(i)); + Map<String, Object> orderShipmentReadMap = UtilGenerics.cast(orderShipmentReadMapList.get(i)); GenericValue orderShipment = (GenericValue)orderShipmentReadMap.get("orderShipment"); OrderReadHelper orderReadHelper = (OrderReadHelper)orderShipmentReadMap.get("orderReadHelper"); GenericValue orderItem = orderReadHelper.getOrderItem(orderShipment.getString("orderItemSeqId")); @@ -583,7 +583,7 @@ public class BOMServices { Map<String, List<Map<String, Object>>> boxTypeContent = new HashMap<>(); List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); for (int i = 0; i < orderShipmentReadMapList.size(); i++) { - Map<String, Object> orderShipmentReadMap = UtilGenerics.checkMap(orderShipmentReadMapList.get(i)); + Map<String, Object> orderShipmentReadMap = UtilGenerics.cast(orderShipmentReadMapList.get(i)); GenericValue orderShipment = (GenericValue)orderShipmentReadMap.get("orderShipment"); OrderReadHelper orderReadHelper = (OrderReadHelper)orderShipmentReadMap.get("orderReadHelper"); List<BOMNode> productsInPackages = UtilGenerics.checkList(orderShipmentReadMap.get("productsInPackages")); @@ -656,8 +656,8 @@ public class BOMServices { } String shipmentPackageSeqId = null; for (int i = 0; i < contentList.size(); i++) { - Map<String, Object> contentMap = UtilGenerics.checkMap(contentList.get(i)); - Map<String, Object> content = UtilGenerics.checkMap(contentMap.get("content")); + Map<String, Object> contentMap = UtilGenerics.cast(contentList.get(i)); + Map<String, Object> content = UtilGenerics.cast(contentMap.get("content")); OrderReadHelper orderReadHelper = (OrderReadHelper)content.get("orderReadHelper"); List<BOMNode> productsInPackages = UtilGenerics.checkList(content.get("productsInPackages")); GenericValue orderShipment = (GenericValue)content.get("orderShipment"); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Sat Jul 20 16:32:34 2019 @@ -2019,7 +2019,7 @@ public class ProductionRunServices { // Optional input fields BigDecimal quantity = (BigDecimal)context.get("quantity"); - Map<GenericPK, Object> componentsLocationMap = UtilGenerics.checkMap(context.get("componentsLocationMap")); + Map<GenericPK, Object> componentsLocationMap = UtilGenerics.cast(context.get("componentsLocationMap")); // The production run is loaded ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); @@ -2314,7 +2314,7 @@ public class ProductionRunServices { BigDecimal addTaskTime = (BigDecimal)context.get("addTaskTime"); String comments = (String)context.get("comments"); Boolean issueRequiredComponents = (Boolean)context.get("issueRequiredComponents"); - Map<GenericPK, Object> componentsLocationMap = UtilGenerics.checkMap(context.get("componentsLocationMap")); + Map<GenericPK, Object> componentsLocationMap = UtilGenerics.cast(context.get("componentsLocationMap")); if (issueRequiredComponents == null) { issueRequiredComponents = Boolean.FALSE; @@ -2397,7 +2397,7 @@ public class ProductionRunServices { GenericPK key = component.getPrimaryKey(); Map<String, Object> componentsLocation = null; if (componentsLocationMap != null) { - componentsLocation = UtilGenerics.checkMap(componentsLocationMap.get(key)); + componentsLocation = UtilGenerics.cast(componentsLocationMap.get(key)); } Map<String, Object> serviceContext = UtilMisc.toMap("workEffortId", workEffortId, "productId", component.getString("productId"), @@ -3496,7 +3496,7 @@ public class ProductionRunServices { productMap.put(estimatedShipDate, UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList<>())); } - Map<String, Object> dateMap = UtilGenerics.checkMap(productMap.get(estimatedShipDate)); + Map<String, Object> dateMap = UtilGenerics.cast(productMap.get(estimatedShipDate)); BigDecimal remainingQty = (BigDecimal)dateMap.get("remainingQty"); remainingQty = remainingQty.add(qtyDiff); dateMap.put("remainingQty", remainingQty); @@ -3539,7 +3539,7 @@ public class ProductionRunServices { productMap.put(estimatedShipDate, UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList<>())); } - Map<String, Object> dateMap = UtilGenerics.checkMap(productMap.get(estimatedShipDate)); + Map<String, Object> dateMap = UtilGenerics.cast(productMap.get(estimatedShipDate)); BigDecimal remainingQty = (BigDecimal)dateMap.get("remainingQty"); remainingQty = remainingQty.add(orderQuantity); dateMap.put("remainingQty", remainingQty); @@ -3575,7 +3575,7 @@ public class ProductionRunServices { SortedMap<Timestamp, Object> subsetMap = productMap.headMap(requiredByDate); // iterate and 'reserve' for (Timestamp currentDate : subsetMap.keySet()) { - Map<String, Object> currentDateMap = UtilGenerics.checkMap(subsetMap.get(currentDate)); + Map<String, Object> currentDateMap = UtilGenerics.cast(subsetMap.get(currentDate)); BigDecimal remainingQty = (BigDecimal)currentDateMap.get("remainingQty"); if (remainingQty.compareTo(ZERO) == 0) { continue; 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=1863500&r1=1863499&r2=1863500&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 20 16:32:34 2019 @@ -2331,7 +2331,7 @@ public class OrderReturnServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "OrderProblemsWithGetReturnAmountByOrder", locale)); } - returnAmountByOrder = UtilGenerics.checkMap(serviceResult.get("orderReturnAmountMap")); + returnAmountByOrder = UtilGenerics.cast(serviceResult.get("orderReturnAmountMap")); if ((returnAmountByOrder != null) && (returnAmountByOrder.entrySet() != null)) { for (Entry<String, BigDecimal> orderId : returnAmountByOrder.entrySet()) { 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=1863500&r1=1863499&r2=1863500&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 20 16:32:34 2019 @@ -859,7 +859,7 @@ public class OrderServices { } // set the additional party roles - Map<String, List<String>> additionalPartyRole = UtilGenerics.checkMap(context.get("orderAdditionalPartyRoleMap")); + Map<String, List<String>> additionalPartyRole = UtilGenerics.cast(context.get("orderAdditionalPartyRoleMap")); if (additionalPartyRole != null) { for (Map.Entry<String, List<String>> entry : additionalPartyRole.entrySet()) { String additionalRoleTypeId = entry.getKey(); @@ -2020,9 +2020,9 @@ public class OrderServices { String orderId = (String) context.get("orderId"); String orderItemSeqId = (String) context.get("orderItemSeqId"); String shipGroupSeqId = (String) context.get("shipGroupSeqId"); - Map<String, String> itemReasonMap = UtilGenerics.checkMap(context.get("itemReasonMap")); - Map<String, String> itemCommentMap = UtilGenerics.checkMap(context.get("itemCommentMap")); - Map<String, String> itemQuantityMap = UtilGenerics.checkMap(context.get("itemQtyMap")); + Map<String, String> itemReasonMap = UtilGenerics.cast(context.get("itemReasonMap")); + Map<String, String> itemCommentMap = UtilGenerics.cast(context.get("itemCommentMap")); + Map<String, String> itemQuantityMap = UtilGenerics.cast(context.get("itemQtyMap")); if ((cancelQuantity == null) && UtilValidate.isNotEmpty(itemQuantityMap)) { String key = orderItemSeqId+":"+shipGroupSeqId; if (UtilValidate.isNotEmpty(itemQuantityMap.get(key))) { @@ -3530,7 +3530,7 @@ public class OrderServices { String orderItemTypeId = (String) context.get("orderItemTypeId"); String changeComments = (String) context.get("changeComments"); Boolean calcTax = (Boolean) context.get("calcTax"); - Map<String, String> itemAttributesMap = UtilGenerics.checkMap(context.get("itemAttributesMap")); + Map<String, String> itemAttributesMap = UtilGenerics.cast(context.get("itemAttributesMap")); if (calcTax == null) { calcTax = Boolean.TRUE; @@ -3675,16 +3675,16 @@ public class OrderServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); String orderId = (String) context.get("orderId"); - Map<String, String> overridePriceMap = UtilGenerics.checkMap(context.get("overridePriceMap")); - Map<String, String> itemDescriptionMap = UtilGenerics.checkMap(context.get("itemDescriptionMap")); - Map<String, String> itemPriceMap = UtilGenerics.checkMap(context.get("itemPriceMap")); - Map<String, String> itemQtyMap = UtilGenerics.checkMap(context.get("itemQtyMap")); - Map<String, String> itemReasonMap = UtilGenerics.checkMap(context.get("itemReasonMap")); - Map<String, String> itemCommentMap = UtilGenerics.checkMap(context.get("itemCommentMap")); - Map<String, String> itemAttributesMap = UtilGenerics.checkMap(context.get("itemAttributesMap")); - Map<String, String> itemEstimatedShipDateMap = UtilGenerics.checkMap(context.get("itemShipDateMap")); - Map<String, String> itemEstimatedDeliveryDateMap = UtilGenerics.checkMap(context.get("itemDeliveryDateMap")); - Map<String, String> itemReserveAfterDateMap = UtilGenerics.checkMap(context.get("itemReserveAfterDateMap")); + Map<String, String> overridePriceMap = UtilGenerics.cast(context.get("overridePriceMap")); + Map<String, String> itemDescriptionMap = UtilGenerics.cast(context.get("itemDescriptionMap")); + Map<String, String> itemPriceMap = UtilGenerics.cast(context.get("itemPriceMap")); + Map<String, String> itemQtyMap = UtilGenerics.cast(context.get("itemQtyMap")); + Map<String, String> itemReasonMap = UtilGenerics.cast(context.get("itemReasonMap")); + Map<String, String> itemCommentMap = UtilGenerics.cast(context.get("itemCommentMap")); + Map<String, String> itemAttributesMap = UtilGenerics.cast(context.get("itemAttributesMap")); + Map<String, String> itemEstimatedShipDateMap = UtilGenerics.cast(context.get("itemShipDateMap")); + Map<String, String> itemEstimatedDeliveryDateMap = UtilGenerics.cast(context.get("itemDeliveryDateMap")); + Map<String, String> itemReserveAfterDateMap = UtilGenerics.cast(context.get("itemReserveAfterDateMap")); Boolean calcTax = (Boolean) context.get("calcTax"); if (calcTax == null) { calcTax = Boolean.TRUE; @@ -4166,7 +4166,7 @@ public class OrderServices { String orderId = (String) context.get("orderId"); GenericValue userLogin = (GenericValue) context.get("userLogin"); ShoppingCart cart = (ShoppingCart) context.get("shoppingCart"); - Map<String, Object> changeMap = UtilGenerics.checkMap(context.get("changeMap")); + Map<String, Object> changeMap = UtilGenerics.cast(context.get("changeMap")); Locale locale = (Locale) context.get("locale"); Boolean deleteItems = (Boolean) context.get("deleteItems"); Boolean calcTax = (Boolean) context.get("calcTax"); @@ -4420,7 +4420,7 @@ public class OrderServices { if (changeFound) { // found changes to store - Map<String, String> itemReasonMap = UtilGenerics.checkMap(changeMap.get("itemReasonMap")); + Map<String, String> itemReasonMap = UtilGenerics.cast(changeMap.get("itemReasonMap")); if (UtilValidate.isNotEmpty(itemReasonMap)) { String changeReasonId = itemReasonMap.get(valueObj.getString("orderItemSeqId")); modifiedItem.put("reasonEnumId", changeReasonId); @@ -4434,8 +4434,8 @@ public class OrderServices { } else { // this is a new item appended to the order - Map<String, String> itemReasonMap = UtilGenerics.checkMap(changeMap.get("itemReasonMap")); - Map<String, String> itemCommentMap = UtilGenerics.checkMap(changeMap.get("itemCommentMap")); + Map<String, String> itemReasonMap = UtilGenerics.cast(changeMap.get("itemReasonMap")); + Map<String, String> itemCommentMap = UtilGenerics.cast(changeMap.get("itemCommentMap")); Map<String, Object> appendedItem = new HashMap<>(); if (UtilValidate.isNotEmpty(itemReasonMap)) { String changeReasonId = itemReasonMap.get("reasonEnumId"); @@ -5300,7 +5300,7 @@ public class OrderServices { String productStoreId = (String) context.get("productStoreId"); String currency = (String) context.get("currency"); String partyId = (String) context.get("partyId"); - Map<String, BigDecimal> itemMap = UtilGenerics.checkMap(context.get("itemMap")); + Map<String, BigDecimal> itemMap = UtilGenerics.cast(context.get("itemMap")); ShoppingCart cart = new ShoppingCart(delegator, productStoreId, null, locale, currency); try { @@ -7004,9 +7004,9 @@ public class OrderServices { Locale locale = (Locale) context.get("locale"); String productId = (String) context.get("productId"); Integer itemListSize = (Integer) context.get("itemListSize"); - Map<String, String> itemOrderIdMap = UtilGenerics.checkMap(context.get("itemOrderIdMap")); - Map<String, String> itemOrderItemSeqIdMap = UtilGenerics.checkMap(context.get("itemOrderItemSeqIdMap")); - Map<String, String> itemAllocatedQuantityMap = UtilGenerics.checkMap(context.get("itemAllocatedQuantityMap")); + Map<String, String> itemOrderIdMap = UtilGenerics.cast(context.get("itemOrderIdMap")); + Map<String, String> itemOrderItemSeqIdMap = UtilGenerics.cast(context.get("itemOrderItemSeqIdMap")); + Map<String, String> itemAllocatedQuantityMap = UtilGenerics.cast(context.get("itemAllocatedQuantityMap")); Map<String, Object> serviceResult = new HashMap<>(); Map<String, Object> serviceCtx = new HashMap<>(); String planId = null; @@ -7072,7 +7072,7 @@ public class OrderServices { public static Map<String, Object> isInventoryAllocationRequired(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); Boolean allocateInventory = false; - Map<String, Object> serviceContext = UtilGenerics.checkMap(context.get("serviceContext")); + Map<String, Object> serviceContext = UtilGenerics.cast(context.get("serviceContext")); String orderId = (String) serviceContext.get("orderId"); OrderReadHelper orderReadHelper = new OrderReadHelper(delegator, orderId); @@ -7091,11 +7091,11 @@ public class OrderServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); String planId = (String) context.get("planId"); - Map<String, String> orderIdMap = UtilGenerics.checkMap(context.get("orderIdMap")); - Map<String, String> productIdMap = UtilGenerics.checkMap(context.get("productIdMap")); - Map<String, String> allocatedQuantityMap = UtilGenerics.checkMap(context.get("allocatedQuantityMap")); - Map<String, String> prioritySeqIdMap = UtilGenerics.checkMap(context.get("prioritySeqIdMap")); - Map<String, String> rowSubmitMap = UtilGenerics.checkMap(context.get("rowSubmitMap")); + Map<String, String> orderIdMap = UtilGenerics.cast(context.get("orderIdMap")); + Map<String, String> productIdMap = UtilGenerics.cast(context.get("productIdMap")); + Map<String, String> allocatedQuantityMap = UtilGenerics.cast(context.get("allocatedQuantityMap")); + Map<String, String> prioritySeqIdMap = UtilGenerics.cast(context.get("prioritySeqIdMap")); + Map<String, String> rowSubmitMap = UtilGenerics.cast(context.get("rowSubmitMap")); Map<String, Object> serviceCtx = new HashMap<>(); Map<String, Object> serviceResult = new HashMap<>(); Boolean changeHeaderStatus = false; Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java Sat Jul 20 16:32:34 2019 @@ -4366,12 +4366,12 @@ public class ShoppingCart implements Ite if (! dropShipItems.containsKey(supplierPartyId)) { dropShipItems.put(supplierPartyId, new HashMap<ShoppingCartItem, Map<Integer, BigDecimal>>()); } - Map<ShoppingCartItem, Map<Integer, BigDecimal>> supplierCartItems = UtilGenerics.checkMap(dropShipItems.get(supplierPartyId)); + Map<ShoppingCartItem, Map<Integer, BigDecimal>> supplierCartItems = UtilGenerics.cast(dropShipItems.get(supplierPartyId)); if (! supplierCartItems.containsKey(cartItem)) { supplierCartItems.put(cartItem, new HashMap<Integer, BigDecimal>()); } - Map<Integer, BigDecimal> cartItemGroupQuantities = UtilGenerics.checkMap(supplierCartItems.get(cartItem)); + Map<Integer, BigDecimal> cartItemGroupQuantities = UtilGenerics.cast(supplierCartItems.get(cartItem)); cartItemGroupQuantities.put(shipGroupIndex, dropShipQuantity); } @@ -4396,10 +4396,10 @@ public class ShoppingCart implements Ite shipInfo.supplierPartyId = supplierPartyId; shipInfo.supplierAgreementId = null; - Map<ShoppingCartItem, Map<Integer, BigDecimal>> supplierCartItems = UtilGenerics.checkMap(supplierPartyEntry.getValue()); + Map<ShoppingCartItem, Map<Integer, BigDecimal>> supplierCartItems = UtilGenerics.cast(supplierPartyEntry.getValue()); for (Entry<ShoppingCartItem, Map<Integer, BigDecimal>> cartItemEntry : supplierCartItems.entrySet()) { ShoppingCartItem cartItem = cartItemEntry.getKey(); - Map<Integer, BigDecimal> cartItemGroupQuantities = UtilGenerics.checkMap(cartItemEntry.getValue()); + Map<Integer, BigDecimal> cartItemGroupQuantities = UtilGenerics.cast(cartItemEntry.getValue()); for (Entry<Integer, BigDecimal> previousShipGroupIndexEntry : cartItemGroupQuantities.entrySet()) { Integer previousShipGroupIndex = previousShipGroupIndexEntry.getKey(); BigDecimal dropShipQuantity = previousShipGroupIndexEntry.getValue(); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Sat Jul 20 16:32:34 2019 @@ -160,9 +160,9 @@ public final class ProductDisplayWorker } try { - Map<String, GenericValue> products = UtilGenerics.checkMap(httpRequest.getSession().getAttribute("_QUICK_REORDER_PRODUCTS_")); - Map<String, BigDecimal> productQuantities = UtilGenerics.checkMap(httpRequest.getSession().getAttribute("_QUICK_REORDER_PRODUCT_QUANTITIES_")); - Map<String, Integer> productOccurances = UtilGenerics.checkMap(httpRequest.getSession().getAttribute("_QUICK_REORDER_PRODUCT_OCCURANCES_")); + Map<String, GenericValue> products = UtilGenerics.cast(httpRequest.getSession().getAttribute("_QUICK_REORDER_PRODUCTS_")); + Map<String, BigDecimal> productQuantities = UtilGenerics.cast(httpRequest.getSession().getAttribute("_QUICK_REORDER_PRODUCT_QUANTITIES_")); + Map<String, Integer> productOccurances = UtilGenerics.cast(httpRequest.getSession().getAttribute("_QUICK_REORDER_PRODUCT_OCCURANCES_")); if (products == null || productQuantities == null || productOccurances == null) { products = new HashMap<>(); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java Sat Jul 20 16:32:34 2019 @@ -263,7 +263,7 @@ public class ContactMechWorker { if (contactMechPurposeTypeIdFieldPresent) { entityContactMechValueMap.put("contactMechPurposeType", delegator.makeValidValue("ContactMechPurposeType", fields)); } - insertRelatedContactElement(delegator, UtilGenerics.checkMap(entityContactMechValueMap), fields); + insertRelatedContactElement(delegator, UtilGenerics.cast(entityContactMechValueMap), fields); } return entityContactMechValueMaps; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java Sat Jul 20 16:32:34 2019 @@ -49,7 +49,7 @@ public class CatalogUrlDirective impleme @Override public void execute(Environment env, @SuppressWarnings("rawtypes") Map args, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { - Map<String, TemplateModel> params = UtilGenerics.checkMap(args); + Map<String, TemplateModel> params = UtilGenerics.cast(args); String productId = (String) DeepUnwrap.unwrap(params.get("productId")); String currentCategoryId = (String) DeepUnwrap.unwrap(params.get("currentCategoryId")); String previousCategoryId = (String) DeepUnwrap.unwrap(params.get("previousCategoryId")); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java Sat Jul 20 16:32:34 2019 @@ -189,7 +189,7 @@ public class ProductFeatureServices { Map<String, List<GenericValue>> features; if (featuresResults.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_SUCCESS)) { - features = UtilGenerics.checkMap(featuresResults.get("productFeaturesByType")); + features = UtilGenerics.cast(featuresResults.get("productFeaturesByType")); } else { return ServiceUtil.returnError((String) featuresResults.get(ModelService.ERROR_MESSAGE_LIST)); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java Sat Jul 20 16:32:34 2019 @@ -268,7 +268,7 @@ public class FrameImage { HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue)session.getAttribute("userLogin"); - Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap()); + Map<String, ? extends Object> context = UtilGenerics.cast(request.getParameterMap()); String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.path", delegator), context); String imageServerUrl = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.url", delegator), context); Map<String, Object> tempFile = LayoutWorker.uploadImageAndParameters(request, "uploadedFile"); @@ -353,7 +353,7 @@ public class FrameImage { public static String previewFrameImage(HttpServletRequest request, HttpServletResponse response) throws IOException, JDOMException { Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap()); + Map<String, ? extends Object> context = UtilGenerics.cast(request.getParameterMap()); HttpSession session = request.getSession(); String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.path", delegator), context); @@ -463,7 +463,7 @@ public class FrameImage { } public static String deleteFrameImage(HttpServletRequest request, HttpServletResponse response) throws IOException { - Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap()); + Map<String, ? extends Object> context = UtilGenerics.cast(request.getParameterMap()); String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.path", (Delegator) context.get("delegator")), context); File file = new File(imageServerPath + "/preview/" + "/previewImage.jpg").getCanonicalFile(); if (file.exists()) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java Sat Jul 20 16:32:34 2019 @@ -91,7 +91,7 @@ public class PriceServices { String webSiteId = (String) context.get("webSiteId"); String checkIncludeVat = (String) context.get("checkIncludeVat"); String surveyResponseId = (String) context.get("surveyResponseId"); - Map<String, Object> customAttributes = UtilGenerics.checkMap(context.get("customAttributes")); + Map<String, Object> customAttributes = UtilGenerics.cast(context.get("customAttributes")); String findAllQuantityPricesStr = (String) context.get("findAllQuantityPrices"); boolean findAllQuantityPrices = "Y".equals(findAllQuantityPricesStr); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java Sat Jul 20 16:32:34 2019 @@ -87,7 +87,7 @@ public class ProductServices { public static Map<String, Object> prodFindSelectedVariant(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); - Map<String, String> selectedFeatures = UtilGenerics.checkMap(context.get("selectedFeatures")); + Map<String, String> selectedFeatures = UtilGenerics.cast(context.get("selectedFeatures")); List<GenericValue> products = new LinkedList<>(); // All the variants for this products are retrieved Map<String, Object> resVariants = prodFindAllVariants(dctx, context); @@ -1090,7 +1090,7 @@ public class ProductServices { /* now store the image versions created by ScaleImage.scaleImageInAllSize */ /* have to shrink length of productContentTypeId, as otherwise value is too long for database field */ - Map<String,String> imageUrlMap = UtilGenerics.checkMap(resultResize.get("imageUrlMap")); + Map<String,String> imageUrlMap = UtilGenerics.cast(resultResize.get("imageUrlMap")); for ( String sizeType : ScaleImage.sizeTypeList ) { imageUrl = imageUrlMap.get(sizeType); if( UtilValidate.isNotEmpty(imageUrl)) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/test/StockMovesTest.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/test/StockMovesTest.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/test/StockMovesTest.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/test/StockMovesTest.java Sat Jul 20 16:32:34 2019 @@ -57,7 +57,7 @@ public class StockMovesTest extends OFBi fsmnCtx.put("facilityId", "WebStoreWarehouse"); fsmnCtx.put("userLogin", userLogin); Map<String, Object> respMap1 = dispatcher.runSync("findStockMovesNeeded", fsmnCtx); - stockMoveHandled = UtilGenerics.checkMap(respMap1.get("stockMoveHandled")); + stockMoveHandled = UtilGenerics.cast(respMap1.get("stockMoveHandled")); warningList = UtilGenerics.checkList(respMap1.get("warningMessageList")); assertNull(warningList); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java Sat Jul 20 16:32:34 2019 @@ -108,13 +108,13 @@ public class PackingServices { String pickerPartyId = (String) context.get("pickerPartyId"); session.setPickerPartyId(pickerPartyId); - Map<String, ?> selInfo = UtilGenerics.checkMap(context.get("selInfo")); - Map<String, String> iteInfo = UtilGenerics.checkMap(context.get("iteInfo")); - Map<String, String> prdInfo = UtilGenerics.checkMap(context.get("prdInfo")); - Map<String, String> qtyInfo = UtilGenerics.checkMap(context.get("qtyInfo")); - Map<String, String> pkgInfo = UtilGenerics.checkMap(context.get("pkgInfo")); - Map<String, String> wgtInfo = UtilGenerics.checkMap(context.get("wgtInfo")); - Map<String, String> numPackagesInfo = UtilGenerics.checkMap(context.get("numPackagesInfo")); + Map<String, ?> selInfo = UtilGenerics.cast(context.get("selInfo")); + Map<String, String> iteInfo = UtilGenerics.cast(context.get("iteInfo")); + Map<String, String> prdInfo = UtilGenerics.cast(context.get("prdInfo")); + Map<String, String> qtyInfo = UtilGenerics.cast(context.get("qtyInfo")); + Map<String, String> pkgInfo = UtilGenerics.cast(context.get("pkgInfo")); + Map<String, String> wgtInfo = UtilGenerics.cast(context.get("wgtInfo")); + Map<String, String> numPackagesInfo = UtilGenerics.cast(context.get("numPackagesInfo")); if (selInfo != null) { for (String rowKey: selInfo.keySet()) { @@ -256,7 +256,7 @@ public class PackingServices { public static Map<String, Object> calcPackSessionAdditionalShippingCharge(DispatchContext dctx, Map<String, ? extends Object> context) { PackingSession session = (PackingSession) context.get("packingSession"); - Map<String, String> packageWeights = UtilGenerics.checkMap(context.get("packageWeights")); + Map<String, String> packageWeights = UtilGenerics.cast(context.get("packageWeights")); String weightUomId = (String) context.get("weightUomId"); String shippingContactMechId = (String) context.get("shippingContactMechId"); String shipmentMethodTypeId = (String) context.get("shipmentMethodTypeId"); @@ -283,8 +283,8 @@ public class PackingServices { String instructions = (String) context.get("handlingInstructions"); String pickerPartyId = (String) context.get("pickerPartyId"); BigDecimal additionalShippingCharge = (BigDecimal) context.get("additionalShippingCharge"); - Map<String, String> packageWeights = UtilGenerics.checkMap(context.get("packageWeights")); - Map<String, String> boxTypes = UtilGenerics.checkMap(context.get("boxTypes")); + Map<String, String> packageWeights = UtilGenerics.cast(context.get("packageWeights")); + Map<String, String> boxTypes = UtilGenerics.cast(context.get("boxTypes")); String weightUomId = (String) context.get("weightUomId"); session.setHandlingInstructions(instructions); session.setPickerPartyId(pickerPartyId); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java Sat Jul 20 16:32:34 2019 @@ -55,11 +55,11 @@ public class VerifyPickServices { VerifyPickSession pickSession = (VerifyPickSession) context.get("verifyPickSession"); String orderId = (String) context.get("orderId"); String shipGroupSeqId = (String) context.get("shipGroupSeqId"); - Map<String, ?> selectedMap = UtilGenerics.checkMap(context.get("selectedMap")); - Map<String, String> itemMap = UtilGenerics.checkMap(context.get("itemMap")); - Map<String, String> productMap = UtilGenerics.checkMap(context.get("productMap")); - Map<String, String> originGeoIdMap = UtilGenerics.checkMap(context.get("originGeoIdMap")); - Map<String, String> quantityMap = UtilGenerics.checkMap(context.get("quantityMap")); + Map<String, ?> selectedMap = UtilGenerics.cast(context.get("selectedMap")); + Map<String, String> itemMap = UtilGenerics.cast(context.get("itemMap")); + Map<String, String> productMap = UtilGenerics.cast(context.get("productMap")); + Map<String, String> originGeoIdMap = UtilGenerics.cast(context.get("originGeoIdMap")); + Map<String, String> quantityMap = UtilGenerics.cast(context.get("quantityMap")); if (selectedMap != null) { for (String rowKey : selectedMap.keySet()) { String orderItemSeqId = itemMap.get(rowKey); Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java Sat Jul 20 16:32:34 2019 @@ -816,7 +816,7 @@ public class WorkEffortServices { } String weFacilityId = incomingProductionRun.getString("facilityId"); - Map<String, Object> quantitySummary = UtilGenerics.checkMap(summaryInByFacility.get(weFacilityId)); + Map<String, Object> quantitySummary = UtilGenerics.cast(summaryInByFacility.get(weFacilityId)); if (quantitySummary == null) { quantitySummary = new HashMap<>(); quantitySummary.put("facilityId", weFacilityId); @@ -864,7 +864,7 @@ public class WorkEffortServices { neededQuantity = (double) 0; } - Map<String, Object> quantitySummary = UtilGenerics.checkMap(summaryOutByFacility.get(weFacilityId)); + Map<String, Object> quantitySummary = UtilGenerics.cast(summaryOutByFacility.get(weFacilityId)); if (quantitySummary == null) { quantitySummary = new HashMap<>(); quantitySummary.put("facilityId", weFacilityId); @@ -1045,7 +1045,7 @@ public class WorkEffortServices { public static Map<String, Object> processWorkEffortEventReminder(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); - Map<String, Object> parameters = UtilGenerics.checkMap(context.get("bodyParameters")); + Map<String, Object> parameters = UtilGenerics.cast(context.get("bodyParameters")); GenericValue reminder = (GenericValue) context.get("reminder"); GenericValue contactMech = null; try { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java Sat Jul 20 16:32:34 2019 @@ -87,7 +87,7 @@ public final class ComponentLoaderConfig } private static ComponentDef retrieveComponentDefFromElement(Element element, URL configUrl) throws ComponentException { - Map<String, ? extends Object> systemProps = UtilGenerics.<String, Object> checkMap(System.getProperties()); + Map<String, ? extends Object> systemProps = UtilGenerics.cast(System.getProperties()); String nodeName = element.getNodeName(); String name = null; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java Sat Jul 20 16:32:34 2019 @@ -541,7 +541,7 @@ public class UtilCodec { } return UtilCodec.getEncoder("html").encode((String) theObject); } else if (theObject instanceof Map<?, ?>) { - return HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(UtilGenerics.<K, Object>checkMap(theObject), this.encoder); + return HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(UtilGenerics.cast(theObject), this.encoder); } return theObject; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java?rev=1863500&r1=1863499&r2=1863500&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java Sat Jul 20 16:32:34 2019 @@ -57,10 +57,6 @@ public final class UtilGenerics { return cast(object); } - public static <K, V> Map<K, V> checkMap(Object object) { - return cast(object); - } - public static <K, V> Map<K, V> checkMap(Object object, Class<K> keyType, Class<V> valueType) { if (object != null) { if (!(object instanceof Map<?, ?>)) { @@ -78,6 +74,6 @@ public final class UtilGenerics { i++; } } - return checkMap(object); + return cast(object); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |