This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch release22.01 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push: new 13784976a0 Improved: Upgrade to gradle 7.6 - support jdk 11 -> 17 (OFBIZ-12400) 13784976a0 is described below commit 13784976a09b65418db2daa7af2cc9e08d6edc3a Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Thu Jan 12 16:18:49 2023 +0100 Improved: Upgrade to gradle 7.6 - support jdk 11 -> 17 (OFBIZ-12400) Eugen made some changes for checkstyle in his PR. I did not apply those because they did not appear with Java 11. Now that I'm using Java 17 I got some checkstyle issues, I guess the same than Eugen fixed. Here they are fixed with some other formatting changes Those missed in previous commit --- .../apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java | 4 ++-- .../src/main/java/org/apache/ofbiz/order/order/OrderServices.java | 4 ++-- .../datafile/src/main/java/org/apache/ofbiz/datafile/Record.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java index ba2a14501e..51cc34ce64 100644 --- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java +++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java @@ -846,8 +846,8 @@ public class ProductionRunServices { if (oneTask.getString("workEffortId").equals(taskId)) { theTask = oneTask; } else { - if (theTask == null && allPrecTaskCompletedOrRunning && (!"PRUN_COMPLETED".equals(oneTask.getString("currentStatusId")) && ! - "PRUN_RUNNING".equals(oneTask.getString("currentStatusId")))) { + if (theTask == null && allPrecTaskCompletedOrRunning && (!"PRUN_COMPLETED".equals(oneTask.getString("currentStatusId")) + && !"PRUN_RUNNING".equals(oneTask.getString("currentStatusId")))) { allPrecTaskCompletedOrRunning = false; } if (allTaskCompleted && !"PRUN_COMPLETED".equals(oneTask.getString("currentStatusId"))) { diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java index 2e167226a7..968ec53999 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java @@ -1270,8 +1270,8 @@ public class OrderServices { + "] is not in a proper status for reservation", MODULE); continue; } - if (UtilValidate.isNotEmpty(orderItem.getString("productId")) && // only reserve product items, ignore non-product items - !"RENTAL_ORDER_ITEM".equals(orderItem.getString("orderItemTypeId"))) { // ignore for rental + if (UtilValidate.isNotEmpty(orderItem.getString("productId")) // only reserve product items, ignore non-product items + && !"RENTAL_ORDER_ITEM".equals(orderItem.getString("orderItemTypeId"))) { // ignore for rental try { // get the product of the order item GenericValue product = orderItem.getRelatedOne("Product", false); diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java index 75f5376f92..3ae4004e87 100644 --- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java +++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java @@ -246,8 +246,8 @@ public class Record implements Serializable { * little endian reader for 8 byte long. */ private static long readLELong(byte[] byteArray) { - return (long) (byteArray[7]) << 56 | /* long cast needed or shift done modulo 32 */ - (long) (byteArray[6] & 0xff) << 48 | (long) (byteArray[5] & 0xff) << 40 | (long) (byteArray[4] & 0xff) << 32 | (long) (byteArray[3] + return (long) (byteArray[7]) << 56 /* long cast needed or shift done modulo 32 */ + | (long) (byteArray[6] & 0xff) << 48 | (long) (byteArray[5] & 0xff) << 40 | (long) (byteArray[4] & 0xff) << 32 | (long) (byteArray[3] & 0xff) << 24 | (long) (byteArray[2] & 0xff) << 16 | (long) (byteArray[1] & 0xff) << 8 | (byteArray[0] & 0xff); }