[ofbiz-framework] branch trunk updated: Improved: Corrected all checkstyle issues related to succeeding space for comma in applications directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review.
Locked
 
|
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 82ce430 Improved: Corrected all checkstyle issues related to succeeding space for comma in applications directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review. 82ce430 is described below commit 82ce4304ae99b5e320a76ee3ef9dbb14feb0acff Author: Suraj Khurana <[hidden email]> AuthorDate: Thu Jul 9 11:59:51 2020 +0530 Improved: Corrected all checkstyle issues related to succeeding space for comma in applications directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review. --- .../ofbiz/accounting/invoice/InvoiceServices.java | 6 +-- .../payment/GiftCertificateServices.java | 4 +- .../accounting/payment/PaymentGatewayServices.java | 2 +- .../ofbiz/accounting/tax/TaxAuthorityServices.java | 2 +- .../authorizedotnet/AIMPaymentServices.java | 20 ++++---- .../thirdparty/orbital/OrbitalPaymentServices.java | 12 ++--- .../thirdparty/sagepay/SagePayPaymentServices.java | 2 +- .../accounting/thirdparty/sagepay/SagePayUtil.java | 2 +- .../securepay/SecurePayPaymentServices.java | 4 +- .../thirdparty/securepay/SecurePayServiceTest.java | 6 +-- .../thirdparty/valuelink/ValueLinkServices.java | 4 +- .../ofbiz/content/ContentManagementWorker.java | 2 +- .../java/org/apache/ofbiz/content/ConvertTree.java | 10 ++-- .../content/content/ContentSearchSession.java | 2 +- .../ofbiz/content/content/ContentServices.java | 6 +-- .../ofbiz/content/content/ContentWorker.java | 16 +++--- .../content/content/UploadContentAndImage.java | 10 ++-- .../ofbiz/content/data/DataResourceWorker.java | 2 +- .../apache/ofbiz/content/data/DataServices.java | 2 +- .../apache/ofbiz/content/survey/SurveyWrapper.java | 2 +- .../webapp/ftl/InjectNodeTrailCsvTransform.java | 10 ++-- .../org/apache/ofbiz/humanres/HumanResEvents.java | 14 ++--- .../manufacturing/jobshopmgt/ProductionRun.java | 14 ++--- .../jobshopmgt/ProductionRunHelper.java | 2 +- .../jobshopmgt/ProductionRunServices.java | 60 +++++++++++----------- .../ofbiz/manufacturing/mrp/ProposedOrder.java | 2 +- .../manufacturing/techdata/TechDataServices.java | 6 +-- .../apache/ofbiz/order/order/OrderReadHelper.java | 4 +- .../ofbiz/order/order/OrderReturnServices.java | 6 +-- .../apache/ofbiz/order/order/OrderServices.java | 38 +++++++------- .../ofbiz/order/shoppingcart/ShoppingCart.java | 22 ++++---- .../order/shoppingcart/ShoppingCartEvents.java | 2 +- .../order/shoppingcart/ShoppingCartHelper.java | 38 +++++++------- .../ofbiz/order/shoppingcart/ShoppingCartItem.java | 36 ++++++------- .../order/shoppingcart/ShoppingCartServices.java | 4 +- .../shoppingcart/product/ProductPromoWorker.java | 14 ++--- .../order/shoppinglist/ShoppingListServices.java | 6 +-- .../thirdparty/zipsales/ZipSalesServices.java | 2 +- .../communication/CommunicationEventServices.java | 4 +- .../ofbiz/party/contact/ContactMechServices.java | 2 +- .../ofbiz/product/config/ProductConfigWorker.java | 4 +- .../org/apache/ofbiz/product/image/ScaleImage.java | 4 +- .../ofbiz/product/product/ProductSearch.java | 2 +- .../ofbiz/product/product/ProductServices.java | 14 ++--- .../ofbiz/product/product/ProductWorker.java | 8 +-- .../ofbiz/product/store/ProductStoreWorker.java | 4 +- .../ofbiz/shipment/shipment/ShipmentServices.java | 4 +- .../ofbiz/shipment/shipment/ShipmentWorker.java | 2 +- .../ofbiz/shipment/thirdparty/ups/UpsServices.java | 4 +- .../ofbiz/shipment/verify/VerifyPickSession.java | 2 +- .../workeffort/workeffort/WorkEffortSearch.java | 10 ++-- .../workeffort/WorkEffortSearchSession.java | 4 +- 52 files changed, 232 insertions(+), 232 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 605878b..e12f1df 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 @@ -2007,7 +2007,7 @@ public class InvoiceServices { String returnId= (String) context.get("returnId"); List<GenericValue> billItems = UtilGenerics.cast(context.get("billItems")); - String errorMsg = UtilProperties.getMessage(RESOURCE, "AccountingErrorCreatingInvoiceForReturn",UtilMisc.toMap("returnId", returnId), locale); + String errorMsg = UtilProperties.getMessage(RESOURCE, "AccountingErrorCreatingInvoiceForReturn", UtilMisc.toMap("returnId", returnId), locale); // List invoicesCreated = new ArrayList(); try { String invoiceTypeId; @@ -2763,7 +2763,7 @@ public class InvoiceServices { if (amountApplied.compareTo(toPaymentApplyAvailable) > 0) { errorMessageList.add(UtilProperties.getMessage(RESOURCE, "AccountingPaymentLessRequested", - UtilMisc.<String, Object>toMap("paymentId",toPaymentId, + UtilMisc.<String, Object>toMap("paymentId", toPaymentId, "paymentApplyAvailable", toPaymentApplyAvailable, "amountApplied", amountApplied, "isoCode", currencyUomId), locale)); } @@ -3394,7 +3394,7 @@ public class InvoiceServices { * @param paymentApplication * @return map results */ - private static Map<String, Object> storePaymentApplication(Delegator delegator, GenericValue paymentApplication,Locale locale) { + private static Map<String, Object> storePaymentApplication(Delegator delegator, GenericValue paymentApplication, Locale locale) { Map<String, Object> results = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "AccountingSuccessful", locale)); boolean debug = true; diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java index af6267f..a91112c 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java @@ -702,7 +702,7 @@ public class GiftCertificateServices { try { orderHeader = orderItem.getRelatedOne("OrderHeader", false); } catch (GenericEntityException e) { - Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE); + Debug.logError(e, "Unable to get OrderHeader from OrderItem", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ORDERError, "OrderCannotGetOrderHeader", UtilMisc.toMap("orderId", orderId), locale)); } @@ -945,7 +945,7 @@ public class GiftCertificateServices { try { orderHeader = orderItem.getRelatedOne("OrderHeader", false); } catch (GenericEntityException e) { - Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE); + Debug.logError(e, "Unable to get OrderHeader from OrderItem", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ORDERError, "OrderCannotGetOrderHeader", UtilMisc.toMap("orderId", orderId), locale)); } 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 dffb010..6b01b8a 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 @@ -2659,7 +2659,7 @@ public class PaymentGatewayServices { EntityQuery eq = EntityQuery.use(delegator) .from("OrderPaymentPreference") .where(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PAYMENT_NOT_AUTH"), - EntityCondition.makeCondition("processAttempt",EntityOperator.GREATER_THAN, 0L)) + EntityCondition.makeCondition("processAttempt", EntityOperator.GREATER_THAN, 0L)) .orderBy("orderId"); try (EntityListIterator eli = eq.queryIterator()) { diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java index cbc0ec9..9cc596b 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java @@ -247,7 +247,7 @@ public class TaxAuthorityServices { List<List<GenericValue>> itemAdjustments = new LinkedList<>(); BigDecimal totalPrice = ZERO_BASE; - Map<GenericValue,BigDecimal> productWeight = new HashMap<>(); + Map<GenericValue, BigDecimal> productWeight = new HashMap<>(); // Loop through the products; get the taxCategory; and lookup each in the cache. for (int i = 0; i < itemProductList.size(); i++) { GenericValue product = itemProductList.get(i); 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 e896cc3..00aad23 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 @@ -322,8 +322,8 @@ public class AIMPaymentServices { } if (isTestMode()) { Debug.logInfo("TEST Authorize.net using url [" + url + "]", MODULE); - Debug.logInfo("TEST Authorize.net request string " + request.toString(),MODULE); - Debug.logInfo("TEST Authorize.net properties string " + props.toString(),MODULE); + Debug.logInfo("TEST Authorize.net request string " + request.toString(), MODULE); + Debug.logInfo("TEST Authorize.net properties string " + props.toString(), MODULE); } // card present has a different layout from standard AIM; this determines how to parse the response @@ -334,7 +334,7 @@ public class AIMPaymentServices { String certificateAlias = props.getProperty("certificateAlias"); httpClient.setClientCertificateAlias(certificateAlias); String httpResponse = httpClient.post(); - Debug.logInfo("transaction response: " + httpResponse,MODULE); + Debug.logInfo("transaction response: " + httpResponse, MODULE); AuthorizeResponse ar = new AuthorizeResponse(httpResponse, apiType); if (ar.isApproved()) { result.put("authResult", Boolean.TRUE); @@ -356,7 +356,7 @@ public class AIMPaymentServices { result.put("httpResponse", httpResponse); result.put("authorizeResponse", ar); } catch (HttpClientException e) { - Debug.logInfo(e, "Could not complete Authorize.Net transaction: " + e.toString(),MODULE); + Debug.logInfo(e, "Could not complete Authorize.Net transaction: " + e.toString(), MODULE); } result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return result; @@ -402,7 +402,7 @@ public class AIMPaymentServices { } if ("3.1".equals(ver)) { if (UtilValidate.isEmpty(tranKey)) { - Debug.logInfo("Trankey property required for version 3.1 reverting to 3.0",MODULE); + Debug.logInfo("Trankey property required for version 3.1 reverting to 3.0", MODULE); ver = "3.0"; } } @@ -675,7 +675,7 @@ public class AIMPaymentServices { results.put("processAmount", BigDecimal.ZERO); results.put("authRefNum", AuthorizeResponse.ERROR); } - Debug.logInfo("processAuthTransResult: " + results.toString(),MODULE); + Debug.logInfo("processAuthTransResult: " + results.toString(), MODULE); } private static void processCaptureTransResult(Map<String, Object> request, Map<String, Object> reply, Map<String, Object> results) { @@ -700,7 +700,7 @@ public class AIMPaymentServices { Debug.logError(ex, MODULE); results.put("captureAmount", BigDecimal.ZERO); } - Debug.logInfo("captureRefNum: " + results.toString(),MODULE); + Debug.logInfo("captureRefNum: " + results.toString(), MODULE); } private static Map<String, Object> processRefundTransResult(Map<String, Object> request, Map<String, Object> reply) { @@ -726,7 +726,7 @@ public class AIMPaymentServices { Debug.logError(ex, MODULE); results.put("refundAmount", BigDecimal.ZERO); } - Debug.logInfo("processRefundTransResult: " + results.toString(),MODULE); + Debug.logInfo("processRefundTransResult: " + results.toString(), MODULE); return results; } @@ -753,7 +753,7 @@ public class AIMPaymentServices { Debug.logError(ex, MODULE); results.put("releaseAmount", BigDecimal.ZERO); } - Debug.logInfo("processReleaseTransResult: " + results.toString(),MODULE); + Debug.logInfo("processReleaseTransResult: " + results.toString(), MODULE); return results; } @@ -789,7 +789,7 @@ public class AIMPaymentServices { results.put("processAmount", BigDecimal.ZERO); results.put("authRefNum", AuthorizeResponse.ERROR); } - Debug.logInfo("processAuthTransResult: " + results.toString(),MODULE); + Debug.logInfo("processAuthTransResult: " + results.toString(), MODULE); } private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java index cbe4fff..35b5a01 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java @@ -521,7 +521,7 @@ public class OrbitalPaymentServices { results.put("processAmount", BigDecimal.ZERO); results.put("authRefNum", OrbitalPaymentServices.ERROR); } - Debug.logInfo("processAuthTransResult: " + results.toString(),MODULE); + Debug.logInfo("processAuthTransResult: " + results.toString(), MODULE); } private static void processAuthCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { @@ -545,7 +545,7 @@ public class OrbitalPaymentServices { results.put("processAmount", BigDecimal.ZERO); results.put("authRefNum", OrbitalPaymentServices.ERROR); } - Debug.logInfo("processAuthCaptureTransResult: " + results.toString(),MODULE); + Debug.logInfo("processAuthCaptureTransResult: " + results.toString(), MODULE); } private static void processCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { @@ -561,7 +561,7 @@ public class OrbitalPaymentServices { } else { results.put("captureAmount", BigDecimal.ZERO); } - Debug.logInfo("processCaptureTransResult: " + results.toString(),MODULE); + Debug.logInfo("processCaptureTransResult: " + results.toString(), MODULE); } private static void processRefundTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { @@ -577,7 +577,7 @@ public class OrbitalPaymentServices { } else { results.put("refundAmount", BigDecimal.ZERO); } - Debug.logInfo("processRefundTransResult: " + results.toString(),MODULE); + Debug.logInfo("processRefundTransResult: " + results.toString(), MODULE); } private static void processReleaseTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { @@ -593,7 +593,7 @@ public class OrbitalPaymentServices { } else { results.put("releaseAmount", BigDecimal.ZERO); } - Debug.logInfo("processReleaseTransResult: " + results.toString(),MODULE); + Debug.logInfo("processReleaseTransResult: " + results.toString(), MODULE); } private static void printTransResult(ResponseIF response) { @@ -611,7 +611,7 @@ public class OrbitalPaymentServices { generatedResponse.put("AVSCode", response.getAVSResponseCode()); generatedResponse.put("CVV2ResponseCode", response.getCVV2RespCode()); - Debug.logInfo("printTransResult === " + generatedResponse.toString(),MODULE); + Debug.logInfo("printTransResult === " + generatedResponse.toString(), MODULE); } private static String formatExpDateForOrbital(String expDate) { 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 d2c9128..1870e05 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 @@ -211,7 +211,7 @@ public class SagePayPaymentServices { Debug.logInfo("SagePay - Payment authorized for order : " + vendorTxCode, MODULE); result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.TRUE, txAuthNo, securityKey, new BigDecimal(amount), vpsTxId, vendorTxCode, statusDetail); if ("PAYMENT".equals(transactionType)) { - Map<String,Object> captureResult = SagePayUtil.buildCardCapturePaymentResponse(Boolean.TRUE, txAuthNo, securityKey, new BigDecimal(amount), vpsTxId, vendorTxCode, statusDetail); + Map<String, Object> captureResult = SagePayUtil.buildCardCapturePaymentResponse(Boolean.TRUE, txAuthNo, securityKey, new BigDecimal(amount), vpsTxId, vendorTxCode, statusDetail); result.putAll(captureResult); } } else if (status != null && "INVALID".equals(status)) { 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 129ac44..967c330 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 @@ -168,7 +168,7 @@ public final class SagePayUtil { httpPost.addHeader("User-Agent", "HTTP Client"); httpPost.addHeader("Content-type", "application/x-www-form-urlencoded"); List<NameValuePair> postParameters = new ArrayList<>(); - for (Entry<String,String> entry : parameters.entrySet()) { + for (Entry<String, String> entry : parameters.entrySet()) { postParameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); } diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java index 7c8b9e3..0a1f4bf 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java @@ -477,7 +477,7 @@ public class SecurePayPaymentServices { return props; } - private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,String RESOURCE, String parameterName) { + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, String RESOURCE, String parameterName) { String returnValue = ""; if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) { try { @@ -500,7 +500,7 @@ public class SecurePayPaymentServices { return returnValue; } - private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,String RESOURCE, String parameterName, String defaultValue) { + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, String RESOURCE, String parameterName, String defaultValue) { String returnValue = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, paymentGatewayConfigParameterName, RESOURCE, parameterName); if (UtilValidate.isEmpty(returnValue)) { returnValue = defaultValue; diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java index 0877481..ef79ec0 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java @@ -128,7 +128,7 @@ public class SecurePayServiceTest extends OFBizTestCase{ serviceInput.put("processAmount", new BigDecimal("100.08")); // run the service - Map<String, Object> result = dispatcher.runSync("ofbScAuthorize",serviceInput); + Map<String, Object> result = dispatcher.runSync("ofbScAuthorize", serviceInput); // verify the results String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); @@ -173,7 +173,7 @@ public class SecurePayServiceTest extends OFBizTestCase{ serviceInput.put("captureAmount", refundAmount); // run the service - Map<String, Object> result = dispatcher.runSync("ofbScCapture",serviceInput); + Map<String, Object> result = dispatcher.runSync("ofbScCapture", serviceInput); // verify the results String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); @@ -239,7 +239,7 @@ public class SecurePayServiceTest extends OFBizTestCase{ ); serviceInput.put("creditAmount", creditAmount); // run the service - Map<String, Object> result = dispatcher.runSync("ofbScCCCredit",serviceInput); + Map<String, Object> result = dispatcher.runSync("ofbScCCCredit", serviceInput); // verify the results String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); Debug.logInfo("[testdoCredit] responseMessage: " + responseMessage, MODULE); diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java index e0f14a3..6fbf4cc 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java @@ -970,7 +970,7 @@ public class ValueLinkServices { try { orderHeader = orderItem.getRelatedOne("OrderHeader", false); } catch (GenericEntityException e) { - Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE); + Debug.logError(e, "Unable to get OrderHeader from OrderItem", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ORDER, "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale)); } @@ -1254,7 +1254,7 @@ public class ValueLinkServices { try { orderHeader = orderItem.getRelatedOne("OrderHeader", false); } catch (GenericEntityException e) { - Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE); + Debug.logError(e, "Unable to get OrderHeader from OrderItem", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ORDER, "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale)); } 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 af53e36..1000940 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 @@ -303,7 +303,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,templateTitle}; + String [] arr = {contentId, templateTitle}; permittedPublishPointList.add(arr); } } diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java b/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java index 8f23960..f82b472 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java @@ -229,7 +229,7 @@ In order to make this service active add the following to the service definition return ServiceUtil.returnSuccess(sucMsg); } - public static Map<String,Object> createSubContent(int index, String line, String rootContent, Map<String, ? extends Object> context, DispatchContext dctx) { + public static Map<String, Object> createSubContent(int index, String line, String rootContent, Map<String, ? extends Object> context, DispatchContext dctx) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -265,7 +265,7 @@ In order to make this service active add the following to the service definition } if (contentNameMatch == false) { //create DataResource - Map<String,Object> data = new HashMap<>(); + Map<String, Object> data = new HashMap<>(); data.put("userLogin", userLogin); result = dispatcher.runSync("createDataResource", data); if (ServiceUtil.isError(result)) { @@ -289,7 +289,7 @@ In order to make this service active add the following to the service definition delegator.create(Entity); //Relation Content - Map<String,Object> contentAssoc = new HashMap<>(); + Map<String, Object> contentAssoc = new HashMap<>(); contentAssoc.put("contentId", contentId); contentAssoc.put("contentAssocTypeId", "SUB_CONTENT"); contentAssoc.put("contentIdTo", rootContent); @@ -330,7 +330,7 @@ In order to make this service active add the following to the service definition } if (contentNameMatch == false) { //create DataResource - Map<String,Object> data = new HashMap<>(); + Map<String, Object> data = new HashMap<>(); data.put("userLogin", userLogin); result = dispatcher.runSync("createDataResource", data); if (ServiceUtil.isError(result)) { @@ -354,7 +354,7 @@ In order to make this service active add the following to the service definition delegator.create(Entity); //create ContentAssoc - Map<String,Object> contentAssoc = new HashMap<>(); + Map<String, Object> contentAssoc = new HashMap<>(); contentAssoc.put("contentId", contentId); contentAssoc.put("contentAssocTypeId", "SUB_CONTENT"); contentAssoc.put("contentIdTo", rootContent); 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 0935adf..576f18d 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 @@ -204,7 +204,7 @@ public class ContentSearchSession { if (UtilValidate.isNotEmpty(parameters.get("thruDate"))) { thruDate = Timestamp.valueOf((String) parameters.get("thruDate")); } - searchAddConstraint(new ContentSearch.LastUpdatedRangeConstraint(fromDate,thruDate), session); + searchAddConstraint(new ContentSearch.LastUpdatedRangeConstraint(fromDate, thruDate), session); constraintsChanged = true; } diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java index 108c912..8a543ef 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java @@ -385,7 +385,7 @@ public class ContentServices { Map<String, Object> results = new HashMap<>(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String,Object> templateContext = UtilGenerics.cast(context.get("templateContext")); + Map<String, Object> templateContext = UtilGenerics.cast(context.get("templateContext")); String contentId = (String) context.get("contentId"); if (templateContext != null && UtilValidate.isEmpty(contentId)) { @@ -429,11 +429,11 @@ public class ContentServices { * matching content. */ public static Map<String, Object> renderContentAsText(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String,Object> results = new HashMap<>(); + Map<String, Object> results = new HashMap<>(); LocalDispatcher dispatcher = dctx.getDispatcher(); Writer out = (Writer) context.get("outWriter"); - Map<String,Object> templateContext = UtilGenerics.cast(context.get("templateContext")); + Map<String, Object> templateContext = UtilGenerics.cast(context.get("templateContext")); String contentId = (String) context.get("contentId"); if (templateContext != null && UtilValidate.isEmpty(contentId)) { contentId = (String) templateContext.get("contentId"); 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 5e9dc56..05c9e36 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 @@ -184,7 +184,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor return content; } - public static void renderContentAsText(LocalDispatcher dispatcher, GenericValue content, Appendable out, Map<String,Object>templateContext, + public static void renderContentAsText(LocalDispatcher dispatcher, GenericValue content, Appendable out, Map<String, Object>templateContext, Locale locale, String mimeTypeId, boolean cache, List<GenericValue> webAnalytics) throws GeneralException, IOException { // if the content has a service attached run the service @@ -200,11 +200,11 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor ModelService service = dctx.getModelService(serviceName); if (service != null) { //put all requestParameters into templateContext to use them as IN service parameters - Map<String,Object> tempTemplateContext = new HashMap<>(); + Map<String, Object> tempTemplateContext = new HashMap<>(); tempTemplateContext.putAll(UtilGenerics.cast(templateContext.get("requestParameters"))); tempTemplateContext.putAll(templateContext); - Map<String,Object> serviceCtx = service.makeValid(tempTemplateContext, ModelService.IN_PARAM); - Map<String,Object> serviceRes; + Map<String, Object> serviceCtx = service.makeValid(tempTemplateContext, ModelService.IN_PARAM); + Map<String, Object> serviceRes; try { serviceRes = dispatcher.runSync(serviceName, serviceCtx); if (ServiceUtil.isError(serviceRes)) { @@ -375,7 +375,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor return writer.toString(); } - public static void renderSubContentAsText(LocalDispatcher dispatcher, String contentId, Appendable out, String mapKey, Map<String,Object> templateContext, + public static void renderSubContentAsText(LocalDispatcher dispatcher, String contentId, Appendable out, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException { Delegator delegator = dispatcher.getDelegator(); @@ -927,7 +927,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor contentAncestorList.add(contentAssoc); } } catch (GenericEntityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); return; } } @@ -962,7 +962,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor } } } catch (GenericEntityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); return; } } @@ -1009,7 +1009,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor contentAncestorList.add(content); } } catch (GenericEntityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); return; } } diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java index 386cf37..f9a43d6 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java @@ -135,7 +135,7 @@ public class UploadContentAndImage { ftlContext.put("statusId", passedParams.get("statusId")); ftlContext.put("contentPurposeList", UtilMisc.toList(passedParams.get("contentPurposeList"))); ftlContext.put("contentPurposeList", contentPurposeList); - ftlContext.put("targetOperationList",targetOperationList); + ftlContext.put("targetOperationList", targetOperationList); ftlContext.put("contentName", passedParams.get("contentName")); ftlContext.put("dataTemplateTypeId", passedParams.get("dataTemplateTypeId")); ftlContext.put("description", passedParams.get("description")); @@ -207,7 +207,7 @@ public class UploadContentAndImage { sumContext.put("contentTypeId", "DOCUMENT"); sumContext.put("statusId", passedParams.get("statusId")); sumContext.put("contentPurposeList", UtilMisc.toList("SUMMARY")); - sumContext.put("targetOperationList",targetOperationList); + sumContext.put("targetOperationList", targetOperationList); sumContext.put("contentName", passedParams.get("contentName")); sumContext.put("description", passedParams.get("description")); sumContext.put("privilegeEnumId", passedParams.get("privilegeEnumId")); @@ -237,7 +237,7 @@ public class UploadContentAndImage { txtContext.put("contentTypeId", "DOCUMENT"); txtContext.put("statusId", passedParams.get("statusId")); txtContext.put("contentPurposeList", UtilMisc.toList("MAIN_ARTICLE")); - txtContext.put("targetOperationList",targetOperationList); + txtContext.put("targetOperationList", targetOperationList); txtContext.put("contentName", passedParams.get("contentName")); txtContext.put("description", passedParams.get("description")); txtContext.put("privilegeEnumId", passedParams.get("privilegeEnumId")); @@ -270,7 +270,7 @@ public class UploadContentAndImage { imgContext.put("description", passedParams.get("description")); imgContext.put("contentPurposeList", contentPurposeList); imgContext.put("privilegeEnumId", passedParams.get("privilegeEnumId")); - imgContext.put("targetOperationList",targetOperationList); + imgContext.put("targetOperationList", targetOperationList); imgContext.put("dataResourceId", passedParams.get("imgDataResourceId")); String dataResourceTypeId = "IMAGE_OBJECT"; imgContext.put("dataResourceTypeId", dataResourceTypeId); @@ -448,7 +448,7 @@ public class UploadContentAndImage { targetOperationString = (String)passedParams.get("targetOperationString"); } List<String> targetOperationList = StringUtil.split(targetOperationString,"|"); - ftlContext.put("targetOperationList",targetOperationList); + ftlContext.put("targetOperationList", targetOperationList); ftlContext.put("userLogin", userLogin); Object objSequenceNum = passedParams.get("caSequenceNum"); diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java index 4a29303..abe24a4 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java @@ -726,7 +726,7 @@ public class DataResourceWorker implements org.apache.ofbiz.widget.content.Data modelTheme = visualTheme.getModelTheme(); String docbookStylesheet = modelTheme.getProperty("VT_DOCBOOKSTYLESHEET").toString(); File sourceFileLocation = new File(System.getProperty("ofbiz.home") + "/themes" + docbookStylesheet.substring(1, docbookStylesheet.length() - 1)); - UtilMisc.copyFile(sourceFileLocation,targetFileLocation); + UtilMisc.copyFile(sourceFileLocation, targetFileLocation); // get the template data for rendering String templateLocation = DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).toString(); // render the XSLT template and file diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java index 9db2293..a950a06 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java @@ -433,7 +433,7 @@ public class DataServices { // write the data to the file if (UtilValidate.isNotEmpty(textData)) { try ( - OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file),StandardCharsets.UTF_8); + OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8); ) { out.write(textData); } catch (IOException e) { diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java index a515d78..f1997d9 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java @@ -225,7 +225,7 @@ public class SurveyWrapper { Template template = null; try ( InputStream templateStream = templateUrl.openStream(); - InputStreamReader templateReader = new InputStreamReader(templateStream,StandardCharsets.UTF_8); + InputStreamReader templateReader = new InputStreamReader(templateStream, StandardCharsets.UTF_8); ){ template = new Template(templateUrl.toExternalForm(), templateReader, config); } catch (IOException e) { diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java index 7d8a190..d6bc00d 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java @@ -106,7 +106,7 @@ public class InjectNodeTrailCsvTransform implements TemplateTransformModel { List<Map<String, ? extends Object>> trail = UtilGenerics.cast(templateCtx.get("globalNodeTrail")); if (Debug.infoOn()) { - Debug.logInfo("in InjectNodeTrailCsv(0), trail:"+trail,MODULE); + Debug.logInfo("in InjectNodeTrailCsv(0), trail:"+trail, MODULE); } // This will build a nodeTrail if none exists // Maybe only contentId or subContentId are passed in @@ -115,15 +115,15 @@ public class InjectNodeTrailCsvTransform implements TemplateTransformModel { if (UtilValidate.isEmpty(trail) || (redo != null && "true".equalsIgnoreCase(redo))) { String subContentId = (String)templateCtx.get("subContentId"); if (Debug.infoOn()) { - Debug.logInfo("in InjectNodeTrailCsv(0), subContentId:"+subContentId,MODULE); + Debug.logInfo("in InjectNodeTrailCsv(0), subContentId:"+subContentId, MODULE); } String contentId = (String)templateCtx.get("contentId"); if (Debug.infoOn()) { - Debug.logInfo("in InjectNodeTrailCsv(0), contentId:"+contentId,MODULE); + Debug.logInfo("in InjectNodeTrailCsv(0), contentId:"+contentId, MODULE); } String contentAssocTypeId = (String)templateCtx.get("contentAssocTypeId"); if (Debug.infoOn()) { - Debug.logInfo("in InjectNodeTrailCsv(0), contentAssocTypeId:"+contentAssocTypeId,MODULE); + Debug.logInfo("in InjectNodeTrailCsv(0), contentAssocTypeId:"+contentAssocTypeId, MODULE); } try { if (UtilValidate.isNotEmpty(subContentId)) { @@ -143,7 +143,7 @@ public class InjectNodeTrailCsvTransform implements TemplateTransformModel { throw new RuntimeException("Error getting current content. " + e.toString()); } if (Debug.infoOn()) { - Debug.logInfo("in InjectNodeTrailCsv(0), csvTrail:"+csvTrail,MODULE); + Debug.logInfo("in InjectNodeTrailCsv(0), csvTrail:"+csvTrail, MODULE); } } else { // Build nodeTrail if one does not exist 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 f8a9c15..aabb335 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 @@ -49,7 +49,7 @@ public class HumanResEvents { String additionParam = request.getParameter("additionParam"); String hrefString = request.getParameter("hrefString"); String hrefString2 = request.getParameter("hrefString2"); - List<Map<String,Object>> categoryList = new ArrayList<>(); + List<Map<String, Object>> categoryList = new ArrayList<>(); Map<String, Object> paramMap = new HashMap<>(); paramMap.put("delegator", delegator); paramMap.put("partyId", partyId); @@ -105,10 +105,10 @@ public class HumanResEvents { for (GenericValue emlpfillCtx : emlpfillCtxs ) { String memberId = emlpfillCtx.getString("partyId"); title = PartyHelper.getPartyName(delegator, memberId, false); - Map<String,Object> josonMap = new HashMap<>(); - Map<String,Object> dataMap = new HashMap<>(); - Map<String,Object> dataAttrMap = new HashMap<>(); - Map<String,Object> attrMap = new HashMap<>(); + Map<String, Object> josonMap = new HashMap<>(); + Map<String, Object> dataMap = new HashMap<>(); + Map<String, Object> dataAttrMap = new HashMap<>(); + Map<String, Object> attrMap = new HashMap<>(); String hrefStr = hrefString + memberId; if (UtilValidate.isNotEmpty(hrefString2)) { hrefStr = hrefStr + hrefString2; @@ -158,7 +158,7 @@ public class HumanResEvents { Map<String, Object> attrMap = new HashMap<>(); catId = childOfCom.getString("partyIdTo"); title = PartyHelper.getPartyName(delegator, catId, false); - josonMap.put("title",title); + josonMap.put("title", title); //Check child existing List<GenericValue> childOfSubComs = EntityQuery.use(delegator).from("PartyRelationship") .where("partyIdFrom", catId, @@ -232,7 +232,7 @@ public class HumanResEvents { emplDataAttrMap.put("rel", "N"); emplMap.put("data", empldataMap); emplMap.put("attr", emplDataAttrMap); - emplMap.put("title",title); + 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 584d9c6..7536b8a 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 @@ -128,14 +128,14 @@ public class ProductionRun { if (updateCompletionDate) { this.estimatedCompletionDate = recalculateEstimatedCompletionDate(); } - productionRun.set("estimatedStartDate",this.estimatedStartDate); - productionRun.set("estimatedCompletionDate",this.estimatedCompletionDate); - productionRun.set("workEffortName",this.productionRunName); - productionRun.set("description",this.description); + productionRun.set("estimatedStartDate", this.estimatedStartDate); + productionRun.set("estimatedCompletionDate", this.estimatedCompletionDate); + productionRun.set("workEffortName", this.productionRunName); + productionRun.set("description", this.description); try { if (quantityIsUpdated) { productionRun.set("quantityToProduce", this.quantity); - productionRunProduct.set("estimatedQuantity",this.quantity.doubleValue()); + productionRunProduct.set("estimatedQuantity", this.quantity.doubleValue()); productionRunProduct.store(); quantityIsUpdated = false; } @@ -353,7 +353,7 @@ public class ProductionRun { if (exist()) { if (productionRunRoutingTasks == null) { try { - productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),UtilMisc.toList("priority"), false); + productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort", UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"), UtilMisc.toList("priority"), false); } catch (GenericEntityException e) { Debug.logWarning(e.getMessage(), MODULE); } @@ -371,7 +371,7 @@ public class ProductionRun { if (exist()) { if (productionRunRoutingTasks == null) { try { - productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),UtilMisc.toList("priority"), false); + productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort", UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"), UtilMisc.toList("priority"), false); } catch (GenericEntityException e) { Debug.logWarning(e.getMessage(), MODULE); } diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java index acc8e31..cc76ccf 100644 --- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java +++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java @@ -62,7 +62,7 @@ public final class ProductionRunHelper { GenericValue productionRunProduct = EntityUtil.getFirst(productionRunProducts); GenericValue productProduced = productionRunProduct.getRelatedOne("Product", true); List<GenericValue> productionRunComponents = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"), null, false); - List<GenericValue> productionRunRoutingTasks = productionRun.getRelated("FromWorkEffortAssoc",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"), null, false); + List<GenericValue> productionRunRoutingTasks = productionRun.getRelated("FromWorkEffortAssoc", UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"), null, false); result.put("productionRunProduct", productionRunProduct); result.put("productProduced", productProduced); result.put("productionRunComponents", productionRunComponents); 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 c9af897..16755aa 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 @@ -159,7 +159,7 @@ public class ProductionRunServices { Debug.logError(e, "Problem accessing WorkEffortGoodStandard entity", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusNotChanged", locale)); } - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); return result; } return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCannotBeCancelled", locale)); @@ -274,7 +274,7 @@ public class ProductionRunServices { serviceContext.put("workEffortName", workEffortName); serviceContext.put("description", description); serviceContext.put("facilityId", facilityId); - serviceContext.put("estimatedStartDate",startDate); + serviceContext.put("estimatedStartDate", startDate); serviceContext.put("quantityToProduce", pRQuantity); serviceContext.put("userLogin", userLogin); try { @@ -322,7 +322,7 @@ public class ProductionRunServices { } // Calculate the estimatedCompletionDate long totalTime = ProductionRun.getEstimatedTaskTime(routingTask, pRQuantity, dispatcher); - Timestamp endDate = TechDataServices.addForward(TechDataServices.getTechDataCalendar(routingTask),startDate, totalTime); + Timestamp endDate = TechDataServices.addForward(TechDataServices.getTechDataCalendar(routingTask), startDate, totalTime); serviceContext.clear(); serviceContext.put("priority", routingTaskAssoc.get("sequenceNum")); @@ -335,7 +335,7 @@ public class ProductionRunServices { serviceContext.put("workEffortParentId", productionRunId); serviceContext.put("facilityId", facilityId); serviceContext.put("reservPersons", routingTask.get("reservPersons")); - serviceContext.put("estimatedStartDate",startDate); + serviceContext.put("estimatedStartDate", startDate); serviceContext.put("estimatedCompletionDate", endDate); serviceContext.put("estimatedSetupMillis", routingTask.get("estimatedSetupMillis")); serviceContext.put("estimatedMilliSeconds", routingTask.get("estimatedMilliSeconds")); @@ -417,7 +417,7 @@ public class ProductionRunServices { // update the estimatedCompletionDate field for the productionRun serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); - serviceContext.put("estimatedCompletionDate",startDate); + serviceContext.put("estimatedCompletionDate", startDate); serviceContext.put("userLogin", userLogin); serviceResult = null; try { @@ -430,7 +430,7 @@ public class ProductionRunServices { } result.put("productionRunId", productionRunId); result.put("estimatedCompletionDate", startDate); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCreated",UtilMisc.toMap("productionRunId", productionRunId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCreated", UtilMisc.toMap("productionRunId", productionRunId), locale)); return result; } @@ -580,14 +580,14 @@ public class ProductionRunServices { } return ServiceUtil.returnSuccess(); } else { - Debug.logError("productionRun.store() fail for productionRunId ="+productionRunId,MODULE); + Debug.logError("productionRun.store() fail for productionRunId ="+productionRunId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunNotUpdated", locale)); } } - Debug.logError("no productionRun for productionRunId ="+productionRunId,MODULE); + Debug.logError("no productionRun for productionRunId ="+productionRunId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunNotUpdated", locale)); } - Debug.logError("service updateProductionRun call with productionRunId empty",MODULE); + Debug.logError("service updateProductionRun call with productionRunId empty", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunNotUpdated", locale)); } @@ -609,7 +609,7 @@ public class ProductionRunServices { if (currentStatusId.equals(statusId)) { result.put("newStatusId", currentStatusId); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", currentStatusId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", currentStatusId), locale)); return result; } @@ -647,7 +647,7 @@ public class ProductionRunServices { } } result.put("newStatusId", statusId); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_CLOSED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_CLOSED"), locale)); return result; } @@ -685,7 +685,7 @@ public class ProductionRunServices { } } result.put("newStatusId", "PRUN_DOC_PRINTED"); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); return result; } @@ -727,7 +727,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusNotChanged", locale)); } result.put("newStatusId", "PRUN_RUNNING"); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); return result; } @@ -751,7 +751,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusNotChanged", locale)); } result.put("newStatusId", "PRUN_COMPLETED"); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); return result; } @@ -789,11 +789,11 @@ public class ProductionRunServices { } } result.put("newStatusId", "PRUN_CLOSED"); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_CLOSED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_CLOSED"), locale)); return result; } result.put("newStatusId", currentStatusId); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", currentStatusId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", currentStatusId), locale)); return result; } @@ -844,7 +844,7 @@ public class ProductionRunServices { if (statusId != null && currentStatusId.equals(statusId)) { result.put("oldStatusId", oldStatusId); result.put("newStatusId", currentStatusId); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunTaskStatusChanged",UtilMisc.toMap("newStatusId", currentStatusId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunTaskStatusChanged", UtilMisc.toMap("newStatusId", currentStatusId), locale)); return result; } @@ -891,7 +891,7 @@ public class ProductionRunServices { } result.put("oldStatusId", oldStatusId); result.put("newStatusId", "PRUN_RUNNING"); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); return result; } @@ -1053,12 +1053,12 @@ public class ProductionRunServices { result.put("oldStatusId", oldStatusId); result.put("newStatusId", "PRUN_COMPLETED"); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged",UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunStatusChanged", UtilMisc.toMap("newStatusId", "PRUN_DOC_PRINTED"), locale)); return result; } result.put("oldStatusId", oldStatusId); result.put("newStatusId", currentStatusId); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunTaskStatusChanged",UtilMisc.toMap("newStatusId", currentStatusId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunTaskStatusChanged", UtilMisc.toMap("newStatusId", currentStatusId), locale)); return result; } @@ -1368,14 +1368,14 @@ public class ProductionRunServices { if (productionRun.store()) { return ServiceUtil.returnSuccess(); } else { - Debug.logError("productionRun.store() fail for productionRunId ="+productionRunId,MODULE); + Debug.logError("productionRun.store() fail for productionRunId ="+productionRunId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunNotUpdated", locale)); } } - Debug.logError("no productionRun for productionRunId ="+productionRunId,MODULE); + Debug.logError("no productionRun for productionRunId ="+productionRunId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunNotUpdated", locale)); } - Debug.logError("service updateProductionRun call with productionRunId empty",MODULE); + Debug.logError("service updateProductionRun call with productionRunId empty", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunNotUpdated", locale)); } @@ -1449,7 +1449,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunComponentNotAdded", locale)); } result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, - "ManufacturingProductionRunComponentAdded",UtilMisc.toMap("productionRunId", productionRunId), locale)); + "ManufacturingProductionRunComponentAdded", UtilMisc.toMap("productionRunId", productionRunId), locale)); return result; } @@ -1526,7 +1526,7 @@ public class ProductionRunServices { Debug.logError(e, "Problem calling the updateWorkEffortGoodStandard service", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunComponentNotAdded", locale)); } - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunComponentUpdated",UtilMisc.toMap("productionRunId", productionRunId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunComponentUpdated", UtilMisc.toMap("productionRunId", productionRunId), locale)); return result; } @@ -1866,7 +1866,7 @@ public class ProductionRunServices { } serviceContext.put("lotId", lotId); serviceContext.put("locationSeqId", locationSeqId); - serviceContext.put("uomId",uomId); + serviceContext.put("uomId", uomId); serviceContext.put("userLogin", userLogin); Map<String, Object> serviceResult = dispatcher.runSync("createInventoryItem", serviceContext); if (ServiceUtil.isError(serviceResult)) { @@ -1914,7 +1914,7 @@ public class ProductionRunServices { serviceContext.put("comments", "Created by production run " + productionRunId); serviceContext.put("lotId", lotId); serviceContext.put("locationSeqId", locationSeqId); - serviceContext.put("uomId",uomId); + serviceContext.put("uomId", uomId); if (unitCost.compareTo(ZERO) != 0) { serviceContext.put("unitCost", unitCost); } @@ -2149,7 +2149,7 @@ public class ProductionRunServices { serviceContext.put("currencyUomId", currencyUomId); } serviceContext.put("lotId", lotId); - serviceContext.put("uomId",uomId); + serviceContext.put("uomId", uomId); serviceContext.put("userLogin", userLogin); serviceContext.put("isReturned", isReturned); Map<String, Object> serviceResult = dispatcher.runSync("createInventoryItem", serviceContext); @@ -2519,7 +2519,7 @@ public class ProductionRunServices { String productionRunId = (String)serviceResult.get("productionRunId"); result.put("productionRunId", productionRunId); - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCreated",UtilMisc.toMap("productionRunId", productionRunId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCreated", UtilMisc.toMap("productionRunId", productionRunId), locale)); return result; } @@ -2691,7 +2691,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ManufacturingRequirementNotDeleted", locale)); } - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCreated",UtilMisc.toMap("productionRunId", productionRunId), locale)); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "ManufacturingProductionRunCreated", UtilMisc.toMap("productionRunId", productionRunId), locale)); return result; } 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 2b1cb55..822edf5 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 @@ -186,7 +186,7 @@ public class ProposedOrder { } startDate = TechDataServices.addBackward(TechDataServices.getTechDataCalendar(routingTask), endDate, totalTime); // record the routingTask with the startDate associated - result.put(routingTask.getString("workEffortId"),startDate); + 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 ccc1a23..e5309b1 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 @@ -126,7 +126,7 @@ public class TechDataServices { try { listRoutingTaskAssoc = EntityQuery.use(delegator).from("WorkEffortAssoc") - .where("workEffortIdFrom", workEffortIdFrom,"sequenceNum",sequenceNum) + .where("workEffortIdFrom", workEffortIdFrom,"sequenceNum", sequenceNum) .orderBy("fromDate") .queryList(); } catch (GenericEntityException e) { @@ -257,7 +257,7 @@ public class TechDataServices { } } result.put("capacity", capacity); - result.put("startTime",startTime); + result.put("startTime", startTime); result.put("moveDay", moveDay); return result; } @@ -411,7 +411,7 @@ public class TechDataServices { } } result.put("capacity", capacity); - result.put("startTime",startTime); + result.put("startTime", startTime); result.put("moveDay", moveDay); return result; } diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java index d318fb2..0dc6f83 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java @@ -1741,7 +1741,7 @@ public class OrderReadHelper { /** * Get the returned total by return type (credit, refund, etc.). Specify returnTypeId = null to get sum over all * return types. Specify includeAll = true to sum up over all return statuses except cancelled. Specify includeAll - * = false to sum up over ACCEPTED,RECEIVED And COMPLETED returns. + * = false to sum up over ACCEPTED, RECEIVED And COMPLETED returns. */ public BigDecimal getOrderReturnedTotalByTypeBd(String returnTypeId, boolean includeAll) { List<GenericValue> returnedItemsBase = getOrderReturnItems(); @@ -2519,7 +2519,7 @@ public class OrderReadHelper { public static BigDecimal getWorkEffortRentalLength(GenericValue workEffort) { BigDecimal length = null; if (workEffort.get("estimatedStartDate") != null && workEffort.get("estimatedCompletionDate") != null) { - length = new BigDecimal(UtilDateTime.getInterval(workEffort.getTimestamp("estimatedStartDate"),workEffort.getTimestamp("estimatedCompletionDate"))/86400000); + length = new BigDecimal(UtilDateTime.getInterval(workEffort.getTimestamp("estimatedStartDate"), workEffort.getTimestamp("estimatedCompletionDate"))/86400000); } return length; } 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 03310e4..9a09792 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 @@ -312,7 +312,7 @@ public class OrderReturnServices { } // cancel replacement order if return not received within 30 days and send notification - public static Map<String,Object> autoCancelReplacementOrders(DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> autoCancelReplacementOrders(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2296,7 +2296,7 @@ public class OrderReturnServices { try { GenericValue returnItemResponse = returnItem.getRelatedOne("ReturnItemResponse", false); if ((returnItemResponse != null) && (orderId != null)) { - // TODO should we filter on payment's status (PMNT_SENT,PMNT_RECEIVED) + // TODO should we filter on payment's status (PMNT_SENT, PMNT_RECEIVED) GenericValue payment = returnItemResponse.getRelatedOne("Payment", false); if ((payment != null) && (payment.getBigDecimal("amount") != null) && !paymentList.contains(payment.get("paymentId"))) { @@ -2427,7 +2427,7 @@ public class OrderReturnServices { // calculate the returnAdjustment amount if (returnItem != null) { // returnAdjustment for returnItem if (needRecalculate(returnAdjustmentTypeId)) { - Debug.logInfo("returnPrice:" + returnItem.getBigDecimal("returnPrice") + ", returnQuantity:" + returnItem.getBigDecimal("returnQuantity") + ",sourcePercentage:" + orderAdjustment.getBigDecimal("sourcePercentage"), MODULE); + Debug.logInfo("returnPrice:" + returnItem.getBigDecimal("returnPrice") + ", returnQuantity:" + returnItem.getBigDecimal("returnQuantity") + ", sourcePercentage:" + orderAdjustment.getBigDecimal("sourcePercentage"), MODULE); BigDecimal returnTotal = returnItem.getBigDecimal("returnPrice").multiply(returnItem.getBigDecimal("returnQuantity")); BigDecimal orderTotal = orderItem.getBigDecimal("quantity").multiply(orderItem.getBigDecimal("unitPrice")); amount = getAdjustmentAmount("RET_SALES_TAX_ADJ".equals(returnAdjustmentTypeId), returnTotal, orderTotal, orderAdjustment.getBigDecimal("amount")); 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 5358a3b..632fa81 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 @@ -212,7 +212,7 @@ public class OrderServices { productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).cache().queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotFindProductStoreWithID",UtilMisc.toMap("productStoreId", productStoreId), locale) + e.toString()); + "OrderErrorCouldNotFindProductStoreWithID", UtilMisc.toMap("productStoreId", productStoreId), locale) + e.toString()); } } @@ -396,7 +396,7 @@ public class OrderServices { Debug.logError(excMsg, MODULE); errorMessages.add(excMsg); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderCouldNotFindRelatedFixedAssetForTheProduct",UtilMisc.toMap("productId", orderItem.getString("productId")), locale)); + "OrderCouldNotFindRelatedFixedAssetForTheProduct", UtilMisc.toMap("productId", orderItem.getString("productId")), locale)); } if (UtilValidate.isNotEmpty(selFixedAssetProduct)) { @@ -675,27 +675,27 @@ public class OrderServices { GenericValue workOrderItemFulfillment = delegator.makeValue("WorkOrderItemFulfillment"); // find fixed asset supplied on the workeffort map GenericValue fixedAsset = null; - Debug.logInfo("find the fixedAsset",MODULE); + Debug.logInfo("find the fixedAsset", MODULE); try { fixedAsset = EntityQuery.use(delegator).from("FixedAsset").where("fixedAssetId", workEffort.get("fixedAssetId")).queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "OrderFixedAssetNotFoundFixedAssetId", - UtilMisc.toMap("fixedAssetId",workEffort.get("fixedAssetId")), locale)); + UtilMisc.toMap("fixedAssetId", workEffort.get("fixedAssetId")), locale)); } if (fixedAsset == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "OrderFixedAssetNotFoundFixedAssetId", - UtilMisc.toMap("fixedAssetId",workEffort.get("fixedAssetId")), locale)); + UtilMisc.toMap("fixedAssetId", workEffort.get("fixedAssetId")), locale)); } // see if this fixed asset has a calendar, when no create one and attach to fixed asset - Debug.logInfo("find the techdatacalendar",MODULE); + Debug.logInfo("find the techdatacalendar", MODULE); GenericValue techDataCalendar = null; try { techDataCalendar = fixedAsset.getRelatedOne("TechDataCalendar", false); } catch (GenericEntityException e) { - Debug.logInfo("TechData calendar does not exist yet so create for fixedAsset: " + fixedAsset.get("fixedAssetId") ,MODULE); + Debug.logInfo("TechData calendar does not exist yet so create for fixedAsset: " + fixedAsset.get("fixedAssetId") , MODULE); } if (techDataCalendar == null) { for (GenericValue currentValue : tempList) { @@ -713,11 +713,11 @@ public class OrderServices { } if (techDataCalendar == null) { techDataCalendar = delegator.makeValue("TechDataCalendar"); - Debug.logInfo("create techdata calendar because it does not exist",MODULE); + Debug.logInfo("create techdata calendar because it does not exist", MODULE); String calendarId = delegator.getNextSeqId("TechDataCalendar"); techDataCalendar.set("calendarId", calendarId); tempList.add(techDataCalendar); - Debug.logInfo("update fixed Asset",MODULE); + Debug.logInfo("update fixed Asset", MODULE); fixedAsset.set("calendarId", calendarId); tempList.add(fixedAsset); } @@ -1534,7 +1534,7 @@ public class OrderServices { if (resetResult != null && ServiceUtil.isError(resetResult)) { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, "OrderErrorCannotResetOrderTotals", - UtilMisc.toMap("orderId", orderId,"resetResult",ServiceUtil.getErrorMessage(resetResult)), locale), MODULE); + UtilMisc.toMap("orderId", orderId,"resetResult", ServiceUtil.getErrorMessage(resetResult)), locale), MODULE); } else { Debug.logInfo("No orders found for reset processing", MODULE); } @@ -1898,7 +1898,7 @@ public class OrderServices { if (orderHeader == null) { Debug.logError("OrderHeader came back as null", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderCannotUpdateNullOrderHeader",UtilMisc.toMap("orderId", orderId), locale)); + "OrderCannotUpdateNullOrderHeader", UtilMisc.toMap("orderId", orderId), locale)); } // get the order items @@ -2224,7 +2224,7 @@ public class OrderServices { } } else { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderInvalidCancelQuantityCannotCancel", UtilMisc.toMap("thisCancelQty",thisCancelQty), locale)); + "OrderInvalidCancelQuantityCannotCancel", UtilMisc.toMap("thisCancelQty", thisCancelQty), locale)); } } } else { @@ -2299,7 +2299,7 @@ public class OrderServices { if (statusChange == null) { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, - "OrderItemStatusNotChangedIsNotAValidChange", UtilMisc.toMap("orderStatusId", orderItem.getString("statusId"),"statusId",statusId), locale), MODULE); + "OrderItemStatusNotChangedIsNotAValidChange", UtilMisc.toMap("orderStatusId", orderItem.getString("statusId"),"statusId", statusId), locale), MODULE); continue; } } catch (GenericEntityException e) { @@ -2378,7 +2378,7 @@ public class OrderServices { if (orderHeader.getString("statusId").equals(statusId)) { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, - "OrderTriedToSetOrderStatusWithTheSameStatusIdforOrderWithId", UtilMisc.toMap("statusId",statusId,"orderId", orderId), locale),MODULE); + "OrderTriedToSetOrderStatusWithTheSameStatusIdforOrderWithId", UtilMisc.toMap("statusId", statusId,"orderId", orderId), locale), MODULE); return successResult; } try { @@ -2689,7 +2689,7 @@ public class OrderServices { bodyParameters.put("note", note); bodyParameters.put("shipGroupSeqId", shipGroupSeqId); sendMap.put("bodyParameters", bodyParameters); - sendMap.put("userLogin",userLogin); + sendMap.put("userLogin", userLogin); String subjectString = productStoreEmail.getString("subject"); sendMap.put("subject", subjectString); @@ -3369,7 +3369,7 @@ public class OrderServices { try { content = productContentItem.getRelatedOne("Content", false); } catch (GenericEntityException e) { - Debug.logError(e,"ERROR: Cannot get Content entity: " + e.getMessage(),MODULE); + Debug.logError(e,"ERROR: Cannot get Content entity: " + e.getMessage(), MODULE); continue; } @@ -3382,7 +3382,7 @@ public class OrderServices { try { custMethod = EntityQuery.use(delegator).from("CustomMethod").where("customMethodId", content.get("customMethodId")).cache().queryOne(); } catch (GenericEntityException e) { - Debug.logError(e,"ERROR: Cannot get CustomMethod associate to Content entity: " + e.getMessage(),MODULE); + Debug.logError(e,"ERROR: Cannot get CustomMethod associate to Content entity: " + e.getMessage(), MODULE); continue; } } @@ -6191,7 +6191,7 @@ public class OrderServices { String shipGroupSeqId = (String) context.get("shipGroupSeqId"); String shippingInstructions = (String) context.get("shippingInstructions"); try { - GenericValue orderItemShipGroup = EntityQuery.use(delegator).from("OrderItemShipGroup").where("orderId", orderId,"shipGroupSeqId",shipGroupSeqId).queryFirst(); + GenericValue orderItemShipGroup = EntityQuery.use(delegator).from("OrderItemShipGroup").where("orderId", orderId,"shipGroupSeqId", shipGroupSeqId).queryFirst(); orderItemShipGroup.set("shippingInstructions", shippingInstructions); orderItemShipGroup.store(); } catch (GenericEntityException e) { @@ -6206,7 +6206,7 @@ public class OrderServices { String shipGroupSeqId = (String) context.get("shipGroupSeqId"); String giftMessage = (String) context.get("giftMessage"); try { - GenericValue orderItemShipGroup = EntityQuery.use(delegator).from("OrderItemShipGroup").where("orderId", orderId,"shipGroupSeqId",shipGroupSeqId).queryFirst(); + GenericValue orderItemShipGroup = EntityQuery.use(delegator).from("OrderItemShipGroup").where("orderId", orderId,"shipGroupSeqId", shipGroupSeqId).queryFirst(); orderItemShipGroup.set("giftMessage", giftMessage); orderItemShipGroup.set("isGift", "Y"); orderItemShipGroup.store(); 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 8a3f05e..7b49493 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,7 +511,7 @@ 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, + return addOrIncreaseItem(productId, selectedAmount, quantity, reservStart, reservLength, reservPersons, null, null, shipBeforeDate, shipAfterDate, features, attributes, prodCatalogId, configWrapper, itemType, itemGroupNumber, parentProductId, dispatcher); } @@ -525,7 +525,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { /** add rental (with accommodation) item to cart and order item attributes*/ // TODO change method signature, this one is really scary, above are not bad too :/ ! public int addOrIncreaseItem(String productId, BigDecimal selectedAmount, BigDecimal quantity, Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, - String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Map<String, GenericValue> features, Map<String,Object> attributes, + String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Map<String, GenericValue> features, Map<String, Object> attributes, Map<String, String> orderItemAttributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, String itemGroupNumber, String parentProductId, LocalDispatcher dispatcher) throws CartItemModifyException, ItemNotFoundException { return addOrIncreaseItem(productId, selectedAmount, quantity, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, shipBeforeDate, shipAfterDate, null, features, attributes, orderItemAttributes, prodCatalogId, configWrapper, itemType, itemGroupNumber, parentProductId, dispatcher); @@ -534,7 +534,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { /** add rental (with accommodation) item to cart and order item attributes*/ // TODO change method signature, this one is really scary, above are not bad too :/ ! public int addOrIncreaseItem(String productId, BigDecimal selectedAmount, BigDecimal quantity, Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, - String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Timestamp reserveAfterDate, Map<String, GenericValue> features, Map<String,Object> attributes, + String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Timestamp reserveAfterDate, Map<String, GenericValue> features, Map<String, Object> attributes, Map<String, String> orderItemAttributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, String itemGroupNumber, String parentProductId, LocalDispatcher dispatcher) throws CartItemModifyException, ItemNotFoundException { if (isReadOnlyCart()) { @@ -552,10 +552,10 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { ShoppingCartItem sci = cartLines.get(i); - if (sci.equals(productId, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, features, attributes, orderItemAttributes, prodCatalogId,selectedAmount, configWrapper, itemType, itemGroup, false)) { + if (sci.equals(productId, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, features, attributes, orderItemAttributes, prodCatalogId, selectedAmount, configWrapper, itemType, itemGroup, false)) { BigDecimal newQuantity = sci.getQuantity().add(quantity); try { - BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(),sci.getBasePrice(), productId); + BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(), sci.getBasePrice(), productId); if (newQuantity.compareTo(minQuantity) < 0) { newQuantity = minQuantity; } @@ -694,7 +694,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { } /** Add an accommodation(rental/aggregated)item to the shopping cart. */ - public int addItemToEnd(String productId, BigDecimal amount, BigDecimal quantity, BigDecimal unitPrice, Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersonsDbl,String accommodationMapId, String accommodationSpotId, HashMap<String, GenericValue> features, HashMap<String, Object> attributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, LocalDispatcher dispatcher, Boolean triggerExternalOps, Boolean triggerPriceRules, Boolean skipInvento [...] + public int addItemToEnd(String productId, BigDecimal amount, BigDecimal quantity, BigDecimal unitPrice, Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersonsDbl, String accommodationMapId, String accommodationSpotId, HashMap<String, GenericValue> features, HashMap<String, Object> attributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, LocalDispatcher dispatcher, Boolean triggerExternalOps, Boolean triggerPriceRules, Boolean skipInvent [...] return addItemToEnd(ShoppingCartItem.makeItem(null, productId, amount, quantity, unitPrice, reservStart, reservLength, reservPersonsDbl, accommodationMapId, accommodationSpotId, null, null, features, attributes, prodCatalogId, configWrapper, itemType, null, dispatcher, this, triggerExternalOps, triggerPriceRules, null, skipInventoryChecks, skipProductChecks)); } @@ -2932,7 +2932,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { return addOrderTerm(orderTerm); } - public int addOrderTerm(String termTypeId, String orderItemSeqId,BigDecimal termValue, Long termDays, String textValue, String description) { + public int addOrderTerm(String termTypeId, String orderItemSeqId, BigDecimal termValue, Long termDays, String textValue, String description) { GenericValue orderTerm = this.getDelegator().makeValue("OrderTerm"); orderTerm.put("termTypeId", termTypeId); if (UtilValidate.isEmpty(orderItemSeqId)) { @@ -3247,7 +3247,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { return new HashMap<>(this.desiredAlternateGiftByAction); } - public void addProductPromoUse(String productPromoId, String productPromoCodeId, BigDecimal totalDiscountAmount, BigDecimal quantityLeftInActions, Map<ShoppingCartItem,BigDecimal> usageInfoMap) { + public void addProductPromoUse(String productPromoId, String productPromoCodeId, BigDecimal totalDiscountAmount, BigDecimal quantityLeftInActions, Map<ShoppingCartItem, BigDecimal> usageInfoMap) { if (UtilValidate.isNotEmpty(productPromoCodeId) && !this.productPromoCodes.contains(productPromoCodeId)) { throw new IllegalStateException("Cannot add a use to a promo code use for a code that has not been entered."); } @@ -4508,9 +4508,9 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { public String productPromoCodeId = null; public BigDecimal totalDiscountAmount = BigDecimal.ZERO; public BigDecimal quantityLeftInActions = BigDecimal.ZERO; - private Map<ShoppingCartItem,BigDecimal> usageInfoMap = null; + private Map<ShoppingCartItem, BigDecimal> usageInfoMap = null; - public ProductPromoUseInfo(String productPromoId, String productPromoCodeId, BigDecimal totalDiscountAmount, BigDecimal quantityLeftInActions, Map<ShoppingCartItem,BigDecimal> usageInfoMap) { + public ProductPromoUseInfo(String productPromoId, String productPromoCodeId, BigDecimal totalDiscountAmount, BigDecimal quantityLeftInActions, Map<ShoppingCartItem, BigDecimal> usageInfoMap) { this.productPromoId = productPromoId; this.productPromoCodeId = productPromoCodeId; this.totalDiscountAmount = totalDiscountAmount; @@ -4522,7 +4522,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { public String getProductPromoCodeId() { return this.productPromoCodeId; } public BigDecimal getTotalDiscountAmount() { return this.totalDiscountAmount; } public BigDecimal getQuantityLeftInActions() { return this.quantityLeftInActions; } - public Map<ShoppingCartItem,BigDecimal> getUsageInfoMap() { return this.usageInfoMap; } + public Map<ShoppingCartItem, BigDecimal> getUsageInfoMap() { return this.usageInfoMap; } public BigDecimal getUsageWeight() { Iterator<Entry<ShoppingCartItem, BigDecimal>> lineItems = this.usageInfoMap.entrySet().iterator(); BigDecimal totalAmount = BigDecimal.ZERO; 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 5518dc5..892d2b1 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 @@ -96,7 +96,7 @@ public class ShoppingCartEvents { return "success"; } - public static String removePromotion(HttpServletRequest request,HttpServletResponse response) { + public static String removePromotion(HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); ShoppingCart cart = getCartObject(request); String promoCodeId = request.getParameter("promoCode"); 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 18cc05b..4db5c57 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 @@ -107,9 +107,9 @@ public class ShoppingCartHelper { java.sql.Timestamp shipBeforeDate, java.sql.Timestamp shipAfterDate, ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) { - return addToCart(catalogId,shoppingListId,shoppingListItemSeqId, productId, + return addToCart(catalogId, shoppingListId, shoppingListItemSeqId, productId, productCategoryId, itemType, itemDescription, price, amount, quantity, - reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, + reservStart, reservLength, reservPersons, null, null, shipBeforeDate, shipAfterDate, configWrapper, itemGroupNumber, context, parentProductId); } @@ -117,13 +117,13 @@ public class ShoppingCartHelper { public Map<String, Object> addToCart(String catalogId, String shoppingListId, String shoppingListItemSeqId, String productId, String productCategoryId, String itemType, String itemDescription, BigDecimal price, BigDecimal amount, BigDecimal quantity, - java.sql.Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId,String accommodationSpotId, + java.sql.Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId, String accommodationSpotId, java.sql.Timestamp shipBeforeDate, java.sql.Timestamp shipAfterDate, ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) { - return addToCart(catalogId,shoppingListId,shoppingListItemSeqId, productId, + return addToCart(catalogId, shoppingListId, shoppingListItemSeqId, productId, productCategoryId, itemType, itemDescription, price, amount, quantity, - reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, null, + reservStart, reservLength, reservPersons, null, null, shipBeforeDate, shipAfterDate, null, configWrapper, itemGroupNumber, context, parentProductId); } @@ -131,7 +131,7 @@ public class ShoppingCartHelper { public Map<String, Object> addToCart(String catalogId, String shoppingListId, String shoppingListItemSeqId, String productId, String productCategoryId, String itemType, String itemDescription, BigDecimal price, BigDecimal amount, BigDecimal quantity, - java.sql.Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId,String accommodationSpotId, + java.sql.Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId, String accommodationSpotId, java.sql.Timestamp shipBeforeDate, java.sql.Timestamp shipAfterDate, java.sql.Timestamp reserveAfterDate, ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) { Map<String, Object> result = null; @@ -165,7 +165,7 @@ public class ShoppingCartHelper { try { java.sql.Timestamp.valueOf((String) context.get("itemDesiredDeliveryDate")); } catch (IllegalArgumentException e) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderInvalidDesiredDeliveryDateSyntaxError",this.cart.getLocale())); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderInvalidDesiredDeliveryDateSyntaxError", this.cart.getLocale())); } } else { context.remove("itemDesiredDeliveryDate"); @@ -214,8 +214,8 @@ public class ShoppingCartHelper { if (product == null || product.get("requireAmount") == null || "N".equals(product.getString("requireAmount"))) { amount = null; } - Debug.logInfo("carthelper productid " + productId,MODULE); - Debug.logInfo("parent productid " + pProductId,MODULE); + Debug.logInfo("carthelper productid " + productId, MODULE); + Debug.logInfo("parent productid " + pProductId, MODULE); } // Get the additional features selected for the product (if any) @@ -1048,12 +1048,12 @@ public class ShoppingCartHelper { GenericValue agreement = null; if ((this.delegator == null) || (this.dispatcher == null) || (this.cart == null)) { - result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderDispatcherOrDelegatorOrCartArgumentIsNull",this.cart.getLocale())); + result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderDispatcherOrDelegatorOrCartArgumentIsNull", this.cart.getLocale())); return result; } if ((agreementId == null) || (agreementId.length() <= 0)) { - result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderNoAgreementSpecified",this.cart.getLocale())); + result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderNoAgreementSpecified", this.cart.getLocale())); return result; } @@ -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); @@ -1080,14 +1080,14 @@ public class ShoppingCartHelper { try { cart.setCurrency(dispatcher, currencyUomId); } catch (CartItemModifyException ex) { - result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderSetCurrencyError",this.cart.getLocale()) + ex.getMessage()); + result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderSetCurrencyError", this.cart.getLocale()) + ex.getMessage()); return result; } } } } 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; } } @@ -1122,7 +1122,7 @@ public class ShoppingCartHelper { 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()); + result = ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderSetCurrencyError", this.cart.getLocale()) + ex.getMessage()); return result; } return result; @@ -1132,9 +1132,9 @@ public class ShoppingCartHelper { return addOrderTerm(termTypeId, termValue, termDays, null); } - public Map<String, Object> addOrderTerm(String termTypeId, BigDecimal termValue,Long termDays, String textValue) { + public Map<String, Object> addOrderTerm(String termTypeId, BigDecimal termValue, Long termDays, String textValue) { Map<String, Object> result = null; - this.cart.addOrderTerm(termTypeId,termValue,termDays,textValue); + this.cart.addOrderTerm(termTypeId, termValue, termDays, textValue); result = ServiceUtil.returnSuccess(); return result; } 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 d3f7548..a8d15b6 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 @@ -295,11 +295,11 @@ public class ShoppingCartItem implements java.io.Serializable { String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, String parentProductId, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException, ItemNotFoundException { - return makeItem(cartLocation, productId,selectedAmount, quantity,unitPrice, - reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, null, + 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, - parentProductId,skipInventoryChecks,skipProductChecks); + itemType, itemGroup, dispatcher, cart, triggerExternalOpsBool, triggerPriceRulesBool, + parentProductId, skipInventoryChecks, skipProductChecks); } @@ -308,7 +308,7 @@ public class ShoppingCartItem implements java.io.Serializable { * @param reserveAfterDate Optional. */ public static ShoppingCartItem makeItem(Integer cartLocation, String productId, BigDecimal selectedAmount, BigDecimal quantity, BigDecimal unitPrice, - Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons,String accommodationMapId,String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, + Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Map<String, GenericValue> additionalProductFeatureAndAppls, Map<String, Object> attributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, String parentProductId, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException, ItemNotFoundException { @@ -325,7 +325,7 @@ public class ShoppingCartItem implements java.io.Serializable { * @param accommodationSpotId Optional. reservations add into workeffort */ public static ShoppingCartItem makeItem(Integer cartLocation, String productId, BigDecimal selectedAmount, BigDecimal quantity, BigDecimal unitPrice, - Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons,String accommodationMapId,String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Timestamp reserveAfterDate, + Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Timestamp reserveAfterDate, Map<String, GenericValue> additionalProductFeatureAndAppls, Map<String, Object> attributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, String parentProductId, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException, ItemNotFoundException { @@ -383,11 +383,11 @@ public class ShoppingCartItem implements java.io.Serializable { String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, GenericValue parentProduct, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException { - return makeItem(cartLocation, product,selectedAmount, - quantity,unitPrice, reservStart, reservLength, reservPersons, - null, null,shipBeforeDate,shipAfterDate, null, additionalProductFeatureAndAppls, attributes, + return makeItem(cartLocation, product, selectedAmount, + quantity, unitPrice, reservStart, reservLength, reservPersons, + null, null, shipBeforeDate, shipAfterDate, null, additionalProductFeatureAndAppls, attributes, prodCatalogId, configWrapper, itemType, itemGroup, dispatcher, cart, - triggerExternalOpsBool,triggerPriceRulesBool, parentProduct,skipInventoryChecks,skipProductChecks); + triggerExternalOpsBool, triggerPriceRulesBool, parentProduct, skipInventoryChecks, skipProductChecks); } /** @@ -397,7 +397,7 @@ public class ShoppingCartItem implements java.io.Serializable { */ public static ShoppingCartItem makeItem(Integer cartLocation, GenericValue product, BigDecimal selectedAmount, BigDecimal quantity, BigDecimal unitPrice, Timestamp reservStart, BigDecimal reservLength, BigDecimal reservPersons, - String accommodationMapId,String accommodationSpotId, + String accommodationMapId, String accommodationSpotId, Timestamp shipBeforeDate, Timestamp shipAfterDate, Timestamp reserveAfterDate, Map<String, GenericValue> additionalProductFeatureAndAppls, Map<String, Object> attributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, GenericValue parentProduct, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException { @@ -452,7 +452,7 @@ public class ShoppingCartItem implements java.io.Serializable { Map<String, Object> messageMap = UtilMisc.<String, Object>toMap("reservMaxPersons", product.getString("reservMaxPersons"), "reservPersons", reservPersons); String excMsg = UtilProperties.getMessage(RES_ERROR, "item.maximum_number_of_person_renting", messageMap, cart.getLocale()); - Debug.logInfo(excMsg,MODULE); + Debug.logInfo(excMsg, MODULE); throw new CartItemModifyException(excMsg); } } @@ -862,7 +862,7 @@ public class ShoppingCartItem implements java.io.Serializable { this.reservPersons = reservPersons; } /** Sets accommodationId using the reservation */ - public void setAccommodationId(String accommodationMapId,String accommodationSpotId) { + public void setAccommodationId(String accommodationMapId, String accommodationSpotId) { this.accommodationMapId = accommodationMapId; this.accommodationSpotId = accommodationSpotId; } @@ -1032,7 +1032,7 @@ public class ShoppingCartItem implements java.io.Serializable { if (_product != null && quantity.compareTo(this.quantity) > 0) { if (!isInventoryAvailableOrNotRequired(quantity, productStoreId, dispatcher)) { Map<String, Object> messageMap = UtilMisc.<String, Object>toMap("requestedQuantity", UtilFormatOut.formatQuantity(quantity.doubleValue()), - "productName",this.getName(dispatcher), "productId", productId); + "productName", this.getName(dispatcher), "productId", productId); String excMsg = UtilProperties.getMessage(RESOURCE, "OrderDoNotHaveEnoughProducts", messageMap , cart.getLocale()); Debug.logWarning(excMsg, MODULE); throw new CartItemModifyException(excMsg); @@ -1490,7 +1490,7 @@ public class ShoppingCartItem implements java.io.Serializable { try { return Timestamp.valueOf(ddDate); } catch (IllegalArgumentException e) { - Debug.logWarning(e, UtilProperties.getMessage(RES_ERROR,"OrderProblemGettingItemDesiredDeliveryDateFor", UtilMisc.toMap("productId",this.getProductId()), locale)); + Debug.logWarning(e, UtilProperties.getMessage(RES_ERROR,"OrderProblemGettingItemDesiredDeliveryDateFor", UtilMisc.toMap("productId", this.getProductId()), locale)); return null; } } @@ -1594,7 +1594,7 @@ public class ShoppingCartItem implements java.io.Serializable { try { orderItemType = this.getDelegator().findOne("OrderItemType", UtilMisc.toMap("orderItemTypeId", this.getItemType()), true); } catch (GenericEntityException e) { - Debug.logWarning(e, UtilProperties.getMessage(RES_ERROR,"OrderProblemsGettingOrderItemTypeFor", UtilMisc.toMap("orderItemTypeId",this.getItemType()), locale)); + Debug.logWarning(e, UtilProperties.getMessage(RES_ERROR,"OrderProblemsGettingOrderItemTypeFor", UtilMisc.toMap("orderItemTypeId", this.getItemType()), locale)); } } if (orderItemType != null) { @@ -1886,7 +1886,7 @@ public class ShoppingCartItem implements java.io.Serializable { if (product != null) { try { List<GenericValue> featureAppls = product.getRelated("ProductFeatureAndAppl", null, null, false); - features=EntityUtil.filterByAnd(featureAppls,UtilMisc.toMap("productFeatureApplTypeId","STANDARD_FEATURE")); + features=EntityUtil.filterByAnd(featureAppls, UtilMisc.toMap("productFeatureApplTypeId","STANDARD_FEATURE")); } catch (GenericEntityException e) { Debug.logError(e, "Unable to get features from product : " + product.get("productId"), MODULE); } @@ -1895,7 +1895,7 @@ public class ShoppingCartItem implements java.io.Serializable { } /** Returns a List of the item's features for supplier*/ - public List<GenericValue> getFeaturesForSupplier(LocalDispatcher dispatcher,String partyId) { + public List<GenericValue> getFeaturesForSupplier(LocalDispatcher dispatcher, String partyId) { List<GenericValue> featureAppls = getStandardFeatureList(); if (UtilValidate.isNotEmpty(featureAppls)) { try { 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 32c5617..20ff482 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 @@ -770,7 +770,7 @@ public class ShoppingCartServices { termDays = Long.parseLong(quoteTerm.getString("termDays").trim()); } String orderItemSeqId = quoteTerm.getString("quoteItemSeqId"); - cart.addOrderTerm(quoteTerm.getString("termTypeId"), orderItemSeqId,termValue, termDays, quoteTerm.getString("textValue"), quoteTerm.getString("description")); + cart.addOrderTerm(quoteTerm.getString("termTypeId"), orderItemSeqId, termValue, termDays, quoteTerm.getString("textValue"), quoteTerm.getString("description")); } } @@ -1127,7 +1127,7 @@ public class ShoppingCartServices { result.put("subTotalCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getSubTotal(), isoCode, locale)); result.put("totalShipping", shoppingCart.getTotalShipping()); result.put("totalShippingCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getTotalShipping(), isoCode, locale)); - result.put("totalSalesTax",shoppingCart.getTotalSalesTax()); + result.put("totalSalesTax", shoppingCart.getTotalSalesTax()); result.put("totalSalesTaxCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getTotalSalesTax(), isoCode, locale)); result.put("displayGrandTotal", shoppingCart.getDisplayGrandTotal()); result.put("displayGrandTotalCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getDisplayGrandTotal(), isoCode, locale)); 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 429481c..2c51f6f 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 @@ -814,7 +814,7 @@ public final class ProductPromoWorker { private static boolean runProductPromoRules(ShoppingCart cart, Long useLimit, boolean requireCode, String productPromoCodeId, Long codeUseLimit, long maxUseLimit, GenericValue productPromo, List<GenericValue> productPromoRules, LocalDispatcher dispatcher, Delegator delegator, Timestamp nowTimestamp) throws GenericEntityException, UseLimitException { boolean cartChanged = false; - Map<ShoppingCartItem,BigDecimal> usageInfoMap = prepareProductUsageInfoMap(cart); + Map<ShoppingCartItem, BigDecimal> usageInfoMap = prepareProductUsageInfoMap(cart); String productPromoId = productPromo.getString("productPromoId"); while ((useLimit == null || useLimit > cart.getProductPromoUseCount(productPromoId)) && (!requireCode || UtilValidate.isNotEmpty(productPromoCodeId)) && @@ -878,8 +878,8 @@ public final class ProductPromoWorker { if (promoUsed) { // Get product use information from the cart - Map<ShoppingCartItem,BigDecimal> newUsageInfoMap = prepareProductUsageInfoMap(cart); - Map<ShoppingCartItem,BigDecimal> deltaUsageInfoMap = prepareDeltaProductUsageInfoMap(usageInfoMap, newUsageInfoMap); + Map<ShoppingCartItem, BigDecimal> newUsageInfoMap = prepareProductUsageInfoMap(cart); + Map<ShoppingCartItem, BigDecimal> deltaUsageInfoMap = prepareDeltaProductUsageInfoMap(usageInfoMap, newUsageInfoMap); usageInfoMap = newUsageInfoMap; cart.addProductPromoUse(productPromo.getString("productPromoId"), productPromoCodeId, totalDiscountAmount, quantityLeftInActions, deltaUsageInfoMap); } else { @@ -895,8 +895,8 @@ public final class ProductPromoWorker { return cartChanged; } - private static Map<ShoppingCartItem,BigDecimal> prepareProductUsageInfoMap(ShoppingCart cart) { - Map<ShoppingCartItem,BigDecimal> usageInfoMap = new HashMap<>(); + private static Map<ShoppingCartItem, BigDecimal> prepareProductUsageInfoMap(ShoppingCart cart) { + Map<ShoppingCartItem, BigDecimal> usageInfoMap = new HashMap<>(); List<ShoppingCartItem> lineOrderedByBasePriceList = cart.getLineListOrderedByBasePrice(false); for (ShoppingCartItem cartItem : lineOrderedByBasePriceList) { BigDecimal used = cartItem.getPromoQuantityUsed(); @@ -907,8 +907,8 @@ public final class ProductPromoWorker { return usageInfoMap; } - private static Map<ShoppingCartItem,BigDecimal> prepareDeltaProductUsageInfoMap(Map<ShoppingCartItem,BigDecimal> oldMap, Map<ShoppingCartItem,BigDecimal> newMap) { - Map<ShoppingCartItem,BigDecimal> deltaUsageInfoMap = new HashMap<>(newMap); + private static Map<ShoppingCartItem, BigDecimal> prepareDeltaProductUsageInfoMap(Map<ShoppingCartItem, BigDecimal> oldMap, Map<ShoppingCartItem, BigDecimal> newMap) { + Map<ShoppingCartItem, BigDecimal> deltaUsageInfoMap = new HashMap<>(newMap); for (Entry<ShoppingCartItem, BigDecimal> entry : oldMap.entrySet()) { ShoppingCartItem key = entry.getKey(); diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java index a5affe8..4832a3e 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java @@ -349,7 +349,7 @@ public class ShoppingListServices { Debug.logError(e, MODULE); } if (serviceResult == null || ServiceUtil.isError(serviceResult)) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToAddItemToShoppingList",UtilMisc.toMap("shoppingListId",shoppingListId), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToAddItemToShoppingList", UtilMisc.toMap("shoppingListId", shoppingListId), locale)); } } } @@ -381,7 +381,7 @@ public class ShoppingListServices { } if (slUpResp == null || ServiceUtil.isError(slUpResp)) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToUpdateShoppingListInformation",UtilMisc.toMap("shoppingListId",shoppingListId), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToUpdateShoppingListInformation", UtilMisc.toMap("shoppingListId", shoppingListId), locale)); } } @@ -574,7 +574,7 @@ public class ShoppingListServices { return result; } - public static Map<String,Object> autoDeleteAutoSaveShoppingList(DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> autoDeleteAutoSaveShoppingList(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java index 7608e35..d2a41f9 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java @@ -93,7 +93,7 @@ public class ZipSalesServices { // locate the file to be imported URL tUrl = UtilURL.fromResource(taxFileLocation); if (tUrl == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLocateTaxFileAtLocation", UtilMisc.toMap("taxFileLocation",taxFileLocation), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLocateTaxFileAtLocation", UtilMisc.toMap("taxFileLocation", taxFileLocation), locale)); } RecordIterator tri = null; 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 5fb7d35..4fdd9c7 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 @@ -1410,7 +1410,7 @@ public class CommunicationEventServices { * Service to process incoming email and look for a bounce message. If the email is indeed a bounce message * the CommunicationEvent will be updated with the proper COM_BOUNCED status. */ - public static Map<String,Object> processBouncedMessage(DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> processBouncedMessage(DispatchContext dctx, Map<String, ? extends Object> context) { Debug.logInfo("Running process bounced message check...", MODULE); MimeMessageWrapper wrapper = (MimeMessageWrapper) context.get("messageWrapper"); @@ -1542,7 +1542,7 @@ public class CommunicationEventServices { return ServiceUtil.returnSuccess(); } - public static Map<String,Object> logIncomingMessage(DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> logIncomingMessage(DispatchContext dctx, Map<String, ? extends Object> context) { MimeMessageWrapper wrapper = (MimeMessageWrapper) context.get("messageWrapper"); Debug.logInfo("Message recevied : " + wrapper.getSubject(), MODULE); Debug.logInfo("-- Content Type : " + wrapper.getContentType(), MODULE); diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java index ddfec6c..eaa76be 100644 --- a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java +++ b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java @@ -989,7 +989,7 @@ public class ContactMechServices { try { delegator.create(emailAddressVerification); } catch (GenericEntityException e) { - Debug.logError(e.getMessage(),MODULE); + Debug.logError(e.getMessage(), MODULE); return ServiceUtil.returnError(e.getMessage()); } break; 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 71b52e3..b9757b5 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 @@ -241,9 +241,9 @@ public final class ProductConfigWorker { for (GenericValue productConfigConfig: configsToCheck) { String tempConfigId = productConfigConfig.getString("configId"); try { - List<GenericValue> tempResult = EntityQuery.use(delegator).from("ProductConfigConfig").where("configId",tempConfigId).queryList(); + List<GenericValue> tempResult = EntityQuery.use(delegator).from("ProductConfigConfig").where("configId", tempConfigId).queryList(); if (tempResult.size() == selectedOptionSize && configsToCheck.containsAll(tempResult)) { - List<GenericValue> configOptionProductOptions = EntityQuery.use(delegator).from("ConfigOptionProductOption").where("configId",tempConfigId).queryList(); + List<GenericValue> configOptionProductOptions = EntityQuery.use(delegator).from("ConfigOptionProductOption").where("configId", tempConfigId).queryList(); if (UtilValidate.isNotEmpty(configOptionProductOptions)) { // check for variant product equality 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 65c440f..4b38267 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 @@ -202,11 +202,11 @@ public class ScaleImage { } } } catch (SecurityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); } } } catch (NullPointerException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); } // write new image 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 4058442..3a73228 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 @@ -2277,7 +2277,7 @@ public class ProductSearch { @Override public void addConstraint(ProductSearchContext productSearchContext) { productSearchContext.dynamicViewEntity.addAlias("PROD", productFieldName, null, null, null, null, null); - productSearchContext.entityConditionList.add(EntityCondition.makeCondition(productFieldName ,EntityOperator.LIKE, keyword + "%")); + productSearchContext.entityConditionList.add(EntityCondition.makeCondition(productFieldName , EntityOperator.LIKE, keyword + "%")); productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", this.keyword))); } 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 c38ba90..3840e25 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 @@ -1026,7 +1026,7 @@ public class ProductServices { } } catch (SecurityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); } // Images aren't ordered by productId (${location}/${viewtype}/${sizetype}/${id}) } else { @@ -1040,11 +1040,11 @@ public class ProductServices { } } } catch (SecurityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); } } } catch (NullPointerException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); } // Write try { @@ -1063,7 +1063,7 @@ public class ProductServices { "ProductImageViewUnableWriteBinaryData", UtilMisc.toMap("fileName", file.getAbsolutePath()), locale)); } } catch (NullPointerException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); } /* scale Image in different sizes */ @@ -1090,7 +1090,7 @@ public class ProductServices { /* now store the image versions created by ScaleImage.scaleImageInAllSize */ /* have to shrink length of productContentTypeId, as otherwise value is too long for database field */ - Map<String,String> imageUrlMap = UtilGenerics.cast(resultResize.get("imageUrlMap")); + Map<String, String> imageUrlMap = UtilGenerics.cast(resultResize.get("imageUrlMap")); for ( String sizeType : ScaleImage.sizeTypeList ) { imageUrl = imageUrlMap.get(sizeType); if ( UtilValidate.isNotEmpty(imageUrl)) { @@ -1108,7 +1108,7 @@ public class ProductServices { } } } catch(GenericEntityException e) { - Debug.logError(e,MODULE); + Debug.logError(e, MODULE); return ServiceUtil.returnError(e.getMessage()); } } @@ -1117,7 +1117,7 @@ public class ProductServices { return ServiceUtil.returnSuccess(); } - private static Map<String,Object> addImageResource( LocalDispatcher dispatcher, Delegator delegator, Map<String, ? extends Object> context, + private static Map<String, Object> addImageResource( LocalDispatcher dispatcher, Delegator delegator, Map<String, ? extends Object> context, String imageUrl, String productContentTypeId ) { GenericValue userLogin = (GenericValue) context.get("userLogin"); String productId = (String) context.get("productId"); 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 269af27..93f98d6 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 @@ -419,11 +419,11 @@ public final class ProductWorker { * @param product * @return list featureType and related featuresIds, description and feature price for this product ordered by type and sequence */ - public static List<List<Map<String,String>>> getSelectableProductFeaturesByTypesAndSeq(GenericValue product) { + public static List<List<Map<String, String>>> getSelectableProductFeaturesByTypesAndSeq(GenericValue product) { if (product == null) { return null; } - List <List<Map<String,String>>> featureTypeFeatures = new LinkedList<>(); + List <List<Map<String, String>>> featureTypeFeatures = new LinkedList<>(); try { Delegator delegator = product.getDelegator(); List<GenericValue> featuresSorted = EntityQuery.use(delegator) @@ -433,7 +433,7 @@ public final class ProductWorker { .cache(true) .queryList(); String oldType = null; - List<Map<String,String>> featureList = new LinkedList<>(); + List<Map<String, String>> featureList = new LinkedList<>(); for (GenericValue productFeatureAppl: featuresSorted) { if (oldType == null || !oldType.equals(productFeatureAppl.getString("productFeatureTypeId"))) { // use first entry for type and description @@ -447,7 +447,7 @@ public final class ProductWorker { oldType = productFeatureAppl.getString("productFeatureTypeId"); } // fill other entries with featureId, description and default price and currency - Map<String,String> featureData = UtilMisc.toMap("productFeatureId", productFeatureAppl.getString("productFeatureId")); + Map<String, String> featureData = UtilMisc.toMap("productFeatureId", productFeatureAppl.getString("productFeatureId")); if (UtilValidate.isNotEmpty(productFeatureAppl.get("description"))) { featureData.put("description", productFeatureAppl.getString("description")); } else { diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java index 56a99a1..f0a7f10 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java @@ -500,7 +500,7 @@ public final class ProductStoreWorker { storeSurveys = EntityUtil.filterByAnd(storeSurveys, UtilMisc.toMap("groupName", groupName)); } - Debug.logInfo("getSurvey for product " + productId,MODULE); + Debug.logInfo("getSurvey for product " + productId, MODULE); // limit by product if (UtilValidate.isNotEmpty(productId) && UtilValidate.isNotEmpty(storeSurveys)) { for (GenericValue surveyAppl: storeSurveys) { @@ -517,7 +517,7 @@ public final class ProductStoreWorker { else { virtualProductId = ProductWorker.getVariantVirtualId(product); } - Debug.logInfo("getSurvey for virtual product " + virtualProductId,MODULE); + Debug.logInfo("getSurvey for virtual product " + virtualProductId, MODULE); } } catch (GenericEntityException e) { Debug.logError(e, "Problem finding product from productId " + productId, MODULE); diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java index 02785ff..48e9d66 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java @@ -718,7 +718,7 @@ public class ShipmentServices { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ProductShipmentPackageNotFound", UtilMisc.toMap("shipmentPackageSeqId", packageSeqId, - "shipmentId",shipmentId), locale)); + "shipmentId", shipmentId), locale)); } pkg.set("weight", pkgInfo.get("packageWeight")); @@ -1093,7 +1093,7 @@ public class ShipmentServices { Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("partyId", partyId, "shipmentId", shipmentId, "orderId", shipment.getString("primaryOrderId"), "userLogin", userLogin, "locale", locale); sendMap.put("bodyParameters", bodyParameters); - sendMap.put("userLogin",userLogin); + sendMap.put("userLogin", userLogin); sendMap.put("subject", productStoreEmail.getString("subject")); sendMap.put("contentType", productStoreEmail.get("contentType")); diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java index 3bc5bbe..7d07139 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java @@ -199,7 +199,7 @@ public final class ShipmentWorker { if (result.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_SUCCESS) && UtilValidate.isNotEmpty(result.get("convertedValue"))) { productWeight = (BigDecimal) result.get("convertedValue"); } else { - Debug.logError("Unsupported weightUom [" + weightUomId + "] for calcPackageWeight running productId " + productId + ", could not find a conversion factor to WT_lb",MODULE); + Debug.logError("Unsupported weightUom [" + weightUomId + "] for calcPackageWeight running productId " + productId + ", could not find a conversion factor to WT_lb", MODULE); } } 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 eef3357..ce8a2c9 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 @@ -2895,8 +2895,8 @@ public class UpsServices { return ServiceUtil.returnFailure(UtilProperties.getMessage(RES_ERROR, "FacilityShipmentUpsErrorParsingRatingServiceSelectionResponse", UtilMisc.toMap("errorString", e2.toString()), locale)); } - Map<String,Object> upsResponse = handleUpsAlternateRatesInquireResponse(rateResponseDocument, locale); - Map<String,BigDecimal> upsRateCodeMap = UtilGenerics.cast(upsResponse.get("upsRateCodeMap")); + Map<String, Object> upsResponse = handleUpsAlternateRatesInquireResponse(rateResponseDocument, locale); + Map<String, BigDecimal> upsRateCodeMap = UtilGenerics.cast(upsResponse.get("upsRateCodeMap")); GenericValue carrierShipmentMethod = null; // Filtering out rates of shipping methods which are not configured in ProductStoreShipmentMeth entity. try { diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java index ecb4d68..de58732 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java @@ -211,7 +211,7 @@ public class VerifyPickSession implements Serializable { } } - protected void createVerifyPickRow(int checkCode, GenericValue res, String orderId, String orderItemSeqId, String shipGroupSeqId, String productId, String originGeoId,BigDecimal quantity, Locale locale) throws GeneralException { + protected void createVerifyPickRow(int checkCode, GenericValue res, String orderId, String orderItemSeqId, String shipGroupSeqId, String productId, String originGeoId, BigDecimal quantity, Locale locale) throws GeneralException { // process the result; add new item if necessary switch (checkCode) { case 0: diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java index dcbd6f0..0f23a9c 100644 --- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java +++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java @@ -61,19 +61,19 @@ import org.apache.ofbiz.entity.util.EntityUtil; * Utilities for WorkEffort search based on various constraints including assocs, features and keywords. * * Search: - * WorkEffort fields: workEffortTypeId,workEffortPurposeTypeId,scopeEnumId, ??others + * WorkEffort fields: workEffortTypeId, workEffortPurposeTypeId, scopeEnumId, ??others * WorkEffortKeyword - keyword search - * WorkEffortAssoc.workEffortIdTo,workEffortIdFrom,workEffortAssocTypeId - * Sub-tasks: WorkEffortAssoc.workEffortIdTo,workEffortIdFrom,workEffortAssocTypeId=WORK_EFF_BREAKDOWN for sub-tasks OR: (specific assoc and all sub-tasks) + * WorkEffortAssoc.workEffortIdTo, workEffortIdFrom, workEffortAssocTypeId + * Sub-tasks: WorkEffortAssoc.workEffortIdTo, workEffortIdFrom, workEffortAssocTypeId=WORK_EFF_BREAKDOWN for sub-tasks OR: (specific assoc and all sub-tasks) * Sub-tasks: WorkEffort.workEffortParentId tree * WorkEffortGoodStandard.productId * WorkEffortPartyAssignment.partyId, roleTypeId * Planned for later: * WorkEffortFixedAssetAssign.fixedAssetId - * WorkEffortContent.contentId,workEffortContentTypeId + * WorkEffortContent.contentId, workEffortContentTypeId * WorkEffortBilling.invoiceId, invoiceItemSeqId * CommunicationEventWorkEff.communicationEventId - * TimeEntry.partyId, rateTypeId,timesheetId, invoiceId, invoiceItemSeqId + * TimeEntry.partyId, rateTypeId, timesheetId, invoiceId, invoiceItemSeqId */ public class WorkEffortSearch { diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java index c58f4da..86217c0 100644 --- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java +++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java @@ -196,7 +196,7 @@ public class WorkEffortSearchSession { String workEffortId=(String) parameters.get("SEARCH_WORK_EFFORT_ID"); String workEffortAssocTypeId=(String) parameters.get("workEffortAssocTypeId"); boolean includeAllSubWorkEfforts =!"N".equalsIgnoreCase((String) parameters.get("SEARCH_SUB_WORK_EFFORTS")); - searchAddConstraint(new WorkEffortSearch.WorkEffortAssocConstraint(workEffortId,workEffortAssocTypeId, includeAllSubWorkEfforts), session); + searchAddConstraint(new WorkEffortSearch.WorkEffortAssocConstraint(workEffortId, workEffortAssocTypeId, includeAllSubWorkEfforts), session); constraintsChanged = true; } // add a Work Effort Party Assignment to the search @@ -229,7 +229,7 @@ public class WorkEffortSearchSession { if (UtilValidate.isNotEmpty(parameters.get("thruDate"))) { thruDate = Timestamp.valueOf((String) parameters.get("thruDate")); } - searchAddConstraint(new WorkEffortSearch.LastUpdatedRangeConstraint(fromDate,thruDate), session); + searchAddConstraint(new WorkEffortSearch.LastUpdatedRangeConstraint(fromDate, thruDate), session); constraintsChanged = true; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |