svn commit: r1863501 [1/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1863501 [1/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Author: mthl
Date: Sat Jul 20 16:35:13 2019 New Revision: 1863501 URL: http://svn.apache.org/viewvc?rev=1863501&view=rev Log: Improved: Inline ‘UtilGenerics#checkList’ (OFBIZ-11141) Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.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/ContentServicesComplex.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/content/PermissionRecorder.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.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/layout/LayoutEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.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/webapp/ftl/CheckPermissionTransform.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/InjectNodeTrailCsvTransform.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/LoopSubContentTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.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/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.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/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.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/quote/QuoteServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.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/ShoppingCartEvents.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.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/inventory/InventoryServices.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/ProductSearchSession.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/supplier/SupplierProductServices.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/picklist/PickListServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.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/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/template/FreeMarkerWorker.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.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/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/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.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/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.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/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/renderer/MenuWrapTransform.java Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Sat Jul 20 16:35:13 2019 @@ -161,7 +161,7 @@ public class InvoiceServices { } String orderId = (String) context.get("orderId"); - List<GenericValue> billItems = UtilGenerics.checkList(context.get("billItems")); + List<GenericValue> billItems = UtilGenerics.cast(context.get("billItems")); String invoiceId = (String) context.get("invoiceId"); if (UtilValidate.isEmpty(billItems)) { @@ -916,11 +916,11 @@ public class InvoiceServices { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); - List<String> salesInvoiceIds = UtilGenerics.checkList(context.get("invoiceIds")); + List<String> salesInvoiceIds = UtilGenerics.cast(context.get("invoiceIds")); List<Map<String, String>> invoicesCreated = new LinkedList<>(); Map<String, List<Map<String, Object>>> commissionParties = new HashMap<>(); for (String salesInvoiceId : salesInvoiceIds) { - List<String> salesRepPartyIds = UtilGenerics.checkList(context.get("partyIds")); + List<String> salesRepPartyIds = UtilGenerics.cast(context.get("partyIds")); BigDecimal amountTotal = InvoiceWorker.getInvoiceTotal(delegator, salesInvoiceId); if (amountTotal.signum() == 0) { Debug.logWarning("Invoice [" + salesInvoiceId + "] has an amount total of [" + amountTotal + "], so no commission invoice will be created", module); @@ -952,7 +952,7 @@ public class InvoiceServices { } else { List<String> salesInvoiceRolePartyIds = EntityUtil.getFieldListFromEntityList(roleQuery.where(invoiceRoleConds).queryList(), "partyId", true); if (UtilValidate.isNotEmpty(salesInvoiceRolePartyIds)) { - salesRepPartyIds = UtilGenerics.checkList(CollectionUtils.intersection(salesRepPartyIds, salesInvoiceRolePartyIds)); + salesRepPartyIds = UtilGenerics.cast(CollectionUtils.intersection(salesRepPartyIds, salesInvoiceRolePartyIds)); } } invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", salesInvoiceId).queryOne(); @@ -998,7 +998,7 @@ public class InvoiceServices { } // build a Map of partyIds (both to and from) in a commission and the amounts // Note that getCommissionForProduct returns a List of Maps with a lot values. See services.xml definition for reference. - List<Map<String, Object>> itemCommissions = UtilGenerics.checkList(resultMap.get("commissions")); + List<Map<String, Object>> itemCommissions = UtilGenerics.cast(resultMap.get("commissions")); if (UtilValidate.isNotEmpty(itemCommissions)) { for (Map<String, Object> commissionMap : itemCommissions) { commissionMap.put("invoice", invoice); @@ -1150,7 +1150,7 @@ public class InvoiceServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); // Get invoices to make ready - List<String> invoicesCreated = UtilGenerics.checkList(context.get("invoicesCreated")); + List<String> invoicesCreated = UtilGenerics.cast(context.get("invoicesCreated")); String nextStatusId = "INVOICE_READY"; try { for (String invoiceId : invoicesCreated) { @@ -1211,7 +1211,7 @@ public class InvoiceServices { "AccountingTroubleCallingCreateInvoicesFromShipmentService", UtilMisc.toMap("shipmentId", shipmentId), locale)); } - invoicesCreated = UtilGenerics.checkList(result.get("invoicesCreated")); + invoicesCreated = UtilGenerics.cast(result.get("invoicesCreated")); } catch (GenericServiceException e) { Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment [" + shipmentId + "]", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -1344,7 +1344,7 @@ public class InvoiceServices { public static Map<String, Object> createInvoicesFromShipments(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - List<String> shipmentIds = UtilGenerics.checkList(context.get("shipmentIds")); + List<String> shipmentIds = UtilGenerics.cast(context.get("shipmentIds")); Locale locale = (Locale) context.get("locale"); Boolean createSalesInvoicesForDropShipments = (Boolean) context.get("createSalesInvoicesForDropShipments"); if (UtilValidate.isEmpty(createSalesInvoicesForDropShipments)) { @@ -1717,7 +1717,7 @@ public class InvoiceServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingTroubleCallingCalcTaxService", locale)); } - List<GenericValue> orderAdjustments = UtilGenerics.checkList(calcTaxResult.get("orderAdjustments")); + List<GenericValue> orderAdjustments = UtilGenerics.cast(calcTaxResult.get("orderAdjustments")); // If we have any OrderAdjustments due to tax on shipping, store them and add them to the total if (orderAdjustments != null) { @@ -2006,7 +2006,7 @@ public class InvoiceServices { Locale locale = (Locale) context.get("locale"); String returnId= (String) context.get("returnId"); - List<GenericValue> billItems = UtilGenerics.checkList(context.get("billItems")); + List<GenericValue> billItems = UtilGenerics.cast(context.get("billItems")); String errorMsg = UtilProperties.getMessage(resource, "AccountingErrorCreatingInvoiceForReturn",UtilMisc.toMap("returnId",returnId),locale); // List invoicesCreated = new ArrayList(); try { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java Sat Jul 20 16:35:13 2019 @@ -66,7 +66,7 @@ public class BillingAccountWorker { if (ServiceUtil.isError(agentResult)) { throw new GeneralException("Error while finding party BillingAccounts when getting Customers that this party is an agent of: " + ServiceUtil.getErrorMessage(agentResult)); } - List<String> relatedPartyIdList = UtilGenerics.checkList(agentResult.get("relatedPartyIdList")); + List<String> relatedPartyIdList = UtilGenerics.cast(agentResult.get("relatedPartyIdList")); List<GenericValue> billingAccountRoleList = EntityQuery.use(delegator).from("BillingAccountRole") .where(EntityCondition.makeCondition("partyId", EntityOperator.IN, relatedPartyIdList), Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java Sat Jul 20 16:35:13 2019 @@ -407,7 +407,7 @@ public class PaymentGatewayServices { hadError += 1; } if (results.get("messages") != null) { - List<String> message = UtilGenerics.checkList(results.get("messages")); + List<String> message = UtilGenerics.cast(results.get("messages")); messages.addAll(message); } if (results.get("processAmount") != null) { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java Sat Jul 20 16:35:13 2019 @@ -169,11 +169,11 @@ public class TaxAuthorityServices { String facilityId = (String) context.get("facilityId"); String payToPartyId = (String) context.get("payToPartyId"); String billToPartyId = (String) context.get("billToPartyId"); - List<GenericValue> itemProductList = UtilGenerics.checkList(context.get("itemProductList")); - List<BigDecimal> itemAmountList = UtilGenerics.checkList(context.get("itemAmountList")); - List<BigDecimal> itemPriceList = UtilGenerics.checkList(context.get("itemPriceList")); - List<BigDecimal> itemQuantityList = UtilGenerics.checkList(context.get("itemQuantityList")); - 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> itemPriceList = UtilGenerics.cast(context.get("itemPriceList")); + List<BigDecimal> itemQuantityList = UtilGenerics.cast(context.get("itemQuantityList")); + List<BigDecimal> itemShippingList = UtilGenerics.cast(context.get("itemShippingList")); BigDecimal orderShippingAmount = (BigDecimal) context.get("orderShippingAmount"); BigDecimal orderPromotionsAmount = (BigDecimal) context.get("orderPromotionsAmount"); GenericValue shippingAddress = (GenericValue) context.get("shippingAddress"); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java Sat Jul 20 16:35:13 2019 @@ -218,7 +218,7 @@ public class ContentManagementEvents { for (Object [] arr : origPublishedLinkList) { String contentId = (String)arr[0]; // main (2nd level) site id String origSubContentId = null; - List<Object []> origSubList = UtilGenerics.checkList(arr[1]); + List<Object []> origSubList = UtilGenerics.cast(arr[1]); Timestamp origFromDate = null; for (Object [] pubArr : origSubList) { Timestamp fromDate = (Timestamp)pubArr[2]; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java Sat Jul 20 16:35:13 2019 @@ -77,7 +77,7 @@ public class ContentManagementServices { String mapKey = (String) context.get("mapKey"); GenericValue userLogin = (GenericValue)context.get("userLogin"); Timestamp fromDate = (Timestamp)context.get("fromDate"); - List<String> assocTypes = UtilGenerics.checkList(context.get("assocTypes")); + List<String> assocTypes = UtilGenerics.cast(context.get("assocTypes")); String assocTypesString = (String)context.get("assocTypesString"); if (UtilValidate.isNotEmpty(assocTypesString)) { List<String> lst = StringUtil.split(assocTypesString, "|"); @@ -155,7 +155,7 @@ public class ContentManagementServices { if (Debug.infoOn()) Debug.logInfo("in persist... mapKey(0):" + mapKey, module); // ContentPurposes can get passed in as a delimited string or a list. Combine. - List<String> contentPurposeList = UtilGenerics.checkList(context.get("contentPurposeList")); + List<String> contentPurposeList = UtilGenerics.cast(context.get("contentPurposeList")); if (contentPurposeList == null) { contentPurposeList = new LinkedList<>(); } @@ -829,7 +829,7 @@ public class ContentManagementServices { seqInc = 100; } int seqIncrement = seqInc; - List<String> typeList = UtilGenerics.checkList(context.get("typeList")); + List<String> typeList = UtilGenerics.cast(context.get("typeList")); if (typeList == null) { typeList = new LinkedList<>(); } @@ -961,7 +961,7 @@ public class ContentManagementServices { public static Map<String, Object> updateLeafCount(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); - List<String> typeList = UtilGenerics.checkList(context.get("typeList")); + List<String> typeList = UtilGenerics.cast(context.get("typeList")); if (typeList == null) { typeList = UtilMisc.toList("PUBLISH_LINK", "SUB_CONTENT"); } @@ -1518,7 +1518,7 @@ public class ContentManagementServices { public static Map<String, Object> followNodeChildrenMethod(GenericValue content, LocalDispatcher dispatcher, String serviceName, Map<String, Object> context) throws GenericEntityException, GenericServiceException { Map<String, Object> result = null; String contentId = content.getString("contentId"); - List<String> contentAssocTypeIdList = UtilGenerics.checkList(context.get("contentAssocTypeIdList")); + List<String> contentAssocTypeIdList = UtilGenerics.cast(context.get("contentAssocTypeIdList")); Locale locale = (Locale) context.get("locale"); Set<String> visitedSet = UtilGenerics.cast(context.get("visitedSet")); if (visitedSet == null) { @@ -1587,7 +1587,7 @@ public class ContentManagementServices { if (ServiceUtil.isError(traversResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(traversResult)); } - parentList = UtilGenerics.checkList(traversResult.get("parentList")); + parentList = UtilGenerics.cast(traversResult.get("parentList")); } else { parentList.add(masterRevisionContentId); } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -507,7 +507,7 @@ public final class ContentManagementWork subArr[3] = contentAssoc.get("fromDate"); } else { if (subArr != null) { - List<Object []> subPointList = UtilGenerics.checkList(subArr[1]); + List<Object []> subPointList = UtilGenerics.cast(subArr[1]); Iterator<Object []> it5 = subPointList.iterator(); Object [] subArr2 = null; while (it5.hasNext()) { @@ -537,7 +537,7 @@ public final class ContentManagementWork // TODO check if we want contentTypes to be filled/used, else this should be removed List<String> contentTypes = null; Map<String, Object> results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, null, "To", null, null, assocTypes, contentTypes, Boolean.TRUE, null, null); - List<GenericValue> valueList = UtilGenerics.checkList(results.get("entityList")); + List<GenericValue> valueList = UtilGenerics.cast(results.get("entityList")); if (valueList.size() > 0) { GenericValue value = valueList.get(0); authorContent = delegator.makeValue("Content"); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java Sat Jul 20 16:35:13 2019 @@ -140,7 +140,7 @@ public class ContentPermissionServices { // I realized, belatedly, that I wanted to be able to pass parameters in as // strings so this service could be used in an action event directly, // so I had to write this code to handle both list and strings - List<String> passedPurposes = UtilGenerics.checkList(context.get("contentPurposeList")); + List<String> passedPurposes = UtilGenerics.cast(context.get("contentPurposeList")); String contentPurposeString = (String) context.get("contentPurposeString"); if (UtilValidate.isNotEmpty(contentPurposeString)) { List<String> purposesFromString = StringUtil.split(contentPurposeString, "|"); @@ -154,7 +154,7 @@ public class ContentPermissionServices { // Sometimes permissions need to be checked before an entity is created, so // there needs to be a method for setting a purpose list auxGetter.setList(passedPurposes); - List<String> targetOperations = UtilGenerics.checkList(context.get("targetOperationList")); + List<String> targetOperations = UtilGenerics.cast(context.get("targetOperationList")); String targetOperationString = (String) context.get("targetOperationString"); if (UtilValidate.isNotEmpty(targetOperationString)) { List<String> operationsFromString = StringUtil.split(targetOperationString, "|"); @@ -167,7 +167,7 @@ public class ContentPermissionServices { permCondGetter.setOperationList(targetOperations); EntityPermissionChecker.StdRelatedRoleGetter roleGetter = new EntityPermissionChecker.StdRelatedRoleGetter("Content", "roleTypeId", "contentId", "partyId", "ownerContentId", "ContentRole"); - List<String> passedRoles = UtilGenerics.checkList(context.get("roleTypeList")); + List<String> passedRoles = UtilGenerics.cast(context.get("roleTypeList")); if (passedRoles == null) passedRoles = new LinkedList<>(); String roleTypeString = (String) context.get("roleTypeString"); if (UtilValidate.isNotEmpty(roleTypeString)) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java Sat Jul 20 16:35:13 2019 @@ -265,7 +265,7 @@ public class ContentSearchSession { ContentSearchOptions.setResultSortOrder(resultSortOrder, session); } public static List<ContentSearchOptions> getSearchOptionsHistoryList(HttpSession session) { - List<ContentSearchOptions> optionsHistoryList = UtilGenerics.checkList(session.getAttribute("_CONTENT_SEARCH_OPTIONS_HISTORY_")); + List<ContentSearchOptions> optionsHistoryList = UtilGenerics.cast(session.getAttribute("_CONTENT_SEARCH_OPTIONS_HISTORY_")); if (optionsHistoryList == null) { optionsHistoryList = new LinkedList<>(); session.setAttribute("_CONTENT_SEARCH_OPTIONS_HISTORY_", optionsHistoryList); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -77,9 +77,9 @@ public class ContentServices { toFrom = toFrom.toUpperCase(Locale.getDefault()); } - List<String> assocTypes = UtilGenerics.checkList(context.get("contentAssocTypeList")); - List<String> targetOperations = UtilGenerics.checkList(context.get("targetOperationList")); - List<String> contentTypes = UtilGenerics.checkList(context.get("contentTypeList")); + List<String> assocTypes = UtilGenerics.cast(context.get("contentAssocTypeList")); + List<String> targetOperations = UtilGenerics.cast(context.get("targetOperationList")); + List<String> contentTypes = UtilGenerics.cast(context.get("contentTypeList")); List<GenericValue> contentList = null; try { @@ -154,7 +154,7 @@ public class ContentServices { } private static void walkParentTree(Map<String, Object> nodeMap, List<Object> parentList) { - List<Map<String, Object>> kids = UtilGenerics.checkList(nodeMap.get("kids")); + List<Map<String, Object>> kids = UtilGenerics.cast(nodeMap.get("kids")); if (UtilValidate.isEmpty(kids)) { parentList.add(nodeMap.get("contentId")); } else { @@ -591,7 +591,7 @@ public class ContentServices { Map<String, Object> result = new HashMap<>(); String outputString = null; String delimiter = UtilFormatOut.checkEmpty((String)context.get("delimiter"), "|"); - List<String> inputList = UtilGenerics.checkList(context.get("inputList")); + List<String> inputList = UtilGenerics.cast(context.get("inputList")); if (inputList != null) { outputString = StringUtil.join(inputList, delimiter); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java Sat Jul 20 16:35:13 2019 @@ -65,8 +65,8 @@ public class ContentServicesComplex { */ public static Map<String, Object> getAssocAndContentAndDataResource(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); - List<String> assocTypes = UtilGenerics.checkList(context.get("assocTypes")); - List<String> contentTypes = UtilGenerics.checkList(context.get("contentTypes")); + List<String> assocTypes = UtilGenerics.cast(context.get("assocTypes")); + List<String> contentTypes = UtilGenerics.cast(context.get("contentTypes")); Timestamp fromDate = (Timestamp)context.get("fromDate"); Timestamp thruDate = (Timestamp)context.get("thruDate"); String fromDateStr = (String)context.get("fromDateStr"); @@ -157,7 +157,7 @@ public class ContentServicesComplex { */ public static Map<String, Object> getAssocAndContentAndDataResourceCache(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); - List<String> assocTypes = UtilGenerics.checkList(context.get("assocTypes")); + List<String> assocTypes = UtilGenerics.cast(context.get("assocTypes")); String assocTypesString = (String)context.get("assocTypesString"); if (UtilValidate.isNotEmpty(assocTypesString)) { List<String> lst = StringUtil.split(assocTypesString, "|"); @@ -166,7 +166,7 @@ public class ContentServicesComplex { } assocTypes.addAll(lst); } - List<String> contentTypes = UtilGenerics.checkList(context.get("contentTypes")); + List<String> contentTypes = UtilGenerics.cast(context.get("contentTypes")); String contentTypesString = (String)context.get("contentTypesString"); if (UtilValidate.isNotEmpty(contentTypesString)) { List<String> lst = StringUtil.split(contentTypesString, "|"); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -515,7 +515,7 @@ public class ContentWorker implements or thisNode.put("contentId", contentId); thisNode.put("contentTypeId", contentTypeId); thisNode.put("contentAssocTypeId", contentAssocTypeId); - List<Map<String, Object>> kids = UtilGenerics.checkList(masterNode.get("kids")); + List<Map<String, Object>> kids = UtilGenerics.cast(masterNode.get("kids")); if (kids == null) { kids = new LinkedList<>(); masterNode.put("kids", kids); @@ -563,7 +563,7 @@ public class ContentWorker implements or public static boolean traverseSubContent(Map<String, Object> ctx) { boolean inProgress = false; - List<Map <String, Object>> nodeTrail = UtilGenerics.checkList(ctx.get("nodeTrail")); + List<Map <String, Object>> nodeTrail = UtilGenerics.cast(ctx.get("nodeTrail")); ContentWorker.traceNodeTrail("11",nodeTrail); int sz = nodeTrail.size(); if (sz == 0) { @@ -576,7 +576,7 @@ public class ContentWorker implements or return false; } - List<Map <String, Object>> kids = UtilGenerics.checkList(currentNode.get("kids")); + List<Map <String, Object>> kids = UtilGenerics.cast(currentNode.get("kids")); if (UtilValidate.isNotEmpty(kids)) { int idx = 0; while (idx < kids.size()) { @@ -611,7 +611,7 @@ public class ContentWorker implements or currentNode = nodeTrail.remove(--sz); ContentWorker.traceNodeTrail("15",nodeTrail); Map<String, Object> parentNode = nodeTrail.get(sz - 1); - kids = UtilGenerics.checkList(parentNode.get("kids")); + kids = UtilGenerics.cast(parentNode.get("kids")); if (kids == null) { continue; } @@ -722,7 +722,7 @@ public class ContentWorker implements or } catch (MiniLangException e2) { throw new RuntimeException(e2.getMessage()); } - List<GenericValue> relatedViews = UtilGenerics.checkList(results.get("entityList")); + List<GenericValue> relatedViews = UtilGenerics.cast(results.get("entityList")); for (GenericValue assocValue : relatedViews) { Map<String, Object> thisNode = ContentWorker.makeNode(assocValue); checkConditions(delegator, thisNode, null, whenMap); @@ -1080,7 +1080,7 @@ public class ContentWorker implements or } Map<String, Object> results = null; results = ContentServicesComplex.getAssocAndContentAndDataResourceMethod(delegator, contentId, mapKey, "To", fromDate, null, null, null, assocTypes, null); - List<GenericValue> entityList = UtilGenerics.checkList(results.get("entityList")); + List<GenericValue> entityList = UtilGenerics.cast(results.get("entityList")); if (UtilValidate.isEmpty(entityList)) { //throw new IOException("No subcontent found."); } else { @@ -1124,7 +1124,7 @@ public class ContentWorker implements or } catch (MiniLangException e) { throw new RuntimeException(e.getMessage()); } - List<GenericValue> entityList = UtilGenerics.checkList(results.get("entityList")); + List<GenericValue> entityList = UtilGenerics.cast(results.get("entityList")); if (UtilValidate.isEmpty(entityList)) { //throw new IOException("No subcontent found."); } else { @@ -1149,7 +1149,7 @@ public class ContentWorker implements or GenericValue currentContent = null; String viewContentId = null; if (UtilValidate.isNotEmpty(trail)) { - passedGlobalNodeTrail = UtilGenerics.checkList(UtilMisc.makeListWritable(trail)); + passedGlobalNodeTrail = UtilGenerics.cast(UtilMisc.makeListWritable(trail)); } else { passedGlobalNodeTrail = new LinkedList<>(); } @@ -1290,7 +1290,7 @@ public class ContentWorker implements or } public static List<String> prepTargetOperationList(Map<String, ? extends Object> context, String md) { - List<String> targetOperationList = UtilGenerics.checkList(context.get("targetOperationList")); + List<String> targetOperationList = UtilGenerics.cast(context.get("targetOperationList")); String targetOperationString = (String)context.get("targetOperationString"); if (Debug.infoOn()) { Debug.logInfo("in prepTargetOperationList, targetOperationString(0):" + targetOperationString, ""); @@ -1322,7 +1322,7 @@ public class ContentWorker implements or * @return the list of content purpose */ public static List<String> prepContentPurposeList(Map<String, Object> context) { - List<String> contentPurposeList = UtilGenerics.checkList(context.get("contentPurposeList")); + List<String> contentPurposeList = UtilGenerics.cast(context.get("contentPurposeList")); String contentPurposeString = (String)context.get("contentPurposeString"); if (Debug.infoOn()) { Debug.logInfo("in prepContentPurposeList, contentPurposeString(0):" + contentPurposeString, ""); @@ -1591,7 +1591,7 @@ public class ContentWorker implements or indent.setLength(indent.length() - 1); } else if (obj instanceof List<?>) { indent.append(' '); - logList(s, "LIST[" + ((List<?>)obj).size() + "]", UtilGenerics.checkList(obj), indent); + logList(s, "LIST[" + ((List<?>)obj).size() + "]", UtilGenerics.cast(obj), indent); indent.setLength(indent.length() - 1); } else if (obj instanceof Map<?, ?>) { indent.append(' '); @@ -1635,7 +1635,7 @@ public class ContentWorker implements or indent.setLength(indent.length() - 1); } else if (obj instanceof List<?>) { indent.append(' '); - logList(s, "LIST[" + ((List<?>)obj).size() + "]", UtilGenerics.checkList(obj), indent); + logList(s, "LIST[" + ((List<?>)obj).size() + "]", UtilGenerics.cast(obj), indent); indent.setLength(indent.length() - 1); } else if (obj instanceof Map<?, ?>) { indent.append(' '); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java Sat Jul 20 16:35:13 2019 @@ -190,7 +190,7 @@ public class PermissionRecorder { map.put("privilegeEnumIdCond", privilegeCond); map.put("roleTypeIdCond", roleCond); map.put("contentId", currentContentId); - List<Map<String, Object>> checkResultList = UtilGenerics.checkList(currentContentMap.get("checkResultList")); + List<Map<String, Object>> checkResultList = UtilGenerics.cast(currentContentMap.get("checkResultList")); checkResultList.add(map); } @@ -229,7 +229,7 @@ public class PermissionRecorder { public String renderCurrentContentMapHtml(Map<String, Object> cMap) { StringBuilder sb = new StringBuilder(); - List<Map<String, Object>> resultList = UtilGenerics.checkList(cMap.get("checkResultList")); + List<Map<String, Object>> resultList = UtilGenerics.cast(cMap.get("checkResultList")); for (Map<String, Object> rMap : resultList) { sb.append(renderResultRowHtml(rMap, cMap)); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java Sat Jul 20 16:35:13 2019 @@ -79,7 +79,7 @@ public class UploadContentAndImage { ServletFileUpload dfu = new ServletFileUpload(new DiskFileItemFactory(10240, FileUtil.getFile("runtime/tmp"))); List<FileItem> lst = null; try { - lst = UtilGenerics.checkList(dfu.parseRequest(request)); + lst = UtilGenerics.cast(dfu.parseRequest(request)); } catch (FileUploadException e4) { request.setAttribute("_ERROR_MESSAGE_", e4.getMessage()); Debug.logError("[UploadContentAndImage.uploadContentAndImage] " + e4.getMessage(), module); @@ -339,7 +339,7 @@ public class UploadContentAndImage { ServletFileUpload dfu = new ServletFileUpload(new DiskFileItemFactory(10240, FileUtil.getFile("runtime/tmp"))); List<FileItem> lst = null; try { - lst = UtilGenerics.checkList(dfu.parseRequest(request)); + lst = UtilGenerics.cast(dfu.parseRequest(request)); } catch (FileUploadException e4) { request.setAttribute("_ERROR_MESSAGE_", e4.getMessage()); Debug.logError("[UploadContentAndImage.uploadContentAndImage] " + e4.getMessage(), module); @@ -449,7 +449,7 @@ public class UploadContentAndImage { String msg = "Caught an exception : " + e.toString(); Debug.logError(e, msg); request.setAttribute("_ERROR_MESSAGE_", msg); - List<String> errorMsgList = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); + List<String> errorMsgList = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_")); if (errorMsgList == null) { errorMsgList = new LinkedList<>(); request.setAttribute("errorMessageList", errorMsgList); @@ -501,7 +501,7 @@ public class UploadContentAndImage { } catch (ServiceAuthException e) { String msg = e.getMessage(); request.setAttribute("_ERROR_MESSAGE_", msg); - List<String> errorMsgList = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); + List<String> errorMsgList = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_")); if (Debug.infoOn()) { Debug.logInfo("[UploadContentStuff]errorMsgList:" + errorMsgList, module); } @@ -518,7 +518,7 @@ public class UploadContentAndImage { if (ServiceUtil.isError(ftlResults)) { String msg = ServiceUtil.getErrorMessage(ftlResults); request.setAttribute("_ERROR_MESSAGE_", msg); - List<String> errorMsgList = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); + List<String> errorMsgList = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_")); if (errorMsgList == null) { errorMsgList = new LinkedList<>(); request.setAttribute("errorMessageList", errorMsgList); @@ -554,7 +554,7 @@ public class UploadContentAndImage { } catch (ServiceAuthException e) { String msg = e.getMessage(); request.setAttribute("_ERROR_MESSAGE_", msg); - List<String> errorMsgList = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); + List<String> errorMsgList = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_")); if (Debug.infoOn()) { Debug.logInfo("[UploadContentStuff]errorMsgList:" + errorMsgList, module); } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -193,7 +193,7 @@ public class DataResourceWorker impleme if (id != null && !"ROOT".equals(id) && !id.equals("")) { lst.add(map); } - List<Map<String, Object>> kids = UtilGenerics.checkList(nd.get("kids")); + List<Map<String, Object>> kids = UtilGenerics.cast(nd.get("kids")); for (Map<String, Object> kidNode : kids) { buildList(kidNode, lst, depth + 1); } @@ -210,7 +210,7 @@ public class DataResourceWorker impleme Locale locale = UtilHttp.getLocale(request); try { - lst = UtilGenerics.checkList(fu.parseRequest(request)); + lst = UtilGenerics.cast(fu.parseRequest(request)); } catch (FileUploadException e) { request.setAttribute("_ERROR_MESSAGE_", e.toString()); return "error"; 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -378,7 +378,7 @@ public class LayoutEvents { Debug.logError(errorMessage, module); return "error"; } - entityList = UtilGenerics.checkList(results.get("entityList")); + entityList = UtilGenerics.cast(results.get("entityList")); if (UtilValidate.isEmpty(entityList)) { String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.no_subcontent", locale); request.setAttribute("_ERROR_MESSAGE_", errMsg); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java Sat Jul 20 16:35:13 2019 @@ -61,7 +61,7 @@ public final class LayoutWorker { ServletFileUpload fu = new ServletFileUpload(new DiskFileItemFactory(10240, new File(new File("runtime"), "tmp"))); List<FileItem> lst = null; try { - lst = UtilGenerics.checkList(fu.parseRequest(request)); + lst = UtilGenerics.cast(fu.parseRequest(request)); } catch (FileUploadException e4) { return ServiceUtil.returnError(e4.getMessage()); } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -142,7 +142,7 @@ public class OutputServices { InputStream bais = new ByteArrayInputStream(baos.toByteArray()); DocAttributeSet docAttributeSet = new HashDocAttributeSet(); - List<Object> docAttributes = UtilGenerics.checkList(serviceContext.remove("docAttributes")); + List<Object> docAttributes = UtilGenerics.cast(serviceContext.remove("docAttributes")); if (UtilValidate.isNotEmpty(docAttributes)) { for (Object da : docAttributes) { Debug.logInfo("Adding DocAttribute: " + da, module); @@ -187,7 +187,7 @@ public class OutputServices { } PrintRequestAttributeSet praset = new HashPrintRequestAttributeSet(); - List<Object> printRequestAttributes = UtilGenerics.checkList(serviceContext.remove("printRequestAttributes")); + List<Object> printRequestAttributes = UtilGenerics.cast(serviceContext.remove("printRequestAttributes")); if (UtilValidate.isNotEmpty(printRequestAttributes)) { for (Object pra : printRequestAttributes) { Debug.logInfo("Adding PrintRequestAttribute: " + pra, module); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Sat Jul 20 16:35:13 2019 @@ -111,7 +111,7 @@ public class CheckPermissionTransform im @Override public int onStart() throws TemplateModelException, IOException { - List<Map<String, ? extends Object>> trail = UtilGenerics.checkList(templateCtx.get("globalNodeTrail")); + List<Map<String, ? extends Object>> trail = UtilGenerics.cast(templateCtx.get("globalNodeTrail")); GenericValue currentContent = null; String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId"); String strNullThruDatesOnly = (String)templateCtx.get("nullThruDatesOnly"); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -89,7 +89,7 @@ public class EditRenderSubContentCacheTr FreeMarkerWorker.getSiteParameters(request, templateCtx); FreeMarkerWorker.overrideWithArgs(templateCtx, args); final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env); - List<Map<String, ? extends Object>> trail = UtilGenerics.checkList(templateCtx.get("globalNodeTrail")); + List<Map<String, ? extends Object>> trail = UtilGenerics.cast(templateCtx.get("globalNodeTrail")); String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId"); String strNullThruDatesOnly = (String)templateCtx.get("nullThruDatesOnly"); Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && "true".equalsIgnoreCase(strNullThruDatesOnly)) ? Boolean.TRUE :Boolean.FALSE; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Sat Jul 20 16:35:13 2019 @@ -103,7 +103,7 @@ public class InjectNodeTrailCsvTransform public int onStart() throws TemplateModelException, IOException { String csvTrail = null; - List<Map<String, ? extends Object>> trail = UtilGenerics.checkList(templateCtx.get("globalNodeTrail")); + List<Map<String, ? extends Object>> trail = UtilGenerics.cast(templateCtx.get("globalNodeTrail")); if (Debug.infoOn()) { Debug.logInfo("in InjectNodeTrailCsv(0), trail:"+trail,module); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -152,7 +152,7 @@ public class LimitedSubContentCacheTrans } catch (MiniLangException | GenericEntityException e) { throw new RuntimeException(e.getMessage(), e); } - List<GenericValue> longList = UtilGenerics.checkList(results.get("entityList")); + List<GenericValue> longList = UtilGenerics.cast(results.get("entityList")); templateRoot.put("entityList", longList); return new LoopWriter(out) { @@ -183,7 +183,7 @@ public class LimitedSubContentCacheTrans @Override public int afterBody() throws TemplateModelException, IOException { FreeMarkerWorker.reloadValues(templateRoot, savedValues, env); - List<Map<String, ? extends Object>> list = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> list = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); List<Map<String, ? extends Object>> subList = list.subList(0, list.size() - 1); templateRoot.put("globalNodeTrail", subList); env.setVariable("globalNodeTrail", FreeMarkerWorker.autoWrap(subList, env)); @@ -227,7 +227,7 @@ public class LimitedSubContentCacheTrans Boolean isFollowObj = (Boolean) trailNode.get("isFollow"); if ((isReturnBeforeObj == null || !isReturnBeforeObj) && ((isPickObj != null && isPickObj) || (isFollowObj != null && isFollowObj))) { - List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(ctx.get("globalNodeTrail")); + List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.cast(ctx.get("globalNodeTrail")); if (globalNodeTrail == null) { globalNodeTrail = new LinkedList<>(); } @@ -257,7 +257,7 @@ public class LimitedSubContentCacheTrans public GenericValue getRandomEntity() { GenericValue pickEntity = null; - List<GenericValue> lst = UtilGenerics.checkList(templateRoot.get("entityList")); + List<GenericValue> lst = UtilGenerics.cast(templateRoot.get("entityList")); if (Debug.verboseOn()) { Debug.logVerbose("in limited, lst:" + lst, ""); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Sat Jul 20 16:35:13 2019 @@ -82,7 +82,7 @@ public class LoopSubContentTransform imp } public static boolean prepCtx(Delegator delegator, Map<String, Object> ctx) { - List<GenericValue> lst = UtilGenerics.checkList(ctx.get("entityList")); + List<GenericValue> lst = UtilGenerics.cast(ctx.get("entityList")); Integer idx = (Integer) ctx.get("entityIndex"); if (idx == null) { idx = 0; @@ -186,7 +186,7 @@ public class LoopSubContentTransform imp //DEJ20080730 Should always use contentId, not subContentId since we're searching for that and it is confusing String thisMapKey = (String)templateCtx.get("mapKey"); Map<String, Object> results = ContentServicesComplex.getAssocAndContentAndDataResourceMethod(delegator, thisContentId, thisMapKey, null, fromDate, null, null, null, assocTypes, null); - List<GenericValue> entityList = UtilGenerics.checkList(results.get("entityList")); + List<GenericValue> entityList = UtilGenerics.cast(results.get("entityList")); templateCtx.put("entityList", entityList); return new LoopWriter(out) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java Sat Jul 20 16:35:13 2019 @@ -95,7 +95,7 @@ public class RenderContentAsText impleme @Override public void close() throws IOException { - List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); if (Debug.verboseOn()) { Debug.logVerbose("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Sat Jul 20 16:35:13 2019 @@ -94,7 +94,7 @@ public class RenderSubContentAsText impl @Override public void close() throws IOException { - List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); if (Debug.infoOn()) { Debug.logInfo("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -68,7 +68,7 @@ public class RenderSubContentCacheTransf FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); FreeMarkerWorker.overrideWithArgs(templateRoot, args); final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env); - List<Map<String, ? extends Object>> trail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> trail = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId"); String strNullThruDatesOnly = (String)templateRoot.get("nullThruDatesOnly"); Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && "true".equalsIgnoreCase(strNullThruDatesOnly)) ? Boolean.TRUE :Boolean.FALSE; @@ -134,7 +134,7 @@ public class RenderSubContentCacheTransf } public void renderSubContent() throws IOException { - List<Map<String, ? extends Object>> passedGlobalNodeTrail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> passedGlobalNodeTrail = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); String editRequestName = (String)templateRoot.get("editRequestName"); GenericValue thisView = null; if (view != null) { 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -92,7 +92,7 @@ public class TraverseSubContentCacheTran final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); FreeMarkerWorker.getSiteParameters(request, templateRoot); final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env); - List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); String strNullThruDatesOnly = (String)templateRoot.get("nullThruDatesOnly"); String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId"); Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && "true".equalsIgnoreCase(strNullThruDatesOnly)) ? Boolean.TRUE :Boolean.FALSE; @@ -149,7 +149,7 @@ public class TraverseSubContentCacheTran public int onStart() throws TemplateModelException, IOException { List<Map<String, ? extends Object>> nodeTrail = null; Map<String, Object> node = null; - List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); + List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.cast(templateRoot.get("globalNodeTrail")); if (globalNodeTrail.size() > 0) { int sz = globalNodeTrail.size() ; nodeTrail = new LinkedList<>(); @@ -208,7 +208,7 @@ public class TraverseSubContentCacheTran } public void populateContext(Map<String, Object> traverseContext, Map<String, Object> templateContext) { - List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail")); + List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.cast(traverseContext.get("nodeTrail")); int sz = nodeTrail.size(); Map<String, ? extends Object> node = nodeTrail.get(sz - 1); GenericValue content = (GenericValue)node.get("value"); @@ -220,7 +220,7 @@ public class TraverseSubContentCacheTran String mapKey = (String)node.get("mapKey"); envWrap("mapKey", mapKey); envWrap("subContentDataResourceView", null); - List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(templateContext.get("nodeTrail")); + List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.cast(templateContext.get("nodeTrail")); String contentIdEnd = null; String contentIdStart = null; if (globalNodeTrail != null) { 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -180,7 +180,7 @@ public class TraverseSubContentTransform @Override public int afterBody() throws TemplateModelException, IOException { - List<Map<String, Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail")); + List<Map<String, Object>> nodeTrail = UtilGenerics.cast(traverseContext.get("nodeTrail")); ContentWorker.traceNodeTrail("6",nodeTrail); boolean inProgress = ContentWorker.traverseSubContent(traverseContext); ContentWorker.traceNodeTrail("7",nodeTrail); @@ -249,7 +249,7 @@ public class TraverseSubContentTransform } assocContext.put("typeAncestry", contentTypeAncestry); Map<String, Object> whenMap = UtilGenerics.cast(traverseContext.get("whenMap")); - List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail")); + List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.cast(traverseContext.get("nodeTrail")); int indentSz = indent + nodeTrail.size(); assocContext.put("indentObj", indentSz); isPick = ContentWorker.checkWhen(assocContext, (String)whenMap.get("pickWhen"), true); @@ -257,7 +257,7 @@ public class TraverseSubContentTransform } public void populateContext(Map<String, Object> traverseContext, Map<String, Object> templateContext) { - List<Map<String, Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail")); + List<Map<String, Object>> nodeTrail = UtilGenerics.cast(traverseContext.get("nodeTrail")); int sz = nodeTrail.size(); Map<String, Object> node = nodeTrail.get(sz - 1); String contentId = (String)node.get("contentId"); 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -98,7 +98,7 @@ public class WrapSubContentCacheTransfor FreeMarkerWorker.overrideWithArgs(templateCtx, args); final String wrapTemplateId = (String)templateCtx.get("wrapTemplateId"); final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env); - List<Map<String, ? extends Object>> trail = UtilGenerics.checkList(templateCtx.get("globalNodeTrail")); + List<Map<String, ? extends Object>> trail = UtilGenerics.cast(templateCtx.get("globalNodeTrail")); String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId"); String strNullThruDatesOnly = (String)templateCtx.get("nullThruDatesOnly"); Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && "true".equalsIgnoreCase(strNullThruDatesOnly)) ? Boolean.TRUE :Boolean.FALSE; Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java?rev=1863501&r1=1863500&r2=1863501&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java Sat Jul 20 16:35:13 2019 @@ -293,7 +293,7 @@ public class BOMNode { Debug.logError(errorMessage, module); throw new GenericEntityException(errorMessage); } - List<GenericValue> variantProducts = UtilGenerics.checkList(storeResult.get("products")); + List<GenericValue> variantProducts = UtilGenerics.cast(storeResult.get("products")); if (variantProducts.size() == 1) { variantProduct = variantProducts.get(0); } 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=1863501&r1=1863500&r2=1863501&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:35:13 2019 @@ -533,7 +533,7 @@ public class BOMServices { List<Map<String, Object>> orderShipmentReadMapList = new LinkedList<>(); partyOrderShipments.put(partyId, orderShipmentReadMapList); } - List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipments.get(partyId)); + List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.cast(partyOrderShipments.get(partyId)); orderShipmentReadMapList.add(orderShipmentReadMap); } } @@ -541,7 +541,7 @@ public class BOMServices { // For each party: try to expand the shipment item products // (search for components that needs to be packaged). for (Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { - List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); + List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.cast(partyOrderShipment.getValue()); for (int i = 0; i < orderShipmentReadMapList.size(); i++) { Map<String, Object> orderShipmentReadMap = UtilGenerics.cast(orderShipmentReadMapList.get(i)); GenericValue orderShipment = (GenericValue)orderShipmentReadMap.get("orderShipment"); @@ -560,7 +560,7 @@ public class BOMServices { } catch (GenericServiceException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingPackageConfiguratorError", locale)); } - List<BOMNode> productsInPackages = UtilGenerics.checkList(serviceResult.get("productsInPackages")); + List<BOMNode> productsInPackages = UtilGenerics.cast(serviceResult.get("productsInPackages")); if (productsInPackages.size() == 1) { BOMNode root = productsInPackages.get(0); String rootProductId = (root.getSubstitutedNode() != null? root.getSubstitutedNode().getProduct().getString("productId"): root.getProduct().getString("productId")); @@ -581,12 +581,12 @@ public class BOMServices { Map<String, GenericValue> boxTypes = new HashMap<>(); for (Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { Map<String, List<Map<String, Object>>> boxTypeContent = new HashMap<>(); - List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); + List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.cast(partyOrderShipment.getValue()); for (int i = 0; i < orderShipmentReadMapList.size(); 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")); + List<BOMNode> productsInPackages = UtilGenerics.cast(orderShipmentReadMap.get("productsInPackages")); if (productsInPackages != null) { // there are subcomponents: // this is a multi package shipment item @@ -609,7 +609,7 @@ public class BOMServices { List<Map<String, Object>> box = new LinkedList<>(); boxTypeContent.put(boxTypeId, box); } - List<Map<String, Object>> boxTypeContentList = UtilGenerics.checkList(boxTypeContent.get(boxTypeId)); + List<Map<String, Object>> boxTypeContentList = UtilGenerics.cast(boxTypeContent.get(boxTypeId)); boxTypeContentList.add(boxTypeContentMap); } } @@ -639,7 +639,7 @@ public class BOMServices { List<Map<String, Object>> box = new LinkedList<>(); boxTypeContent.put(boxTypeId, box); } - List<Map<String, Object>> boxTypeContentList = UtilGenerics.checkList(boxTypeContent.get(boxTypeId)); + List<Map<String, Object>> boxTypeContentList = UtilGenerics.cast(boxTypeContent.get(boxTypeId)); boxTypeContentList.add(boxTypeContentMap); } } @@ -647,7 +647,7 @@ public class BOMServices { // The packages and package contents are created. for (Map.Entry<String, List<Map<String, Object>>> boxTypeContentEntry : boxTypeContent.entrySet()) { String boxTypeId = boxTypeContentEntry.getKey(); - List<Map<String, Object>> contentList = UtilGenerics.checkList(boxTypeContentEntry.getValue()); + List<Map<String, Object>> contentList = UtilGenerics.cast(boxTypeContentEntry.getValue()); GenericValue boxType = boxTypes.get(boxTypeId); BigDecimal boxWidth = boxType.getBigDecimal("boxLength"); BigDecimal totalWidth = BigDecimal.ZERO; @@ -659,7 +659,7 @@ public class BOMServices { 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")); + List<BOMNode> productsInPackages = UtilGenerics.cast(content.get("productsInPackages")); GenericValue orderShipment = (GenericValue)content.get("orderShipment"); GenericValue product = null; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |