You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by su...@apache.org on 2020/07/06 10:04:23 UTC
[ofbiz-framework] branch trunk updated: Improved: Corrected all 'if
is not followed by whitespace' checkstyle errors. Also corrected few ',
is not followed by whitespace' checkstyle errors in applications component.
(OFBIZ-11805) Thanks Jacques Le Roux and Ritesh Kumar for review.
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new bfe3ade Improved: Corrected all 'if is not followed by whitespace' checkstyle errors. Also corrected few ', is not followed by whitespace' checkstyle errors in applications component. (OFBIZ-11805) Thanks Jacques Le Roux and Ritesh Kumar for review.
bfe3ade is described below
commit bfe3adeae93ea3e62ebb71de37ae5acefa588389
Author: Suraj Khurana <su...@apache.org>
AuthorDate: Mon Jul 6 15:34:00 2020 +0530
Improved: Corrected all 'if is not followed by whitespace' checkstyle errors. Also corrected few ', is not followed by whitespace' checkstyle errors in applications component.
(OFBIZ-11805)
Thanks Jacques Le Roux and Ritesh Kumar for review.
---
.../ofbiz/accounting/invoice/InvoiceServices.java | 6 +-
.../accounting/payment/PaymentGatewayServices.java | 2 +-
.../accounting/payment/PaymentMethodServices.java | 16 ++---
.../authorizedotnet/AIMPaymentServices.java | 4 +-
.../thirdparty/sagepay/SagePayPaymentServices.java | 4 +-
.../thirdparty/sagepay/SagePayServices.java | 10 ++--
.../accounting/thirdparty/sagepay/SagePayUtil.java | 68 +++++++++++-----------
.../ofbiz/content/ContentManagementServices.java | 2 +-
.../ofbiz/content/ContentManagementWorker.java | 4 +-
.../ofbiz/content/content/ContentMapFacade.java | 6 +-
.../content/content/ContentSearchSession.java | 2 +-
.../ofbiz/content/content/ContentWorker.java | 2 +-
.../apache/ofbiz/content/layout/LayoutEvents.java | 2 +-
.../apache/ofbiz/content/layout/LayoutWorker.java | 2 +-
.../org/apache/ofbiz/humanres/HumanResEvents.java | 8 +--
.../manufacturing/jobshopmgt/ProductionRun.java | 2 +-
.../jobshopmgt/ProductionRunServices.java | 4 +-
.../ofbiz/manufacturing/mrp/ProposedOrder.java | 2 +-
.../manufacturing/techdata/TechDataServices.java | 8 +--
.../marketing/tracking/TrackingCodeEvents.java | 2 +-
.../ofbiz/order/order/OrderReturnServices.java | 2 +-
.../apache/ofbiz/order/order/OrderServices.java | 12 ++--
.../ofbiz/order/shoppingcart/CheckOutEvents.java | 14 ++---
.../ofbiz/order/shoppingcart/ShoppingCart.java | 16 ++---
.../order/shoppingcart/ShoppingCartEvents.java | 10 ++--
.../order/shoppingcart/ShoppingCartHelper.java | 26 ++++-----
.../ofbiz/order/shoppingcart/ShoppingCartItem.java | 18 +++---
.../order/shoppingcart/ShoppingCartServices.java | 6 +-
.../shoppingcart/product/ProductDisplayWorker.java | 2 +-
.../shoppingcart/product/ProductPromoWorker.java | 2 +-
.../communication/CommunicationEventServices.java | 6 +-
.../ofbiz/party/content/PartyContentWrapper.java | 2 +-
.../apache/ofbiz/party/party/PartyServices.java | 4 +-
.../ofbiz/product/category/CategoryServices.java | 4 +-
.../ofbiz/product/config/ProductConfigWorker.java | 8 +--
.../org/apache/ofbiz/product/image/ScaleImage.java | 6 +-
.../ofbiz/product/imagemanagement/FrameImage.java | 4 +-
.../product/imagemanagement/ImageUrlServlet.java | 2 +-
.../ofbiz/product/inventory/InventoryServices.java | 2 +-
.../ofbiz/product/product/ProductEvents.java | 4 +-
.../ofbiz/product/product/ProductSearch.java | 4 +-
.../ofbiz/product/product/ProductServices.java | 12 ++--
.../ofbiz/product/product/ProductUtilServices.java | 4 +-
.../ofbiz/product/product/ProductWorker.java | 10 ++--
.../ofbiz/product/store/ProductStoreEvents.java | 4 +-
.../product/supplier/SupplierProductServices.java | 2 +-
.../ofbiz/shipment/thirdparty/ups/UpsServices.java | 4 +-
47 files changed, 173 insertions(+), 173 deletions(-)
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
index f7eaa39..7a889c3 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
@@ -570,7 +570,7 @@ public class InvoiceServices {
BigDecimal amount = BigDecimal.ZERO;
if (originalOrderItemQuantity.signum() != 0) {
if (adj.get("amount") != null) {
- if("PROMOTION_ADJUSTMENT".equals(adj.getString("orderAdjustmentTypeId")) && adj.get("productPromoId") != null) {
+ if ("PROMOTION_ADJUSTMENT".equals(adj.getString("orderAdjustmentTypeId")) && adj.get("productPromoId") != null) {
/* Find negative amountAlreadyIncluded in OrderAdjustment to subtract it from discounted amount.
As we stored negative sales tax amount in order adjustment for discounted item.
*/
@@ -1565,7 +1565,7 @@ public class InvoiceServices {
billAvail = BigDecimal.ZERO;
} else {
// now have been billed
- if(issueQty == null){
+ if (issueQty == null){
issueQty = BigDecimal.ZERO;
}
billAvail = billAvail.subtract(issueQty).setScale(DECIMALS, ROUNDING);
@@ -2417,7 +2417,7 @@ public class InvoiceServices {
// pro-rate the amount
BigDecimal amount = BigDecimal.ZERO;
- if("DONATION_ADJUSTMENT".equals(adj.getString("orderAdjustmentTypeId"))) {
+ if ("DONATION_ADJUSTMENT".equals(adj.getString("orderAdjustmentTypeId"))) {
amount=baseAmount;
} else if (divisor.signum() != 0) { // make sure the divisor is not 0 to avoid NaN problems; just leave the amount as 0 and skip it in essense
// multiply first then divide to avoid rounding errors
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
index 69168ca..dffb010 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
@@ -1842,7 +1842,7 @@ public class PaymentGatewayServices {
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
Locale locale = (Locale) context.get("locale");
- if(authResult == null) {
+ if (authResult == null) {
Debug.logError("No authentification result available. Payment preference can't be checked.", MODULE);
return ServiceUtil
.returnError(UtilProperties.getMessage(RESOURCE, "AccountingProcessingAuthResultEmpty", locale));
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
index 49fa5b2..7905ce8 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
@@ -186,7 +186,7 @@ public class PaymentMethodServices {
}
newPm.set("partyId", partyId);
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newPm.set("fromDate", (context.get("fromDate") != null ? context.get("fromDate") : now));
newPm.set("thruDate", context.get("thruDate"));
newCc.set("companyNameOnCard", context.get("companyNameOnCard"));
@@ -355,7 +355,7 @@ public class PaymentMethodServices {
newPm.set("partyId", partyId);
newPm.set("fromDate", context.get("fromDate"), false);
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
// The following check is needed to avoid to reactivate an expired pm
if (newPm.get("thruDate") == null) {
newPm.set("thruDate", context.get("thruDate"));
@@ -523,7 +523,7 @@ public class PaymentMethodServices {
newPm.set("partyId", partyId);
newPm.set("fromDate", (context.get("fromDate") != null ? context.get("fromDate") : now));
newPm.set("thruDate", context.get("thruDate"));
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newGc.set("cardNumber", context.get("cardNumber"));
newGc.set("pinNumber", context.get("pinNumber"));
@@ -632,7 +632,7 @@ public class PaymentMethodServices {
newPm.set("partyId", partyId);
newPm.set("fromDate", context.get("fromDate"), false);
newPm.set("thruDate", context.get("thruDate"));
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newGc.set("cardNumber", context.get("cardNumber"));
newGc.set("pinNumber", context.get("pinNumber"));
@@ -718,7 +718,7 @@ public class PaymentMethodServices {
newPm.set("partyId", partyId);
newPm.set("fromDate", (context.get("fromDate") != null ? context.get("fromDate") : now));
newPm.set("thruDate", context.get("thruDate"));
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newEa.set("bankName", context.get("bankName"));
newEa.set("routingNumber", context.get("routingNumber"));
newEa.set("accountType", context.get("accountType"));
@@ -846,7 +846,7 @@ public class PaymentMethodServices {
newPm.set("partyId", partyId);
newPm.set("fromDate", context.get("fromDate"), false);
newPm.set("thruDate", context.get("thruDate"));
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newEa.set("bankName", context.get("bankName"));
newEa.set("routingNumber", context.get("routingNumber"));
newEa.set("accountType", context.get("accountType"));
@@ -952,7 +952,7 @@ public class PaymentMethodServices {
}
newPm.set("partyId", partyId);
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newPm.set("paymentMethodTypeId", context.get("paymentMethodTypeId"));
newPm.set("fromDate", now);
newPm.set("paymentMethodId", newPmId);
@@ -1072,7 +1072,7 @@ public class PaymentMethodServices {
newPm.set("partyId", partyId);
newPm.set("paymentMethodTypeId", context.get("paymentMethodTypeId"));
newPm.set("fromDate", context.get("fromDate"), false);
- newPm.set("description",context.get("description"));
+ newPm.set("description", context.get("description"));
newCa.set("bankName", context.get("bankName"));
newCa.set("routingNumber", context.get("routingNumber"));
newCa.set("accountType", context.get("accountType"));
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
index 95ef05a..5f69c3d 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
@@ -166,8 +166,8 @@ public class AIMPaymentServices {
return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE,
"AccountingPaymentTransactionAuthorizationNotFoundCannotRefund", locale));
}
- context.put("creditCard",creditCard);
- context.put("authTransaction",authTransaction);
+ context.put("creditCard", creditCard);
+ context.put("authTransaction", authTransaction);
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> request = new HashMap<>();
Properties props = buildAIMProperties(context, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
index 5351583..d2c9128 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
@@ -130,7 +130,7 @@ public class SagePayPaymentServices {
}
billingInfo.put("orderId", orderId);
- if(processAmount != null){
+ if (processAmount != null){
billingInfo.put("amount", processAmount.toString());
} else {
billingInfo.put("amount", "");
@@ -309,7 +309,7 @@ public class SagePayPaymentServices {
Debug.logError(e, "Error getting CreditCard for OrderPaymentPreference : " + orderPaymentPreference, MODULE);
return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AccountingPaymentUnableToGetCCInfo", locale) + " " + orderPaymentPreference);
}
- context.put("creditCard",creditCard);
+ context.put("creditCard", creditCard);
context.put("captureTransaction", captureTransaction);
List<GenericValue> authTransactions = PaymentGatewayServices.getAuthTransactions(orderPaymentPreference);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
index ba706d0..1f31121 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
@@ -58,7 +58,7 @@ public class SagePayServices
GenericValue sagePay = EntityQuery.use(delegator).from("PaymentGatewaySagePay").where("paymentGatewayConfigId", paymentGatewayConfigId).queryOne();
if (sagePay != null) {
for (Entry<String, Object> set : sagePay.entrySet()) {
- if(set.getValue() == null){
+ if (set.getValue() == null){
sagePayConfig.put(set.getKey(), null);
} else {
sagePayConfig.put(set.getKey(), set.getValue().toString());
@@ -132,16 +132,16 @@ public class SagePayServices
//start - required parameters
StringBuilder errorRequiredParameters = new StringBuilder();
- if(vpsProtocol == null){
+ if (vpsProtocol == null){
errorRequiredParameters.append("Required transaction parameter 'protocolVersion' is missing. ");
}
- if(vendor == null){
+ if (vendor == null){
errorRequiredParameters.append("Required transaction parameter 'vendor' is missing. ");
}
- if(txType == null){
+ if (txType == null){
errorRequiredParameters.append("Required transaction parameter 'authenticationsTransType' is missing. ");
}
- if(errorRequiredParameters.length() > 0){
+ if (errorRequiredParameters.length() > 0){
return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AccountingSagePayPaymentAuthorisationException", UtilMisc.toMap("errorString", errorRequiredParameters), locale));
}
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
index 65dc2f7..129ac44 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
@@ -52,13 +52,13 @@ public final class SagePayUtil {
(Boolean authResult, String authCode, String authFlag, BigDecimal processAmount, String authRefNum, String authAltRefNum, String authMessage) {
Map<String, Object> result = new HashMap<>();
- if(authResult != null) { result.put("authResult", authResult); }
- if(authCode != null) { result.put("authCode", authCode); }
- if(authFlag != null) { result.put("authFlag", authFlag); }
- if(processAmount != null) { result.put("processAmount", processAmount); }
- if(authRefNum != null) { result.put("authRefNum", authRefNum); }
- if(authAltRefNum != null) { result.put("authAltRefNum", authAltRefNum); }
- if(authMessage != null) { result.put("authMessage", authMessage); }
+ if (authResult != null) { result.put("authResult", authResult); }
+ if (authCode != null) { result.put("authCode", authCode); }
+ if (authFlag != null) { result.put("authFlag", authFlag); }
+ if (processAmount != null) { result.put("processAmount", processAmount); }
+ if (authRefNum != null) { result.put("authRefNum", authRefNum); }
+ if (authAltRefNum != null) { result.put("authAltRefNum", authAltRefNum); }
+ if (authMessage != null) { result.put("authMessage", authMessage); }
return result;
}
@@ -66,13 +66,13 @@ public final class SagePayUtil {
(Boolean captureResult, String captureCode, String captureFlag, BigDecimal captureAmount, String captureRefNum, String captureAltRefNum, String captureMessage) {
Map<String, Object> result = new HashMap<>();
- if(captureResult != null) { result.put("captureResult", captureResult); }
- if(captureCode != null) { result.put("captureCode", captureCode); }
- if(captureFlag != null) { result.put("captureFlag", captureFlag); }
- if(captureAmount != null) { result.put("captureAmount", captureAmount); }
- if(captureRefNum != null) { result.put("captureRefNum", captureRefNum); }
- if(captureAltRefNum != null) { result.put("captureAltRefNum", captureAltRefNum); }
- if(captureMessage != null) { result.put("captureMessage", captureMessage); }
+ if (captureResult != null) { result.put("captureResult", captureResult); }
+ if (captureCode != null) { result.put("captureCode", captureCode); }
+ if (captureFlag != null) { result.put("captureFlag", captureFlag); }
+ if (captureAmount != null) { result.put("captureAmount", captureAmount); }
+ if (captureRefNum != null) { result.put("captureRefNum", captureRefNum); }
+ if (captureAltRefNum != null) { result.put("captureAltRefNum", captureAltRefNum); }
+ if (captureMessage != null) { result.put("captureMessage", captureMessage); }
return result;
}
@@ -80,12 +80,12 @@ public final class SagePayUtil {
(Boolean releaseResult, String releaseCode, BigDecimal releaseAmount, String releaseRefNum, String releaseAltRefNum, String releaseMessage) {
Map<String, Object> result = new HashMap<>();
- if(releaseResult != null) { result.put("releaseResult", releaseResult); }
- if(releaseCode != null) { result.put("releaseCode", releaseCode); }
- if(releaseAmount != null) { result.put("releaseAmount", releaseAmount); }
- if(releaseRefNum != null) { result.put("releaseRefNum", releaseRefNum); }
- if(releaseAltRefNum != null) { result.put("releaseAltRefNum", releaseAltRefNum); }
- if(releaseMessage != null) { result.put("releaseMessage", releaseMessage); }
+ if (releaseResult != null) { result.put("releaseResult", releaseResult); }
+ if (releaseCode != null) { result.put("releaseCode", releaseCode); }
+ if (releaseAmount != null) { result.put("releaseAmount", releaseAmount); }
+ if (releaseRefNum != null) { result.put("releaseRefNum", releaseRefNum); }
+ if (releaseAltRefNum != null) { result.put("releaseAltRefNum", releaseAltRefNum); }
+ if (releaseMessage != null) { result.put("releaseMessage", releaseMessage); }
return result;
}
@@ -93,11 +93,11 @@ public final class SagePayUtil {
(Boolean refundResult, BigDecimal refundAmount, String refundRefNum, String refundAltRefNum, String refundMessage) {
Map<String, Object> result = new HashMap<>();
- if(refundResult != null) { result.put("refundResult", refundResult); }
- if(refundAmount != null) { result.put("refundAmount", refundAmount); }
- if(refundRefNum != null) { result.put("refundRefNum", refundRefNum); }
- if(refundAltRefNum != null) { result.put("refundAltRefNum", refundAltRefNum); }
- if(refundMessage != null) { result.put("refundMessage", refundMessage); }
+ if (refundResult != null) { result.put("refundResult", refundResult); }
+ if (refundAmount != null) { result.put("refundAmount", refundAmount); }
+ if (refundRefNum != null) { result.put("refundRefNum", refundRefNum); }
+ if (refundAltRefNum != null) { result.put("refundAltRefNum", refundAltRefNum); }
+ if (refundMessage != null) { result.put("refundMessage", refundMessage); }
return result;
}
@@ -105,12 +105,12 @@ public final class SagePayUtil {
(Boolean refundResult, String refundCode, BigDecimal refundAmount, String refundRefNum, String refundAltRefNum, String refundMessage) {
Map<String, Object> result = new HashMap<>();
- if(refundResult != null) { result.put("refundResult", refundResult); }
- if(refundCode != null) { result.put("refundCode", refundCode); }
- if(refundAmount != null) { result.put("refundAmount", refundAmount); }
- if(refundRefNum != null) { result.put("refundRefNum", refundRefNum); }
- if(refundAltRefNum != null) { result.put("refundAltRefNum", refundAltRefNum); }
- if(refundMessage != null) { result.put("refundMessage", refundMessage); }
+ if (refundResult != null) { result.put("refundResult", refundResult); }
+ if (refundCode != null) { result.put("refundCode", refundCode); }
+ if (refundAmount != null) { result.put("refundAmount", refundAmount); }
+ if (refundRefNum != null) { result.put("refundRefNum", refundRefNum); }
+ if (refundAltRefNum != null) { result.put("refundAltRefNum", refundAltRefNum); }
+ if (refundMessage != null) { result.put("refundMessage", refundMessage); }
return result;
}
@@ -122,12 +122,12 @@ public final class SagePayUtil {
*/
public static HttpHost getHost(Map<String, String> props) {
String hostUrl = null;
- if("PRODUCTION".equals(props.get("sagePayMode"))) {
+ if ("PRODUCTION".equals(props.get("sagePayMode"))) {
hostUrl = props.get("productionHost");
- } else if("TEST".equals(props.get("sagePayMode"))) {
+ } else if ("TEST".equals(props.get("sagePayMode"))) {
hostUrl = props.get("testingHost");
}
- if(hostUrl == null){
+ if (hostUrl == null){
throw new IllegalArgumentException("Could not find host-url via SagePay Properties");
}
String scheme = hostUrl.substring(0, 5);
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
index ef2a232..b4b969c 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
@@ -190,7 +190,7 @@ public class ContentManagementServices {
dataResource.setNonPKFields(context);
dataResource.setAllFields(context, false, "dr", null);
String isPublic = (String) context.get("isPublic");
- if(UtilValidate.isEmpty(isPublic)){
+ if (UtilValidate.isEmpty(isPublic)){
dataResource.set("isPublic", "N");
}
context.putAll(dataResource);
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
index 8456db8..af53e36 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
@@ -214,7 +214,7 @@ public final class ContentManagementWorker {
attrVal = (String)paramMap.get(attrName);
}
if (UtilValidate.isNotEmpty(attrVal)) {
- passedPK.put(attrName,attrVal);
+ passedPK.put(attrName, attrVal);
}
}
@@ -575,7 +575,7 @@ public final class ContentManagementWorker {
results = EntityPermissionChecker.checkPermission(content, statusId, userLogin, passedPurposes, targetOperationList, roles, delegator, security, entityAction);
String permissionStatus = (String)results.get("permissionStatus");
if (permissionStatus != null && "granted".equalsIgnoreCase(permissionStatus)) {
- String [] arr = {contentId,contentName};
+ String [] arr = {contentId, contentName};
permittedDepartmentPointList.add(arr);
}
}
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
index df06b95..e0fff6b 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
@@ -294,10 +294,10 @@ public class ContentMapFacade implements Map<Object, Object> {
try {
Map<String, Object> expressions = new HashMap<>();
expressions.put("contentIdStart", contentId);
- if(!this.mapKeyFilter.equals("")) {
+ if (!this.mapKeyFilter.equals("")) {
expressions.put("caMapKey", this.mapKeyFilter);
}
- if(!this.statusFilter.equals("")) {
+ if (!this.statusFilter.equals("")) {
expressions.put("statusId", this.statusFilter);
}
@@ -475,7 +475,7 @@ public class ContentMapFacade implements Map<Object, Object> {
Map<String, Object> expressions = new HashMap<>();
expressions.put("contentIdStart", contentId);
expressions.put("caMapKey", name);
- if(!this.statusFilter.equals("")) {
+ if (!this.statusFilter.equals("")) {
expressions.put("statusId", this.statusFilter);
}
sub = EntityQuery.use(delegator).from("ContentAssocViewTo")
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
index 1608f88..a807937 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
@@ -189,7 +189,7 @@ public class ContentSearchSession {
String contentId=(String) parameters.get("SEARCH_CONTENT_ID");
String contentAssocTypeId=(String) parameters.get("contentAssocTypeId");
boolean includeAllSubContents =!"N".equalsIgnoreCase((String) parameters.get("SEARCH_SUB_CONTENTS"));
- searchAddConstraint(new ContentSearch.ContentAssocConstraint(contentId,contentAssocTypeId,includeAllSubContents), session);
+ searchAddConstraint(new ContentSearch.ContentAssocConstraint(contentId, contentAssocTypeId,includeAllSubContents), session);
constraintsChanged = true;
}
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
index 51b6f14..b56e28f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
@@ -743,7 +743,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(whenStr);
String newWhen = fse.expandString(context);
try {
- Object retVal = GroovyUtil.eval(newWhen,context);
+ Object retVal = GroovyUtil.eval(newWhen, context);
// retVal should be a Boolean, if not something weird is up...
if (retVal instanceof Boolean) {
Boolean boolVal = (Boolean) retVal;
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
index 12be1aa..4697cd1 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
@@ -595,7 +595,7 @@ public class LayoutEvents {
if (Debug.verboseOn()) Debug.logVerbose("in copyToClip, attrName:" + attrName,"");
if (Debug.verboseOn()) Debug.logVerbose("in copyToClip, attrVal:" + attrVal,"");
if (UtilValidate.isNotEmpty(attrVal)) {
- passedPK.put(attrName,attrVal);
+ passedPK.put(attrName, attrVal);
} else {
String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.empty", locale);
request.setAttribute("_ERROR_MESSAGE_", attrName + " " + errMsg);
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
index bb99807..da59b83 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
@@ -77,7 +77,7 @@ public final class LayoutWorker {
return ServiceUtil.returnError(e4.getMessage());
}
- if(lst.size() == 0 && UtilValidate.isNotEmpty(request.getAttribute("fileItems"))) {
+ if (lst.size() == 0 && UtilValidate.isNotEmpty(request.getAttribute("fileItems"))) {
lst = UtilGenerics.cast(request.getAttribute("fileItems"));
}
if (lst.size() == 0) {
diff --git a/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java b/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
index 7ea8f9a..f8a9c15 100644
--- a/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
+++ b/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
@@ -119,7 +119,7 @@ public class HumanResEvents {
dataAttrMap.put("href", hrefStr);
dataMap.put("title", title);
dataMap.put("attr", dataAttrMap);
- josonMap.put("attr",attrMap);
+ josonMap.put("attr", attrMap);
josonMap.put("data", dataMap);
responseList.add(josonMap) ;
}
@@ -157,7 +157,7 @@ public class HumanResEvents {
Map<String, Object> dataAttrMap = new HashMap<>();
Map<String, Object> attrMap = new HashMap<>();
catId = childOfCom.getString("partyIdTo");
- title = PartyHelper.getPartyName(delegator,catId, false);
+ title = PartyHelper.getPartyName(delegator, catId, false);
josonMap.put("title",title);
//Check child existing
List<GenericValue> childOfSubComs = EntityQuery.use(delegator).from("PartyRelationship")
@@ -179,7 +179,7 @@ public class HumanResEvents {
dataAttrMap.put("href", hrefStr);
dataMap.put("attr", dataAttrMap);
dataMap.put("title", title);
- josonMap.put("attr",attrMap);
+ josonMap.put("attr", attrMap);
josonMap.put("data", dataMap);
resultList.add(josonMap);
}
@@ -231,7 +231,7 @@ public class HumanResEvents {
emplDataAttrMap.put("id", emplId);
emplDataAttrMap.put("rel", "N");
emplMap.put("data", empldataMap);
- emplMap.put("attr",emplDataAttrMap);
+ emplMap.put("attr", emplDataAttrMap);
emplMap.put("title",title);
resultList.add(emplMap);
}
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
index 9ed5c37..584d9c6 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
@@ -274,7 +274,7 @@ public class ProductionRun {
}
}
/**
- * call recalculateEstimatedCompletionDate(0,estimatedStartDate), so recalculated for all the routing tasks.
+ * call recalculateEstimatedCompletionDate(0, estimatedStartDate), so recalculated for all the routing tasks.
*/
public Timestamp recalculateEstimatedCompletionDate() {
this.updateCompletionDate = false;
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 d4118dd..acd4a06 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
@@ -272,7 +272,7 @@ public class ProductionRunServices {
serviceContext.put("workEffortPurposeTypeId", "WEPT_PRODUCTION_RUN");
serviceContext.put("currentStatusId", "PRUN_CREATED");
serviceContext.put("workEffortName", workEffortName);
- serviceContext.put("description",description);
+ serviceContext.put("description", description);
serviceContext.put("facilityId", facilityId);
serviceContext.put("estimatedStartDate",startDate);
serviceContext.put("quantityToProduce", pRQuantity);
@@ -336,7 +336,7 @@ public class ProductionRunServices {
serviceContext.put("facilityId", facilityId);
serviceContext.put("reservPersons", routingTask.get("reservPersons"));
serviceContext.put("estimatedStartDate",startDate);
- serviceContext.put("estimatedCompletionDate",endDate);
+ serviceContext.put("estimatedCompletionDate", endDate);
serviceContext.put("estimatedSetupMillis", routingTask.get("estimatedSetupMillis"));
serviceContext.put("estimatedMilliSeconds", routingTask.get("estimatedMilliSeconds"));
serviceContext.put("quantityToProduce", pRQuantity);
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
index 9e467bc..2b1cb55 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
@@ -184,7 +184,7 @@ public class ProposedOrder {
// add the daysToShip at the end of the routing
totalTime += timeToShip;
}
- startDate = TechDataServices.addBackward(TechDataServices.getTechDataCalendar(routingTask),endDate, totalTime);
+ startDate = TechDataServices.addBackward(TechDataServices.getTechDataCalendar(routingTask), endDate, totalTime);
// record the routingTask with the startDate associated
result.put(routingTask.getString("workEffortId"),startDate);
endDate = startDate;
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
index 2503f68..09a8495 100644
--- 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
@@ -256,7 +256,7 @@ public class TechDataServices {
dayStart = (dayStart==7) ? 1 : dayStart +1;
}
}
- result.put("capacity",capacity);
+ result.put("capacity", capacity);
result.put("startTime",startTime);
result.put("moveDay", moveDay);
return result;
@@ -329,7 +329,7 @@ public class TechDataServices {
if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo,moveDay);
dateTo.setTime(dateTo.getTime() + startTime.getTime() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET));
}
- result.put("dateTo",dateTo);
+ result.put("dateTo", dateTo);
result.put("nextCapacity",position.get("capacity"));
return result;
}
@@ -410,7 +410,7 @@ public class TechDataServices {
dayEnd = (dayEnd==1) ? 7 : dayEnd - 1;
}
}
- result.put("capacity",capacity);
+ result.put("capacity", capacity);
result.put("startTime",startTime);
result.put("moveDay", moveDay);
return result;
@@ -485,7 +485,7 @@ public class TechDataServices {
if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo,moveDay);
dateTo.setTime(dateTo.getTime() + startTime.getTime() + capacity.longValue() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET));
}
- result.put("dateTo",dateTo);
+ result.put("dateTo", dateTo);
result.put("previousCapacity",position.get("capacity"));
return result;
}
diff --git a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
index 0e22d2e..692525d 100644
--- a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
+++ b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
@@ -514,7 +514,7 @@ public class TrackingCodeEvents {
GenericValue trackingCodeOrder = delegator.makeValue("TrackingCodeOrder",
UtilMisc.toMap("trackingCodeTypeId", trackingCode.get("trackingCodeTypeId"),
"trackingCodeId", trackingCodeId, "isBillable", isBillable, "siteId", siteId,
- "hasExported", "N", "affiliateReferredTimeStamp",affiliateReferredTimeStamp));
+ "hasExported", "N", "affiliateReferredTimeStamp", affiliateReferredTimeStamp));
Debug.logInfo(" trackingCodeOrder is " + trackingCodeOrder, MODULE);
trackingCodeOrders.add(trackingCodeOrder);
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
index d0ff84a..57d3f4b 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
@@ -435,7 +435,7 @@ public class OrderReturnServices {
}
String returnStatus = returnHeader.getString("statusId");
if (!"RETURN_CANCELLED".equals(returnStatus)) {
- if(UtilValidate.isNotEmpty(returnItem.getBigDecimal("returnQuantity"))){
+ if (UtilValidate.isNotEmpty(returnItem.getBigDecimal("returnQuantity"))){
returnedQty = returnedQty.add(returnItem.getBigDecimal("returnQuantity"));
}
}
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 7f911ba..a9e03d4 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
@@ -718,7 +718,7 @@ public class OrderServices {
techDataCalendar.set("calendarId", calendarId);
tempList.add(techDataCalendar);
Debug.logInfo("update fixed Asset",MODULE);
- fixedAsset.set("calendarId",calendarId);
+ fixedAsset.set("calendarId", calendarId);
tempList.add(fixedAsset);
}
// then create the workEffort and the workOrderItemFulfillment to connect to the order and orderItem
@@ -742,7 +742,7 @@ public class OrderServices {
while (--dayCount >= 0) {
GenericValue techDataCalendarExcDay = null;
// find an existing Day exception record
- Timestamp exceptionDateStartTime = UtilDateTime.getDayStart(new Timestamp(estimatedStartDate.getTime()),(int)dayCount);
+ Timestamp exceptionDateStartTime = UtilDateTime.getDayStart(new Timestamp(estimatedStartDate.getTime()), (int)dayCount);
try {
techDataCalendarExcDay = EntityQuery.use(delegator).from("TechDataCalendarExcDay").where("calendarId", fixedAsset.get("calendarId"), "exceptionDateStartTime", exceptionDateStartTime).queryOne();
}
@@ -3563,7 +3563,7 @@ public class OrderServices {
try {
//For quantity we should test if we allow to add decimal quantity for this product an productStore :
// if not and if quantity is in decimal format then return error.
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
BigDecimal remainder = quantity.remainder(BigDecimal.ONE);
if (remainder.compareTo(BigDecimal.ZERO) != 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "cart.addToCart.quantityInDecimalNotAllowed", locale));
@@ -3735,7 +3735,7 @@ public class OrderServices {
try {
//For quantity we should test if we allow to add decimal quantity for this product an productStore :
// if not and if quantity is in decimal format then return error.
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, cartItem.getProductId(), cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, cartItem.getProductId(), cart.getProductStoreId())){
BigDecimal remainder = qty.remainder(BigDecimal.ONE);
if (remainder.compareTo(BigDecimal.ZERO) != 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "cart.addToCart.quantityInDecimalNotAllowed", locale));
@@ -3898,7 +3898,7 @@ public class OrderServices {
try {
//For quantity we should test if we allow to add decimal quantity for this product an productStore :
// if not and if quantity is in decimal format then return error.
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, cartItem.getProductId(), cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, cartItem.getProductId(), cart.getProductStoreId())){
BigDecimal remainder = groupQty.remainder(BigDecimal.ONE);
if (remainder.compareTo(BigDecimal.ZERO) != 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "cart.addToCart.quantityInDecimalNotAllowed", locale));
@@ -6448,7 +6448,7 @@ public class OrderServices {
}
// set first shipping method from list, if shipping method for ship group is not applicable to new ship address.
- if(!isShippingMethodAvailable) {
+ if (!isShippingMethodAvailable) {
shoppingCart.setShipmentMethodTypeId(groupIdx - 1, shippingMethods.get(0).getString("shipmentMethodTypeId"));
shoppingCart.setCarrierPartyId(groupIdx - 1, shippingMethods.get(0).getString("carrierPartyId"));
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
index d699f54..664561a 100644
--- 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
@@ -179,7 +179,7 @@ public class CheckOutEvents {
BigDecimal billingAccountAmt = null;
billingAccountAmt = determineBillingAccountAmount(billingAccountId, request.getParameter("billingAccountAmount"), dispatcher);
if ((billingAccountId != null) && !"_NA_".equals(billingAccountId) && (billingAccountAmt == null)) {
- request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR,"OrderInvalidAmountSetForBillingAccount", UtilMisc.toMap("billingAccountId",billingAccountId), cart.getLocale()));
+ request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR,"OrderInvalidAmountSetForBillingAccount", UtilMisc.toMap("billingAccountId", billingAccountId), cart.getLocale()));
return "error";
}
selectedPaymentMethods.put("EXT_BILLACT", UtilMisc.<String, Object>toMap("amount", billingAccountAmt, "securityCode", null));
@@ -358,7 +358,7 @@ public class CheckOutEvents {
BigDecimal billingAccountAmt = null;
billingAccountAmt = determineBillingAccountAmount(billingAccountId, request.getParameter("billingAccountAmount"), dispatcher);
if (billingAccountAmt == null) {
- request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR,"OrderInvalidAmountSetForBillingAccount", UtilMisc.toMap("billingAccountId",billingAccountId), (cart != null ? cart.getLocale() : Locale.getDefault())));
+ request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR,"OrderInvalidAmountSetForBillingAccount", UtilMisc.toMap("billingAccountId", billingAccountId), (cart != null ? cart.getLocale() : Locale.getDefault())));
return "error";
}
selectedPaymentMethods.put("EXT_BILLACT", UtilMisc.<String, Object>toMap("amount", billingAccountAmt, "securityCode", null));
@@ -443,14 +443,14 @@ public class CheckOutEvents {
if (UtilValidate.isEmpty(paymentMethodTypes)) {
String errMsg = UtilProperties.getMessage(RES_ERROR, "OrderNoPaymentMethodTypeSelected",
cart.getLocale());
- request.setAttribute("_ERROR_MESSAGE_",errMsg);
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String shipmentMethod = cart.getShipmentMethodTypeId();
if (UtilValidate.isEmpty(shipmentMethod)) {
String errMsg = UtilProperties.getMessage(RES_ERROR, "OrderNoShipmentMethodSelected",
cart.getLocale());
- request.setAttribute("_ERROR_MESSAGE_",errMsg);
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
}
@@ -832,9 +832,9 @@ public class CheckOutEvents {
String facilityId = request.getParameter(shipGroupIndex + "_shipGroupFacilityId");
if (shippingContactMechId == null) {
shippingContactMechId = (String) request.getAttribute("contactMechId");
- } else if("PURCHASE_ORDER".equals(cart.getOrderType())){
+ } else if ("PURCHASE_ORDER".equals(cart.getOrderType())){
String[] shipInfo = shippingContactMechId.split("_@_");
- if(shipInfo.length > 1){
+ if (shipInfo.length > 1){
shippingContactMechId = shipInfo[0];
facilityId = shipInfo[1];
}
@@ -935,7 +935,7 @@ public class CheckOutEvents {
BigDecimal billingAccountAmt = null;
billingAccountAmt = determineBillingAccountAmount(billingAccountId, request.getParameter("billingAccountAmount"), dispatcher);
if (billingAccountAmt == null) {
- request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR,"OrderInvalidAmountSetForBillingAccount", UtilMisc.toMap("billingAccountId",billingAccountId), (cart != null ? cart.getLocale() : Locale.getDefault())));
+ request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR,"OrderInvalidAmountSetForBillingAccount", UtilMisc.toMap("billingAccountId", billingAccountId), (cart != null ? cart.getLocale() : Locale.getDefault())));
return "error";
}
selectedPaymentMethods.put("EXT_BILLACT", UtilMisc.<String, Object>toMap("amount", billingAccountAmt, "securityCode", null));
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
index 4e2d3d4..e795f0f 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
@@ -511,8 +511,8 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
Timestamp shipBeforeDate, Timestamp shipAfterDate, Map<String, GenericValue> features, Map<String, Object> attributes, String prodCatalogId,
ProductConfigWrapper configWrapper, String itemType, String itemGroupNumber, String parentProductId, LocalDispatcher dispatcher) throws CartItemModifyException, ItemNotFoundException {
- return addOrIncreaseItem(productId,selectedAmount,quantity,reservStart,reservLength,reservPersons, null,null,shipBeforeDate,shipAfterDate,features,attributes,prodCatalogId,
- configWrapper,itemType,itemGroupNumber,parentProductId,dispatcher);
+ return addOrIncreaseItem(productId,selectedAmount,quantity,reservStart,reservLength,reservPersons, null,null,shipBeforeDate,shipAfterDate,features, attributes,prodCatalogId,
+ configWrapper,itemType,itemGroupNumber,parentProductId, dispatcher);
}
/** add rental (with accommodation) item to cart */
@@ -556,7 +556,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
BigDecimal newQuantity = sci.getQuantity().add(quantity);
try {
BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(),sci.getBasePrice(), productId);
- if(newQuantity.compareTo(minQuantity) < 0) {
+ if (newQuantity.compareTo(minQuantity) < 0) {
newQuantity = minQuantity;
}
} catch (GenericEntityException e) {
@@ -603,7 +603,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
} else {
try {
BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(),null, productId);
- if(quantity.compareTo(minQuantity) < 0) {
+ if (quantity.compareTo(minQuantity) < 0) {
quantity = minQuantity;
}
} catch (GenericEntityException e) {
@@ -1132,7 +1132,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
String checkResult = ProductPromoWorker.checkCanUsePromoCode(promoCode, partyId, this.getDelegator(), locale);
if (checkResult != null) {
promoCodeIter.remove();
- Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderOnUserChangePromoCodeWasRemovedBecause", UtilMisc.toMap("checkResult",checkResult), locale), MODULE);
+ Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderOnUserChangePromoCodeWasRemovedBecause", UtilMisc.toMap("checkResult", checkResult), locale), MODULE);
}
}
@@ -2123,7 +2123,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
public void setItemShipGroupQty(int itemIndex, BigDecimal quantity, int idx) {
ShoppingCartItem itemIdx = this.findCartItem(itemIndex);
- if(itemIdx != null) {
+ if (itemIdx != null) {
this.setItemShipGroupQty(itemIdx, itemIndex, quantity, idx);
}
}
@@ -3537,7 +3537,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
serviceContext.put("internalName", internalName);
serviceContext.put("productName", productName);
serviceContext.put("description", description);
- if(ProductWorker.isAggregateService(delegator, item.getProductId())) {
+ if (ProductWorker.isAggregateService(delegator, item.getProductId())) {
serviceContext.put("productTypeId", "AGGREGATEDSERV_CONF");
}
else {
@@ -4836,7 +4836,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable {
GenericValue shipAdj = delegator.makeValue("OrderAdjustment");
shipAdj.set("orderAdjustmentTypeId", "SHIPPING_CHARGES");
shipAdj.set("amount", shipEstimate);
- if("PURCHASE_ORDER".equals(cart.getOrderType())) {
+ if ("PURCHASE_ORDER".equals(cart.getOrderType())) {
shipAdj.set("isManual", "Y");
}
shipAdj.set("shipGroupSeqId", shipGroupSeqId);
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
index e185bf8..f05da16 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
@@ -127,7 +127,7 @@ public class ShoppingCartEvents {
if (!itemAdjustments.isEmpty()) {
index = 0;
for (GenericValue adjustment : itemAdjustments ) {
- if(adjustment.get("productPromoId").equals(productPromoId)) {
+ if (adjustment.get("productPromoId").equals(productPromoId)) {
checkItem.getAdjustments().remove(index);
result = "success";
}
@@ -466,7 +466,7 @@ public class ShoppingCartEvents {
quantity = (BigDecimal) ObjectType.simpleTypeOrObjectConvert(quantityStr, "BigDecimal", null, locale);
//For quantity we should test if we allow to add decimal quantity for this product an productStore :
// if not and if quantity is in decimal format then return error.
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
BigDecimal remainder = quantity.remainder(BigDecimal.ONE);
if (remainder.compareTo(BigDecimal.ZERO) != 0) {
request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR, "cart.addToCart.quantityInDecimalNotAllowed", locale));
@@ -640,7 +640,7 @@ public class ShoppingCartEvents {
}
// check for alternative packing
- if(ProductWorker.isAlternativePacking(delegator, productId , parentProductId)){
+ if (ProductWorker.isAlternativePacking(delegator, productId , parentProductId)){
GenericValue parentProduct = null;
try {
parentProduct = EntityQuery.use(delegator).from("Product").where("productId", parentProductId).queryOne();
@@ -648,7 +648,7 @@ public class ShoppingCartEvents {
Debug.logError(e, "Error getting parent product", MODULE);
}
BigDecimal piecesIncluded = BigDecimal.ZERO;
- if(parentProduct != null){
+ if (parentProduct != null){
piecesIncluded = new BigDecimal(parentProduct.getLong("piecesIncluded"));
quantity = quantity.multiply(piecesIncluded);
}
@@ -1840,7 +1840,7 @@ public class ShoppingCartEvents {
try {
//For quantity we should test if we allow to add decimal quantity for this product an productStore :
// if not and if quantity is in decimal format then return error.
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
BigDecimal remainder = quantity.remainder(BigDecimal.ONE);
if (remainder.compareTo(BigDecimal.ZERO) != 0) {
request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(RES_ERROR, "cart.addToCart.quantityInDecimalNotAllowed", cart.getLocale()));
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
index dbe7da6..a210669 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
@@ -108,9 +108,9 @@ public class ShoppingCartHelper {
ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) {
return addToCart(catalogId,shoppingListId,shoppingListItemSeqId,productId,
- productCategoryId,itemType,itemDescription,price,amount,quantity,
+ productCategoryId,itemType,itemDescription,price, amount,quantity,
reservStart,reservLength,reservPersons,null,null,shipBeforeDate,shipAfterDate,
- configWrapper,itemGroupNumber,context,parentProductId);
+ configWrapper,itemGroupNumber, context,parentProductId);
}
/** Overriden for reserveAfterDate. */
@@ -122,9 +122,9 @@ public class ShoppingCartHelper {
ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) {
return addToCart(catalogId,shoppingListId,shoppingListItemSeqId,productId,
- productCategoryId,itemType,itemDescription,price,amount,quantity,
+ productCategoryId,itemType,itemDescription,price, amount,quantity,
reservStart,reservLength,reservPersons,null,null,shipBeforeDate,shipAfterDate,null,
- configWrapper,itemGroupNumber,context,parentProductId);
+ configWrapper,itemGroupNumber, context,parentProductId);
}
/** Event to add an item to the shopping cart with accommodation. */
@@ -438,7 +438,7 @@ public class ShoppingCartHelper {
}
if (quantity.compareTo(BigDecimal.ZERO) > 0) {
// check for alternative packing
- if(ProductWorker.isAlternativePacking(delegator, null , productId)){
+ if (ProductWorker.isAlternativePacking(delegator, null , productId)){
GenericValue originalProduct = null;
originalProductId = productId;
productId = ProductWorker.getOriginalProductId(delegator, productId);
@@ -447,7 +447,7 @@ public class ShoppingCartHelper {
} catch (GenericEntityException e) {
Debug.logError(e, "Error getting parent product", MODULE);
}
- if(originalProduct != null){
+ if (originalProduct != null){
BigDecimal piecesIncluded = new BigDecimal(originalProduct.getLong("piecesIncluded"));
quantity = quantity.multiply(piecesIncluded);
}
@@ -456,7 +456,7 @@ public class ShoppingCartHelper {
try {
//For quantity we should test if we allow to add decimal quantity for this product an productStore :
// if not and if quantity is in decimal format then return error.
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){
BigDecimal remainder = quantity.remainder(BigDecimal.ONE);
if (remainder.compareTo(BigDecimal.ZERO) != 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "cart.addToCart.quantityInDecimalNotAllowed", this.cart.getLocale()));
@@ -1061,12 +1061,12 @@ public class ShoppingCartHelper {
agreement = EntityQuery.use(this.delegator).from("Agreement").where("agreementId", agreementId).cache(true).queryOne();
} catch (GenericEntityException e) {
Debug.logWarning(e.toString(), MODULE);
- result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreement",UtilMisc.toMap("agreementId",agreementId),this.cart.getLocale()) + UtilProperties.getMessage(RES_ERROR,"OrderError",this.cart.getLocale()) + e.getMessage());
+ result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreement",UtilMisc.toMap("agreementId", agreementId),this.cart.getLocale()) + UtilProperties.getMessage(RES_ERROR,"OrderError",this.cart.getLocale()) + e.getMessage());
return result;
}
if (agreement == null) {
- result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreement",UtilMisc.toMap("agreementId",agreementId),this.cart.getLocale()));
+ result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreement",UtilMisc.toMap("agreementId", agreementId),this.cart.getLocale()));
} else {
// set the agreement id in the cart
cart.setAgreementId(agreementId);
@@ -1078,7 +1078,7 @@ public class ShoppingCartHelper {
String currencyUomId = (String) agreementItem.get("currencyUomId");
if (UtilValidate.isNotEmpty(currencyUomId)) {
try {
- cart.setCurrency(dispatcher,currencyUomId);
+ cart.setCurrency(dispatcher, currencyUomId);
} catch (CartItemModifyException ex) {
result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderSetCurrencyError",this.cart.getLocale()) + ex.getMessage());
return result;
@@ -1087,7 +1087,7 @@ public class ShoppingCartHelper {
}
} catch (GenericEntityException e) {
Debug.logWarning(e.toString(), MODULE);
- result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreementItemsThrough",UtilMisc.toMap("agreementId",agreementId),this.cart.getLocale()) + UtilProperties.getMessage(RES_ERROR,"OrderError",this.cart.getLocale()) + e.getMessage());
+ result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreementItemsThrough",UtilMisc.toMap("agreementId", agreementId),this.cart.getLocale()) + UtilProperties.getMessage(RES_ERROR,"OrderError",this.cart.getLocale()) + e.getMessage());
return result;
}
@@ -1108,7 +1108,7 @@ public class ShoppingCartHelper {
}
} catch (GenericEntityException e) {
Debug.logWarning(e.toString(), MODULE);
- result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreementTermsThrough",UtilMisc.toMap("agreementId",agreementId),this.cart.getLocale()) + UtilProperties.getMessage(RES_ERROR,"OrderError",this.cart.getLocale()) + e.getMessage());
+ result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCouldNotGetAgreementTermsThrough",UtilMisc.toMap("agreementId", agreementId),this.cart.getLocale()) + UtilProperties.getMessage(RES_ERROR,"OrderError",this.cart.getLocale()) + e.getMessage());
return result;
}
}
@@ -1119,7 +1119,7 @@ public class ShoppingCartHelper {
Map<String, Object> result = null;
try {
- this.cart.setCurrency(this.dispatcher,currencyUomId);
+ this.cart.setCurrency(this.dispatcher, currencyUomId);
result = ServiceUtil.returnSuccess();
} catch (CartItemModifyException ex) {
result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderSetCurrencyError",this.cart.getLocale()) + ex.getMessage());
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
index 62618a9..a4bd3ec 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
@@ -297,8 +297,8 @@ public class ShoppingCartItem implements java.io.Serializable {
return makeItem(cartLocation,productId,selectedAmount,quantity,unitPrice,
reservStart,reservLength,reservPersons,null,null,shipBeforeDate,shipAfterDate, null,
- additionalProductFeatureAndAppls,attributes,prodCatalogId,configWrapper,
- itemType,itemGroup,dispatcher,cart,triggerExternalOpsBool,triggerPriceRulesBool,
+ additionalProductFeatureAndAppls, attributes,prodCatalogId, configWrapper,
+ itemType,itemGroup, dispatcher, cart,triggerExternalOpsBool,triggerPriceRulesBool,
parentProductId,skipInventoryChecks,skipProductChecks);
}
@@ -385,8 +385,8 @@ public class ShoppingCartItem implements java.io.Serializable {
return makeItem(cartLocation,product,selectedAmount,
quantity,unitPrice,reservStart,reservLength,reservPersons,
- null,null,shipBeforeDate,shipAfterDate, null, additionalProductFeatureAndAppls,attributes,
- prodCatalogId,configWrapper,itemType,itemGroup,dispatcher,cart,
+ null,null,shipBeforeDate,shipAfterDate, null, additionalProductFeatureAndAppls, attributes,
+ prodCatalogId, configWrapper,itemType,itemGroup, dispatcher, cart,
triggerExternalOpsBool,triggerPriceRulesBool,parentProduct,skipInventoryChecks,skipProductChecks);
}
@@ -467,7 +467,7 @@ public class ShoppingCartItem implements java.io.Serializable {
}
if ((accommodationMapId != null) && (accommodationSpotId != null)) {
- newItem.setAccommodationId(accommodationMapId,accommodationSpotId);
+ newItem.setAccommodationId(accommodationMapId, accommodationSpotId);
}
// check to see if the related fixed asset is available for rent
@@ -1087,7 +1087,7 @@ public class ShoppingCartItem implements java.io.Serializable {
BigDecimal adjustmentAmount = depositAmount.getBigDecimal("price").multiply(this.getQuantity(), generalRounding);
// itemAdjustments is a reference so directly setting updated amount to the same.
for(GenericValue itemAdjustment : itemAdjustments) {
- if("DEPOSIT_ADJUSTMENT".equals(itemAdjustment.getString("orderAdjustmentTypeId"))) {
+ if ("DEPOSIT_ADJUSTMENT".equals(itemAdjustment.getString("orderAdjustmentTypeId"))) {
itemAdjustment.set("amount", adjustmentAmount);
updatedDepositAmount = true;
}
@@ -1127,7 +1127,7 @@ public class ShoppingCartItem implements java.io.Serializable {
// check alternative packaging
boolean isAlternativePacking = ProductWorker.isAlternativePacking(delegator, this.productId , this.getParentProductId());
BigDecimal pieces = BigDecimal.ONE;
- if(isAlternativePacking && UtilValidate.isNotEmpty(this.getParentProduct())){
+ if (isAlternativePacking && UtilValidate.isNotEmpty(this.getParentProduct())){
GenericValue originalProduct = this.getParentProduct();
if (originalProduct != null) {
pieces = new BigDecimal(originalProduct.getLong("piecesIncluded"));
@@ -1155,7 +1155,7 @@ public class ShoppingCartItem implements java.io.Serializable {
throw new CartItemModifyException("Could not find a valid price for the product with ID [" + this.getProductId() + "] and supplier with ID [" + partyId + "], not adding to cart.");
}
- if(isAlternativePacking){
+ if (isAlternativePacking){
this.setBasePrice(((BigDecimal) priceResult.get("price")).divide(pieces, RoundingMode.HALF_UP));
}else{
this.setBasePrice(((BigDecimal) priceResult.get("price")));
@@ -1210,7 +1210,7 @@ public class ShoppingCartItem implements java.io.Serializable {
}
//set alternative product price
- if(isAlternativePacking){
+ if (isAlternativePacking){
int decimals = 2;
if (priceResult.get("listPrice") != null) {
this.listPrice = ((BigDecimal) priceResult.get("listPrice")).divide(pieces, decimals, RoundingMode.HALF_UP);
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
index b56f943..c9254d8 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
@@ -414,7 +414,7 @@ public class ShoppingCartServices {
}
//BigDecimal quantity = item.getBigDecimal("quantity");
BigDecimal quantity = BigDecimal.ZERO;
- if("ITEM_COMPLETED".equals(item.getString("statusId")) && "N".equals(createAsNewOrder)) {
+ if ("ITEM_COMPLETED".equals(item.getString("statusId")) && "N".equals(createAsNewOrder)) {
quantity = item.getBigDecimal("quantity");
} else {
quantity = OrderReadHelper.getOrderItemQuantity(item);
@@ -492,7 +492,7 @@ public class ShoppingCartServices {
configWrapper = ProductConfigWorker.loadProductConfigWrapper(delegator, dispatcher, configId, productId, productStoreId, prodCatalogId, website, currency, locale, userLogin);
}
try {
- itemIndex = cart.addItemToEnd(productId, amount, quantity, unitPrice, reservStart, reservLength, reservPersons,accommodationMapId,accommodationSpotId, null, null, prodCatalogId, configWrapper, item.getString("orderItemTypeId"), dispatcher, null, unitPrice == null ? null : false, skipInventoryChecks, skipProductChecks);
+ itemIndex = cart.addItemToEnd(productId, amount, quantity, unitPrice, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, null, null, prodCatalogId, configWrapper, item.getString("orderItemTypeId"), dispatcher, null, unitPrice == null ? null : false, skipInventoryChecks, skipProductChecks);
} catch (ItemNotFoundException | CartItemModifyException e) {
Debug.logError(e, MODULE);
return ServiceUtil.returnError(e.getMessage());
@@ -1142,7 +1142,7 @@ public class ShoppingCartServices {
cartItemData.put("displayItemSubTotalCurrencyFormatted_" + cartLineIndex ,org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getDisplayItemSubTotal(), isoCode, locale));
cartItemData.put("displayItemAdjustment_" + cartLineIndex ,org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getOtherAdjustments(), isoCode, locale));
}
- result.put("cartItemData",cartItemData);
+ result.put("cartItemData", cartItemData);
}
return result;
}
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
index d4cbb40..14b075b 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
@@ -271,7 +271,7 @@ public final class ProductDisplayWorker {
Integer quantity = entry.getValue();
BigDecimal occs = productQuantities.get(prodId);
//For quantity we should test if we allow to add decimal quantity for this product an productStore : if not then round to 0
- if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, prodId, cart.getProductStoreId())){
+ if (! ProductWorker.isDecimalQuantityOrderAllowed(delegator, prodId, cart.getProductStoreId())){
occs = occs.setScale(0, UtilNumber.getRoundingMode("order.rounding"));
}
else {
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
index 245e5cf..f02d247 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
@@ -1222,7 +1222,7 @@ public final class ProductPromoWorker {
List<GenericValue> adjustments = cartItem.getAdjustments();
if (UtilValidate.isNotEmpty(adjustments)) {
for(GenericValue adjustment : adjustments) {
- if("PROMOTION_ADJUSTMENT".equals(adjustment.getString("orderAdjustmentTypeId")) &&
+ if ("PROMOTION_ADJUSTMENT".equals(adjustment.getString("orderAdjustmentTypeId")) &&
productPromoAction.get("productPromoId").equals(adjustment.getString("productPromoId")) &&
productPromoAction.get("productPromoRuleId").equals(adjustment.getString("productPromoRuleId")) &&
productPromoAction.get("productPromoActionSeqId").equals(adjustment.getString("productPromoActionSeqId"))) {
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
index 6b2e2f4..5fb7d35 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
@@ -304,8 +304,8 @@ public class CommunicationEventServices {
String contactMechId = communicationEvent.getString("contactMechIdTo");
// Check contactMech type to FTP_ADDRESS
- GenericValue contactMech = EntityQuery.use(delegator).from("ContactMech").cache().where("contactMechId",contactMechId).queryOne();
- GenericValue ftpAddress = EntityQuery.use(delegator).from("FtpAddress").cache().where("contactMechId",contactMechId).queryOne();
+ GenericValue contactMech = EntityQuery.use(delegator).from("ContactMech").cache().where("contactMechId", contactMechId).queryOne();
+ GenericValue ftpAddress = EntityQuery.use(delegator).from("FtpAddress").cache().where("contactMechId", contactMechId).queryOne();
if (null == contactMech || null == ftpAddress || !"FTP_ADDRESS".equals(contactMech.getString("contactMechTypeId"))) {
String errMsg = UtilProperties.getMessage(RESOURCE, "commeventservices.communication_event_to_contact_mech_must_be_ftp", locale);
return ServiceUtil.returnError(errMsg + " " + communicationEventId);
@@ -983,7 +983,7 @@ public class CommunicationEventServices {
if (userLogin.get("partyId") == null && partyIdTo != null) {
int ch = 0;
for (ch=partyIdTo.length(); ch > 0 && Character.isDigit(partyIdTo.charAt(ch-1)); ch--) {}
- userLogin.put("partyId", partyIdTo.substring(0,ch)); //allow services to be called to have prefix
+ userLogin.put("partyId", partyIdTo.substring(0, ch)); //allow services to be called to have prefix
}
// get the 'from' partyId
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
index 2235ce9..6123541 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
@@ -118,7 +118,7 @@ public class PartyContentWrapper implements ContentWrapper {
public static String getPartyContentAsText(GenericValue party, String partyContentId, HttpServletRequest request, String encoderType) {
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
String mimeTypeId = EntityUtilProperties.getPropertyValue("content", "defaultMimeType", "text/html; charset=utf-8", party.getDelegator());
- return getPartyContentAsText(party, partyContentId, null, UtilHttp.getLocale(request), mimeTypeId, party.getDelegator(), dispatcher, true,encoderType);
+ return getPartyContentAsText(party, partyContentId, null, UtilHttp.getLocale(request), mimeTypeId, party.getDelegator(), dispatcher, true, encoderType);
}
public static String getPartyContentAsText(GenericValue party, String partyContentId, Locale locale, LocalDispatcher dispatcher, String encoderType) {
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
index a123534..ea5bd54 100644
--- 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
@@ -1463,7 +1463,7 @@ public class PartyServices {
Debug.logInfo("In findParty mainCond=" + mainCond, MODULE);
String sortField = (String) context.get("sortField");
- if(UtilValidate.isNotEmpty(sortField)){
+ if (UtilValidate.isNotEmpty(sortField)){
orderBy.add(sortField);
}
@@ -1548,7 +1548,7 @@ public class PartyServices {
List<String> orderBy = new ArrayList<>();
String sortField = (String) context.get("sortField");
- if(UtilValidate.isNotEmpty(sortField)){
+ if (UtilValidate.isNotEmpty(sortField)){
orderBy.add(sortField);
}
List<String> fieldsToSelect = new ArrayList<>();
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
index 8daa7e2..ef76342 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
@@ -471,7 +471,7 @@ public class CategoryServices {
CategoryWorker.getRelatedCategories(request, "ChildCatalogList", CatalogWorker.getCatalogTopCategoryId(request, productCategoryId), true);
childOfCats = EntityUtil.filterByDate((List<GenericValue>) request.getAttribute("ChildCatalogList"));
- } else if("false".equals(isCatalog) && "false".equals(isCategoryType)){
+ } else if ("false".equals(isCatalog) && "false".equals(isCategoryType)){
childOfCats = EntityQuery.use(delegator).from("ProductCategoryRollupAndChild").where("parentProductCategoryId", productCategoryId).filterByDate().queryList();
} else {
childOfCats = EntityQuery.use(delegator).from("ProdCatalogCategory").where("prodCatalogId", productCategoryId).filterByDate().queryList();
@@ -493,7 +493,7 @@ public class CategoryServices {
childList = EntityQuery.use(delegator).from("ProductCategoryRollup").where("parentProductCategoryId", catId).filterByDate().queryList();
// Get the chosen category information for the categoryContentWrapper
- GenericValue cate = EntityQuery.use(delegator).from("ProductCategory").where("productCategoryId",catId).queryOne();
+ GenericValue cate = EntityQuery.use(delegator).from("ProductCategory").where("productCategoryId", catId).queryOne();
// If chosen category's child exists, then put the arrow before category icon
if (UtilValidate.isNotEmpty(childList)) {
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java
index 6eeeada..71b52e3 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java
@@ -92,7 +92,7 @@ public final class ProductConfigWorker {
Object o = combinedMap.get(Integer.toString(k));
if (o instanceof String) {
opts = new String[]{(String)o};
- } else if(o instanceof List) {
+ } else if (o instanceof List) {
List<?> list = (List<?>)o;
opts = list.toArray(new String[list.size()]);
}
@@ -218,7 +218,7 @@ public final class ProductConfigWorker {
configItemId = ci.getConfigItemAssoc().getString("configItemId");
sequenceNum = ci.getConfigItemAssoc().getLong("sequenceNum");
try {
- List<GenericValue> configs = EntityQuery.use(delegator).from("ProductConfigConfig").where("configItemId",configItemId,"sequenceNum", sequenceNum).queryList();
+ List<GenericValue> configs = EntityQuery.use(delegator).from("ProductConfigConfig").where("configItemId", configItemId,"sequenceNum", sequenceNum).queryList();
for (GenericValue productConfigConfig: configs) {
for (ConfigOption oneOption: selectedOptions) {
String configOptionId = oneOption.configOption.getString("configOptionId");
@@ -271,7 +271,7 @@ public final class ProductConfigWorker {
Map<String, String> componentOptions = anOption.getComponentOptions();
String optionProductId = aComponent.getString("productId");
String optionProductOptionId = null;
- if(UtilValidate.isNotEmpty(componentOptions)) {
+ if (UtilValidate.isNotEmpty(componentOptions)) {
optionProductOptionId = componentOptions.get(optionProductId);
}
String configOptionId = anOption.configOption.getString("configOptionId");
@@ -280,7 +280,7 @@ public final class ProductConfigWorker {
GenericValue configOptionProductOption = delegator.makeValue("ConfigOptionProductOption");
configOptionProductOption.set("configId", tempConfigId);
- configOptionProductOption.set("configItemId",configItemId);
+ configOptionProductOption.set("configItemId", configItemId);
configOptionProductOption.set("sequenceNum", sequenceNum);
configOptionProductOption.set("configOptionId", configOptionId);
configOptionProductOption.set("productId", optionProductId);
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
index 717ffae..65c440f 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
@@ -111,7 +111,7 @@ public class ScaleImage {
Map<String, Object> imageContext = new HashMap<>();
imageContext.putAll(context);
- imageContext.put("tenantId",((Delegator)context.get("delegator")).getDelegatorTenantId());
+ imageContext.put("tenantId", ((Delegator)context.get("delegator")).getDelegatorTenantId());
String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), imageContext);
String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", (Delegator)context.get("delegator")), imageContext);
imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
@@ -289,11 +289,11 @@ public class ScaleImage {
// paths
Map<String, Object> imageContext = new HashMap<>();
imageContext.putAll(context);
- imageContext.put("tenantId",((Delegator)context.get("delegator")).getDelegatorTenantId());
+ imageContext.put("tenantId", ((Delegator)context.get("delegator")).getDelegatorTenantId());
String mainFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", (Delegator) context.get("delegator"));
String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), imageContext);
- String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",(Delegator)context.get("delegator")), imageContext);
+ String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", (Delegator)context.get("delegator")), imageContext);
imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
String id = null;
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
index ffdd325..7a96e90 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
@@ -395,7 +395,7 @@ public class FrameImage {
if (UtilValidate.isNotEmpty(imageName)) {
File file = new File(imageServerPath + "/preview/" +"/previewImage.jpg");
- if(!file.delete()) {
+ if (!file.delete()) {
Debug.logError("File :" + file.getName() + ", couldn't be loaded", MODULE);
}
// Image Frame
@@ -429,7 +429,7 @@ public class FrameImage {
public static String chooseFrameImage(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
- if(UtilValidate.isEmpty(request.getParameter("frameContentId"))) {
+ if (UtilValidate.isEmpty(request.getParameter("frameContentId"))) {
if (UtilValidate.isNotEmpty(request.getParameter("frameExistContentId")) && UtilValidate.isNotEmpty(request.getParameter("frameExistDataResourceId"))) {
session.setAttribute("frameExistContentId", request.getParameter("frameExistContentId"));
session.setAttribute("frameDataResourceId", request.getParameter("frameExistDataResourceId"));
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java
index 3001786..7b71f10 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java
@@ -73,7 +73,7 @@ public class ImageUrlServlet extends HttpServlet {
String lastTagElement = tagElements.get(tagElements.size() - 1);
String contentId = lastTagElement.substring(0, lastTagElement.lastIndexOf('.'));
String sizeTagElement = null;
- if(tagElements.size() > 2){
+ if (tagElements.size() > 2){
sizeTagElement = tagElements.get(tagElements.size() - 2);
}
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java
index 39ad790..4952935 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java
@@ -912,7 +912,7 @@ public class InventoryServices {
Debug.logError(e, MODULE);
}
//change this for product price
- if(productPrices != null) {
+ if (productPrices != null) {
for (GenericValue onePrice: productPrices) {
if ("DEFAULT_PRICE".equals(onePrice.getString("productPriceTypeId"))) { //defaultPrice
result.put("defaultPrice", onePrice.getBigDecimal("price"));
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java
index ca1367e..d972c21 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java
@@ -1169,11 +1169,11 @@ public class ProductEvents {
return "error";
}
- if(UtilValidate.isEmpty(statusId)) {
+ if (UtilValidate.isEmpty(statusId)) {
statusId = "KW_PENDING";
}
- if(UtilValidate.isNotEmpty(matchList)) {
+ if (UtilValidate.isNotEmpty(matchList)) {
for (String keywordStr : matchList) {
try {
dispatcher.runSync("createProductKeyword", UtilMisc.toMap("productId", productId, "keyword", keywordStr.trim(), "keywordTypeId", "KWT_TAG", "statusId", statusId, "userLogin", userLogin));
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java
index 3eeed84..4058442 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java
@@ -2245,7 +2245,7 @@ public class ProductSearch {
if (this == obj) {
return true;
}
- if(obj == null) {
+ if (obj == null) {
return false;
}
if (!(obj instanceof GoodIdentificationConstraint)) {
@@ -2358,7 +2358,7 @@ public class ProductSearch {
public void setSortOrder(ProductSearchContext productSearchContext) {
if (productSearchContext.includedKeywordSearch) {
// we have to check this in order to be sure that there is a totalRelevancy to sort by...
- if(productSearchContext.keywordFixedOrSetAndList.size() > 0 || productSearchContext.andKeywordFixedSet.size() > 0) {
+ if (productSearchContext.keywordFixedOrSetAndList.size() > 0 || productSearchContext.andKeywordFixedSet.size() > 0) {
productSearchContext.orderByList.add("-totalRelevancy");
productSearchContext.fieldsToSelect.add("totalRelevancy");
}
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
index 530c0f1..c38ba90 100644
--- 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
@@ -961,7 +961,7 @@ public class ProductServices {
Map<String, Object> imageContext = new HashMap<>();
imageContext.putAll(context);
imageContext.put("delegator", delegator);
- imageContext.put("tenantId",delegator.getDelegatorTenantId());
+ imageContext.put("tenantId", delegator.getDelegatorTenantId());
String imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format", delegator);
String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), imageContext);
@@ -1084,7 +1084,7 @@ public class ProductServices {
/* store the imageUrl version of the image, for backwards compatibility with code that does not use scaled versions */
Map<String, Object> result = addImageResource(dispatcher, delegator, context, imageUrl, productContentTypeId);
- if( ServiceUtil.isError(result)) {
+ if ( ServiceUtil.isError(result)) {
return result;
}
@@ -1093,7 +1093,7 @@ public class ProductServices {
Map<String,String> imageUrlMap = UtilGenerics.cast(resultResize.get("imageUrlMap"));
for ( String sizeType : ScaleImage.sizeTypeList ) {
imageUrl = imageUrlMap.get(sizeType);
- if( UtilValidate.isNotEmpty(imageUrl)) {
+ if ( UtilValidate.isNotEmpty(imageUrl)) {
try {
GenericValue productContentType = EntityQuery.use(delegator)
.from("ProductContentType")
@@ -1102,7 +1102,7 @@ public class ProductServices {
.queryOne();
if (UtilValidate.isNotEmpty(productContentType)) {
result = addImageResource(dispatcher, delegator, context, imageUrl, "XTRA_IMG_" + viewNumber + "_" + sizeType.toUpperCase(Locale.getDefault()));
- if( ServiceUtil.isError(result)) {
+ if ( ServiceUtil.isError(result)) {
Debug.logError(ServiceUtil.getErrorMessage(result), MODULE);
return result;
}
@@ -1303,10 +1303,10 @@ public class ProductServices {
if (UtilValidate.isNotEmpty(context.get("_uploadedFile_fileName"))) {
Map<String, Object> imageContext = new HashMap<>();
imageContext.putAll(context);
- imageContext.put("tenantId",delegator.getDelegatorTenantId());
+ imageContext.put("tenantId", delegator.getDelegatorTenantId());
String imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", delegator);
- String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path",delegator), imageContext);
+ String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), imageContext);
String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator), imageContext);
imageServerPath = imageServerPath.endsWith("/") ? imageServerPath.substring(0, imageServerPath.length()-1) : imageServerPath;
imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java
index 918a522..17c0d70 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java
@@ -497,9 +497,9 @@ public final class ProductUtilServices {
if (UtilValidate.isEmpty(pattern)) {
Map<String, Object> imageContext = new HashMap<>();
imageContext.putAll(context);
- imageContext.put("tenantId",delegator.getDelegatorTenantId());
+ imageContext.put("tenantId", delegator.getDelegatorTenantId());
String imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", delegator);
- String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator), imageContext);
+ String imageUrlPrefix = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator), imageContext);
imageUrlPrefix = imageUrlPrefix.endsWith("/") ? imageUrlPrefix.substring(0, imageUrlPrefix.length()-1) : imageUrlPrefix;
pattern = imageUrlPrefix + "/" + imageFilenameFormat;
}
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
index d1bf319..2e69bf4 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
@@ -1151,7 +1151,7 @@ nextProd:
public static boolean isAlternativePacking(Delegator delegator, String productId, String virtualVariantId) {
boolean isAlternativePacking = false;
- if(productId != null || virtualVariantId != null){
+ if (productId != null || virtualVariantId != null){
List<GenericValue> alternativePackingProds = null;
try {
List<EntityCondition> condList = new LinkedList<>();
@@ -1164,7 +1164,7 @@ nextProd:
}
condList.add(EntityCondition.makeCondition("productAssocTypeId", "ALTERNATIVE_PACKAGE"));
alternativePackingProds = EntityQuery.use(delegator).from("ProductAssoc").where(condList).cache(true).queryList();
- if(UtilValidate.isNotEmpty(alternativePackingProds)) {
+ if (UtilValidate.isNotEmpty(alternativePackingProds)) {
isAlternativePacking = true;
}
} catch (GenericEntityException e) {
@@ -1203,13 +1203,13 @@ nextProd:
*/
public static Boolean isDecimalQuantityOrderAllowed(Delegator delegator, String productId, String productStoreId) throws GenericEntityException{
//sometime productStoreId may be null (ie PO), then return default value which is TRUE
- if(UtilValidate.isEmpty(productStoreId)){
+ if (UtilValidate.isEmpty(productStoreId)){
return Boolean.TRUE;
}
String allowDecimalStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).cache(true).queryOne().getString("orderDecimalQuantity");
String allowDecimalProduct = EntityQuery.use(delegator).from("Product").where("productId", productId).cache(true).queryOne().getString("orderDecimalQuantity");
- if("N".equals(allowDecimalProduct) || (UtilValidate.isEmpty(allowDecimalProduct) && "N".equals(allowDecimalStore))){
+ if ("N".equals(allowDecimalProduct) || (UtilValidate.isEmpty(allowDecimalProduct) && "N".equals(allowDecimalStore))){
return Boolean.FALSE;
}
return Boolean.TRUE;
@@ -1244,7 +1244,7 @@ nextProd:
Debug.logWarning("Error getting available marketing package.", MODULE);
BigDecimal availableInventory = (BigDecimal) resultOutput.get("availableToPromiseTotal");
- if(availableInventory.compareTo(BigDecimal.ZERO) > 0) {
+ if (availableInventory.compareTo(BigDecimal.ZERO) > 0) {
productsInStock.add(genericRecord);
}
} else {
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java
index ec67d8f..58bc429 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java
@@ -75,8 +75,8 @@ public class ProductStoreEvents {
josonMap.put("data", dataMap);
Map<String, String> attrMap = new HashMap<>();
attrMap.put("parentGroupId", productStoreGroupId);
- josonMap.put("attr",attrMap);
- josonMap.put("sequenceNum",child.get("sequenceNum"));
+ josonMap.put("attr", attrMap);
+ josonMap.put("sequenceNum", child.get("sequenceNum"));
josonMap.put("title", child.get("productStoreGroupName"));
productStoreGroupList.add(josonMap);
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java
index c859baf..d301035 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java
@@ -82,7 +82,7 @@ public class SupplierProductServices {
supplierProducts = virtualProduct.getRelated("SupplierProduct", null, null, true);
}
}
- if(agreementId != null) {
+ if (agreementId != null) {
supplierProducts = EntityUtil.filterByAnd(supplierProducts, UtilMisc.toMap("agreementId", agreementId));
}
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
index 3a4b841..182b687 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
@@ -1614,7 +1614,7 @@ public class UpsServices {
cxt.put("carrierPartyId", context.get("carrierPartyId"));
cxt.put("shipmentMethodTypeId", context.get("shipmentMethodTypeId"));
cxt.put("shippingPostalCode", shipToAddress.getString("postalCode"));
- cxt.put("shippingCountryCode",destCountryGeo.getString("geoCode"));
+ cxt.put("shippingCountryCode", destCountryGeo.getString("geoCode"));
cxt.put("packageWeights", context.get("packageWeights"));
cxt.put("shippableItemInfo", context.get("shippableItemInfo"));
cxt.put("shippableTotal", context.get("shippableTotal"));
@@ -1752,7 +1752,7 @@ public class UpsServices {
String accessLicenseNumber = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessLicenseNumber", serviceConfigProps, "shipment.ups.access.license.number", "");
String userId = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessUserId", serviceConfigProps, "shipment.ups.access.user.id", "");
String password = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessPassword", serviceConfigProps, "shipment.ups.access.password", "");
- UtilXml.addChildElementValue(accessRequestElement, "AccessLicenseNumber",accessLicenseNumber, accessRequestDocument);
+ UtilXml.addChildElementValue(accessRequestElement, "AccessLicenseNumber", accessLicenseNumber, accessRequestDocument);
UtilXml.addChildElementValue(accessRequestElement, "UserId", userId, accessRequestDocument);
UtilXml.addChildElementValue(accessRequestElement, "Password", password, accessRequestDocument);
return accessRequestDocument;