svn commit: r1857906 [4/9] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1857906 [4/9] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -81,12 +81,12 @@ public class ProductionRunServices { * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> cancelProductionRun(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); String productionRunId = (String) context.get("productionRunId"); ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); @@ -99,7 +99,7 @@ public class ProductionRunServices { if ("PRUN_CREATED".equals(currentStatusId) || "PRUN_DOC_PRINTED".equals(currentStatusId) || "PRUN_SCHEDULED".equals(currentStatusId)) { try { // First of all, make sure that there aren't production runs that depend on this one. - List<ProductionRun> mandatoryWorkEfforts = new LinkedList<ProductionRun>(); + List<ProductionRun> mandatoryWorkEfforts = new LinkedList<>(); ProductionRunHelper.getLinkedProductionRuns(delegator, dispatcher, productionRunId, mandatoryWorkEfforts); for (int i = 1; i < mandatoryWorkEfforts.size(); i++) { GenericValue mandatoryWorkEffort = (mandatoryWorkEfforts.get(i)).getGenericValue(); @@ -107,7 +107,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChangedMandatoryProductionRunFound", locale)); } } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); // change the production run (header) status to PRUN_CANCELLED serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_CANCELLED"); @@ -188,7 +188,7 @@ public class ProductionRunServices { * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> createProductionRun(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -250,7 +250,7 @@ public class ProductionRunServices { // The components are retrieved using the getManufacturingComponents service // (that performs a bom breakdown and if needed runs the configurator). List<BOMNode> components = null; - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.put("productId", productId); // the product that we want to manufacture serviceContext.put("quantity", pRQuantity); // the quantity that we want to manufacture serviceContext.put("userLogin", userLogin); @@ -598,12 +598,12 @@ public class ProductionRunServices { } public static Map<String, Object> changeProductionRunStatus(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); String productionRunId = (String) context.get("productionRunId"); String statusId = (String) context.get("statusId"); @@ -622,7 +622,7 @@ public class ProductionRunServices { // PRUN_CREATED --> PRUN_SCHEDULED if ("PRUN_CREATED".equals(currentStatusId) && "PRUN_SCHEDULED".equals(statusId)) { // change the production run status to PRUN_SCHEDULED - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", statusId); @@ -660,7 +660,7 @@ public class ProductionRunServices { // PRUN_CREATED or PRUN_SCHEDULED --> PRUN_DOC_PRINTED if (("PRUN_CREATED".equals(currentStatusId) || "PRUN_SCHEDULED".equals(currentStatusId)) && (statusId == null || "PRUN_DOC_PRINTED".equals(statusId))) { // change only the production run (header) status to PRUN_DOC_PRINTED - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_DOC_PRINTED"); @@ -718,7 +718,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChanged", locale)); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_RUNNING"); @@ -742,7 +742,7 @@ public class ProductionRunServices { // this should be called only when the last task is completed if ("PRUN_RUNNING".equals(currentStatusId) && (statusId == null || "PRUN_COMPLETED".equals(statusId))) { // change only the production run (header) status to PRUN_COMPLETED - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_COMPLETED"); @@ -765,7 +765,7 @@ public class ProductionRunServices { // PRUN_COMPLETED --> PRUN_CLOSED if ("PRUN_COMPLETED".equals(currentStatusId) && (statusId == null || "PRUN_CLOSED".equals(statusId))) { // change the production run status to PRUN_CLOSED - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_CLOSED"); @@ -805,7 +805,7 @@ public class ProductionRunServices { } public static Map<String, Object> changeProductionRunTaskStatus(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -813,7 +813,7 @@ public class ProductionRunServices { String productionRunId = (String) context.get("productionRunId"); String taskId = (String) context.get("workEffortId"); String statusId = (String) context.get("statusId"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); Boolean issueAllComponents = (Boolean) context.get("issueAllComponents"); if (issueAllComponents == null) { issueAllComponents = Boolean.FALSE; @@ -866,7 +866,7 @@ public class ProductionRunServices { if ("PRUN_CREATED".equals(productionRun.getGenericValue().getString("currentStatusId"))) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunTaskCannotStartDocsNotPrinted", locale)); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", taskId); serviceContext.put("currentStatusId", "PRUN_RUNNING"); @@ -905,7 +905,7 @@ public class ProductionRunServices { // PRUN_RUNNING --> PRUN_COMPLETED // this should be called only when the last task is completed if ("PRUN_RUNNING".equals(currentStatusId) && (statusId == null || "PRUN_COMPLETED".equals(statusId))) { - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); if (issueAllComponents) { // Issue all the components, if this task needs components and they still need to be issued try { @@ -1076,7 +1076,7 @@ public class ProductionRunServices { } public static Map<String, Object> getWorkEffortCosts(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); String workEffortId = (String)context.get("workEffortId"); Locale locale = (Locale) context.get("locale"); @@ -1110,7 +1110,7 @@ public class ProductionRunServices { } public static Map<String, Object> getProductionRunCost(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1154,7 +1154,7 @@ public class ProductionRunServices { LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); // this is the id of the actual (real) production run task String productionRunTaskId = (String)context.get("productionRunTaskId"); try { @@ -1275,7 +1275,7 @@ public class ProductionRunServices { } // materials costs: these are the costs derived from the materials used by the production run task try { - Map<String, BigDecimal> materialsCostByCurrency = new HashMap<String, BigDecimal>(); + Map<String, BigDecimal> materialsCostByCurrency = new HashMap<>(); for (GenericValue inventoryConsumed : EntityQuery.use(delegator).from("WorkEffortAndInventoryAssign") .where("workEffortId", productionRunTaskId).queryList()) { BigDecimal quantity = inventoryConsumed.getBigDecimal("quantity"); @@ -1329,7 +1329,7 @@ public class ProductionRunServices { LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); String productionRunId = (String) context.get("productionRunId"); String routingTaskId = (String) context.get("routingTaskId"); if (! UtilValidate.isEmpty(productionRunId) && ! UtilValidate.isEmpty(routingTaskId)) { @@ -1399,7 +1399,7 @@ public class ProductionRunServices { } public static Map<String, Object> addProductionRunComponent(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Timestamp now = UtilDateTime.nowTimestamp(); @@ -1449,7 +1449,7 @@ public class ProductionRunServices { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", workEffortId); serviceContext.put("productId", productId); @@ -1473,7 +1473,7 @@ public class ProductionRunServices { } public static Map<String, Object> updateProductionRunComponent(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -1526,7 +1526,7 @@ public class ProductionRunServices { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", theComponent.getString("workEffortId")); serviceContext.put("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"); @@ -1550,7 +1550,7 @@ public class ProductionRunServices { } public static Map<String, Object> addProductionRunRoutingTask(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -1626,7 +1626,7 @@ public class ProductionRunServices { long totalTime = ProductionRun.getEstimatedTaskTime(routingTask, pRQuantity, dispatcher); estimatedCompletionDate = TechDataServices.addForward(TechDataServices.getTechDataCalendar(routingTask), estimatedStartDate, totalTime); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("priority", priority); serviceContext.put("workEffortPurposeTypeId", routingTask.get("workEffortPurposeTypeId")); @@ -1700,7 +1700,7 @@ public class ProductionRunServices { } public static Map<String, Object> productionRunProduce(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -1729,7 +1729,7 @@ public class ProductionRunServices { autoCreateLot = Boolean.FALSE; } - List<String> inventoryItemIds = new LinkedList<String>(); + List<String> inventoryItemIds = new LinkedList<>(); result.put("inventoryItemIds", inventoryItemIds); // The production run is loaded ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); @@ -1857,7 +1857,7 @@ public class ProductionRunServices { , "facilityId", facility.get("facilityId")).queryOne(); if (productFacility == null) { - Map<String, Object> createProductFacilityCtx = new HashMap<String, Object>(); + Map<String, Object> createProductFacilityCtx = new HashMap<>(); createProductFacilityCtx.put("productId", productionRun.getProductProduced().getString("productId")); createProductFacilityCtx.put("facilityId", facility.get("facilityId")); createProductFacilityCtx.put("userLogin", userLogin); @@ -1918,7 +1918,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); } // Recompute reservations - serviceContext = new HashMap<String, Object>(); + serviceContext = new HashMap<>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); serviceResult = dispatcher.runSync("balanceInventoryItems", serviceContext); @@ -1971,7 +1971,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); } // Recompute reservations - serviceContext = new HashMap<String, Object>(); + serviceContext = new HashMap<>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); if (orderItem != null) { @@ -2009,7 +2009,7 @@ public class ProductionRunServices { } public static Map<String, Object> productionRunDeclareAndProduce(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -2066,7 +2066,7 @@ public class ProductionRunServices { } } try { - Map<String, Object> inputMap = new HashMap<String, Object>(); + Map<String, Object> inputMap = new HashMap<>(); inputMap.putAll(context); inputMap.remove("componentsLocationMap"); result = dispatcher.runSync("productionRunProduce", inputMap); @@ -2081,7 +2081,7 @@ public class ProductionRunServices { } public static Map<String, Object> productionRunTaskProduce(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2109,7 +2109,7 @@ public class ProductionRunServices { ProductionRun productionRun = new ProductionRun(productionRunTaskId, delegator, dispatcher); facilityId = productionRun.getGenericValue().getString("facilityId"); } - List<String> inventoryItemIds = new LinkedList<String>(); + List<String> inventoryItemIds = new LinkedList<>(); if ("SERIALIZED_INV_ITEM".equals(inventoryItemTypeId)) { try { int numOfItems = quantity.intValue(); @@ -2154,7 +2154,7 @@ public class ProductionRunServices { } inventoryItemIds.add(inventoryItemId); // Recompute reservations - serviceContext = new HashMap<String, Object>(); + serviceContext = new HashMap<>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); serviceResult = dispatcher.runSync("balanceInventoryItems", serviceContext); @@ -2209,7 +2209,7 @@ public class ProductionRunServices { } inventoryItemIds.add(inventoryItemId); // Recompute reservations - serviceContext = new HashMap<String, Object>(); + serviceContext = new HashMap<>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); serviceResult = dispatcher.runSync("balanceInventoryItems", serviceContext); @@ -2292,7 +2292,7 @@ public class ProductionRunServices { } public static Map<String, Object> updateProductionRunTask(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -2426,7 +2426,7 @@ public class ProductionRunServices { // Create a new TimeEntry try { - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("workEffortId", workEffortId); if (addTaskTime != null) { @@ -2493,7 +2493,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunFromRequirement(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -2521,7 +2521,7 @@ public class ProductionRunServices { if (quantity == null) { quantity = requirement.getBigDecimal("quantity"); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("productId", requirement.getString("productId")); serviceContext.put("quantity", quantity); @@ -2559,7 +2559,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunFromConfiguration(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -2593,7 +2593,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.clear(); serviceContext.put("productId", instanceProductId); serviceContext.put("pRQuantity", quantity); @@ -2612,7 +2612,7 @@ public class ProductionRunServices { String productionRunId = (String)serviceResult.get("productionRunId"); result.put("productionRunId", productionRunId); - Map<String, BigDecimal> components = new HashMap<String, BigDecimal>(); + Map<String, BigDecimal> components = new HashMap<>(); for (ConfigOption co : config.getSelectedOptions()) { for (GenericValue selComponent : co.getComponents()) { BigDecimal componentQuantity = null; @@ -2704,7 +2704,7 @@ public class ProductionRunServices { componentQuantity = BigDecimal.ONE; } serviceResult = null; - serviceContext = new HashMap<String, Object>(); + serviceContext = new HashMap<>(); serviceContext.put("productionRunId", productionRunId); serviceContext.put("productId", productId); serviceContext.put("estimatedQuantity", componentQuantity); @@ -2731,7 +2731,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunForMktgPkg(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -2789,7 +2789,7 @@ public class ProductionRunServices { // how many should we produce? If there already is some inventory, then just produce enough to bring ATP back up to zero. BigDecimal qtyRequired = BigDecimal.ZERO.subtract(existingAtp); // ok so that's how many we WANT to produce, but let's check how many we can actually produce based on the available components - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.put("productId", orderItem.getString("productId")); serviceContext.put("facilityId", facilityId); serviceContext.put("userLogin", userLogin); @@ -2855,7 +2855,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunsForOrder(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -2908,7 +2908,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, "OrderProblemsReadingOrderItemInformation", UtilMisc.toMap("errorString", gee.getMessage()), locale)); } } - List<String> productionRuns = new LinkedList<String>(); + List<String> productionRuns = new LinkedList<>(); for (int i = 0; i < orderItems.size(); i++) { GenericValue orderItemOrShipGroupAssoc = orderItems.get(i); String productId = null; @@ -2966,7 +2966,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturinWorkOrderItemFulfillmentError", UtilMisc.toMap("errorString", gee.getMessage()), locale)); } try { - List<BOMNode> components = new LinkedList<BOMNode>(); + List<BOMNode> components = new LinkedList<>(); BOMTree tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.setRootAmount(amount); @@ -2981,7 +2981,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunsForProductBom(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin =(GenericValue)context.get("userLogin"); @@ -2998,7 +2998,7 @@ public class ProductionRunServices { quantity = BigDecimal.ONE; } try { - List<BOMNode> components = new LinkedList<BOMNode>(); + List<BOMNode> components = new LinkedList<>(); BOMTree tree = new BOMTree(productId, "MANUF_COMPONENT", startDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.setRootAmount(BigDecimal.ZERO); @@ -3010,7 +3010,7 @@ public class ProductionRunServices { if (workEffortId == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunIsNotRequiredForProductId", UtilMisc.toMap("productId", productId, "startDate", startDate), locale)); } - List<String> productionRuns = new LinkedList<String>(); + List<String> productionRuns = new LinkedList<>(); result.put("productionRuns" , productionRuns); result.put("productionRunId" , workEffortId); return result; @@ -3034,7 +3034,7 @@ public class ProductionRunServices { String taskId = (String) context.get("taskId"); try { - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); Map<String, Object> serviceResult = null; GenericValue task = EntityQuery.use(delegator).from("WorkEffort").where("workEffortId", taskId).queryOne(); String currentStatusId = task.getString("currentStatusId"); @@ -3096,7 +3096,7 @@ public class ProductionRunServices { oneTask = tasks.get(i); taskId = oneTask.getString("workEffortId"); try { - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.put("productionRunId", productionRunId); serviceContext.put("taskId", taskId); serviceContext.put("userLogin", userLogin); @@ -3165,13 +3165,13 @@ public class ProductionRunServices { LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); String productionRunId = (String) context.get("productionRunId"); String statusId = (String) context.get("statusId"); String startAllTasks = (String) context.get("startAllTasks"); try { - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); // Change the task status to running if ("PRUN_DOC_PRINTED".equals(statusId) || @@ -3257,13 +3257,13 @@ public class ProductionRunServices { } BigDecimal totQty = BigDecimal.ZERO; try { - List<EntityCondition> findOutgoingProductionRunsConds = new LinkedList<EntityCondition>(); + List<EntityCondition> findOutgoingProductionRunsConds = new LinkedList<>(); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "WEGS_CREATED")); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.LESS_THAN_EQUAL_TO, startDate)); - List<EntityCondition> findOutgoingProductionRunsStatusConds = new LinkedList<EntityCondition>(); + List<EntityCondition> findOutgoingProductionRunsStatusConds = new LinkedList<>(); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_CREATED")); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_SCHEDULED")); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_DOC_PRINTED")); @@ -3296,7 +3296,7 @@ public class ProductionRunServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); String inventoryItemId = (String)context.get("inventoryItemId"); Locale locale = (Locale) context.get("locale"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); try { GenericValue inventoryItem = EntityQuery.use(delegator).from("InventoryItem").where("inventoryItemId", inventoryItemId).queryOne(); if (inventoryItem == null) { @@ -3331,7 +3331,7 @@ public class ProductionRunServices { } public static Map<String, Object> decomposeInventoryItem(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Timestamp now = UtilDateTime.nowTimestamp(); @@ -3340,7 +3340,7 @@ public class ProductionRunServices { // Mandatory input fields String inventoryItemId = (String)context.get("inventoryItemId"); BigDecimal quantity = (BigDecimal)context.get("quantity"); - List<String> inventoryItemIds = new LinkedList<String>(); + List<String> inventoryItemIds = new LinkedList<>(); try { GenericValue inventoryItem = EntityQuery.use(delegator).from("InventoryItem") .where("inventoryItemId", inventoryItemId).queryOne(); @@ -3458,7 +3458,7 @@ public class ProductionRunServices { Delegator delegator = ctx.getDelegator(); Timestamp now = UtilDateTime.nowTimestamp(); Locale locale = (Locale) context.get("locale"); - Map<String, TreeMap<Timestamp, Object>> products = new HashMap<String, TreeMap<Timestamp,Object>>(); + Map<String, TreeMap<Timestamp, Object>> products = new HashMap<>(); try { List<GenericValue> resultList = EntityQuery.use(delegator).from("WorkEffortAndGoods") @@ -3546,7 +3546,7 @@ public class ProductionRunServices { } // backorders - List<EntityCondition> backordersCondList = new LinkedList<EntityCondition>(); + List<EntityCondition> backordersCondList = new LinkedList<>(); backordersCondList.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.NOT_EQUAL, null)); backordersCondList.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.GREATER_THAN, BigDecimal.ZERO)); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -89,7 +89,7 @@ public class MrpServices { } // Proposed requirements are deleted - List<GenericValue> listResultRoles = new LinkedList<GenericValue>(); + List<GenericValue> listResultRoles = new LinkedList<>(); try { listResult = EntityQuery.use(delegator).from("Requirement") .where("requirementTypeId", "PRODUCT_REQUIREMENT","facilityId", facilityId, @@ -98,7 +98,7 @@ public class MrpServices { } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpEventFindError", locale)); } - List<GenericValue> requirementStatus = new ArrayList<GenericValue>(); + List<GenericValue> requirementStatus = new ArrayList<>(); if (listResult != null) { try { for (GenericValue tmpRequirement : listResult) { @@ -482,7 +482,7 @@ public class MrpServices { } } } - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); Debug.logInfo("return from initMrpEvent", module); return result; @@ -842,8 +842,8 @@ public class MrpServices { // if there are 3 levels with no inventoryEvenPanned we stop } while (bomLevelWithNoEvent < 3); - result = new HashMap<String, Object>(); - List<Object> msgResult = new LinkedList<Object>(); + result = new HashMap<>(); + List<Object> msgResult = new LinkedList<>(); result.put("msgResult", msgResult); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); Debug.logInfo("return from executeMrp", module); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -126,7 +126,7 @@ public class ProposedOrder { if (routing == null) { // try to find a routing linked to the virtual product BOMTree tree = null; - List<BOMNode> components = new LinkedList<BOMNode>(); + List<BOMNode> components = new LinkedList<>(); try { tree = new BOMTree(product.getString("productId"), "MANUF_COMPONENT", requiredByDate, BOMTree.EXPLOSION_SINGLE_LEVEL, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); @@ -151,7 +151,7 @@ public class ProposedOrder { } } if (routing != null) { - result = new HashMap<String, Object>(); + result = new HashMap<>(); //Looks for all the routingTask (ordered by inversed (begin from the end) sequence number) if (listRoutingTaskAssoc == null) { try { @@ -237,7 +237,7 @@ public class ProposedOrder { Map<String, Object> parameters = UtilMisc.<String, Object>toMap("userLogin", userLogin); if (isBuilt) { try { - List<BOMNode> bom = new LinkedList<BOMNode>(); + List<BOMNode> bom = new LinkedList<>(); BOMTree tree = new BOMTree(productId, "MANUF_COMPONENT", null, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.print(bom); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java Sun Apr 21 12:49:52 2019 @@ -50,7 +50,7 @@ public class RoutingServices { * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> getEstimatedTaskTime(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java Sun Apr 21 12:49:52 2019 @@ -63,13 +63,13 @@ public class TechDataServices { */ public static Map<String, Object> lookupRoutingTask(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Locale locale = (Locale) context.get("locale"); String workEffortName = (String) context.get("workEffortName"); String fixedAssetId = (String) context.get("fixedAssetId"); List<GenericValue> listRoutingTask = null; - List<EntityExpr> constraints = new LinkedList<EntityExpr>(); + List<EntityExpr> constraints = new LinkedList<>(); if (UtilValidate.isNotEmpty(workEffortName)) { constraints.add(EntityCondition.makeCondition("workEffortName", EntityOperator.GREATER_THAN_EQUAL_TO, workEffortName)); @@ -90,7 +90,7 @@ public class TechDataServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingTechDataWorkEffortNotExist", UtilMisc.toMap("errorString", e.toString()), locale)); } if (listRoutingTask == null) { - listRoutingTask = new LinkedList<GenericValue>(); + listRoutingTask = new LinkedList<>(); } if (listRoutingTask.size() == 0) { //FIXME is it correct ? @@ -110,7 +110,7 @@ public class TechDataServices { */ public static Map<String, Object> checkRoutingTaskAssoc(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); String sequenceNumNotOk = "N"; Locale locale = (Locale) context.get("locale"); String workEffortIdFrom = (String) context.get("workEffortIdFrom"); @@ -216,7 +216,7 @@ public class TechDataServices { * @return a map with the capacity (Double) available and moveDay (int): the number of day it's necessary to move to have capacity available */ public static Map<String, Object> dayStartCapacityAvailable(GenericValue techDataCalendarWeek, int dayStart) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); int moveDay = 0; Double capacity = null; Time startTime = null; @@ -299,7 +299,7 @@ public class TechDataServices { * @return a map with Timestamp dateTo, Double nextCapacity */ public static Map<String, Object> startNextDay(GenericValue techDataCalendar, Timestamp dateFrom) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Timestamp dateTo = null; GenericValue techDataCalendarWeek = null; // TODO read TechDataCalendarExcWeek to manage execption week (maybe it's needed to refactor the entity definition @@ -349,7 +349,7 @@ public class TechDataServices { amount = 0; } else amount -= nextCapacity; - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); while (amount > 0) { result = startNextDay(techDataCalendar, dateTo); dateTo = (Timestamp) result.get("dateTo"); @@ -370,7 +370,7 @@ public class TechDataServices { * @return a map with the capacity (Double) available, the startTime and moveDay (int): the number of day it's necessary to move to have capacity available */ public static Map<String, Object> dayEndCapacityAvailable(GenericValue techDataCalendarWeek, int dayEnd) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); int moveDay = 0; Double capacity = null; Time startTime = null; @@ -453,7 +453,7 @@ public class TechDataServices { * @return a map with Timestamp dateTo, Double previousCapacity */ public static Map<String, Object> endPreviousDay(GenericValue techDataCalendar, Timestamp dateFrom) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Timestamp dateTo = null; GenericValue techDataCalendarWeek = null; // TODO read TechDataCalendarExcWeek to manage exception week (maybe it's needed to refactor the entity definition @@ -505,7 +505,7 @@ public class TechDataServices { amount = 0; } else amount -= previousCapacity; - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); while (amount > 0) { result = endPreviousDay(techDataCalendar, dateTo); dateTo = (Timestamp) result.get("dateTo"); Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java Sun Apr 21 12:49:52 2019 @@ -46,11 +46,11 @@ public final class ReportHelper { * conversionRate - # orders/# visits */ public static List<Map<String, Object>> calcConversionRates(List<GenericValue> visits, List<GenericValue> orders, String keyFieldName) { - List<Map<String, Object>> conversionRates = new LinkedList<Map<String, Object>>(); + List<Map<String, Object>> conversionRates = new LinkedList<>(); // loop through all the visits for (GenericValue visit: visits) { - Map<String, Object> reportValue = new HashMap<String, Object>(); + Map<String, Object> reportValue = new HashMap<>(); reportValue.put(keyFieldName, visit.getString(keyFieldName)); reportValue.put("visits", visit.getLong("visitId")); // actually # of visits Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java Sun Apr 21 12:49:52 2019 @@ -456,7 +456,7 @@ public class TrackingCodeEvents { public static List<GenericValue> makeTrackingCodeOrders(HttpServletRequest request) { Delegator delegator = (Delegator) request.getAttribute("delegator"); java.sql.Timestamp nowStamp = UtilDateTime.nowTimestamp(); - List<GenericValue> trackingCodeOrders = new LinkedList<GenericValue>(); + List<GenericValue> trackingCodeOrders = new LinkedList<>(); Cookie[] cookies = request.getCookies(); Timestamp affiliateReferredTimeStamp = null; Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java Sun Apr 21 12:49:52 2019 @@ -83,10 +83,10 @@ public class VCard { ByteBuffer byteBuffer = (ByteBuffer) context.get("infile"); byte[] inputByteArray = byteBuffer.array(); InputStream in = new ByteArrayInputStream(inputByteArray); - Map<String, Object> serviceCtx = new HashMap<String, Object>(); + Map<String, Object> serviceCtx = new HashMap<>(); boolean isGroup = false; - List<Map<String, String>> partiesCreated = new ArrayList<Map<String,String>>(); - List<Map<String, String>> partiesExist = new ArrayList<Map<String,String>>(); + List<Map<String, String>> partiesCreated = new ArrayList<>(); + List<Map<String, String>> partiesExist = new ArrayList<>(); try (VCardReader vCardReader = new VCardReader(in)) { ezvcard.VCard vcard = null; Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java Sun Apr 21 12:49:52 2019 @@ -66,7 +66,7 @@ public class OrderManagerEvents { if (session.getAttribute("OFFLINE_PAYMENTS") != null) { String orderId = (String) request.getAttribute("orderId"); - List<GenericValue> toBeStored = new LinkedList<GenericValue>(); + List<GenericValue> toBeStored = new LinkedList<>(); List<GenericValue> paymentPrefs = null; GenericValue placingCustomer = null; try { @@ -217,7 +217,7 @@ public class OrderManagerEvents { } } - List<GenericValue> toBeStored = new LinkedList<GenericValue>(); + List<GenericValue> toBeStored = new LinkedList<>(); for (GenericValue paymentMethodType : paymentMethodTypes) { String paymentMethodTypeId = paymentMethodType.getString("paymentMethodTypeId"); String amountStr = request.getParameter(paymentMethodTypeId + "_amount"); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java Sun Apr 21 12:49:52 2019 @@ -595,7 +595,7 @@ public class OrderReturnServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); String returnId = (String) context.get("returnId"); Locale locale = (Locale) context.get("locale"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); GenericValue returnHeader = null; List<GenericValue> returnItems = null; 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -2007,7 +2007,7 @@ public class OrderServices { LocalDispatcher dispatcher = ctx.getDispatcher(); Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); - Map<String, Object> resp = new HashMap<String, Object>(); + Map<String, Object> resp = new HashMap<>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); BigDecimal cancelQuantity = (BigDecimal) context.get("cancelQuantity"); String orderId = (String) context.get("orderId"); @@ -6300,7 +6300,7 @@ public class OrderServices { String orderId = (String) context.get("orderId"); OrderReadHelper orh = new OrderReadHelper(delegator, orderId); List<GenericValue> orderItems = orh.getOrderItems(); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); // In order to improve efficiency a little bit, we will always create the ProductAssoc records // with productId < productIdTo when the two are compared. This way when checking for an existing // record we don't have to check both possible combinations of productIds 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -58,7 +58,7 @@ public class QuoteServices { String note = (String) context.get("note"); // prepare the order information - Map<String, Object> sendMap = new HashMap<String, Object>(); + Map<String, Object> sendMap = new HashMap<>(); // get the quote and store GenericValue quote = null; @@ -165,11 +165,11 @@ public class QuoteServices { List<GenericValue> quoteWorkEfforts = UtilGenerics.checkList(context.get("quoteWorkEfforts")); List<GenericValue> quoteAdjustments = UtilGenerics.checkList(context.get("quoteAdjustments")); Locale locale = (Locale) context.get("locale"); - Map<String, Object> serviceResult = new HashMap<String, Object>(); + Map<String, Object> serviceResult = new HashMap<>(); //TODO create Quote Terms still to be implemented //TODO create Quote Term Attributes still to be implemented - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); try { Map<String, Object> quoteIn = UtilMisc.toMap("quoteTypeId", quoteTypeId, "partyId", partyId, "issueDate", issueDate, "statusId", statusId, "currencyUomId", currencyUomId); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -96,23 +96,23 @@ public class RequirementServices { .queryList(); // maps to cache the associated suppliers and products data, so we don't do redundant DB and service requests - Map<String, GenericValue> suppliers = new HashMap<String, GenericValue>(); - Map<String, GenericValue> gids = new HashMap<String, GenericValue>(); - Map<String, Map<String, Object>> inventories = new HashMap<String, Map<String,Object>>(); - Map<String, BigDecimal> productsSold = new HashMap<String, BigDecimal>(); + Map<String, GenericValue> suppliers = new HashMap<>(); + Map<String, GenericValue> gids = new HashMap<>(); + Map<String, Map<String, Object>> inventories = new HashMap<>(); + Map<String, BigDecimal> productsSold = new HashMap<>(); // to count quantity, running total, and distinct products in list BigDecimal quantity = BigDecimal.ZERO; BigDecimal amountTotal = BigDecimal.ZERO; - Set<String> products = new HashSet<String>(); + Set<String> products = new HashSet<>(); // time period to count products ordered from, six months ago and the 1st of that month Timestamp timePeriodStart = UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp(), 0, -6); // join in fields with extra data about the suppliers and products - List<Map<String, Object>> requirements = new LinkedList<Map<String,Object>>(); + List<Map<String, Object>> requirements = new LinkedList<>(); for (GenericValue requirement : requirementAndRoles) { - Map<String, Object> union = new HashMap<String, Object>(); + Map<String, Object> union = new HashMap<>(); String productId = requirement.getString("productId"); partyId = requirement.getString("partyId"); String facilityId = requirement.getString("facilityId"); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java Sun Apr 21 12:49:52 2019 @@ -107,7 +107,7 @@ public class ShippingEstimateWrapper { } protected void loadEstimates(BigDecimal totalAllowance) { - this.shippingEstimates = new HashMap<GenericValue, BigDecimal>(); + this.shippingEstimates = new HashMap<>(); if (shippingMethods != null) { for (GenericValue shipMethod : shippingMethods) { String shippingMethodTypeId = shipMethod.getString("shipmentMethodTypeId"); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Sun Apr 21 12:49:52 2019 @@ -164,7 +164,7 @@ public class ShippingEvents { String productStoreId, String supplierPartyId, List<Map<String, Object>> itemInfo, BigDecimal shippableWeight, BigDecimal shippableQuantity, BigDecimal shippableTotal, String partyId, String productStoreShipMethId, BigDecimal totalAllowance) { String standardMessage = "A problem occurred calculating shipping. Fees will be calculated offline."; - List<String> errorMessageList = new LinkedList<String>(); + List<String> errorMessageList = new LinkedList<>(); if ("NO_SHIPPING".equals(shipmentMethodTypeId)) { return ServiceUtil.returnSuccess(); @@ -217,7 +217,7 @@ public class ShippingEvents { BigDecimal shippingTotal = BigDecimal.ZERO; // prepare the service invocation fields - Map<String, Object> serviceFields = new HashMap<String, Object>(); + Map<String, Object> serviceFields = new HashMap<>(); serviceFields.put("initialEstimateAmt", shippingTotal); serviceFields.put("shippableTotal", shippableTotal); serviceFields.put("shippableQuantity", shippableQuantity); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java Sun Apr 21 12:49:52 2019 @@ -327,7 +327,7 @@ public class ShoppingListEvents { Debug.logError(e, module); } - Map<String, Object> serviceInMap = new HashMap<String, Object>(); + Map<String, Object> serviceInMap = new HashMap<>(); serviceInMap.put("shoppingListId", request.getParameter("shoppingListId")); serviceInMap.put("shoppingListItemSeqId", request.getParameter("shoppingListItemSeqId")); serviceInMap.put("productId", request.getParameter("add_product_id")); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java Sun Apr 21 12:49:52 2019 @@ -581,7 +581,7 @@ public class ShoppingListServices { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); List<GenericValue> shoppingList = null; - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); try { shoppingList = EntityQuery.use(delegator).from("ShoppingList").where("partyId", null, "shoppingListTypeId", "SLT_SPEC_PURP").queryList(); } catch (GenericEntityException e) { 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -89,7 +89,7 @@ public class OrderTestServices { salesChannel = "WEB_SALES_CHANNEL"; } - List<String> productsList = new LinkedList<String>(); + List<String> productsList = new LinkedList<>(); try { if (UtilValidate.isNotEmpty(productId)) { productsList.add(productId); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -225,8 +225,8 @@ public class ZipSalesServices { String city = shippingAddress.getString("city"); // setup the return lists. - List<GenericValue> orderAdjustments = new LinkedList<GenericValue>(); - List<List<GenericValue>> itemAdjustments = new LinkedList<List<GenericValue>>(); + List<GenericValue> orderAdjustments = new LinkedList<>(); + List<List<GenericValue>> itemAdjustments = new LinkedList<>(); // check for a valid state/province geo String validStates = EntityUtilProperties.getPropertyValue("zipsales", "zipsales.valid.states", delegator); @@ -263,7 +263,7 @@ public class ZipSalesServices { } private static List<GenericValue>getItemTaxList(Delegator delegator, GenericValue item, String zipCode, String city, BigDecimal itemAmount, BigDecimal shippingAmount, boolean isUseTax) throws GeneralException { - List<GenericValue> adjustments = new LinkedList<GenericValue>(); + List<GenericValue> adjustments = new LinkedList<>(); // check the item for tax status if (item != null && item.get("taxable") != null && "N".equals(item.getString("taxable"))) { Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java Sun Apr 21 12:49:52 2019 @@ -214,7 +214,7 @@ public class PartyContentWrapper impleme } if (partyContent != null) { // when rendering the product content, always include the Product and ProductContent records that this comes from - Map<String, Object> inContext = new HashMap<String, Object>(); + Map<String, Object> inContext = new HashMap<>(); inContext.put("party", party); inContext.put("partyContent", partyContent); ContentWorker.renderContentAsText(dispatcher, partyContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, cache); @@ -264,11 +264,11 @@ public class PartyContentWrapper impleme .filterByDate() .queryList(); - List<String> contentList = new LinkedList<String>(); + List<String> contentList = new LinkedList<>(); if (partyContentList != null) { for (GenericValue partyContent: partyContentList) { StringWriter outWriter = new StringWriter(); - Map<String, Object> inContext = new HashMap<String, Object>(); + Map<String, Object> inContext = new HashMap<>(); inContext.put("party", party); inContext.put("partyContent", partyContent); ContentWorker.renderContentAsText(dispatcher, partyContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java Sun Apr 21 12:49:52 2019 @@ -68,7 +68,7 @@ public final class CatalogWorker { } public static List<String> getAllCatalogIds(ServletRequest request) { - List<String> catalogIds = new LinkedList<String>(); + List<String> catalogIds = new LinkedList<>(); List<GenericValue> catalogs = null; Delegator delegator = (Delegator) request.getAttribute("delegator"); try { @@ -194,8 +194,8 @@ public final class CatalogWorker { } public static List<String> getCatalogIdsAvailable(List<GenericValue> partyCatalogs, List<GenericValue> storeCatalogs) { - List<String> categoryIds = new LinkedList<String>(); - List<GenericValue> allCatalogLinks = new LinkedList<GenericValue>(); + List<String> categoryIds = new LinkedList<>(); + List<GenericValue> allCatalogLinks = new LinkedList<>(); if (partyCatalogs != null) allCatalogLinks.addAll(partyCatalogs); if (storeCatalogs != null) allCatalogLinks.addAll(storeCatalogs); @@ -386,7 +386,7 @@ public final class CatalogWorker { public static Collection<String> getCatalogQuickaddCategories(ServletRequest request, String prodCatalogId) { if (UtilValidate.isEmpty(prodCatalogId)) return null; - Collection<String> categoryIds = new LinkedList<String>(); + Collection<String> categoryIds = new LinkedList<>(); Collection<GenericValue> prodCatalogCategories = getProdCatalogCategories(request, prodCatalogId, "PCCT_QUICK_ADD"); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java Sun Apr 21 12:49:52 2019 @@ -88,7 +88,7 @@ public class CatalogUrlFilter implements try { // look for productId if (alternativeUrl.endsWith("-p")) { - List<EntityCondition> productContentConds = new LinkedList<EntityCondition>(); + List<EntityCondition> productContentConds = new LinkedList<>(); productContentConds.add(EntityCondition.makeCondition("productContentTypeId", "ALTERNATIVE_URL")); productContentConds.add(EntityUtil.getFilterByDateExpr()); List<GenericValue> productContentInfos = EntityQuery.use(delegator).from("ProductContentAndInfo").where(productContentConds).orderBy("-fromDate").cache(true).queryList(); @@ -143,7 +143,7 @@ public class CatalogUrlFilter implements // look for productCategoryId if (alternativeUrl.endsWith("-c")) { - List<EntityCondition> productCategoryContentConds = new LinkedList<EntityCondition>(); + List<EntityCondition> productCategoryContentConds = new LinkedList<>(); productCategoryContentConds.add(EntityCondition.makeCondition("prodCatContentTypeId", "ALTERNATIVE_URL")); productCategoryContentConds.add(EntityUtil.getFilterByDateExpr()); List<GenericValue> productCategoryContentInfos = EntityQuery.use(delegator).from("ProductCategoryContentAndInfo").where(productCategoryContentConds).orderBy("-fromDate").cache(true).queryList(); @@ -208,7 +208,7 @@ public class CatalogUrlFilter implements if (UtilValidate.isNotEmpty(productId)) { try { - List<EntityCondition> conds = new LinkedList<EntityCondition>(); + List<EntityCondition> conds = new LinkedList<>(); conds.add(EntityCondition.makeCondition("productId", productId)); conds.add(EntityUtil.getFilterByDateExpr()); List<GenericValue> productCategoryMembers = EntityQuery.use(delegator).select("productCategoryId").from("ProductCategoryMember").where(conds).orderBy("-fromDate").cache(true).queryList(); @@ -233,7 +233,7 @@ public class CatalogUrlFilter implements // look for productCategoryId from productId if (UtilValidate.isNotEmpty(productId)) { try { - List<EntityCondition> rolllupConds = new LinkedList<EntityCondition>(); + List<EntityCondition> rolllupConds = new LinkedList<>(); rolllupConds.add(EntityCondition.makeCondition("productId", productId)); rolllupConds.add(EntityUtil.getFilterByDateExpr()); List<GenericValue> productCategoryMembers = EntityQuery.use(delegator).from("ProductCategoryMember").where(rolllupConds).orderBy("-fromDate").cache(true).queryList(); @@ -251,13 +251,13 @@ public class CatalogUrlFilter implements // generate trail elements from productCategoryId if (UtilValidate.isNotEmpty(productCategoryId)) { - List<String> trailElements = new LinkedList<String>(); + List<String> trailElements = new LinkedList<>(); trailElements.add(productCategoryId); String parentProductCategoryId = productCategoryId; while (UtilValidate.isNotEmpty(parentProductCategoryId)) { // find product category rollup try { - List<EntityCondition> rolllupConds = new LinkedList<EntityCondition>(); + List<EntityCondition> rolllupConds = new LinkedList<>(); rolllupConds.add(EntityCondition.makeCondition("productCategoryId", parentProductCategoryId)); rolllupConds.add(EntityUtil.getFilterByDateExpr()); List<GenericValue> productCategoryRollups = EntityQuery.use(delegator).from("ProductCategoryRollup").where(rolllupConds).orderBy("-fromDate").cache(true).queryList(); @@ -282,7 +282,7 @@ public class CatalogUrlFilter implements List<String> trail = CategoryWorker.getTrail(httpRequest); if (trail == null) { - trail = new LinkedList<String>(); + trail = new LinkedList<>(); } // adjust trail @@ -410,7 +410,7 @@ public class CatalogUrlFilter implements url = urlBuilder.toString(); } else { if (UtilValidate.isEmpty(trail)) { - trail = new LinkedList<String>(); + trail = new LinkedList<>(); } url = CatalogUrlServlet.makeCatalogUrl(contextPath, trail, productId, productCategoryId, previousCategoryId); } @@ -453,7 +453,7 @@ public class CatalogUrlFilter implements url = urlBuilder.toString(); } else { if (UtilValidate.isEmpty(trail)) { - trail = new LinkedList<String>(); + trail = new LinkedList<>(); } url = CatalogUrlServlet.makeCatalogUrl(contextPath, trail, productId, productCategoryId, previousCategoryId); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java Sun Apr 21 12:49:52 2019 @@ -106,7 +106,7 @@ public class CatalogUrlServlet extends H } else if (pathElements.size() > 2) { List<String> trail = CategoryWorker.getTrail(request); if (trail == null) { - trail = new LinkedList<String>(); + trail = new LinkedList<>(); } if (trail.contains(pathElements.get(0))) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java Sun Apr 21 12:49:52 2019 @@ -146,7 +146,7 @@ public class CategoryContentWrapper impl GenericValue categoryContent = EntityUtil.getFirst(categoryContentList); if (categoryContent != null) { // when rendering the category content, always include the Product Category and ProductCategoryContent records that this comes from - Map<String, Object> inContext = new HashMap<String, Object>(); + Map<String, Object> inContext = new HashMap<>(); inContext.put("productCategory", productCategory); inContext.put("categoryContent", categoryContent); ContentWorker.renderContentAsText(dispatcher, categoryContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, cache); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -96,7 +96,7 @@ public class CategoryServices { } List<String> orderByFields = UtilGenerics.checkList(context.get("orderByFields")); - if (orderByFields == null) orderByFields = new LinkedList<String>(); + if (orderByFields == null) orderByFields = new LinkedList<>(); String entityName = getCategoryFindEntityName(delegator, orderByFields, introductionDateLimit, releaseDateLimit); GenericValue productCategory; @@ -111,7 +111,7 @@ public class CategoryServices { if (activeOnly) { productCategoryMembers = EntityUtil.filterByDate(productCategoryMembers, true); } - List<EntityCondition> filterConditions = new LinkedList<EntityCondition>(); + List<EntityCondition> filterConditions = new LinkedList<>(); if (introductionDateLimit != null) { EntityCondition condition = EntityCondition.makeCondition(EntityCondition.makeCondition("introductionDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("introductionDate", EntityOperator.LESS_THAN_EQUAL_TO, introductionDateLimit)); filterConditions.add(condition); @@ -217,7 +217,7 @@ public class CategoryServices { Timestamp releaseDateLimit = (Timestamp) context.get("releaseDateLimit"); List<String> orderByFields = UtilGenerics.checkList(context.get("orderByFields")); - if (orderByFields == null) orderByFields = new LinkedList<String>(); + if (orderByFields == null) orderByFields = new LinkedList<>(); String entityName = getCategoryFindEntityName(delegator, orderByFields, introductionDateLimit, releaseDateLimit); String prodCatalogId = (String) context.get("prodCatalogId"); @@ -291,7 +291,7 @@ public class CategoryServices { if (activeOnly) { productCategoryMembers = EntityUtil.filterByDate(productCategoryMembers, true); } - List<EntityCondition> filterConditions = new LinkedList<EntityCondition>(); + List<EntityCondition> filterConditions = new LinkedList<>(); if (introductionDateLimit != null) { EntityCondition condition = EntityCondition.makeCondition(EntityCondition.makeCondition("introductionDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("introductionDate", EntityOperator.LESS_THAN_EQUAL_TO, introductionDateLimit)); filterConditions.add(condition); @@ -339,7 +339,7 @@ public class CategoryServices { highIndex = listSize; } } else { - List<EntityCondition> mainCondList = new LinkedList<EntityCondition>(); + List<EntityCondition> mainCondList = new LinkedList<>(); mainCondList.add(EntityCondition.makeCondition("productCategoryId", EntityOperator.EQUALS, productCategory.getString("productCategoryId"))); if (activeOnly) { mainCondList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp)); @@ -366,7 +366,7 @@ public class CategoryServices { if (limitView) { if (viewProductCategoryId != null) { // do manual checking to filter view allow - productCategoryMembers = new LinkedList<GenericValue>(); + productCategoryMembers = new LinkedList<>(); GenericValue nextValue; int chunkSize = 0; listSize = 0; @@ -409,7 +409,7 @@ public class CategoryServices { // null safety if (productCategoryMembers == null) { - productCategoryMembers = new LinkedList<GenericValue>(); + productCategoryMembers = new LinkedList<>(); } if (highIndex > listSize) { @@ -421,7 +421,7 @@ public class CategoryServices { } } - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); result.put("viewIndex", viewIndex); result.put("viewSize", viewSize); result.put("lowIndex", lowIndex); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |