Backported: Refactor boolean assignments to comply with codestyle rules

jacopoc · jacopoc · commit 2199981bbd66 · 2026-04-13T12:12:11.000+02:00
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
@@ -827,8 +827,8 @@ public static Map<String, Object> giftCertificatePurchase(DispatchContext dctx,
         String orderEmails = orh.getOrderEmailString();
         String copyMeField = giftCertSettings.getString("purchSurveyCopyMe");
         String copyMeResp = copyMeField != null ? (String) answerMap.get(copyMeField) : null;
-        boolean copyMe = (UtilValidate.isNotEmpty(copyMeField)
-                && UtilValidate.isNotEmpty(copyMeResp) && "true".equalsIgnoreCase(copyMeResp)) ? true : false;
+        boolean copyMe = UtilValidate.isNotEmpty(copyMeField)
+                && UtilValidate.isNotEmpty(copyMeResp) && "true".equalsIgnoreCase(copyMeResp);
 
         int qtyLoop = quantity.intValue();
         for (int i = 0; i < qtyLoop; i++) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
@@ -454,7 +454,7 @@ private static RitaApi getApi(Properties props) {
         } catch (RuntimeException e) {
             Debug.logError(e, MODULE);
         }
-        boolean ssl = "Y".equals(props.getProperty("ssl", "N")) ? true : false;
+        boolean ssl = "Y".equals(props.getProperty("ssl", "N"));
 
         RitaApi api = null;
         if (port > 0 && host != null) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
@@ -1111,8 +1111,8 @@ public static Map<String, Object> giftCardPurchase(DispatchContext dctx, Map<Str
         String orderEmails = orh.getOrderEmailString();
         String copyMeField = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.copyMe", delegator);
         String copyMeResp = copyMeField != null ? (String) answerMap.get(copyMeField) : null;
-        boolean copyMe = (UtilValidate.isNotEmpty(copyMeField)
-                && UtilValidate.isNotEmpty(copyMeResp) && "true".equalsIgnoreCase(copyMeResp)) ? true : false;
+        boolean copyMe = UtilValidate.isNotEmpty(copyMeField)
+                && UtilValidate.isNotEmpty(copyMeResp) && "true".equalsIgnoreCase(copyMeResp);
 
         int qtyLoop = quantity.intValue();
         for (int i = 0; i < qtyLoop; i++) {
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
@@ -816,7 +816,7 @@ public static Map<String, Object> updateOrRemove(DispatchContext dctx, Map<Strin
             }
             pkFields.put(fieldName, fieldValue);
         }
-        boolean doLink = (action != null && "Y".equalsIgnoreCase(action)) ? true : false;
+        boolean doLink = "Y".equalsIgnoreCase(action);
         if (Debug.infoOn()) {
             Debug.logInfo("in updateOrRemove, context:" + context, MODULE);
         }
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
@@ -76,7 +76,7 @@ public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) {
         }
         final String thisContentId = (String) templateRoot.get("contentId");
         final String xmlEscape = (String) templateRoot.get("xmlEscape");
-        final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId) ? true : false;
+        final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId);
         if (Debug.verboseOn()) {
             Debug.logVerbose("in Render(0), directAssocMode ." + directAssocMode, MODULE);
         }
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
@@ -75,7 +75,7 @@ public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) {
         if (Debug.infoOn()) {
             Debug.logInfo("in Render(0), thisSubContentId ." + thisContentId, MODULE);
         }
-        final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId) ? true : false;
+        final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId);
         if (Debug.infoOn()) {
             Debug.logInfo("in Render(0), directAssocMode ." + directAssocMode, MODULE);
         }
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
@@ -73,7 +73,7 @@ public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) {
         String strNullThruDatesOnly = (String) templateRoot.get("nullThruDatesOnly");
         Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && "true".equalsIgnoreCase(strNullThruDatesOnly)) ? Boolean.TRUE : Boolean.FALSE;
         String thisSubContentId = (String) templateRoot.get("subContentId");
-        final boolean directAssocMode = UtilValidate.isNotEmpty(thisSubContentId) ? true : false;
+        final boolean directAssocMode = UtilValidate.isNotEmpty(thisSubContentId);
         GenericValue val = null;
         try {
             val = ContentWorker.getCurrentContent(delegator, trail, userLogin, templateRoot, nullThruDatesOnly, contentAssocPredicateId);
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java
@@ -119,7 +119,7 @@ public static Map<String, Object> checkRoutingTaskAssoc(DispatchContext ctx, Map
         Timestamp thruDate = (Timestamp) context.get("thruDate");
         String create = (String) context.get("create");
 
-        boolean createProcess = (create != null && "Y".equals(create)) ? true : false;
+        boolean createProcess = "Y".equals(create);
         List<GenericValue> listRoutingTaskAssoc = null;
 
         try {
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
@@ -1050,7 +1050,7 @@ public static String determineNextFinalizeStep(HttpServletRequest request, HttpS
                 requireTerm = requireTermStr == null || "true".equalsIgnoreCase(requireTermStr);
             }
             requireAdditionalParty = requireAdditionalPartyStr == null || "true".equalsIgnoreCase(requireAdditionalPartyStr);
-            isSingleUsePayment = singleUsePaymentStr != null && "Y".equalsIgnoreCase(singleUsePaymentStr) ? true : false;
+            isSingleUsePayment = "Y".equalsIgnoreCase(singleUsePaymentStr);
         }
 
         boolean shippingAddressSet = true;
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
@@ -535,7 +535,7 @@ public static String restoreAutoSaveList(HttpServletRequest request, HttpServlet
 
         // check to see if we are okay to load this list
         java.sql.Timestamp lastLoad = cart.getLastListRestore();
-        boolean okayToLoad = autoSaveListId == null ? false : (lastLoad == null ? true : false);
+        boolean okayToLoad = autoSaveListId != null && lastLoad == null;
         if (!okayToLoad && lastLoad != null) {
             GenericValue shoppingList = null;
             try {
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
@@ -903,7 +903,7 @@ public static Map<String, Object> getPartyContactMechValueMaps(DispatchContext c
             }
         }
         Boolean bShowOld = (Boolean) context.get("showOld");
-        boolean showOld = (bShowOld != null && bShowOld) ? true : false;
+        boolean showOld = Boolean.TRUE.equals(bShowOld);
         String contactMechTypeId = (String) context.get("contactMechTypeId");
         List<Map<String, Object>> valueMaps = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld, contactMechTypeId);
         result.put("valueMaps", valueMaps);
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
@@ -2262,8 +2262,8 @@ public static Map<String, Object> findPartyById(DispatchContext ctx, Map<String,
         String searchPartyFirstContext = (String) context.get("searchPartyFirst");
         String searchAllIdContext = (String) context.get("searchAllId");
 
-        boolean searchPartyFirst = UtilValidate.isNotEmpty(searchPartyFirstContext) && "N".equals(searchPartyFirstContext) ? false : true;
-        boolean searchAllId = UtilValidate.isNotEmpty(searchAllIdContext) && "Y".equals(searchAllIdContext) ? true : false;
+        boolean searchPartyFirst = !UtilValidate.isNotEmpty(searchPartyFirstContext) || !"N".equals(searchPartyFirstContext);
+        boolean searchAllId = UtilValidate.isNotEmpty(searchAllIdContext) && "Y".equals(searchAllIdContext);
 
         GenericValue party = null;
         List<GenericValue> partiesFound = null;
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
@@ -1319,8 +1319,8 @@ public static Map<String, Object> findProductById(DispatchContext ctx, Map<Strin
         String searchProductFirstContext = (String) context.get("searchProductFirst");
         String searchAllIdContext = (String) context.get("searchAllId");
 
-        boolean searchProductFirst = UtilValidate.isNotEmpty(searchProductFirstContext) && "N".equals(searchProductFirstContext) ? false : true;
-        boolean searchAllId = UtilValidate.isNotEmpty(searchAllIdContext) && "Y".equals(searchAllIdContext) ? true : false;
+        boolean searchProductFirst = !UtilValidate.isNotEmpty(searchProductFirstContext) || !"N".equals(searchProductFirstContext);
+        boolean searchAllId = UtilValidate.isNotEmpty(searchAllIdContext) && "Y".equals(searchAllIdContext);
 
         GenericValue product = null;
         List<GenericValue> productsFound = null;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
@@ -63,7 +63,7 @@ public IntegerToBoolean() {
 
         @Override
         public Boolean convert(Integer obj) throws ConversionException {
-            return obj == 0 ? false : true;
+            return obj != 0;
         }
     }
 
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
@@ -206,8 +206,7 @@ public static Map<String, Object> sendMail(DispatchContext ctx, Map<String, ? ex
                 socketFactoryFallback = EntityUtilProperties.getPropertyValue("general", "mail.smtp.socketFactory.fallback", "false", delegator);
             }
             if (sendPartial == null) {
-                sendPartial = EntityUtilProperties.propertyValueEqualsIgnoreCase("general", "mail.smtp.sendpartial", "true", delegator)
-                        ? true : false;
+                sendPartial = EntityUtilProperties.propertyValueEqualsIgnoreCase("general", "mail.smtp.sendpartial", "true", delegator);
             }
             if (isStartTLSEnabled == null) {
                 isStartTLSEnabled = EntityUtilProperties.propertyValueEqualsIgnoreCase("general", "mail.smtp.starttls.enable", "true", delegator);
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
@@ -1772,7 +1772,7 @@ public void setChanged() {
      * @return the boolean
      */
     public boolean originalDbValuesAvailable() {
-        return this.originalDbValues != null ? true : false;
+        return this.originalDbValues != null;
     }
 
     /**
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
@@ -5485,9 +5485,9 @@ public TextFindField(Element element, ModelFormField modelFormField) {
                 this.defaultOption = UtilProperties.getPropertyValue("widget", "widget.form.defaultTextFindOption", "contains");
             }
             this.hideIgnoreCase = "true".equals(element.getAttribute("hide-options"))
-                    || "ignore-case".equals(element.getAttribute("hide-options")) ? true : false;
+                    || "ignore-case".equals(element.getAttribute("hide-options"));
             this.hideOptions = "true".equals(element.getAttribute("hide-options"))
-                    || "options".equals(element.getAttribute("hide-options")) ? true : false;
+                    || "options".equals(element.getAttribute("hide-options"));
             this.ignoreCase = "true".equals(element.getAttribute("ignore-case"));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ private static RitaApi getApi(Properties props) {`
`454`	`454`	`} catch (RuntimeException e) {`
`455`	`455`	`Debug.logError(e, MODULE);`
`456`	`456`	`}`
`457`		`- boolean ssl = "Y".equals(props.getProperty("ssl", "N")) ? true : false;`
	`457`	`+ boolean ssl = "Y".equals(props.getProperty("ssl", "N"));`
`458`	`458`
`459`	`459`	`RitaApi api = null;`
`460`	`460`	`if (port > 0 && host != null) {`
Original file line number	Diff line number	Diff line change
`@@ -816,7 +816,7 @@ public static Map<String, Object> updateOrRemove(DispatchContext dctx, Map<Strin`
`816`	`816`	`}`
`817`	`817`	`pkFields.put(fieldName, fieldValue);`
`818`	`818`	`}`
`819`		`- boolean doLink = (action != null && "Y".equalsIgnoreCase(action)) ? true : false;`
	`819`	`+ boolean doLink = "Y".equalsIgnoreCase(action);`
`820`	`820`	`if (Debug.infoOn()) {`
`821`	`821`	`Debug.logInfo("in updateOrRemove, context:" + context, MODULE);`
`822`	`822`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) {`
`76`	`76`	`}`
`77`	`77`	`final String thisContentId = (String) templateRoot.get("contentId");`
`78`	`78`	`final String xmlEscape = (String) templateRoot.get("xmlEscape");`
`79`		`- final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId) ? true : false;`
	`79`	`+ final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId);`
`80`	`80`	`if (Debug.verboseOn()) {`
`81`	`81`	`Debug.logVerbose("in Render(0), directAssocMode ." + directAssocMode, MODULE);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) {`
`75`	`75`	`if (Debug.infoOn()) {`
`76`	`76`	`Debug.logInfo("in Render(0), thisSubContentId ." + thisContentId, MODULE);`
`77`	`77`	`}`
`78`		`- final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId) ? true : false;`
	`78`	`+ final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId);`
`79`	`79`	`if (Debug.infoOn()) {`
`80`	`80`	`Debug.logInfo("in Render(0), directAssocMode ." + directAssocMode, MODULE);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1050,7 +1050,7 @@ public static String determineNextFinalizeStep(HttpServletRequest request, HttpS`
`1050`	`1050`	`requireTerm = requireTermStr == null \|\| "true".equalsIgnoreCase(requireTermStr);`
`1051`	`1051`	`}`
`1052`	`1052`	`requireAdditionalParty = requireAdditionalPartyStr == null \|\| "true".equalsIgnoreCase(requireAdditionalPartyStr);`
`1053`		`- isSingleUsePayment = singleUsePaymentStr != null && "Y".equalsIgnoreCase(singleUsePaymentStr) ? true : false;`
	`1053`	`+ isSingleUsePayment = "Y".equalsIgnoreCase(singleUsePaymentStr);`
`1054`	`1054`	`}`
`1055`	`1055`
`1056`	`1056`	`boolean shippingAddressSet = true;`