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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -233,7 +233,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(routingOutMap)); } routing = (GenericValue)routingOutMap.get("routing"); - routingTaskAssocs = UtilGenerics.checkList(routingOutMap.get("tasks")); + routingTaskAssocs = UtilGenerics.cast(routingOutMap.get("tasks")); } catch (GenericServiceException gse) { Debug.logWarning(gse.getMessage(), module); } @@ -260,7 +260,7 @@ public class ProductionRunServices { if (ServiceUtil.isError(serviceResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); } - components = UtilGenerics.checkList(serviceResult.get("components")); // a list of objects representing the product's components + components = UtilGenerics.cast(serviceResult.get("components")); // a list of objects representing the product's components } catch (GenericServiceException e) { Debug.logError(e, "Problem calling the getManufacturingComponents service", module); return ServiceUtil.returnError(e.getMessage()); @@ -3409,7 +3409,7 @@ public class ProductionRunServices { if (ServiceUtil.isError(serviceResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); } - List<Map<String, Object>> components = UtilGenerics.checkList(serviceResult.get("componentsMap")); + List<Map<String, Object>> components = UtilGenerics.cast(serviceResult.get("componentsMap")); if (UtilValidate.isEmpty(components)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunCannotDecomposingInventoryItemNoComponentsFound", UtilMisc.toMap("productId", inventoryItem.getString("productId")), locale)); } @@ -3439,7 +3439,7 @@ public class ProductionRunServices { if (ServiceUtil.isError(serviceResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); } - List<String> newInventoryItemIds = UtilGenerics.checkList(serviceResult.get("inventoryItemIds")); + List<String> newInventoryItemIds = UtilGenerics.cast(serviceResult.get("inventoryItemIds")); inventoryItemIds.addAll(newInventoryItemIds); } // the components are put in warehouse
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java Sat Jul 20 16:35:13 2019 @@ -747,7 +747,7 @@ public class MrpServices { } catch (Exception e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpErrorExplodingProduct", UtilMisc.toMap("productId", product.getString("productId")), locale)); } - components = UtilGenerics.checkList(serviceResponse.get("components")); + components = UtilGenerics.cast(serviceResponse.get("components")); if (UtilValidate.isNotEmpty(components)) { BOMNode node = (components.get(0)).getParentNode(); isBuilt = node.isManufactured(); @@ -784,7 +784,7 @@ public class MrpServices { } catch (Exception e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpErrorExplodingProduct", UtilMisc.toMap("productId", product.getString("productId")), locale)); } - components = UtilGenerics.checkList(serviceResponse.get("components")); + components = UtilGenerics.cast(serviceResponse.get("components")); String routingId = (String)serviceResponse.get("workEffortId"); if (routingId != null) { try { Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java Sat Jul 20 16:35:13 2019 @@ -122,7 +122,7 @@ public class ProposedOrder { Debug.logError(errorMessage, module); } routing = (GenericValue)routingOutMap.get("routing"); - listRoutingTaskAssoc = UtilGenerics.checkList(routingOutMap.get("tasks")); + listRoutingTaskAssoc = UtilGenerics.cast(routingOutMap.get("tasks")); if (routing == null) { // try to find a routing linked to the virtual product BOMTree tree = null; @@ -162,7 +162,7 @@ public class ProposedOrder { String errorMessage = ServiceUtil.getErrorMessage(routingTasksOutMap); Debug.logError(errorMessage, module); } - listRoutingTaskAssoc = UtilGenerics.checkList(routingTasksOutMap.get("routingTaskAssocs")); + listRoutingTaskAssoc = UtilGenerics.cast(routingTasksOutMap.get("routingTaskAssocs")); } catch (GenericServiceException gse) { Debug.logWarning(gse.getMessage(), module); } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java Sat Jul 20 16:35:13 2019 @@ -118,7 +118,7 @@ public class OrderLookupServices { } // the base order header fields - List<String> orderTypeList = UtilGenerics.checkList(context.get("orderTypeId")); + List<String> orderTypeList = UtilGenerics.cast(context.get("orderTypeId")); if (orderTypeList != null) { List<EntityExpr> orExprs = new LinkedList<>(); for (String orderTypeId : orderTypeList) { @@ -137,7 +137,7 @@ public class OrderLookupServices { conditions.add(makeExpr("orderName", orderName, true)); } - List<String> orderStatusList = UtilGenerics.checkList(context.get("orderStatusId")); + List<String> orderStatusList = UtilGenerics.cast(context.get("orderStatusId")); if (orderStatusList != null) { List<EntityCondition> orExprs = new LinkedList<>(); for (String orderStatusId : orderStatusList) { @@ -155,7 +155,7 @@ public class OrderLookupServices { conditions.add(EntityCondition.makeCondition(orExprs, EntityOperator.OR)); } - List<String> productStoreList = UtilGenerics.checkList(context.get("productStoreId")); + List<String> productStoreList = UtilGenerics.cast(context.get("productStoreId")); if (productStoreList != null) { List<EntityExpr> orExprs = new LinkedList<>(); for (String productStoreId : productStoreList) { @@ -165,7 +165,7 @@ public class OrderLookupServices { conditions.add(EntityCondition.makeCondition(orExprs, EntityOperator.OR)); } - List<String> webSiteList = UtilGenerics.checkList(context.get("orderWebSiteId")); + List<String> webSiteList = UtilGenerics.cast(context.get("orderWebSiteId")); if (webSiteList != null) { List<EntityExpr> orExprs = new LinkedList<>(); for (String webSiteId : webSiteList) { @@ -175,7 +175,7 @@ public class OrderLookupServices { conditions.add(EntityCondition.makeCondition(orExprs, EntityOperator.OR)); } - List<String> saleChannelList = UtilGenerics.checkList(context.get("salesChannelEnumId")); + List<String> saleChannelList = UtilGenerics.cast(context.get("salesChannelEnumId")); if (saleChannelList != null) { List<EntityExpr> orExprs = new LinkedList<>(); for (String salesChannelEnumId : saleChannelList) { @@ -255,7 +255,7 @@ public class OrderLookupServices { // party (role) fields String userLoginId = (String) context.get("userLoginId"); String partyId = (String) context.get("partyId"); - List<String> roleTypeList = UtilGenerics.checkList(context.get("roleTypeId")); + List<String> roleTypeList = UtilGenerics.cast(context.get("roleTypeId")); if (UtilValidate.isNotEmpty(userLoginId) && UtilValidate.isEmpty(partyId)) { GenericValue ul = null; @@ -408,7 +408,7 @@ public class OrderLookupServices { if (ServiceUtil.isError(varLookup)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(varLookup)); } - variants = UtilGenerics.checkList(varLookup.get("assocProducts")); + variants = UtilGenerics.cast(varLookup.get("assocProducts")); } catch (GenericServiceException e) { Debug.logWarning(e.getMessage(), module); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -241,16 +241,16 @@ public class OrderServices { } // check to make sure we have something to order - List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems")); + List<GenericValue> orderItems = UtilGenerics.cast(context.get("orderItems")); if (orderItems.size() < 1) { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "items.none", locale)); } // all this marketing pkg auto stuff is deprecated in favor of MARKETING_PKG_AUTO productTypeId and a BOM of MANUF_COMPONENT assocs // these need to be retrieved now because they might be needed for exploding MARKETING_PKG_AUTO - List<GenericValue> orderAdjustments = UtilGenerics.checkList(context.get("orderAdjustments")); - List<GenericValue> orderItemShipGroupInfo = UtilGenerics.checkList(context.get("orderItemShipGroupInfo")); - List<GenericValue> orderItemPriceInfo = UtilGenerics.checkList(context.get("orderItemPriceInfos")); + List<GenericValue> orderAdjustments = UtilGenerics.cast(context.get("orderAdjustments")); + List<GenericValue> orderItemShipGroupInfo = UtilGenerics.cast(context.get("orderItemShipGroupInfo")); + List<GenericValue> orderItemPriceInfo = UtilGenerics.cast(context.get("orderItemPriceInfos")); // check inventory and other things for each item List<String> errorMessages = new LinkedList<>(); @@ -356,7 +356,7 @@ public class OrderServices { Map<String, Object> invReqResult = dispatcher.runSync("isStoreInventoryAvailableOrNotRequired", UtilMisc.toMap("productStoreId", productStoreId, "productId", product.get("productId"), "product", product, "quantity", currentQuantity)); if (ServiceUtil.isError(invReqResult)) { errorMessages.add(ServiceUtil.getErrorMessage(invReqResult)); - List<String> errMsgList = UtilGenerics.checkList(invReqResult.get(ModelService.ERROR_MESSAGE_LIST)); + List<String> errMsgList = UtilGenerics.cast(invReqResult.get(ModelService.ERROR_MESSAGE_LIST)); errorMessages.addAll(errMsgList); } else if (!"Y".equals(invReqResult.get("availableOrNotRequired"))) { String invErrMsg = UtilProperties.getMessage(resource_error, "product.out_of_stock", @@ -374,7 +374,7 @@ public class OrderServices { } // add the fixedAsset id to the workefforts map by obtaining the fixed Asset number from the FixedAssetProduct table - List<GenericValue> workEfforts = UtilGenerics.checkList(context.get("workEfforts")); // is an optional parameter from this service but mandatory for rental items + List<GenericValue> workEfforts = UtilGenerics.cast(context.get("workEfforts")); // is an optional parameter from this service but mandatory for rental items for (GenericValue orderItem : orderItems) { if ("RENTAL_ORDER_ITEM".equals(orderItem.getString("orderItemTypeId"))) { // check to see if workefforts are available for this order type. @@ -580,7 +580,7 @@ public class OrderServices { toBeStored.add(orderStatus); // before processing orderItems process orderItemGroups so that they'll be in place for the foreign keys and what not - List<GenericValue> orderItemGroups = UtilGenerics.checkList(context.get("orderItemGroups")); + List<GenericValue> orderItemGroups = UtilGenerics.cast(context.get("orderItemGroups")); if (UtilValidate.isNotEmpty(orderItemGroups)) { for (GenericValue orderItemGroup : orderItemGroups) { orderItemGroup.set("orderId", orderId); @@ -605,7 +605,7 @@ public class OrderServices { } // set the order attributes - List<GenericValue> orderAttributes = UtilGenerics.checkList(context.get("orderAttributes")); + List<GenericValue> orderAttributes = UtilGenerics.cast(context.get("orderAttributes")); if (UtilValidate.isNotEmpty(orderAttributes)) { for (GenericValue oatt : orderAttributes) { oatt.set("orderId", orderId); @@ -614,7 +614,7 @@ public class OrderServices { } // set the order item attributes - List<GenericValue> orderItemAttributes = UtilGenerics.checkList(context.get("orderItemAttributes")); + List<GenericValue> orderItemAttributes = UtilGenerics.cast(context.get("orderItemAttributes")); if (UtilValidate.isNotEmpty(orderItemAttributes)) { for (GenericValue oiatt : orderItemAttributes) { oiatt.set("orderId", orderId); @@ -623,7 +623,7 @@ public class OrderServices { } // create the order internal notes - List<String> orderInternalNotes = UtilGenerics.checkList(context.get("orderInternalNotes")); + List<String> orderInternalNotes = UtilGenerics.cast(context.get("orderInternalNotes")); if (UtilValidate.isNotEmpty(orderInternalNotes)) { for (String orderInternalNote : orderInternalNotes) { try { @@ -645,7 +645,7 @@ public class OrderServices { } // create the order public notes - List<String> orderNotes = UtilGenerics.checkList(context.get("orderNotes")); + List<String> orderNotes = UtilGenerics.cast(context.get("orderNotes")); if (UtilValidate.isNotEmpty(orderNotes)) { for (String orderNote : orderNotes) { try { @@ -815,7 +815,7 @@ public class OrderServices { } // set the order contact mechs - List<GenericValue> orderContactMechs = UtilGenerics.checkList(context.get("orderContactMechs")); + List<GenericValue> orderContactMechs = UtilGenerics.cast(context.get("orderContactMechs")); if (UtilValidate.isNotEmpty(orderContactMechs)) { for (GenericValue ocm : orderContactMechs) { ocm.set("orderId", orderId); @@ -824,7 +824,7 @@ public class OrderServices { } // set the order item contact mechs - List<GenericValue> orderItemContactMechs = UtilGenerics.checkList(context.get("orderItemContactMechs")); + List<GenericValue> orderItemContactMechs = UtilGenerics.cast(context.get("orderItemContactMechs")); if (UtilValidate.isNotEmpty(orderItemContactMechs)) { for (GenericValue oicm : orderItemContactMechs) { oicm.set("orderId", orderId); @@ -874,7 +874,7 @@ public class OrderServices { } // set the item survey responses - List<GenericValue> surveyResponses = UtilGenerics.checkList(context.get("orderItemSurveyResponses")); + List<GenericValue> surveyResponses = UtilGenerics.cast(context.get("orderItemSurveyResponses")); if (UtilValidate.isNotEmpty(surveyResponses)) { for (GenericValue surveyResponse : surveyResponses) { surveyResponse.set("orderId", orderId); @@ -898,7 +898,7 @@ public class OrderServices { } // set the item associations - List<GenericValue> orderItemAssociations = UtilGenerics.checkList(context.get("orderItemAssociations")); + List<GenericValue> orderItemAssociations = UtilGenerics.cast(context.get("orderItemAssociations")); if (UtilValidate.isNotEmpty(orderItemAssociations)) { for (GenericValue orderItemAssociation : orderItemAssociations) { if (orderItemAssociation.get("toOrderId") == null) { @@ -911,7 +911,7 @@ public class OrderServices { } // store the orderProductPromoUseInfos - List<GenericValue> orderProductPromoUses = UtilGenerics.checkList(context.get("orderProductPromoUses")); + List<GenericValue> orderProductPromoUses = UtilGenerics.cast(context.get("orderProductPromoUses")); if (UtilValidate.isNotEmpty(orderProductPromoUses)) { for (GenericValue productPromoUse : orderProductPromoUses) { productPromoUse.set("orderId", orderId); @@ -989,7 +989,7 @@ public class OrderServices { } // set the order payment info - List<GenericValue> orderPaymentInfos = UtilGenerics.checkList(context.get("orderPaymentInfo")); + List<GenericValue> orderPaymentInfos = UtilGenerics.cast(context.get("orderPaymentInfo")); if (UtilValidate.isNotEmpty(orderPaymentInfos)) { for (GenericValue valueObj : orderPaymentInfos) { valueObj.set("orderId", orderId); @@ -1008,7 +1008,7 @@ public class OrderServices { } // store the trackingCodeOrder entities - List<GenericValue> trackingCodeOrders = UtilGenerics.checkList(context.get("trackingCodeOrders")); + List<GenericValue> trackingCodeOrders = UtilGenerics.cast(context.get("trackingCodeOrders")); if (UtilValidate.isNotEmpty(trackingCodeOrders)) { for (GenericValue trackingCodeOrder : trackingCodeOrders) { trackingCodeOrder.set("orderId", orderId); @@ -1018,7 +1018,7 @@ public class OrderServices { // store the OrderTerm entities - List<GenericValue> orderTerms = UtilGenerics.checkList(context.get("orderTerms")); + List<GenericValue> orderTerms = UtilGenerics.cast(context.get("orderTerms")); if (UtilValidate.isNotEmpty(orderTerms)) { for (GenericValue orderTerm : orderTerms) { orderTerm.set("orderId", orderId); @@ -1243,7 +1243,7 @@ public class OrderServices { resErrorMessages.add(ServiceUtil.getErrorMessage(componentsRes)); continue; } - List<GenericValue> assocProducts = UtilGenerics.checkList(componentsRes.get("assocProducts")); + List<GenericValue> assocProducts = UtilGenerics.cast(componentsRes.get("assocProducts")); for (GenericValue productAssoc : assocProducts) { BigDecimal quantityOrd = productAssoc.getBigDecimal("quantity"); BigDecimal quantityKit = orderItemShipGroupAssoc.getBigDecimal("quantity"); @@ -1336,7 +1336,7 @@ public class OrderServices { resErrorMessages.add((String)componentsRes.get(ModelService.ERROR_MESSAGE)); continue; } - List<GenericValue> assocProducts = UtilGenerics.checkList(componentsRes.get("assocProducts")); + List<GenericValue> assocProducts = UtilGenerics.cast(componentsRes.get("assocProducts")); for (GenericValue productAssoc : assocProducts) { BigDecimal quantityOrd = productAssoc.getBigDecimal("quantity"); BigDecimal quantityKit = orderItemShipGroupAssoc.getBigDecimal("quantity"); @@ -1708,8 +1708,8 @@ public class OrderServices { } // the adjustments (returned in order) from the tax service - List<GenericValue> orderAdj = UtilGenerics.checkList(serviceResult.get("orderAdjustments")); - List<List<GenericValue>> itemAdj = UtilGenerics.checkList(serviceResult.get("itemAdjustments")); + List<GenericValue> orderAdj = UtilGenerics.cast(serviceResult.get("orderAdjustments")); + List<List<GenericValue>> itemAdj = UtilGenerics.cast(serviceResult.get("itemAdjustments")); // Accumulate the new tax total from the recalculated header adjustments if (UtilValidate.isNotEmpty(orderAdj)) { @@ -1837,7 +1837,7 @@ public class OrderServices { Debug.logInfo("Old Shipping Total [" + orderId + " / " + shipGroupSeqId + "] : " + currentShipping, module); } - List<String> errorMessageList = UtilGenerics.checkList(shippingEstMap.get(ModelService.ERROR_MESSAGE_LIST)); + List<String> errorMessageList = UtilGenerics.cast(shippingEstMap.get(ModelService.ERROR_MESSAGE_LIST)); if (errorMessageList != null) { Debug.logWarning("Problem finding shipping estimates for [" + orderId + "/ " + shipGroupSeqId + "] = " + errorMessageList, module); continue; @@ -3315,7 +3315,7 @@ public class OrderServices { Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); //appears to not be used: String orderId = (String) context.get("orderId"); - List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems")); + List<GenericValue> orderItems = UtilGenerics.cast(context.get("orderItems")); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); if (UtilValidate.isNotEmpty(orderItems)) { @@ -4722,7 +4722,7 @@ public class OrderServices { LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); Locale locale = (Locale) context.get("locale"); for (String orderId : orderIds) { if (UtilValidate.isEmpty(orderId)) { @@ -4764,7 +4764,7 @@ public class OrderServices { LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); Locale locale = (Locale) context.get("locale"); for (String orderId : orderIds) { if (UtilValidate.isEmpty(orderId)) { @@ -4804,7 +4804,7 @@ public class OrderServices { public static Map<String, Object> massQuickShipOrders(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); Locale locale = (Locale) context.get("locale"); for (Object orderId : orderIds) { if (UtilValidate.isEmpty(orderId)) { @@ -4838,7 +4838,7 @@ public class OrderServices { Map<String, List<String>> facilityOrdersMap = new HashMap<>(); // make the list per facility - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); for (String orderId : orderIds) { if (UtilValidate.isEmpty(orderId)) { continue; @@ -4895,7 +4895,7 @@ public class OrderServices { String printerName = (String) context.get("printerName"); // make the list per facility - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); for (String orderId : orderIds) { if (UtilValidate.isEmpty(orderId)) { continue; @@ -4923,7 +4923,7 @@ public class OrderServices { String screenLocation = (String) context.get("screenLocation"); // make the list per facility - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); for (String orderId : orderIds) { if (UtilValidate.isEmpty(orderId)) { continue; @@ -4946,7 +4946,7 @@ public class OrderServices { public static Map<String, Object> massCancelRemainingPurchaseOrderItems(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); + List<String> orderIds = UtilGenerics.cast(context.get("orderIdList")); Locale locale = (Locale) context.get("locale"); for (Object orderId : orderIds) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java Sat Jul 20 16:35:13 2019 @@ -158,12 +158,12 @@ public class QuoteServices { Timestamp validThruDate = (Timestamp) context.get("validThruDate"); String quoteName = (String) context.get("quoteName"); String description = (String) context.get("description"); - List<GenericValue> quoteItems = UtilGenerics.checkList(context.get("quoteItems")); - List<GenericValue> quoteAttributes = UtilGenerics.checkList(context.get("quoteAttributes")); - List<GenericValue> quoteCoefficients = UtilGenerics.checkList(context.get("quoteCoefficients")); - List<GenericValue> quoteRoles = UtilGenerics.checkList(context.get("quoteRoles")); - List<GenericValue> quoteWorkEfforts = UtilGenerics.checkList(context.get("quoteWorkEfforts")); - List<GenericValue> quoteAdjustments = UtilGenerics.checkList(context.get("quoteAdjustments")); + List<GenericValue> quoteItems = UtilGenerics.cast(context.get("quoteItems")); + List<GenericValue> quoteAttributes = UtilGenerics.cast(context.get("quoteAttributes")); + List<GenericValue> quoteCoefficients = UtilGenerics.cast(context.get("quoteCoefficients")); + List<GenericValue> quoteRoles = UtilGenerics.cast(context.get("quoteRoles")); + List<GenericValue> quoteWorkEfforts = UtilGenerics.cast(context.get("quoteWorkEfforts")); + List<GenericValue> quoteAdjustments = UtilGenerics.cast(context.get("quoteAdjustments")); Locale locale = (Locale) context.get("locale"); Map<String, Object> serviceResult = new HashMap<>(); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java Sat Jul 20 16:35:13 2019 @@ -66,7 +66,7 @@ public class RequirementServices { EntityCondition requirementConditions = (EntityCondition) context.get("requirementConditions"); String partyId = (String) context.get("partyId"); String unassignedRequirements = (String) context.get("unassignedRequirements"); - List<String> statusIds = UtilGenerics.checkList(context.get("statusIds")); + List<String> statusIds = UtilGenerics.cast(context.get("statusIds")); //TODO currencyUomId still not used try { List<EntityCondition> conditions = UtilMisc.toList( Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java Sat Jul 20 16:35:13 2019 @@ -613,7 +613,7 @@ public class CheckOutEvents { ServiceUtil.getMessages(request, callResult, null); // check for customer message(s) - List<String> messages = UtilGenerics.checkList(callResult.get("authResultMsgs")); + List<String> messages = UtilGenerics.cast(callResult.get("authResultMsgs")); if (UtilValidate.isNotEmpty(messages)) { request.setAttribute("_EVENT_MESSAGE_LIST_", messages); } @@ -1172,8 +1172,8 @@ public class CheckOutEvents { String originalOrderId = request.getParameter("orderId"); // create the replacement order adjustment - List <GenericValue>orderAdjustments = UtilGenerics.checkList(context.get("orderAdjustments")); - List <GenericValue>orderItems = UtilGenerics.checkList(context.get("orderItems")); + List <GenericValue>orderAdjustments = UtilGenerics.cast(context.get("orderAdjustments")); + List <GenericValue>orderItems = UtilGenerics.cast(context.get("orderItems")); OrderReadHelper orderReadHelper = new OrderReadHelper(orderAdjustments, orderItems); BigDecimal grandTotal = orderReadHelper.getOrderGrandTotal(); if (grandTotal.compareTo(new BigDecimal(0)) != 0) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java Sat Jul 20 16:35:13 2019 @@ -638,7 +638,7 @@ public class CheckOutHelper { // ---------- // If needed, the production runs are created and linked to the order lines. // - List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems")); + List<GenericValue> orderItems = UtilGenerics.cast(context.get("orderItems")); int counter = 0; for (GenericValue orderItem : orderItems) { String productId = orderItem.getString("productId"); @@ -801,8 +801,8 @@ public class CheckOutHelper { if (Debug.verboseOn()) { Debug.logVerbose("ReturnList: " + taxReturn, module); } - List<GenericValue> orderAdj = UtilGenerics.checkList(taxReturn.get(0)); - List<List<GenericValue>> itemAdj = UtilGenerics.checkList(taxReturn.get(1)); + List<GenericValue> orderAdj = UtilGenerics.cast(taxReturn.get(0)); + List<List<GenericValue>> itemAdj = UtilGenerics.cast(taxReturn.get(1)); // set the item adjustments if (itemAdj != null) { @@ -924,8 +924,8 @@ public class CheckOutHelper { throw new GeneralException("Problem occurred in tax service (" + e.getMessage() + ")", e); } // the adjustments (returned in order) from taxware. - List<GenericValue> orderAdj = UtilGenerics.checkList(serviceResult.get("orderAdjustments")); - List<List<GenericValue>> itemAdj = UtilGenerics.checkList(serviceResult.get("itemAdjustments")); + List<GenericValue> orderAdj = UtilGenerics.cast(serviceResult.get("orderAdjustments")); + List<List<GenericValue>> itemAdj = UtilGenerics.cast(serviceResult.get("itemAdjustments")); return UtilMisc.toList(orderAdj, itemAdj); } @@ -1058,7 +1058,7 @@ public class CheckOutHelper { } if (paymentResult != null && paymentResult.containsKey("processResult")) { // grab the customer messages -- only passed back in the case of an error or failure - List<String> messages = UtilGenerics.checkList(paymentResult.get("authResultMsgs")); + List<String> messages = UtilGenerics.cast(paymentResult.get("authResultMsgs")); String authResp = (String) paymentResult.get("processResult"); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -489,7 +489,7 @@ public class ShoppingCart implements Ite Debug.logError(ServiceUtil.getErrorMessage(result), module); return null; } - List<GenericValue> productSuppliers = UtilGenerics.checkList(result.get("supplierProducts")); + List<GenericValue> productSuppliers = UtilGenerics.cast(result.get("supplierProducts")); if ((productSuppliers != null) && (productSuppliers.size() > 0)) { supplierProduct = productSuppliers.get(0); } @@ -3944,7 +3944,7 @@ public class ShoppingCart implements Ite public List<GenericValue> makeAllOrderItemSurveyResponses() { List<GenericValue> allInfos = new LinkedList<>(); for (ShoppingCartItem item : this) { - List<String> responses = UtilGenerics.checkList(item.getAttribute("surveyResponses")); + List<String> responses = UtilGenerics.cast(item.getAttribute("surveyResponses")); if (responses != null) { try { List<GenericValue> surveyResponses = EntityQuery.use(getDelegator()).from("SurveyResponse").where(EntityCondition.makeCondition("surveyResponseId", EntityOperator.IN, responses)).queryList(); @@ -4346,7 +4346,7 @@ public class ShoppingCart implements Ite Debug.logError(errorMessage, module); return; } - List<GenericValue> supplierProducts = UtilGenerics.checkList(getSuppliersForProductResult.get("supplierProducts")); + List<GenericValue> supplierProducts = UtilGenerics.cast(getSuppliersForProductResult.get("supplierProducts")); // Order suppliers by supplierPrefOrderId so that preferred suppliers are used first supplierProducts = EntityUtil.orderBy(supplierProducts, UtilMisc.toList("supplierPrefOrderId")); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java Sat Jul 20 16:35:13 2019 @@ -223,7 +223,7 @@ public class ShoppingCartEvents { try { productId = (String) object; } catch (ClassCastException e) { - List<String> productList = UtilGenerics.checkList(object); + List<String> productList = UtilGenerics.cast(object); productId = productList.get(0); } } @@ -998,7 +998,7 @@ public class ShoppingCartEvents { Debug.logWarning("Invalid value for cart index =" + cartIndexStr, module); } } - List<ShoppingCart> cartList = UtilGenerics.checkList(session.getAttribute("shoppingCartList")); + List<ShoppingCart> cartList = UtilGenerics.cast(session.getAttribute("shoppingCartList")); if (UtilValidate.isEmpty(cartList)) { cartList = new LinkedList<>(); session.setAttribute("shoppingCartList", cartList); @@ -1034,7 +1034,7 @@ public class ShoppingCartEvents { Debug.logWarning("Invalid value for cart index =" + cartIndexStr, module); } } - List<ShoppingCart> cartList = UtilGenerics.checkList(session.getAttribute("shoppingCartList")); + List<ShoppingCart> cartList = UtilGenerics.cast(session.getAttribute("shoppingCartList")); if (UtilValidate.isNotEmpty(cartList) && cartIndex >= 0 && cartIndex < cartList.size()) { cartList.remove(cartIndex); } @@ -1153,7 +1153,7 @@ public class ShoppingCartEvents { } if (request.getAttribute("_EVENT_MESSAGE_LIST_") != null) { - List<String> msg = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); + List<String> msg = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_")); eventList.addAll(msg); } @@ -1185,7 +1185,7 @@ public class ShoppingCartEvents { } if (request.getAttribute("_EVENT_MESSAGE_LIST_") != null) { - List<String> msg = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); + List<String> msg = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_")); eventList.addAll(msg); } @@ -1220,7 +1220,7 @@ public class ShoppingCartEvents { //Check for errors StringBuilder errMsg = new StringBuilder(); if (result.containsKey(ModelService.ERROR_MESSAGE_LIST)) { - List<String> errorMsgs = UtilGenerics.checkList(result.get(ModelService.ERROR_MESSAGE_LIST)); + List<String> errorMsgs = UtilGenerics.cast(result.get(ModelService.ERROR_MESSAGE_LIST)); Iterator<String> iterator = errorMsgs.iterator(); errMsg.append("<ul>"); while (iterator.hasNext()) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java Sat Jul 20 16:35:13 2019 @@ -1162,13 +1162,13 @@ public class ShoppingCartItem implements } this.setDisplayPrice(this.basePrice); - this.orderItemPriceInfos = UtilGenerics.checkList(priceResult.get("orderItemPriceInfos")); + this.orderItemPriceInfos = UtilGenerics.cast(priceResult.get("orderItemPriceInfos")); } else { if (productId != null) { String productStoreId = cart.getProductStoreId(); List<GenericValue> productSurvey = ProductStoreWorker.getProductSurveys(delegator, productStoreId, productId, "CART_ADD", parentProductId); if (UtilValidate.isNotEmpty(productSurvey) && UtilValidate.isNotEmpty(attributes)) { - List<String> surveyResponses = UtilGenerics.checkList(attributes.get("surveyResponses")); + List<String> surveyResponses = UtilGenerics.cast(attributes.get("surveyResponses")); if (UtilValidate.isNotEmpty(surveyResponses)) { for (String surveyResponseId : surveyResponses) { // TODO: implement multiple survey per product @@ -1193,7 +1193,7 @@ public class ShoppingCartItem implements priceContext.put("checkIncludeVat", "Y"); // check if a survey is associated with the item and add to the price calculation - List<String> surveyResponses = UtilGenerics.checkList(getAttribute("surveyResponses")); + List<String> surveyResponses = UtilGenerics.cast(getAttribute("surveyResponses")); if (UtilValidate.isNotEmpty(surveyResponses)) { priceContext.put("surveyResponseId", surveyResponses.get(0)); } @@ -1243,7 +1243,7 @@ public class ShoppingCartItem implements this.setSpecialPromoPrice((BigDecimal) priceResult.get("specialPromoPrice")); } - this.orderItemPriceInfos = UtilGenerics.checkList(priceResult.get("orderItemPriceInfos")); + this.orderItemPriceInfos = UtilGenerics.cast(priceResult.get("orderItemPriceInfos")); // If product is configurable, the price is taken from the configWrapper. if (configWrapper != null) { @@ -1904,7 +1904,7 @@ public class ShoppingCartItem implements String errorMessage = ServiceUtil.getErrorMessage(result); Debug.logError(errorMessage, module); } - featuresForSupplier = UtilGenerics.checkList(result.get("convertedProductFeatures")); + featuresForSupplier = UtilGenerics.cast(result.get("convertedProductFeatures")); } catch (GenericServiceException e) { Debug.logError(e, "Unable to get features for supplier from product : " + this.productId, module); } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java Sat Jul 20 16:35:13 2019 @@ -100,7 +100,7 @@ public class OrderTestServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result)); } if (result.get("categoryMembers") != null) { - List<GenericValue> productCategoryMembers = UtilGenerics.checkList(result.get("categoryMembers")); + List<GenericValue> productCategoryMembers = UtilGenerics.cast(result.get("categoryMembers")); if (productCategoryMembers != null) { for (GenericValue prodCatMemb : productCategoryMembers) { if (prodCatMemb != null) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Sat Jul 20 16:35:13 2019 @@ -213,9 +213,9 @@ public class ZipSalesServices { // tax calc service public static Map<String, Object> flatTaxCalc(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); - List<GenericValue> itemProductList = UtilGenerics.checkList(context.get("itemProductList")); - List<BigDecimal> itemAmountList = UtilGenerics.checkList(context.get("itemAmountList")); - List<BigDecimal> itemShippingList = UtilGenerics.checkList(context.get("itemShippingList")); + List<GenericValue> itemProductList = UtilGenerics.cast(context.get("itemProductList")); + List<BigDecimal> itemAmountList = UtilGenerics.cast(context.get("itemAmountList")); + List<BigDecimal> itemShippingList = UtilGenerics.cast(context.get("itemShippingList")); BigDecimal orderShippingAmount = (BigDecimal) context.get("orderShippingAmount"); GenericValue shippingAddress = (GenericValue) context.get("shippingAddress"); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java Sat Jul 20 16:35:13 2019 @@ -921,7 +921,7 @@ public class ContactMechServices { for (Map<String, Object> thisMap: valueMaps) { GenericValue contactMech = (GenericValue) thisMap.get("contactMech"); GenericValue partyContactMech = (GenericValue) thisMap.get("partyContactMech"); - List<GenericValue> partyContactMechPurposes = UtilGenerics.checkList(thisMap.get("partyContactMechPurposes")); + List<GenericValue> partyContactMechPurposes = UtilGenerics.cast(thisMap.get("partyContactMechPurposes")); // get the contactMechId String contactMechId = contactMech.getString("contactMechId"); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java Sat Jul 20 16:35:13 2019 @@ -95,7 +95,7 @@ public class CategoryServices { return ServiceUtil.returnFailure(UtilProperties.getMessage(resourceError, "categoryservices.problems_getting_next_products", locale)); } - List<String> orderByFields = UtilGenerics.checkList(context.get("orderByFields")); + List<String> orderByFields = UtilGenerics.cast(context.get("orderByFields")); if (orderByFields == null) orderByFields = new LinkedList<>(); String entityName = getCategoryFindEntityName(delegator, orderByFields, introductionDateLimit, releaseDateLimit); @@ -216,7 +216,7 @@ public class CategoryServices { Timestamp introductionDateLimit = (Timestamp) context.get("introductionDateLimit"); Timestamp releaseDateLimit = (Timestamp) context.get("releaseDateLimit"); - List<String> orderByFields = UtilGenerics.checkList(context.get("orderByFields")); + List<String> orderByFields = UtilGenerics.cast(context.get("orderByFields")); if (orderByFields == null) orderByFields = new LinkedList<>(); String entityName = getCategoryFindEntityName(delegator, orderByFields, introductionDateLimit, releaseDateLimit); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java Sat Jul 20 16:35:13 2019 @@ -296,7 +296,7 @@ public final class CategoryWorker { public static List<String> getTrail(ServletRequest request) { HttpSession session = ((HttpServletRequest) request).getSession(); - List<String> crumb = UtilGenerics.checkList(session.getAttribute("_BREAD_CRUMB_TRAIL_")); + List<String> crumb = UtilGenerics.cast(session.getAttribute("_BREAD_CRUMB_TRAIL_")); return crumb; } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -131,7 +131,7 @@ public class ProductFeatureServices { Delegator delegator = dctx.getDelegator(); String productId = (String) context.get("productId"); - List<String> curProductFeatureAndAppls = UtilGenerics.checkList(context.get("productFeatureAppls")); + List<String> curProductFeatureAndAppls = UtilGenerics.cast(context.get("productFeatureAppls")); List<String> existingVariantProductIds = new LinkedList<>(); try { @@ -241,8 +241,8 @@ public class ProductFeatureServices { Map<String, Object> newCombination = new HashMap<>(); // .clone() is important, or you'll keep adding to the same List for all the variants // have to cast twice: once from get() and once from clone() - List<GenericValue> newFeatures = UtilMisc.makeListWritable(UtilGenerics.<GenericValue>checkList(combination.get("curProductFeatureAndAppls"))); - List<String> newFeatureIds = UtilMisc.makeListWritable(UtilGenerics.<String>checkList(combination.get("curProductFeatureIds"))); + List<GenericValue> newFeatures = UtilMisc.makeListWritable(UtilGenerics.cast(combination.get("curProductFeatureAndAppls"))); + List<String> newFeatureIds = UtilMisc.makeListWritable(UtilGenerics.cast(combination.get("curProductFeatureIds"))); if (currentFeature.getString("idCode") != null) { newCombination.put("defaultVariantProductId", combination.get("defaultVariantProductId") + currentFeature.getString("idCode")); } else { @@ -296,7 +296,7 @@ public class ProductFeatureServices { Map<String, Object> results = new HashMap<>(); LocalDispatcher dispatcher = dctx.getDispatcher(); - List<GenericValue> productFeatures = UtilGenerics.checkList(context.get("productFeatures")); + List<GenericValue> productFeatures = UtilGenerics.cast(context.get("productFeatures")); String productCategoryId = (String) context.get("productCategoryId"); Locale locale = (Locale) context.get("locale"); @@ -309,7 +309,7 @@ public class ProductFeatureServices { return ServiceUtil.returnError(ex.getMessage()); } - List<GenericValue> memberProducts = UtilGenerics.checkList(result.get("categoryMembers")); + List<GenericValue> memberProducts = UtilGenerics.cast(result.get("categoryMembers")); if ((memberProducts != null) && (memberProducts.size() > 0)) { // construct a Map of productFeatureTypeId -> productFeatureId from the productFeatures List Map<String, String> featuresByType = new HashMap<>(); @@ -328,7 +328,7 @@ public class ProductFeatureServices { return ServiceUtil.returnError(ex.getMessage()); } - List<GenericValue> variantProducts = UtilGenerics.checkList(result.get("products")); + List<GenericValue> variantProducts = UtilGenerics.cast(result.get("products")); if ((variantProducts != null) && (variantProducts.size() > 0)) { products.addAll(variantProducts); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java Sat Jul 20 16:35:13 2019 @@ -677,7 +677,7 @@ public class InventoryServices { * */ public static Map<String, Object> getProductInventoryAvailableFromAssocProducts(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - List<GenericValue> productAssocList = UtilGenerics.checkList(context.get("assocProducts")); + List<GenericValue> productAssocList = UtilGenerics.cast(context.get("assocProducts")); String facilityId = (String)context.get("facilityId"); String statusId = (String)context.get("statusId"); @@ -749,7 +749,7 @@ public class InventoryServices { public static Map<String, Object> getProductInventorySummaryForItems(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems")); + List<GenericValue> orderItems = UtilGenerics.cast(context.get("orderItems")); String facilityId = (String) context.get("facilityId"); Locale locale = (Locale) context.get("locale"); Map<String, BigDecimal> atpMap = new HashMap<>(); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -359,7 +359,7 @@ public class PriceServices { Map<String, Object> outMap = dispatcher.runSync(customMethod.getString("customMethodName"), inMap); if (ServiceUtil.isSuccess(outMap)) { BigDecimal calculatedDefaultPrice = (BigDecimal)outMap.get("price"); - orderItemPriceInfos = UtilGenerics.checkList(outMap.get("orderItemPriceInfos")); + orderItemPriceInfos = UtilGenerics.cast(outMap.get("orderItemPriceInfos")); if (UtilValidate.isNotEmpty(calculatedDefaultPrice)) { defaultPrice = calculatedDefaultPrice; validPriceFound = true; @@ -477,7 +477,7 @@ public class PriceServices { // The orderItemPriceInfos out parameter requires a special treatment: // the list of OrderItemPriceInfos generated by the price rule is appended to // the existing orderItemPriceInfos list and the aggregated list is returned. - List<GenericValue> orderItemPriceInfosFromRule = UtilGenerics.checkList(calcResults.get("orderItemPriceInfos")); + List<GenericValue> orderItemPriceInfosFromRule = UtilGenerics.cast(calcResults.get("orderItemPriceInfos")); if (UtilValidate.isNotEmpty(orderItemPriceInfosFromRule)) { orderItemPriceInfos.addAll(orderItemPriceInfosFromRule); } @@ -495,7 +495,7 @@ public class PriceServices { // The orderItemPriceInfos out parameter requires a special treatment: // the list of OrderItemPriceInfos generated by the price rule is appended to // the existing orderItemPriceInfos list and the aggregated list is returned. - List<GenericValue> orderItemPriceInfosFromRule = UtilGenerics.checkList(calcResults.get("orderItemPriceInfos")); + List<GenericValue> orderItemPriceInfosFromRule = UtilGenerics.cast(calcResults.get("orderItemPriceInfos")); if (UtilValidate.isNotEmpty(orderItemPriceInfosFromRule)) { orderItemPriceInfos.addAll(orderItemPriceInfosFromRule); } @@ -1294,7 +1294,7 @@ public class PriceServices { Debug.logError(errMsg, module); return ServiceUtil.returnError(errMsg); } - productSuppliers = UtilGenerics.checkList(priceResult.get("supplierProducts")); + productSuppliers = UtilGenerics.cast(priceResult.get("supplierProducts")); } catch (GenericServiceException gse) { Debug.logError(gse, module); return ServiceUtil.returnError(gse.getMessage()); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java Sat Jul 20 16:35:13 2019 @@ -337,7 +337,7 @@ public class ProductSearchSession { } } public static List<ProductSearchOptions> getSearchOptionsHistoryList(HttpSession session) { - List<ProductSearchOptions> optionsHistoryList = UtilGenerics.checkList(session.getAttribute("_PRODUCT_SEARCH_OPTIONS_HISTORY_")); + List<ProductSearchOptions> optionsHistoryList = UtilGenerics.cast(session.getAttribute("_PRODUCT_SEARCH_OPTIONS_HISTORY_")); if (optionsHistoryList == null) { optionsHistoryList = new LinkedList<>(); session.setAttribute("_PRODUCT_SEARCH_OPTIONS_HISTORY_", optionsHistoryList); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -91,14 +91,14 @@ public class ProductServices { List<GenericValue> products = new LinkedList<>(); // All the variants for this products are retrieved Map<String, Object> resVariants = prodFindAllVariants(dctx, context); - List<GenericValue> variants = UtilGenerics.checkList(resVariants.get("assocProducts")); + List<GenericValue> variants = UtilGenerics.cast(resVariants.get("assocProducts")); for (GenericValue oneVariant: variants) { // For every variant, all the standard features are retrieved Map<String, String> feaContext = new HashMap<>(); feaContext.put("productId", oneVariant.getString("productIdTo")); feaContext.put("type", "STANDARD_FEATURE"); Map<String, Object> resFeatures = prodGetFeatures(dctx, feaContext); - List<GenericValue> features = UtilGenerics.checkList(resFeatures.get("productFeatures")); + List<GenericValue> features = UtilGenerics.cast(resFeatures.get("productFeatures")); boolean variantFound = true; // The variant is discarded if at least one of its standard features // has the same type of one of the selected features but a different feature id. @@ -186,7 +186,7 @@ public class ProductServices { "ProductFeatureTreeCannotFindFeaturesList", locale)); } - List<GenericValue> variants = UtilGenerics.checkList(prodFindAllVariants(dctx, context).get("assocProducts")); + List<GenericValue> variants = UtilGenerics.cast(prodFindAllVariants(dctx, context).get("assocProducts")); List<String> virtualVariant = new LinkedList<>(); if (UtilValidate.isEmpty(variants)) { @@ -614,7 +614,7 @@ public class ProductServices { // loop through the keysets and get the sub-groups for (Entry<String, Object> entry : group.entrySet()) { String key = entry.getKey(); - List<String> itemList = UtilGenerics.checkList(group.get(key)); + List<String> itemList = UtilGenerics.cast(group.get(key)); if (UtilValidate.isNotEmpty(itemList)) { Map<String, Object> subGroup = makeGroup(delegator, featureList, itemList, order, index + 1); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java Sat Jul 20 16:35:13 2019 @@ -125,7 +125,7 @@ public class SupplierProductServices { public static Map<String, Object> convertFeaturesForSupplier(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> results; String partyId = (String) context.get("partyId"); - Collection<GenericValue> features = UtilGenerics.checkList(context.get("productFeatures")); + Collection<GenericValue> features = UtilGenerics.cast(context.get("productFeatures")); try { if (partyId != null && UtilValidate.isNotEmpty(features)) { 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -58,14 +58,14 @@ public class StockMovesTest extends OFBi fsmnCtx.put("userLogin", userLogin); Map<String, Object> respMap1 = dispatcher.runSync("findStockMovesNeeded", fsmnCtx); stockMoveHandled = UtilGenerics.cast(respMap1.get("stockMoveHandled")); - warningList = UtilGenerics.checkList(respMap1.get("warningMessageList")); + warningList = UtilGenerics.cast(respMap1.get("warningMessageList")); assertNull(warningList); if (stockMoveHandled != null) { fsmnCtx.put("stockMoveHandled", stockMoveHandled); } Map<String, Object> respMap2 = dispatcher.runSync("findStockMovesRecommended", fsmnCtx); - warningList = UtilGenerics.checkList(respMap2.get("warningMessageList")); + warningList = UtilGenerics.cast(respMap2.get("warningMessageList")); assertNull(warningList); Map<String, Object> ppsmCtx = new HashMap<>(); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java Sat Jul 20 16:35:13 2019 @@ -42,8 +42,8 @@ public class PickListServices { public static Map<String, Object> convertOrderIdListToHeaders(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); - List<GenericValue> orderHeaderList = UtilGenerics.checkList(context.get("orderHeaderList")); - List<String> orderIdList = UtilGenerics.checkList(context.get("orderIdList")); + List<GenericValue> orderHeaderList = UtilGenerics.cast(context.get("orderHeaderList")); + List<String> orderIdList = UtilGenerics.cast(context.get("orderIdList")); // we don't want to process if there is already a header list if (orderHeaderList == null) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java Sat Jul 20 16:35:13 2019 @@ -212,7 +212,7 @@ public class ShipmentServices { String shippingPostalCode = (String) context.get("shippingPostalCode"); String shippingCountryCode = (String) context.get("shippingCountryCode"); - List<Map<String, Object>> shippableItemInfo = UtilGenerics.checkList(context.get("shippableItemInfo")); + List<Map<String, Object>> shippableItemInfo = UtilGenerics.cast(context.get("shippableItemInfo")); BigDecimal shippableTotal = (BigDecimal) context.get("shippableTotal"); BigDecimal shippableQuantity = (BigDecimal) context.get("shippableQuantity"); BigDecimal shippableWeight = (BigDecimal) context.get("shippableWeight"); 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=1863501&r1=1863500&r2=1863501&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 20 16:35:13 2019 @@ -1915,8 +1915,8 @@ public class UpsServices { String shipmentMethodTypeId = (String) context.get("shipmentMethodTypeId"); String shippingPostalCode = (String) context.get("shippingPostalCode"); String shippingCountryCode = (String) context.get("shippingCountryCode"); - List<BigDecimal> packageWeights = UtilGenerics.checkList(context.get("packageWeights")); - List<Map<String, Object>> shippableItemInfo = UtilGenerics.checkList(context.get("shippableItemInfo")); + List<BigDecimal> packageWeights = UtilGenerics.cast(context.get("packageWeights")); + List<Map<String, Object>> shippableItemInfo = UtilGenerics.cast(context.get("shippableItemInfo")); String isResidentialAddress = (String)context.get("isResidentialAddress"); // Important: DO NOT returnError here or you could trigger a transaction rollback and break other services. Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java Sat Jul 20 16:35:13 2019 @@ -175,7 +175,7 @@ public class UspsServices { maxWeight = new BigDecimal("70"); } - List<Map<String, Object>> shippableItemInfo = UtilGenerics.checkList(context.get("shippableItemInfo")); + List<Map<String, Object>> shippableItemInfo = UtilGenerics.cast(context.get("shippableItemInfo")); List<Map<String, BigDecimal>> packages = ShipmentWorker.getPackageSplit(dctx, shippableItemInfo, maxWeight); boolean isOnePackage = packages.size() == 1; // use shippableWeight if there's only one package // TODO: Up to 25 packages can be included per request - handle more than 25 @@ -342,7 +342,7 @@ public class UspsServices { maxWeight = new BigDecimal("70"); } - List<Map<String, Object>> shippableItemInfo = UtilGenerics.checkList(context.get("shippableItemInfo")); + List<Map<String, Object>> shippableItemInfo = UtilGenerics.cast(context.get("shippableItemInfo")); List<Map<String, BigDecimal>> packages = ShipmentWorker.getPackageSplit(dctx, shippableItemInfo, maxWeight); boolean isOnePackage = packages.size() == 1; // use shippableWeight if there's only one package Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java Sat Jul 20 16:35:13 2019 @@ -71,7 +71,7 @@ public class UspsServicesTests extends O assertEquals("trackingSummary is correct", "Your item was delivered at 8:10 am on June 1 in Wilmington DE 19801.", trackingSummary); - List<String> trackingDetailList = UtilGenerics.checkList(result.get("trackingDetailList")); + List<String> trackingDetailList = UtilGenerics.cast(result.get("trackingDetailList")); assertEquals("trackingDetailList has 3 elements", 3, trackingDetailList.size()); Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[0]: " + trackingDetailList.get(0), module); Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Sat Jul 20 16:35:13 2019 @@ -290,7 +290,7 @@ public class WorkEffortSearchSession { WorkEffortSearchOptions.setResultSortOrder(resultSortOrder, session); } public static List<WorkEffortSearchOptions> getSearchOptionsHistoryList(HttpSession session) { - List<WorkEffortSearchOptions> optionsHistoryList = UtilGenerics.checkList(session.getAttribute("_WORK_EFFORT_SEARCH_OPTIONS_HISTORY_")); + List<WorkEffortSearchOptions> optionsHistoryList = UtilGenerics.cast(session.getAttribute("_WORK_EFFORT_SEARCH_OPTIONS_HISTORY_")); if (optionsHistoryList == null) { optionsHistoryList = new LinkedList<>(); session.setAttribute("_WORK_EFFORT_SEARCH_OPTIONS_HISTORY_", optionsHistoryList); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -576,7 +576,7 @@ public class WorkEffortServices { EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "PRUN_CANCELLED")); - List<EntityCondition> entityExprList = UtilGenerics.checkList(context.get("entityExprList")); + List<EntityCondition> entityExprList = UtilGenerics.cast(context.get("entityExprList")); if (entityExprList == null) { entityExprList = getDefaultWorkEffortExprList(calendarType, partyIdsToUse, workEffortTypeId, cancelledCheckAndList); } @@ -829,7 +829,7 @@ public class WorkEffortServices { quantitySummary.put("estimatedQuantityTotal", remainingQuantity + remainingQuantityTot); } - List<GenericValue> incomingProductionRunList = UtilGenerics.checkList(quantitySummary.get("incomingProductionRunList")); + List<GenericValue> incomingProductionRunList = UtilGenerics.cast(quantitySummary.get("incomingProductionRunList")); if (incomingProductionRunList == null) { incomingProductionRunList = new LinkedList<>(); quantitySummary.put("incomingProductionRunList", incomingProductionRunList); @@ -877,7 +877,7 @@ public class WorkEffortServices { quantitySummary.put("estimatedQuantityTotal", neededQuantity + remainingQuantityTot); } - List<GenericValue> outgoingProductionRunList = UtilGenerics.checkList(quantitySummary.get("outgoingProductionRunList")); + List<GenericValue> outgoingProductionRunList = UtilGenerics.cast(quantitySummary.get("outgoingProductionRunList")); if (outgoingProductionRunList == null) { outgoingProductionRunList = new LinkedList<>(); quantitySummary.put("outgoingProductionRunList", outgoingProductionRunList); @@ -1095,7 +1095,7 @@ public class WorkEffortServices { workEffort = eli.next(); } } else { - List<GenericValue> workEfforts = UtilGenerics.checkList(context.get("workEfforts")); + List<GenericValue> workEfforts = UtilGenerics.cast(context.get("workEfforts")); if (workEfforts != null) { resultList = WorkEffortWorker.removeDuplicateWorkEfforts(workEfforts); } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -19,7 +19,6 @@ package org.apache.ofbiz.base.util; import java.util.Collection; -import java.util.List; import java.util.Map; public final class UtilGenerics { @@ -53,10 +52,6 @@ public final class UtilGenerics { return cast(object); } - public static <T> List<T> checkList(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<?, ?>)) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Sat Jul 20 16:35:13 2019 @@ -219,7 +219,7 @@ public final class UtilHttp { List<FileItem> uploadedItems = null; try { - uploadedItems = UtilGenerics.<FileItem>checkList(upload.parseRequest(request)); + uploadedItems = UtilGenerics.cast(upload.parseRequest(request)); } catch (FileUploadException e) { Debug.logError("File upload error" + e, module); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java Sat Jul 20 16:35:13 2019 @@ -233,7 +233,7 @@ public final class UtilMisc { * Assuming outerMap not null; if null will throw a NullPointerException */ public static <K, V> List<V> getListFromMap(Map<K, Object> outerMap, K key) { - List<V> innerList = UtilGenerics.<V>checkList(outerMap.get(key)); + List<V> innerList = UtilGenerics.cast(outerMap.get(key)); if (innerList == null) { innerList = new LinkedList<>(); outerMap.put(key, innerList); @@ -380,7 +380,7 @@ public final class UtilMisc { } public static <K, V> void addToListInMap(V element, Map<K, Object> theMap, K listKey) { - List<V> theList = UtilGenerics.checkList(theMap.get(listKey)); + List<V> theList = UtilGenerics.cast(theMap.get(listKey)); if (theList == null) { theList = new LinkedList<>(); theMap.put(listKey, theList); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java Sat Jul 20 16:35:13 2019 @@ -18,8 +18,6 @@ */ package org.apache.ofbiz.base.util; -import static org.apache.ofbiz.base.util.UtilGenerics.checkList; - import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; @@ -55,7 +53,7 @@ public final class UtilPlist { Map<String, Object> map = UtilGenerics.cast(value); writePlistPropertyMap(map, indentLevel, writer, false); } else if (value instanceof List<?>) { - List<Object> list = checkList(value); + List<Object> list = UtilGenerics.cast(value); writePlistPropertyValueList(list, indentLevel, writer); } else { writer.print(value); @@ -116,7 +114,7 @@ public final class UtilPlist { Map<String, Object> map = UtilGenerics.cast(value); writePlistPropertyMapXml(map, indentLevel, writer); } else if (value instanceof List<?>) { - List<Object> list = checkList(value); + List<Object> list = UtilGenerics.cast(value); writePlistPropertyValueListXml(list, indentLevel, writer); } else { for (int i = 0; i < indentLevel; i++) {
