From bfd533ccc3ba09a03cb5c01cae22c2daf1ea2e19 Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Mon, 14 Aug 2017 08:32:21 +0000 Subject: [PATCH] Improved: [DEPRECATION] Replace BigDecimal.ROUND_* by RoundingMode.* (OFBIZ-9571) No functional change. We read at http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html : <> That's an easy global replacement. But it also needs to import the RoundingMode class. It was 26 files so I decided to rather clean all the imports in all files with the help of Eclipse. This is a 1st step. I will need to closely look at 2 special class: UtilNumber and Calculate. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1804953 13f79535-47bb-0310-9956-ffa450edef68 --- .../finaccount/FinAccountProductServices.java | 22 +++++----- .../accounting/tax/TaxAuthorityServices.java | 7 ++-- .../clearcommerce/CCServicesTest.java | 4 +- .../thirdparty/eway/GatewayResponse.java | 3 +- .../thirdparty/paypal/PayPalServices.java | 24 +++++------ .../securepay/SecurePayPaymentServices.java | 10 ++--- .../org/apache/ofbiz/content/ConvertTree.java | 4 +- .../content/content/ContentSearchEvents.java | 6 +-- .../content/content/ContentSearchSession.java | 4 +- .../ofbiz/content/survey/SurveyEvents.java | 2 +- .../ftl/OfbizContentAltUrlTransforms.java | 10 ++--- .../apache/ofbiz/humanres/HumanResEvents.java | 2 + .../ofbiz/manufacturing/bom/BOMServices.java | 5 ++- .../jobshopmgt/ProductionRun.java | 3 +- .../tracking/TrackingCodeEvents.java | 4 +- .../apache/ofbiz/order/order/OrderEvents.java | 2 +- .../requirement/RequirementServices.java | 20 +++++++-- .../order/shoppingcart/ShoppingCart.java | 5 ++- .../product/ProductPromoWorker.java | 9 ++-- .../apache/ofbiz/order/task/TaskEvents.java | 10 ++--- .../ofbiz/order/test/FinAccountTest.java | 2 +- .../party/contact/ContactMechServices.java | 13 +++--- .../ofbiz/product/catalog/CatalogWorker.java | 2 +- .../product/category/CatalogUrlDirective.java | 1 - .../ofbiz/product/category/SeoConfigUtil.java | 6 +-- .../product/category/SeoContextFilter.java | 4 +- .../category/ftl/CatalogUrlSeoTransform.java | 8 ++-- .../product/category/ftl/SeoTransform.java | 4 +- .../category/ftl/UrlRegexpTransform.java | 4 +- .../ofbiz/product/image/ScaleImage.java | 2 +- .../product/imagemanagement/FrameImage.java | 4 +- .../ImageManagementServices.java | 2 +- .../ofbiz/product/product/VariantEvents.java | 10 ++--- .../shipment/packing/PackingSession.java | 5 ++- .../shipment/packing/PackingSessionLine.java | 4 +- .../shipment/shipment/ShipmentWorker.java | 3 +- .../ofbiz/shipment/test/IssuanceTest.java | 2 +- .../shipment/thirdparty/dhl/DhlServices.java | 3 +- .../thirdparty/fedex/FedexServices.java | 15 +++---- .../shipment/thirdparty/ups/UpsServices.java | 5 ++- .../thirdparty/usps/UspsServices.java | 19 +++++---- .../workeffort/workeffort/ICalConverter.java | 42 +++++++++---------- .../workeffort/ICalRecurConverter.java | 27 ++++++++++-- .../component/ComponentResourceHandler.java | 3 +- .../apache/ofbiz/base/config/FileLoader.java | 3 +- .../base/config/MainResourceHandler.java | 3 +- .../apache/ofbiz/base/config/UrlLoader.java | 2 +- .../test/TestBooleanConverters.java | 4 +- .../conversion/test/TestJSONConverters.java | 4 +- .../apache/ofbiz/base/crypto/DesCrypt.java | 11 ++--- .../base/lang/test/ComparableRangeTests.java | 9 ++-- .../apache/ofbiz/base/test/BaseUnitTests.java | 4 +- .../ofbiz/base/util/AliasKeyManager.java | 2 +- .../ofbiz/base/util/IndentingWriter.java | 2 +- .../ofbiz/base/util/ObjectInputStream.java | 2 +- .../ofbiz/base/util/PatternFactory.java | 2 +- .../org/apache/ofbiz/base/util/UtilMisc.java | 11 ++--- .../apache/ofbiz/base/util/UtilObject.java | 5 +-- .../apache/ofbiz/base/util/UtilValidate.java | 13 +++--- .../util/collections/FlexibleMapAccessor.java | 1 + .../base/util/collections/GenericMap.java | 2 +- .../ofbiz/base/util/collections/LifoSet.java | 2 +- .../test/FlexibleMapAccessorTests.java | 2 +- .../ofbiz/base/util/string/JuelConnector.java | 4 +- .../base/util/string/NodeELResolver.java | 2 +- .../ofbiz/base/util/string/UelFunctions.java | 2 +- .../test/FlexibleStringExpanderTests.java | 10 ++--- .../base/util/template/FreeMarkerWorker.java | 6 +-- .../base/util/template/XslTransform.java | 42 +++++++++---------- .../ofbiz/base/util/test/AssertTests.java | 4 +- .../base/util/test/IndentingWriterTests.java | 2 +- .../ofbiz/base/util/test/StringUtilTests.java | 2 +- .../base/util/test/TimeDurationTests.java | 8 ++-- .../ofbiz/base/util/UtilCodecTests.java | 7 +++- .../util/template/FreeMarkerWorkerTests.java | 3 +- .../catalina/container/CatalinaContainer.java | 10 ++--- .../container/CrossSubdomainSessionValve.java | 4 +- .../apache/ofbiz/common/CommonWorkers.java | 1 + .../common/authentication/AuthHelper.java | 2 +- .../example/TestFailAuthenticator.java | 4 +- .../ofbiz/common/email/EmailServices.java | 2 +- .../ofbiz/common/image/ImageTransform.java | 2 +- .../preferences/PreferenceServices.java | 3 +- .../ofbiz/common/qrcode/QRCodeEvents.java | 1 - .../ofbiz/common/qrcode/QRCodeServices.java | 3 +- .../ofbiz/common/scripting/ContextHelper.java | 2 +- .../ofbiz/common/status/StatusServices.java | 5 +-- .../ofbiz/entity/DelegatorContainer.java | 2 +- .../apache/ofbiz/entity/DelegatorFactory.java | 1 - .../org/apache/ofbiz/entity/cache/Cache.java | 2 +- .../condition/EntityComparisonOperator.java | 10 ++--- .../condition/EntityConditionBuilder.java | 4 +- .../entity/config/model/DelegatorElement.java | 2 +- .../entity/config/model/EntityConfig.java | 2 +- .../connection/DebugManagedDataSource.java | 13 +++--- .../entity/datasource/ReadOnlyHelperDAO.java | 1 - .../apache/ofbiz/entity/finder/Finder.java | 4 +- .../ofbiz/entity/model/DynamicViewEntity.java | 5 +-- .../apache/ofbiz/entity/model/ModelUtil.java | 1 + .../ofbiz/entity/model/ModelViewEntity.java | 4 +- .../ofbiz/entity/serialize/XmlSerializer.java | 3 +- .../entity/test/EntityQueryTestSuite.java | 2 +- .../entity/testtools/EntityTestCase.java | 4 +- .../entity/transaction/DebugXaResource.java | 2 +- .../entity/transaction/GenericXaResource.java | 6 +-- .../transaction/JNDITransactionFactory.java | 4 +- .../transaction/TransactionFactory.java | 1 + .../ofbiz/entity/util/EntityCrypto.java | 10 ++--- .../apache/ofbiz/entity/util/EntityQuery.java | 2 - .../ofbiz/entity/util/EntitySaxReader.java | 1 + .../ofbiz/entity/DelegatorUnitTests.java | 9 +++- .../entity/util/EntitySaxReaderTests.java | 9 ++-- .../entityext/eca/EntityEcaSetField.java | 8 ++-- .../ofbiz/minilang/MiniLangElement.java | 2 +- .../method/conditional/RegexpCondition.java | 8 ++-- .../ofbiz/minilang/operation/Regexp.java | 8 ++-- .../service/GenericAbstractDispatcher.java | 4 +- .../ofbiz/service/GenericRequester.java | 2 +- .../service/ServiceValidationException.java | 2 +- .../service/calendar/RecurrenceInfo.java | 4 +- .../service/calendar/RecurrenceRule.java | 3 +- .../service/calendar/TemporalExpression.java | 3 +- .../service/calendar/TemporalExpressions.java | 3 +- .../ofbiz/service/engine/GroovyEngine.java | 5 ++- .../service/engine/StandardJavaEngine.java | 4 +- .../service/engine/XMLRPCClientEngine.java | 4 +- .../ofbiz/service/group/GroupModel.java | 3 +- .../ofbiz/service/jms/JmsQueueListener.java | 2 +- .../ofbiz/service/jms/JmsTopicListener.java | 2 +- .../apache/ofbiz/service/job/JobPoller.java | 2 +- .../ofbiz/service/rmi/RemoteDispatcher.java | 2 +- .../socket/ssl/SSLClientSocketFactory.java | 3 +- .../service/test/AbstractXmlRpcTestCase.java | 6 +-- .../ofbiz/service/test/XmlRpcTests.java | 2 +- .../AliasSupportedTransportFactory.java | 4 +- .../ofbiz/service/xmlrpc/XmlRpcClient.java | 10 ++--- .../base/start/OfbizStartupUnitTests.java | 6 +-- .../ofbiz/testtools/EntityXmlAssertTest.java | 6 +-- .../ofbiz/testtools/JunitSuiteWrapper.java | 6 +-- .../ofbiz/testtools/ModelTestSuite.java | 8 ++-- .../apache/ofbiz/testtools/ServiceTest.java | 6 +-- .../ofbiz/testtools/TestRunContainer.java | 20 ++++----- .../org/apache/ofbiz/webapp/WebAppUtil.java | 18 ++++---- .../ofbiz/webapp/control/ControlFilter.java | 3 +- .../control/ExternalLoginKeysManager.java | 15 +++---- .../event/FileUploadProgressListener.java | 4 +- .../webapp/event/GroovyEventHandler.java | 6 +-- .../event/JSONRequestBodyMapHandler.java | 9 ++-- .../webapp/event/RequestBodyMapHandler.java | 3 +- .../event/RequestBodyMapHandlerFactory.java | 3 +- .../ofbiz/webapp/event/RomeEventHandler.java | 2 +- .../webapp/event/XmlRpcEventHandler.java | 22 +++++----- .../webapp/ftl/OfbizAmountTransform.java | 9 ++-- .../ofbiz/webapp/ftl/OfbizCacheStorage.java | 4 +- .../webapp/ftl/OfbizCurrencyTransform.java | 15 +++---- .../ftl/RenderWrappedTextTransform.java | 9 ++-- .../webapp/ftl/SetContextFieldTransform.java | 12 ++++-- .../webapp/ftl/SetRequestAttributeMethod.java | 1 + .../ofbiz/webapp/taglib/ContentUrlTag.java | 3 +- .../ofbiz/webapp/view/HttpViewHandler.java | 1 + .../ofbiz/webapp/view/JspViewHandler.java | 1 + .../webapp/control/ControlFilterTests.java | 9 ++-- .../ExternalLoginKeysManagerTests.java | 8 +++- .../webtools/artifactinfo/RunTestEvents.java | 3 +- .../webtools/print/FoPrintServerEvents.java | 18 ++++---- .../widget/model/AbstractModelCondition.java | 8 ++-- .../apache/ofbiz/widget/model/ModelForm.java | 2 +- .../ofbiz/widget/model/ModelFormField.java | 2 +- .../widget/model/ModelScreenCondition.java | 5 --- .../widget/model/ModelWidgetCondition.java | 8 ++-- 170 files changed, 548 insertions(+), 468 deletions(-) diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java index f4ab698b6d..9b45dbb18e 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java @@ -25,24 +25,24 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.ofbiz.service.DispatchContext; -import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ServiceUtil; -import org.apache.ofbiz.service.GenericServiceException; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.util.EntityQuery; -import org.apache.ofbiz.entity.util.EntityUtil; -import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; -import org.apache.ofbiz.order.order.OrderReadHelper; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.entity.util.EntityUtil; +import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.order.finaccount.FinAccountHelper; +import org.apache.ofbiz.order.order.OrderReadHelper; +import org.apache.ofbiz.service.DispatchContext; +import org.apache.ofbiz.service.GenericServiceException; +import org.apache.ofbiz.service.LocalDispatcher; +import org.apache.ofbiz.service.ServiceUtil; /** * FinAccountProductServices - Financial Accounts created from product purchases (i.e. gift certificates) 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 3314c6b97f..73533b4a0c 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 @@ -19,6 +19,7 @@ package org.apache.ofbiz.accounting.tax; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.HashMap; import java.util.HashSet; @@ -449,15 +450,15 @@ public class TaxAuthorityServices { // itemQuantity = 3; // taxAmountIncludedInFullPrice = (43-(43/(1+(20/100))))*3 = 21.51 taxAdjValue.set("orderAdjustmentTypeId", "VAT_TAX"); - BigDecimal taxAmountIncludedInFullPrice = itemPrice.subtract(itemPrice.divide(BigDecimal.ONE.add(taxRate.divide(PERCENT_SCALE, 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP)).multiply(itemQuantity); + BigDecimal taxAmountIncludedInFullPrice = itemPrice.subtract(itemPrice.divide(BigDecimal.ONE.add(taxRate.divide(PERCENT_SCALE, 4, RoundingMode.HALF_UP)), 2, RoundingMode.HALF_UP)).multiply(itemQuantity); // If 1 quantity has 50% discount then itemAmount = 107.5 otherwise 129 (In case of no discount) // Net price for each item // netItemPrice = itemAmount / quantity = 107.5 / 3 = 35.833333333 - BigDecimal netItemPrice = itemAmount.divide(itemQuantity, BigDecimal.ROUND_HALF_UP); + BigDecimal netItemPrice = itemAmount.divide(itemQuantity, RoundingMode.HALF_UP); // Calculate tax on the discounted price, be sure to round to 2 decimal places before multiplying by quantity // netTax = (netItemPrice - netItemPrice / (1 + (taxRate/100))) * quantity // netTax = (35.833333333-(35.833333333/(1+(20/100))))*3 = 17.92 - BigDecimal netTax = netItemPrice.subtract(netItemPrice.divide(BigDecimal.ONE.add(taxRate.divide(PERCENT_SCALE, 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP)).multiply(itemQuantity); + BigDecimal netTax = netItemPrice.subtract(netItemPrice.divide(BigDecimal.ONE.add(taxRate.divide(PERCENT_SCALE, 4, RoundingMode.HALF_UP)), 2, RoundingMode.HALF_UP)).multiply(itemQuantity); //Subtract net tax from base tax (taxAmountIncludedFullPrice) to get the negative promotion tax adjustment amount // discountedSalesTax = 17.92 - 21.51 = −3.59 (If no discounted item quantity then discountedSalesTax will be ZERO) discountedSalesTax = netTax.subtract(taxAmountIncludedInFullPrice); diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java index f123e04155..efa33592f1 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java @@ -22,8 +22,6 @@ package org.apache.ofbiz.accounting.thirdparty.clearcommerce; import java.math.BigDecimal; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.GenericValue; @@ -31,6 +29,8 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.testtools.OFBizTestCase; +import junit.framework.TestCase; + public class CCServicesTest extends OFBizTestCase { public static final String module = CCServicesTest.class.getName(); diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java index 957fb4aef3..9c965f96ed 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.accounting.thirdparty.eway; import java.io.InputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -94,7 +95,7 @@ public class GatewayResponse { public BigDecimal getTransactionAmount() { BigDecimal amt = new BigDecimal(getReturnAmount()); amt = amt.divide(new BigDecimal(100)); - return amt.setScale(2, BigDecimal.ROUND_HALF_UP); + return amt.setScale(2, RoundingMode.HALF_UP); } public boolean getTrxnStatus() { diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java index 644b63e35a..7f9aa00fc5 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java @@ -256,10 +256,10 @@ public class PayPalServices { } String estimateLabel = shipMethod.getString("partyId") + " - " + shipMethod.getString("description"); encoder.add("L_SHIPINGPOPTIONLABEL" + line, estimateLabel); - encoder.add("L_SHIPPINGOPTIONAMOUNT" + line, estimate.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("L_SHIPPINGOPTIONAMOUNT" + line, estimate.setScale(2, RoundingMode.HALF_UP).toPlainString()); // Just make this first one default for now encoder.add("L_SHIPPINGOPTIONISDEFAULT" + line, line == 0 ? "true" : "false"); - encoder.add("L_TAXAMT" + line, cart.getTotalSalesTax().setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("L_TAXAMT" + line, cart.getTotalSalesTax().setScale(2, RoundingMode.HALF_UP).toPlainString()); line++; } String responseMsg = null; @@ -317,14 +317,14 @@ public class PayPalServices { for (ShoppingCartItem item : cart.items()) { encoder.add("L_NUMBER" + line, item.getProductId()); encoder.add("L_NAME" + line, item.getName()); - encoder.add("L_AMT" + line, item.getBasePrice().setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("L_AMT" + line, item.getBasePrice().setScale(2, RoundingMode.HALF_UP).toPlainString()); encoder.add("L_QTY" + line, item.getQuantity().toBigInteger().toString()); line++; BigDecimal otherAdjustments = item.getOtherAdjustments(); if (otherAdjustments.compareTo(BigDecimal.ZERO) != 0) { encoder.add("L_NUMBER" + line, item.getProductId()); encoder.add("L_NAME" + line, item.getName() + " Adjustments"); - encoder.add("L_AMT" + line, otherAdjustments.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("L_AMT" + line, otherAdjustments.setScale(2, RoundingMode.HALF_UP).toPlainString()); encoder.add("L_QTY" + line, "1"); line++; } @@ -333,7 +333,7 @@ public class PayPalServices { if (otherAdjustments.compareTo(BigDecimal.ZERO) != 0) { encoder.add("L_NUMBER" + line, "N/A"); encoder.add("L_NAME" + line, "Order Adjustments"); - encoder.add("L_AMT" + line, otherAdjustments.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("L_AMT" + line, otherAdjustments.setScale(2, RoundingMode.HALF_UP).toPlainString()); encoder.add("L_QTY" + line, "1"); line++; } @@ -657,7 +657,7 @@ public class PayPalServices { String paymentMethodId = (String) outMap.get("paymentMethodId"); cart.clearPayments(); - BigDecimal maxAmount = cart.getGrandTotal().setScale(2, BigDecimal.ROUND_HALF_UP); + BigDecimal maxAmount = cart.getGrandTotal().setScale(2, RoundingMode.HALF_UP); cart.addPaymentAmount(paymentMethodId, maxAmount, true); return ServiceUtil.returnSuccess(); @@ -695,9 +695,9 @@ public class PayPalServices { encoder.add("AMT", processAmount.setScale(2).toPlainString()); encoder.add("CURRENCYCODE", orh.getCurrency()); BigDecimal grandTotal = orh.getOrderGrandTotal(); - BigDecimal shippingTotal = orh.getShippingTotal().setScale(2, BigDecimal.ROUND_HALF_UP); - BigDecimal taxTotal = orh.getTaxTotal().setScale(2, BigDecimal.ROUND_HALF_UP); - BigDecimal subTotal = grandTotal.subtract(shippingTotal).subtract(taxTotal).setScale(2, BigDecimal.ROUND_HALF_UP); + BigDecimal shippingTotal = orh.getShippingTotal().setScale(2, RoundingMode.HALF_UP); + BigDecimal taxTotal = orh.getTaxTotal().setScale(2, RoundingMode.HALF_UP); + BigDecimal subTotal = grandTotal.subtract(shippingTotal).subtract(taxTotal).setScale(2, RoundingMode.HALF_UP); encoder.add("ITEMAMT", subTotal.toPlainString()); encoder.add("SHIPPINGAMT", shippingTotal.toPlainString()); encoder.add("TAXAMT", taxTotal.toPlainString()); @@ -759,7 +759,7 @@ public class PayPalServices { NVPEncoder encoder = new NVPEncoder(); encoder.add("METHOD", "DoAuthorization"); encoder.add("TRANSACTIONID", payPalPaymentMethod.getString("transactionId")); - encoder.add("AMT", processAmount.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("AMT", processAmount.setScale(2, RoundingMode.HALF_UP).toPlainString()); encoder.add("TRANSACTIONENTITY", "Order"); String currency = (String) context.get("currency"); if (currency == null) { @@ -816,7 +816,7 @@ public class PayPalServices { NVPEncoder encoder = new NVPEncoder(); encoder.add("METHOD", "DoCapture"); encoder.add("AUTHORIZATIONID", authTrans.getString("referenceNum")); - encoder.add("AMT", captureAmount.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("AMT", captureAmount.setScale(2, RoundingMode.HALF_UP).toPlainString()); encoder.add("CURRENCYCODE", authTrans.getString("currencyUomId")); encoder.add("COMPLETETYPE", "NotComplete"); @@ -920,7 +920,7 @@ public class PayPalServices { encoder.add("TRANSACTIONID", captureTrans.getString("referenceNum")); encoder.add("REFUNDTYPE", "Partial"); encoder.add("CURRENCYCODE", captureTrans.getString("currencyUomId")); - encoder.add("AMT", refundAmount.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + encoder.add("AMT", refundAmount.setScale(2, RoundingMode.HALF_UP).toPlainString()); encoder.add("NOTE", "Order #" + orderPaymentPreference.getString("orderId")); NVPDecoder decoder = null; try { 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 0c5cf36b6d..61f7284cdb 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 @@ -68,7 +68,7 @@ public class SecurePayPaymentServices { int amont; if (enableamountround.equals("Y")) { - newAmount = new BigDecimal(processAmount.setScale(0, BigDecimal.ROUND_HALF_UP)+".00"); + newAmount = new BigDecimal(processAmount.setScale(0, RoundingMode.HALF_UP)+".00"); } else { newAmount = processAmount; } @@ -163,7 +163,7 @@ public class SecurePayPaymentServices { int amont; if (enableamountround.equals("Y")) { - newAmount = new BigDecimal(captureAmount.setScale(0, BigDecimal.ROUND_HALF_UP)+".00"); + newAmount = new BigDecimal(captureAmount.setScale(0, RoundingMode.HALF_UP)+".00"); } else { newAmount = captureAmount; } @@ -242,7 +242,7 @@ public class SecurePayPaymentServices { int amont; if (enableamountround.equals("Y")) { - newAmount = new BigDecimal(releaseAmount.setScale(0, BigDecimal.ROUND_HALF_UP)+".00"); + newAmount = new BigDecimal(releaseAmount.setScale(0, RoundingMode.HALF_UP)+".00"); } else { newAmount = releaseAmount; } @@ -328,7 +328,7 @@ public class SecurePayPaymentServices { BigDecimal newAmount = null; if (enableamountround.equals("Y")) { - newAmount = new BigDecimal(refundAmount.setScale(0, BigDecimal.ROUND_HALF_UP)+".00"); + newAmount = new BigDecimal(refundAmount.setScale(0, RoundingMode.HALF_UP)+".00"); } else { newAmount = refundAmount; } @@ -401,7 +401,7 @@ public class SecurePayPaymentServices { int amont; if (enableamountround.equals("Y")) { - newAmount = new BigDecimal(creditAmount.setScale(0, BigDecimal.ROUND_HALF_UP)+".00"); + newAmount = new BigDecimal(creditAmount.setScale(0, RoundingMode.HALF_UP)+".00"); } else { newAmount = creditAmount; } 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 3f3cb3ca3a..a508c696b9 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 @@ -23,15 +23,15 @@ import java.io.FileReader; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; -import java.util.Locale; import java.util.List; +import java.util.Locale; import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.UtilProperties; +import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java index d7efd85bb3..a88a54fb10 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java @@ -27,12 +27,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.webapp.stats.VisitHandler; -import org.apache.ofbiz.content.content.ContentSearch.ResultSortOrder; import org.apache.ofbiz.content.content.ContentSearch.ContentSearchConstraint; import org.apache.ofbiz.content.content.ContentSearch.ContentSearchContext; +import org.apache.ofbiz.content.content.ContentSearch.ResultSortOrder; import org.apache.ofbiz.content.content.ContentSearchSession.ContentSearchOptions; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.webapp.stats.VisitHandler; public class ContentSearchEvents { 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 46a69a1173..434e207982 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 @@ -32,10 +32,10 @@ import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.content.content.ContentSearch.ContentSearchConstraint; import org.apache.ofbiz.content.content.ContentSearch.ResultSortOrder; import org.apache.ofbiz.content.content.ContentSearch.SortKeywordRelevancy; -import org.apache.ofbiz.content.content.ContentSearch.ContentSearchConstraint; +import org.apache.ofbiz.entity.Delegator; public class ContentSearchSession { diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java index d7d91b61ae..100503ddf9 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.webapp.control.ConfigXMLReader; -import org.apache.ofbiz.webapp.control.RequestHandler; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.apache.ofbiz.webapp.control.RequestHandler; import org.apache.ofbiz.webapp.control.WebAppConfigurationException; import org.apache.ofbiz.webapp.event.EventHandlerException; diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java index dcff4d0288..970f7ced66 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java @@ -29,6 +29,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilCodec; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.webapp.WebAppUtil; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; @@ -38,11 +43,6 @@ import freemarker.template.SimpleNumber; import freemarker.template.SimpleScalar; import freemarker.template.TemplateModelException; import freemarker.template.TemplateTransformModel; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityQuery; -import org.apache.ofbiz.webapp.WebAppUtil; public class OfbizContentAltUrlTransforms implements TemplateTransformModel { public final static String module = OfbizContentAltUrlTransforms.class.getName(); 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 6507f46060..3bfc470345 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 @@ -22,8 +22,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java index 743db61952..512b25d16e 100644 --- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java +++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.manufacturing.bom; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.Date; import java.util.HashMap; @@ -671,10 +672,10 @@ public class BOMServices { productDepth = BigDecimal.ONE; } - BigDecimal firstMaxNumOfProducts = boxWidth.subtract(totalWidth).divide(productDepth, 0, BigDecimal.ROUND_FLOOR); + BigDecimal firstMaxNumOfProducts = boxWidth.subtract(totalWidth).divide(productDepth, 0, RoundingMode.FLOOR); if (firstMaxNumOfProducts.compareTo(BigDecimal.ZERO) == 0) firstMaxNumOfProducts = BigDecimal.ONE; // - BigDecimal maxNumOfProducts = boxWidth.divide(productDepth, 0, BigDecimal.ROUND_FLOOR); + BigDecimal maxNumOfProducts = boxWidth.divide(productDepth, 0, RoundingMode.FLOOR); if (maxNumOfProducts.compareTo(BigDecimal.ZERO) == 0) maxNumOfProducts = BigDecimal.ONE; BigDecimal remQuantity = quantity; 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 741c27c3f9..166ac52215 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 @@ -20,6 +20,7 @@ package org.apache.ofbiz.manufacturing.jobshopmgt; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.Iterator; import java.util.LinkedList; @@ -207,7 +208,7 @@ public class ProductionRun { for (Iterator iter = productionRunComponents.iterator(); iter.hasNext();) { GenericValue component = iter.next(); componentQuantity = component.getBigDecimal("estimatedQuantity"); - component.set("estimatedQuantity", componentQuantity.divide(previousQuantity, 10, BigDecimal.ROUND_HALF_UP).multiply(newQuantity).doubleValue()); + component.set("estimatedQuantity", componentQuantity.divide(previousQuantity, 10, RoundingMode.HALF_UP).multiply(newQuantity).doubleValue()); } } /** diff --git a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java index 4df71b08d1..6a5ec20073 100644 --- a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java +++ b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java @@ -31,14 +31,14 @@ import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.webapp.stats.VisitHandler; -import org.apache.ofbiz.webapp.website.WebSiteWorker; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.product.category.CategoryWorker; +import org.apache.ofbiz.webapp.stats.VisitHandler; +import org.apache.ofbiz.webapp.website.WebSiteWorker; /** * Events used for maintaining TrackingCode related information diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java index 1626b4d00e..5c97ee7640 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.order.order; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -42,7 +43,6 @@ import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; -import java.math.BigDecimal; /** * Order Events diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java index 10ebdf1a40..1fd889ea2b 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java @@ -18,15 +18,29 @@ */ package org.apache.ofbiz.order.requirement; -import java.util.*; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.entity.condition.*; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilDateTime; +import org.apache.ofbiz.base.util.UtilGenerics; +import org.apache.ofbiz.base.util.UtilMisc; +import org.apache.ofbiz.base.util.UtilProperties; +import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.entity.condition.EntityCondition; +import org.apache.ofbiz.entity.condition.EntityConditionList; +import org.apache.ofbiz.entity.condition.EntityExpr; +import org.apache.ofbiz.entity.condition.EntityOperator; import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityUtil; import org.apache.ofbiz.order.order.OrderReadHelper; 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 d3978bc7ff..f073b3f40e 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 @@ -21,6 +21,7 @@ package org.apache.ofbiz.order.shoppingcart; import java.io.Serializable; import java.math.BigDecimal; import java.math.MathContext; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; @@ -3794,7 +3795,7 @@ public class ShoppingCart implements Iterable, Serializable { Delegator delegator = this.getDelegator(); List allOpPrefs = new LinkedList(); BigDecimal remainingAmount = this.getGrandTotal().subtract(this.getPaymentTotal()); - remainingAmount = remainingAmount.setScale(2, BigDecimal.ROUND_HALF_UP); + remainingAmount = remainingAmount.setScale(2, RoundingMode.HALF_UP); if (getBillingAccountId() != null && this.billingAccountAmt.compareTo(BigDecimal.ZERO) <= 0) { BigDecimal billingAccountAvailableAmount = CheckOutHelper.availableAccountBalance(getBillingAccountId(), dispatcher); if (this.billingAccountAmt.compareTo(BigDecimal.ZERO) == 0 && billingAccountAvailableAmount.compareTo(BigDecimal.ZERO) > 0) { @@ -5072,7 +5073,7 @@ public class ShoppingCart implements Iterable, Serializable { minimumOrderPrice = EntityUtil.getFirst(minimumOrderPriceList).getBigDecimal("price"); } if (itemBasePrice != null && minimumOrderPrice.compareTo(itemBasePrice) > 0) { - minQuantity = minimumOrderPrice.divide(itemBasePrice, 0, BigDecimal.ROUND_UP); + minQuantity = minimumOrderPrice.divide(itemBasePrice, 0, RoundingMode.UP); } return minQuantity; } 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 73cd6002c0..a3a6587626 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 @@ -20,6 +20,7 @@ package org.apache.ofbiz.order.shoppingcart.product; import java.math.BigDecimal; import java.math.MathContext; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collections; @@ -410,7 +411,7 @@ public final class ProductPromoWorker { // set a max limit on how many times each promo can be run, for cases where there is no use limit this will be the use limit //default to 2 times the number of items in the cart - long maxUseLimit = cart.getTotalQuantity().multiply(BigDecimal.valueOf(2)).setScale(0, BigDecimal.ROUND_CEILING).longValue(); + long maxUseLimit = cart.getTotalQuantity().multiply(BigDecimal.valueOf(2)).setScale(0, RoundingMode.CEILING).longValue(); maxUseLimit = Math.max(1, maxUseLimit); try { @@ -958,7 +959,7 @@ public final class ProductPromoWorker { BigDecimal basePrice = cartItem.getBasePrice(); // get a rough price, round it up to an integer - BigDecimal quantityNeeded = amountNeeded.divide(basePrice, generalRounding).setScale(0, BigDecimal.ROUND_CEILING); + BigDecimal quantityNeeded = amountNeeded.divide(basePrice, generalRounding).setScale(0, RoundingMode.CEILING); // reduce amount still needed to qualify for promo (amountNeeded) BigDecimal quantity = cartItem.addPromoQuantityCandidateUse(quantityNeeded, productPromoCond, false); @@ -1315,7 +1316,7 @@ public final class ProductPromoWorker { BigDecimal basePrice = cartItem.getBasePrice(); BigDecimal amountOff = listPrice.subtract(basePrice); - BigDecimal percentOff = amountOff.divide(listPrice, 2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100L)); + BigDecimal percentOff = amountOff.divide(listPrice, 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100L)); Integer compareBase = null; @@ -1844,7 +1845,7 @@ public final class ProductPromoWorker { BigDecimal ratioOfTotal = quantityUsed.multiply(cartItem.getBasePrice()).divide(totalAmount, generalRounding); BigDecimal weightedAmount = ratioOfTotal.multiply(discountAmountTotal); // round the weightedAmount to 3 decimal places, we don't want an exact number cents/whatever because this will be added up as part of a subtotal which will be rounded to 2 decimal places - weightedAmount = weightedAmount.setScale(3, BigDecimal.ROUND_HALF_UP); + weightedAmount = weightedAmount.setScale(3, RoundingMode.HALF_UP); discountAmount = discountAmount.subtract(weightedAmount); doOrderItemPromoAction(productPromoAction, cartItem, weightedAmount, "amount", delegator); } else { diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java index d2ef7672cc..c087a39ee8 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java @@ -18,12 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.order.task; +import java.util.Locale; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Locale; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; @@ -31,14 +31,14 @@ import org.apache.ofbiz.base.util.ObjectType; import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; -import org.apache.ofbiz.webapp.control.RequestHandler; -import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; -import org.apache.ofbiz.webapp.event.EventHandler; -import org.apache.ofbiz.webapp.event.EventHandlerException; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; +import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; +import org.apache.ofbiz.webapp.control.RequestHandler; +import org.apache.ofbiz.webapp.event.EventHandler; +import org.apache.ofbiz.webapp.event.EventHandlerException; /** * Order Processing Task Events diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/test/FinAccountTest.java b/applications/order/src/main/java/org/apache/ofbiz/order/test/FinAccountTest.java index 82f3d95e93..e3861c88c7 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/test/FinAccountTest.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/test/FinAccountTest.java @@ -20,8 +20,8 @@ package org.apache.ofbiz.order.test; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.apache.ofbiz.order.finaccount.FinAccountHelper; +import org.apache.ofbiz.service.testtools.OFBizTestCase; public class FinAccountTest extends OFBizTestCase { public FinAccountTest(String name) { 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 1169362ccb..4e1ea6041d 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 @@ -21,21 +21,18 @@ package org.apache.ofbiz.party.contact; import java.security.SecureRandom; import java.sql.Timestamp; - -import com.ibm.icu.util.Calendar; - import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Locale; +import java.util.Map; import org.apache.ofbiz.base.crypto.HashCrypt; import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilDateTime; +import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; @@ -46,10 +43,12 @@ import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.security.Security; import org.apache.ofbiz.service.DispatchContext; +import org.apache.ofbiz.service.GenericServiceException; +import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; -import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.GenericServiceException; + +import com.ibm.icu.util.Calendar; /** diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java index b674865337..fee8ed3a38 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java @@ -32,7 +32,6 @@ import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.webapp.website.WebSiteWorker; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; @@ -40,6 +39,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityUtil; import org.apache.ofbiz.product.category.CategoryWorker; import org.apache.ofbiz.product.store.ProductStoreWorker; +import org.apache.ofbiz.webapp.website.WebSiteWorker; /** * CatalogWorker - Worker class for catalog related functionality diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java index 4199fd6622..833af24cc9 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.ofbiz.base.util.UtilGenerics; - import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; import freemarker.template.TemplateDirectiveBody; diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java index e77ee761ba..1517e764ea 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java @@ -31,14 +31,14 @@ import java.util.Set; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.Perl5Compiler; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilURL; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.UtilXml; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.Perl5Compiler; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java index fce6eafa6e..75128723a6 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java @@ -39,8 +39,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilHttp; @@ -49,6 +47,8 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.ControllerConfig; import org.apache.ofbiz.webapp.control.ControlFilter; import org.apache.ofbiz.webapp.control.WebAppConfigurationException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.Perl5Matcher; /** * SeoContextFilter - Restricts access to raw files and configures servlet objects. diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java index e236fca81c..f3f014df5c 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java @@ -31,10 +31,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.Perl5Compiler; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.StringUtil.StringWrapper; @@ -53,6 +49,10 @@ import org.apache.ofbiz.product.category.CategoryWorker; import org.apache.ofbiz.product.category.SeoConfigUtil; import org.apache.ofbiz.product.category.SeoUrlUtil; import org.apache.ofbiz.product.product.ProductContentWrapper; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.Perl5Compiler; +import org.apache.oro.text.regex.Perl5Matcher; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java index 922fe0ec29..db67533804 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java @@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.product.category.SeoConfigUtil; import org.apache.ofbiz.webapp.control.RequestHandler; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.Perl5Matcher; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java index 700ec5326e..fcec397fbb 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java @@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.product.category.SeoConfigUtil; import org.apache.ofbiz.webapp.control.RequestHandler; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.Perl5Matcher; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; 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 1e0961edb0..2e8c65071d 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 @@ -30,7 +30,6 @@ import java.util.Map; import javax.imageio.ImageIO; import org.apache.ofbiz.base.location.FlexibleLocation; -import org.jdom.JDOMException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilMisc; @@ -42,6 +41,7 @@ import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.jdom.JDOMException; /** * ScaleImage Class diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java index 232ae71e0c..f49952a8f1 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java @@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.swing.ImageIcon; -import org.jdom.JDOMException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilGenerics; @@ -50,14 +49,15 @@ import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.content.layout.LayoutWorker; import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; +import org.jdom.JDOMException; public class FrameImage { diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java index 72d93731da..56138f69ec 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java @@ -36,7 +36,6 @@ import java.util.Map; import javax.imageio.ImageIO; import org.apache.ofbiz.base.location.FlexibleLocation; -import org.jdom.JDOMException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilGenerics; @@ -56,6 +55,7 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.jdom.JDOMException; /** * Product Services diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java index 4e2ba65624..9fbb7decc1 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java @@ -18,15 +18,17 @@ *******************************************************************************/ package org.apache.ofbiz.product.product; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilHttp; +import org.apache.ofbiz.base.util.UtilMisc; +import org.apache.ofbiz.base.util.UtilProperties; +import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; @@ -34,8 +36,6 @@ import org.apache.ofbiz.entity.transaction.GenericTransactionException; import org.apache.ofbiz.entity.transaction.TransactionUtil; import org.apache.ofbiz.entity.util.EntityQuery; -import java.util.Map; - /** * Product Variant Related Events */ diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java index c7eb53e9a1..0f3cd89aa8 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java @@ -19,6 +19,7 @@ package org.apache.ofbiz.shipment.packing; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.AbstractMap; import java.util.HashMap; import java.util.HashSet; @@ -1018,7 +1019,7 @@ public class PackingSession implements java.io.Serializable { public ItemDisplay(GenericValue v) { if ("PicklistItem".equals(v.getEntityName())) { - quantity = v.getBigDecimal("quantity").setScale(2, BigDecimal.ROUND_HALF_UP); + quantity = v.getBigDecimal("quantity").setScale(2, RoundingMode.HALF_UP); try { orderItem = v.getRelatedOne("OrderItem", false); productId = v.getRelatedOne("InventoryItem", false).getString("productId"); @@ -1029,7 +1030,7 @@ public class PackingSession implements java.io.Serializable { // this is an OrderItemAndShipGrpInvResAndItemSum orderItem = v; productId = v.getString("inventoryProductId"); - quantity = v.getBigDecimal("totQuantityReserved").setScale(2, BigDecimal.ROUND_HALF_UP); + quantity = v.getBigDecimal("totQuantityReserved").setScale(2, RoundingMode.HALF_UP); } Debug.logInfo("created item display object quantity: " + quantity + " (" + productId + ")", module); } diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java index 0ca3e79d8e..2fd4fcc72b 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java @@ -22,11 +22,11 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.UtilFormatOut; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; 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 4e5e07b55e..45f5d55d31 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 @@ -20,6 +20,7 @@ package org.apache.ofbiz.shipment.shipment; import java.math.BigDecimal; import java.math.MathContext; +import java.math.RoundingMode; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -102,7 +103,7 @@ public final class ShipmentWorker { } } // take the average value of the issuances and multiply it by the shipment package content quantity - value = totalValue.divide(totalIssued, 10, BigDecimal.ROUND_HALF_EVEN).multiply(quantity); + value = totalValue.divide(totalIssued, 10, RoundingMode.HALF_EVEN).multiply(quantity); return value; } diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/test/IssuanceTest.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/test/IssuanceTest.java index f04da434f3..165f056fe9 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/test/IssuanceTest.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/test/IssuanceTest.java @@ -26,8 +26,8 @@ import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityQuery; -import org.apache.ofbiz.shipment.packing.PackingSession; import org.apache.ofbiz.service.testtools.OFBizTestCase; +import org.apache.ofbiz.shipment.packing.PackingSession; /** * Item Issuance Tests diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java index 28d282ee01..9bd80e35f5 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.shipment.thirdparty.dhl; import java.io.IOException; import java.io.StringWriter; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -680,7 +681,7 @@ public class DhlServices { weight = packageWeight; } // want the rounded weight as a string, so we use the "" + int shortcut - String roundedWeight = weight.setScale(0, BigDecimal.ROUND_HALF_UP).toPlainString(); + String roundedWeight = weight.setScale(0, RoundingMode.HALF_UP).toPlainString(); // translate shipmentMethodTypeId to DHL service code String shipmentMethodTypeId = shipmentRouteSegment.getString("shipmentMethodTypeId"); diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java index c0de72c834..db7d680d50 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.shipment.thirdparty.fedex; import java.io.StringWriter; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.HashMap; import java.util.LinkedList; @@ -912,15 +913,15 @@ public class FedexServices { shipRequestContext.put("DropoffType", dropoffType); shipRequestContext.put("Packaging", packaging); if (UtilValidate.isNotEmpty(dimensionsUomId) && - dimensionsLength != null && dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && - dimensionsWidth != null && dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && - dimensionsHeight != null && dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0) { + dimensionsLength != null && dimensionsLength.setScale(0, RoundingMode.HALF_UP).compareTo(BigDecimal.ZERO) > 0 && + dimensionsWidth != null && dimensionsWidth.setScale(0, RoundingMode.HALF_UP).compareTo(BigDecimal.ZERO) > 0 && + dimensionsHeight != null && dimensionsHeight.setScale(0, RoundingMode.HALF_UP).compareTo(BigDecimal.ZERO) > 0) { shipRequestContext.put("DimensionsUnits", dimensionsUomId.equals("LEN_in") ? "IN" : "CM"); - shipRequestContext.put("DimensionsLength", dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); - shipRequestContext.put("DimensionsWidth", dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); - shipRequestContext.put("DimensionsHeight", dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); + shipRequestContext.put("DimensionsLength", dimensionsLength.setScale(0, RoundingMode.HALF_UP).toString()); + shipRequestContext.put("DimensionsWidth", dimensionsWidth.setScale(0, RoundingMode.HALF_UP).toString()); + shipRequestContext.put("DimensionsHeight", dimensionsHeight.setScale(0, RoundingMode.HALF_UP).toString()); } - shipRequestContext.put("Weight", weight.setScale(1, BigDecimal.ROUND_UP).toString()); + shipRequestContext.put("Weight", weight.setScale(1, RoundingMode.UP).toString()); } StringWriter outWriter = new StringWriter(); 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 48afdb232b..c6f1d4b62e 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 @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.math.MathContext; +import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Iterator; @@ -549,7 +550,7 @@ public class UpsServices { UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentPackageSeqId", shipmentPackage.getString("shipmentPackageSeqId")), locale)); } BigDecimal boxWeight = shipmentPackage.getBigDecimal("weight"); - UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilValidate.isNotEmpty(boxWeight) ? ""+ boxWeight.setScale(0, BigDecimal.ROUND_CEILING) : "", shipmentConfirmRequestDoc); + UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilValidate.isNotEmpty(boxWeight) ? ""+ boxWeight.setScale(0, RoundingMode.CEILING) : "", shipmentConfirmRequestDoc); // Adding only when order is not an international order if (!internationalServiceCodes.contains(carrierServiceCode)) { Element referenceNumberElement = UtilXml.addChildElement(packageElement, "ReferenceNumber", shipmentConfirmRequestDoc); @@ -567,7 +568,7 @@ public class UpsServices { if (! UtilValidate.isEmpty(insuredValue)) { Element insuredValueElement = UtilXml.addChildElement(packageServiceOptionsElement, "InsuredValue", shipmentConfirmRequestDoc); - UtilXml.addChildElementValue(insuredValueElement, "MonetaryValue", insuredValue.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), shipmentConfirmRequestDoc); + UtilXml.addChildElementValue(insuredValueElement, "MonetaryValue", insuredValue.setScale(2, RoundingMode.HALF_UP).toString(), shipmentConfirmRequestDoc); UtilXml.addChildElementValue(insuredValueElement, "CurrencyCode", currencyCode, shipmentConfirmRequestDoc); } diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java index a46921e915..d166973918 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java @@ -24,6 +24,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.Collections; import java.util.HashMap; @@ -192,14 +193,14 @@ public class UspsServices { UtilXml.addChildElementValue(packageElement, "ZipOrigination", StringUtils.substring(originationZip, 0, 5), requestDocument); UtilXml.addChildElementValue(packageElement, "ZipDestination", StringUtils.substring(destinationZip, 0, 5), requestDocument); - BigDecimal weightPounds = packageWeight.setScale(0, BigDecimal.ROUND_FLOOR); + BigDecimal weightPounds = packageWeight.setScale(0, RoundingMode.FLOOR); // for Parcel post, the weight must be at least 1 lb if ("PARCEL".equals(serviceCode.toUpperCase()) && (weightPounds.compareTo(BigDecimal.ONE) < 0)) { weightPounds = BigDecimal.ONE; packageWeight = BigDecimal.ZERO; } // (packageWeight % 1) * 16 (Rounded up to 0 dp) - BigDecimal weightOunces = packageWeight.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, BigDecimal.ROUND_CEILING); + BigDecimal weightOunces = packageWeight.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, RoundingMode.CEILING); UtilXml.addChildElementValue(packageElement, "Pounds", weightPounds.toPlainString(), requestDocument); UtilXml.addChildElementValue(packageElement, "Ounces", weightOunces.toPlainString(), requestDocument); @@ -1075,8 +1076,8 @@ public class UspsServices { } - BigDecimal weightPounds = weight.setScale(0, BigDecimal.ROUND_FLOOR); - BigDecimal weightOunces = weight.multiply(new BigDecimal("16")).remainder(new BigDecimal("16")).setScale(0, BigDecimal.ROUND_CEILING); + BigDecimal weightPounds = weight.setScale(0, RoundingMode.FLOOR); + BigDecimal weightOunces = weight.multiply(new BigDecimal("16")).remainder(new BigDecimal("16")).setScale(0, RoundingMode.CEILING); DecimalFormat df = new DecimalFormat("#"); UtilXml.addChildElementValue(packageElement, "Pounds", df.format(weightPounds), requestDocument); @@ -1372,7 +1373,7 @@ public class UspsServices { } DecimalFormat df = new DecimalFormat("#"); - UtilXml.addChildElementValue(requestElement, "WeightInOunces", df.format(weight.setScale(0, BigDecimal.ROUND_CEILING)), requestDocument); + UtilXml.addChildElementValue(requestElement, "WeightInOunces", df.format(weight.setScale(0, RoundingMode.CEILING)), requestDocument); UtilXml.addChildElementValue(requestElement, "ServiceType", serviceType, requestDocument); UtilXml.addChildElementValue(requestElement, "ImageType", "TIF", requestDocument); @@ -1613,8 +1614,8 @@ public class UspsServices { } UtilXml.addChildElementValue(itemDetail, "Description", product.getString("productName"), packageDocument); - UtilXml.addChildElementValue(itemDetail, "Quantity", shipmentPackageContent.getBigDecimal("quantity").setScale(0, BigDecimal.ROUND_CEILING).toPlainString(), packageDocument); - String packageContentValue = ShipmentWorker.getShipmentPackageContentValue(shipmentPackageContent).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); + UtilXml.addChildElementValue(itemDetail, "Quantity", shipmentPackageContent.getBigDecimal("quantity").setScale(0, RoundingMode.CEILING).toPlainString(), packageDocument); + String packageContentValue = ShipmentWorker.getShipmentPackageContentValue(shipmentPackageContent).setScale(2, RoundingMode.HALF_UP).toPlainString(); UtilXml.addChildElementValue(itemDetail, "Value", packageContentValue, packageDocument); BigDecimal productWeight = ProductWorker.getProductWeight(product, "WT_lbs", delegator, dispatcher); Integer[] productPoundsOunces = convertPoundsToPoundsOunces(productWeight); @@ -1754,9 +1755,9 @@ public class UspsServices { public static Integer[] convertPoundsToPoundsOunces(BigDecimal decimalPounds) { if (decimalPounds == null) return null; Integer[] poundsOunces = new Integer[2]; - poundsOunces[0] = Integer.valueOf(decimalPounds.setScale(0, BigDecimal.ROUND_FLOOR).toPlainString()); + poundsOunces[0] = Integer.valueOf(decimalPounds.setScale(0, RoundingMode.FLOOR).toPlainString()); // (weight % 1) * 16 rounded up to nearest whole number - poundsOunces[1] = Integer.valueOf(decimalPounds.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, BigDecimal.ROUND_CEILING).toPlainString()); + poundsOunces[1] = Integer.valueOf(decimalPounds.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, RoundingMode.CEILING).toPlainString()); return poundsOunces; } diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java index ae166af35c..2747ce4816 100644 --- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java +++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java @@ -34,6 +34,27 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import org.apache.ofbiz.base.util.DateRange; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.ObjectType; +import org.apache.ofbiz.base.util.TimeDuration; +import org.apache.ofbiz.base.util.UtilGenerics; +import org.apache.ofbiz.base.util.UtilMisc; +import org.apache.ofbiz.base.util.UtilProperties; +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.service.GenericServiceException; +import org.apache.ofbiz.service.LocalDispatcher; +import org.apache.ofbiz.service.ModelParam; +import org.apache.ofbiz.service.ModelService; +import org.apache.ofbiz.service.ServiceUtil; +import org.apache.ofbiz.service.calendar.TemporalExpression; +import org.apache.ofbiz.service.calendar.TemporalExpressionWorker; +import org.apache.ofbiz.workeffort.workeffort.ICalWorker.ResponseProperties; + import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.data.ParserException; import net.fortuna.ical4j.model.Calendar; @@ -77,27 +98,6 @@ import net.fortuna.ical4j.model.property.Uid; import net.fortuna.ical4j.model.property.Version; import net.fortuna.ical4j.model.property.XProperty; -import org.apache.ofbiz.base.util.DateRange; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.ObjectType; -import org.apache.ofbiz.base.util.TimeDuration; -import org.apache.ofbiz.base.util.UtilGenerics; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilProperties; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityQuery; -import org.apache.ofbiz.service.GenericServiceException; -import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ModelParam; -import org.apache.ofbiz.service.ModelService; -import org.apache.ofbiz.service.ServiceUtil; -import org.apache.ofbiz.service.calendar.TemporalExpression; -import org.apache.ofbiz.service.calendar.TemporalExpressionWorker; -import org.apache.ofbiz.workeffort.workeffort.ICalWorker.ResponseProperties; - /** iCalendar converter class. This class uses the * iCal4J library. */ diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java index bbd887b01c..5d619eb42f 100644 --- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java +++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java @@ -25,16 +25,35 @@ import java.util.List; import java.util.Set; import java.util.Stack; -import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.model.property.*; - import org.apache.ofbiz.service.calendar.TemporalExpression; import org.apache.ofbiz.service.calendar.TemporalExpressionVisitor; import org.apache.ofbiz.service.calendar.TemporalExpressions; -import org.apache.ofbiz.service.calendar.TemporalExpressions.*; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Difference; +import org.apache.ofbiz.service.calendar.TemporalExpressions.HourRange; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Intersection; +import org.apache.ofbiz.service.calendar.TemporalExpressions.MinuteRange; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Null; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Substitution; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Union; import com.ibm.icu.util.Calendar; +import net.fortuna.ical4j.model.DateTime; +import net.fortuna.ical4j.model.NumberList; +import net.fortuna.ical4j.model.Period; +import net.fortuna.ical4j.model.PeriodList; +import net.fortuna.ical4j.model.Property; +import net.fortuna.ical4j.model.PropertyList; +import net.fortuna.ical4j.model.Recur; +import net.fortuna.ical4j.model.WeekDay; +import net.fortuna.ical4j.model.WeekDayList; +import net.fortuna.ical4j.model.property.DateListProperty; +import net.fortuna.ical4j.model.property.DtStart; +import net.fortuna.ical4j.model.property.ExDate; +import net.fortuna.ical4j.model.property.ExRule; +import net.fortuna.ical4j.model.property.RDate; +import net.fortuna.ical4j.model.property.RRule; + /** Temporal Expression to iCalendar recurrence converter. The conversion results * (or conversion success) are unpredictable since the OFBiz Temporal Expressions * are more sophisticated than iCalendar recurrences. This class attempts to diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java index 9b930c2369..e0cf0e101f 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java @@ -23,9 +23,8 @@ import java.net.URL; import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.config.ResourceHandler; -import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.base.util.Debug; - +import org.apache.ofbiz.base.util.UtilXml; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java index 0f6a366216..e912f792fa 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java @@ -18,8 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.base.config; -import java.net.URL; import java.io.InputStream; +import java.net.URL; + import org.apache.ofbiz.base.util.UtilURL; /** diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java index 60d855389b..516a49e1c5 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java @@ -21,9 +21,8 @@ package org.apache.ofbiz.base.config; import java.io.InputStream; import java.net.URL; -import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.base.util.Debug; - +import org.apache.ofbiz.base.util.UtilXml; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java index 475b7ea5a5..c0ca78c219 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java @@ -18,9 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.base.config; -import java.net.URL; import java.io.InputStream; import java.io.Serializable; +import java.net.URL; /** * Loads resources from a URL diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java index 6d26eeb7ad..22961dc48d 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - import org.apache.ofbiz.base.conversion.BooleanConverters; import org.apache.ofbiz.base.conversion.Converter; import org.apache.ofbiz.base.conversion.ConverterLoader; import org.apache.ofbiz.base.conversion.Converters; +import junit.framework.TestCase; + public class TestBooleanConverters extends TestCase { public TestBooleanConverters(String name) { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java index 54882b6989..a3e67a0e4e 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java @@ -25,8 +25,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ofbiz.base.conversion.Converter; import org.apache.ofbiz.base.conversion.ConverterLoader; import org.apache.ofbiz.base.conversion.Converters; @@ -34,6 +32,8 @@ import org.apache.ofbiz.base.conversion.JSONConverters; import org.apache.ofbiz.base.lang.JSON; import org.apache.ofbiz.base.util.UtilGenerics; +import junit.framework.TestCase; + public class TestJSONConverters extends TestCase { public TestJSONConverters(String name) { super(name); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java index d409add216..ffb8336f19 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java @@ -18,19 +18,20 @@ *******************************************************************************/ package org.apache.ofbiz.base.crypto; -import java.security.NoSuchAlgorithmException; -import java.security.InvalidKeyException; import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; import java.security.Key; +import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; + +import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; -import javax.crypto.BadPaddingException; -import javax.crypto.NoSuchPaddingException; import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.DESedeKeySpec; +import javax.crypto.spec.IvParameterSpec; import org.apache.ofbiz.base.util.GeneralException; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java index f6fd332a24..fc5aba388d 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java @@ -18,14 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.base.lang.test; -import org.apache.ofbiz.base.test.GenericTestCaseBase; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.lessThan; + import org.apache.ofbiz.base.lang.ComparableRange; import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.test.GenericTestCaseBase; import org.apache.ofbiz.base.util.UtilGenerics; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; - @SourceMonitored public class ComparableRangeTests extends GenericTestCaseBase { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java index 9af2e016ca..ffee7d1da6 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java @@ -18,13 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.base.test; -import junit.framework.TestCase; - import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilFormatOut; import org.apache.ofbiz.base.util.UtilValidate; +import junit.framework.TestCase; + public class BaseUnitTests extends TestCase { public BaseUnitTests(String name) { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java index 394651841f..9660244ce8 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; +import java.net.Socket; import java.security.Principal; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import java.net.Socket; import javax.net.ssl.X509KeyManager; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java index 87a113aaa9..5e938f9e75 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; -import java.io.IOException; import java.io.FilterWriter; +import java.io.IOException; import java.io.Writer; import org.apache.ofbiz.base.lang.SourceMonitored; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java index 85b265efbf..38d0405399 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectStreamClass; import java.lang.reflect.Proxy; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java index 898e80aa8c..e9aa853fcf 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; +import org.apache.ofbiz.base.util.cache.UtilCache; import org.apache.oro.text.regex.MalformedPatternException; import org.apache.oro.text.regex.Pattern; import org.apache.oro.text.regex.Perl5Compiler; -import org.apache.ofbiz.base.util.cache.UtilCache; /** * A RegEx compiled pattern factory. diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java index f80387197d..6fa8d15883 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java @@ -39,17 +39,18 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; + +import org.apache.ofbiz.base.util.collections.MapComparator; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.service.ModelService; -import org.apache.ofbiz.base.util.collections.MapComparator; +import com.google.i18n.phonenumbers.NumberParseException; +import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; /** * UtilMisc - Misc Utility Functions diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java index 7fabb7a290..2272aedeeb 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java @@ -18,15 +18,14 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; -import java.lang.reflect.Array; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ObjectOutputStream; import java.io.InputStream; +import java.io.ObjectOutputStream; +import java.lang.reflect.Array; import java.util.Iterator; import java.util.ServiceLoader; -import java.lang.Class; import org.apache.ofbiz.base.lang.Factory; import org.apache.ofbiz.base.lang.SourceMonitored; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java index c5df34740d..e48cdeea03 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java @@ -24,17 +24,16 @@ import java.util.Map; import org.apache.commons.validator.routines.EmailValidator; import org.apache.ofbiz.base.lang.IsEmpty; - -import com.ibm.icu.util.Calendar; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.entity.util.EntityUtilProperties; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityUtilProperties; -import org.apache.ofbiz.entity.util.EntityQuery; +import com.ibm.icu.util.Calendar; /** * General input/data validation methods diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java index 134b22f971..944ac30854 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.base.util.collections; import java.io.Serializable; import java.util.Locale; import java.util.Map; + import javax.el.PropertyNotFoundException; import org.apache.ofbiz.base.lang.IsEmpty; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java index caa0331e8d..692f8cc190 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java @@ -19,8 +19,8 @@ package org.apache.ofbiz.base.util.collections; import java.io.Serializable; -import java.util.ConcurrentModificationException; import java.util.Collection; +import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; import java.util.Set; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java index 6af23b2572..e5509a250b 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java @@ -20,9 +20,9 @@ package org.apache.ofbiz.base.util.collections; import java.io.Serializable; import java.util.AbstractSet; +import java.util.EmptyStackException; import java.util.Iterator; import java.util.LinkedList; -import java.util.EmptyStackException; /** * LifoSet - Set interface wrapper around a LinkedList diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java index 6233686e15..f8474a230b 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java @@ -18,12 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.collections.test; +import java.math.BigDecimal; import java.util.HashMap; import java.util.HashSet; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.math.BigDecimal; import org.apache.ofbiz.base.lang.SourceMonitored; import org.apache.ofbiz.base.test.GenericTestCaseBase; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java index e0ddffe944..8dc51ff2c0 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java @@ -28,6 +28,8 @@ import javax.el.ELException; import javax.el.ExpressionFactory; import javax.el.PropertyNotFoundException; +import org.apache.ofbiz.base.util.Debug; + import de.odysseus.el.ExpressionFactoryImpl; import de.odysseus.el.misc.LocalMessages; import de.odysseus.el.tree.Bindings; @@ -45,8 +47,6 @@ import de.odysseus.el.tree.impl.ast.AstEval; import de.odysseus.el.tree.impl.ast.AstIdentifier; import de.odysseus.el.tree.impl.ast.AstNode; -import org.apache.ofbiz.base.util.Debug; - /** A facade class used to connect the OFBiz framework to the JUEL library. *

The Unified Expression Language specification doesn't allow assignment of * values to non-existent variables (auto-vivify) - but the OFBiz scripting diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java index a2be132a63..3205d502f0 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java @@ -33,9 +33,9 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.xerces.dom.NodeImpl; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.cache.UtilCache; +import org.apache.xerces.dom.NodeImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java index c67cb1aec2..35c2cbecee 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java @@ -37,12 +37,12 @@ import javax.el.FunctionMapper; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import org.cyberneko.html.parsers.DOMParser; import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.FileUtil; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilXml; +import org.cyberneko.html.parsers.DOMParser; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java index c9437c8b84..f93cdd5d1f 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java @@ -26,14 +26,14 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import junit.framework.TestCase; - -import org.apache.ofbiz.base.lang.SourceMonitored; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.base.conversion.AbstractConverter; import org.apache.ofbiz.base.conversion.ConversionException; import org.apache.ofbiz.base.conversion.Converters; +import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.string.FlexibleStringExpander; + +import junit.framework.TestCase; @SourceMonitored public class FlexibleStringExpanderTests extends TestCase { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java index 6e63ed0d3e..6dd9f32664 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java @@ -36,9 +36,6 @@ import java.util.TimeZone; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import freemarker.cache.MultiTemplateLoader; -import freemarker.cache.StringTemplateLoader; -import freemarker.cache.TemplateLoader; import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; @@ -48,6 +45,9 @@ import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.cache.UtilCache; +import freemarker.cache.MultiTemplateLoader; +import freemarker.cache.StringTemplateLoader; +import freemarker.cache.TemplateLoader; import freemarker.cache.URLTemplateLoader; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java index a34918dd98..197630bd7f 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java @@ -18,40 +18,38 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.template; -import java.util.Map; +import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; +import java.io.StringWriter; import java.net.URL; import java.net.URLConnection; -import java.io.InputStream; -import java.io.IOException; -import java.io.StringWriter; +import java.util.Map; -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.base.util.UtilXml; -import org.apache.ofbiz.base.util.URLConnector; -import org.apache.ofbiz.base.util.cache.UtilCache; -import org.apache.ofbiz.base.location.FlexibleLocation; -import org.apache.ofbiz.base.util.GeneralException; - -import javax.xml.transform.Transformer; +import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; +import javax.xml.transform.Templates; +import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.Templates; -import javax.xml.transform.dom.DOMSource; import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import org.apache.ofbiz.base.location.FlexibleLocation; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.URLConnector; +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilXml; +import org.apache.ofbiz.base.util.cache.UtilCache; import org.w3c.dom.Document; import org.w3c.dom.Node; - -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.stream.StreamResult; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; public final class XslTransform { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java index 49330f6dff..6a4f7d1f74 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java @@ -21,10 +21,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ofbiz.base.util.Assert; +import junit.framework.TestCase; + /** * Assert tests {@link org.apache.ofbiz.base.util.Assert}. * diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java index 5e49f8f8a9..83aba13252 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java @@ -21,8 +21,8 @@ package org.apache.ofbiz.base.util.test; import java.io.StringWriter; import org.apache.ofbiz.base.lang.SourceMonitored; -import org.apache.ofbiz.base.util.IndentingWriter; import org.apache.ofbiz.base.test.GenericTestCaseBase; +import org.apache.ofbiz.base.util.IndentingWriter; @SourceMonitored public class IndentingWriterTests extends GenericTestCaseBase { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java index f0b104832b..c55063a02b 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java @@ -25,10 +25,10 @@ import java.util.Map; import org.apache.ofbiz.base.lang.Appender; import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.test.GenericTestCaseBase; import org.apache.ofbiz.base.util.GeneralRuntimeException; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilGenerics; -import org.apache.ofbiz.base.test.GenericTestCaseBase; @SourceMonitored public class StringUtilTests extends GenericTestCaseBase { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java index 68156a027f..938a7f529e 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java @@ -18,15 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.test; +import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.test.GenericTestCaseBase; +import org.apache.ofbiz.base.util.TimeDuration; + //import com.ibm.icu.util.Calendar; //import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.TimeZone; -import org.apache.ofbiz.base.lang.SourceMonitored; -import org.apache.ofbiz.base.util.TimeDuration; -import org.apache.ofbiz.base.test.GenericTestCaseBase; - @SourceMonitored public class TimeDurationTests extends GenericTestCaseBase { private static final Calendar zero = Calendar.getInstance(TimeZone.getTimeZone("GMT")); diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java index 73b3b63ade..d59a0fa0bd 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java @@ -18,11 +18,14 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.ArrayList; + import org.junit.Test; -import static org.junit.Assert.*; public class UtilCodecTests { diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java index 177bed2bb7..27ef6050d3 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java @@ -18,13 +18,14 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.template; +import static org.junit.Assert.assertEquals; + import java.io.StringWriter; import java.util.HashMap; import java.util.Map; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; public class FreeMarkerWorkerTests { @Before diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java index 4f71465c32..9014961a56 100644 --- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java +++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java @@ -62,11 +62,6 @@ import org.apache.catalina.tribes.transport.nio.NioReceiver; import org.apache.catalina.util.ServerInfo; import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.webresources.StandardRoot; -import org.apache.tomcat.JarScanner; -import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.tomcat.util.descriptor.web.FilterDef; -import org.apache.tomcat.util.descriptor.web.FilterMap; -import org.apache.tomcat.util.scan.StandardJarScanner; import org.apache.ofbiz.base.component.ComponentConfig; import org.apache.ofbiz.base.concurrent.ExecutionPool; import org.apache.ofbiz.base.container.Container; @@ -80,6 +75,11 @@ import org.apache.ofbiz.base.start.StartupCommand; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.UtilXml; +import org.apache.tomcat.JarScanner; +import org.apache.tomcat.util.IntrospectionUtils; +import org.apache.tomcat.util.descriptor.web.FilterDef; +import org.apache.tomcat.util.descriptor.web.FilterMap; +import org.apache.tomcat.util.scan.StandardJarScanner; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java index 9bb41a8060..8a571d5e27 100644 --- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java +++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java @@ -27,12 +27,12 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.SessionConfig; import org.apache.catalina.valves.ValveBase; -import org.apache.tomcat.util.buf.MessageBytes; -import org.apache.tomcat.util.http.MimeHeaders; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.util.EntityUtilProperties; +import org.apache.tomcat.util.buf.MessageBytes; +import org.apache.tomcat.util.http.MimeHeaders; public class CrossSubdomainSessionValve extends ValveBase { diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java index 1a7adac8d7..7a022870f0 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.common; import java.util.LinkedList; import java.util.List; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilMisc; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java index dbd9fb123e..2e93b1a799 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java @@ -23,8 +23,8 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collections; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.ServiceLoader; import org.apache.ofbiz.base.util.Debug; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java index 7e7f3ddf52..c2855fc14d 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java @@ -19,11 +19,11 @@ package org.apache.ofbiz.common.authentication.example; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.common.authentication.api.Authenticator; import org.apache.ofbiz.common.authentication.api.AuthenticatorException; -import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.service.LocalDispatcher; /** * LocalAuthenticator diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java index 47a8f232f8..3c609a7066 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java @@ -72,9 +72,9 @@ import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.service.mail.MimeMessageWrapper; import org.apache.ofbiz.webapp.view.ApacheFopWorker; -import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenStringRenderer; +import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; import org.xml.sax.SAXException; import com.sun.mail.smtp.SMTPAddressFailedException; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java index 0fb0c5c379..d2c53fcb3d 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java @@ -37,9 +37,9 @@ import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.service.ModelService; -import org.xml.sax.SAXException; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.xml.sax.SAXException; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java index 9ac178dad7..e2d7cb5d54 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java @@ -18,6 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.common.preferences; +import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; + import java.util.List; import java.util.Locale; import java.util.Map; @@ -26,7 +28,6 @@ import java.util.Properties; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; -import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java index be8e7e411e..0715942678 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Locale; import java.util.Map; -import java.lang.Integer; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java index f961c98b3b..e9751bd99f 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java @@ -22,14 +22,13 @@ import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; +import java.io.IOException; import java.util.Arrays; import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.io.IOException; -import java.lang.Integer; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.FileUtil; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java index 2a78e1e58b..2596692d76 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java @@ -21,8 +21,8 @@ package org.apache.ofbiz.common.scripting; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; -import java.util.Locale; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.TimeZone; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java index 1ffaf65019..72e38f19c7 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java @@ -18,6 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.common.status; +import static org.apache.ofbiz.base.util.UtilGenerics.checkList; + import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -27,9 +29,6 @@ import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; - -import static org.apache.ofbiz.base.util.UtilGenerics.checkList; - import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java index 3fa9ebf864..84058c2a74 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java @@ -28,8 +28,8 @@ import org.apache.ofbiz.base.container.Container; import org.apache.ofbiz.base.container.ContainerConfig; import org.apache.ofbiz.base.container.ContainerException; import org.apache.ofbiz.base.start.StartupCommand; -import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.StringUtil; +import org.apache.ofbiz.base.util.UtilValidate; public class DelegatorContainer implements Container { private String name; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java index f20cd5542d..6f3b6b00f8 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java @@ -26,7 +26,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.ScheduledExecutorService; import org.apache.ofbiz.base.concurrent.ExecutionPool; - import org.apache.ofbiz.base.lang.Factory; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilObject; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java index 02a2d5f66a..666943260e 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java @@ -23,8 +23,8 @@ import java.util.List; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.entity.GenericEntity; -import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.GenericPK; +import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.condition.EntityCondition; public class Cache { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java index 8d03a11f73..92faa0c712 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java @@ -23,11 +23,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.oro.text.perl.Perl5Util; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.PatternFactory; import org.apache.ofbiz.base.util.UtilGenerics; @@ -37,6 +32,11 @@ import org.apache.ofbiz.entity.GenericModelException; import org.apache.ofbiz.entity.config.model.Datasource; import org.apache.ofbiz.entity.model.ModelEntity; import org.apache.ofbiz.entity.model.ModelField; +import org.apache.oro.text.perl.Perl5Util; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; /** * Base class for comparisons. diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java index e336f3e6fc..f194347f35 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java @@ -19,8 +19,6 @@ package org.apache.ofbiz.entity.condition; -import groovy.util.BuilderSupport; - import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -33,6 +31,8 @@ import org.apache.ofbiz.entity.GenericModelException; import org.apache.ofbiz.entity.config.model.Datasource; import org.apache.ofbiz.entity.model.ModelEntity; +import groovy.util.BuilderSupport; + public class EntityConditionBuilder extends BuilderSupport { public static final String module = EntityConditionBuilder.class.getName(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java index 2768dcdf52..38a00a422b 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java @@ -20,9 +20,9 @@ package org.apache.ofbiz.entity.config.model; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.apache.ofbiz.base.lang.ThreadSafe; import org.apache.ofbiz.base.util.UtilXml; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java index a3609e7419..e8d9256e6b 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java @@ -21,9 +21,9 @@ package org.apache.ofbiz.entity.config.model; import java.net.URL; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.apache.ofbiz.base.lang.ThreadSafe; import org.apache.ofbiz.base.util.Debug; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java index c51f26f50b..ea1edcbdf1 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java @@ -19,18 +19,17 @@ package org.apache.ofbiz.entity.connection; -import org.apache.commons.dbcp2.managed.ManagedDataSource; -import org.apache.commons.dbcp2.managed.TransactionRegistry; -import org.apache.commons.pool2.ObjectPool; - -import org.apache.commons.pool2.impl.GenericObjectPool; -import org.apache.ofbiz.base.util.Debug; - import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import org.apache.commons.dbcp2.managed.ManagedDataSource; +import org.apache.commons.dbcp2.managed.TransactionRegistry; +import org.apache.commons.pool2.ObjectPool; +import org.apache.commons.pool2.impl.GenericObjectPool; +import org.apache.ofbiz.base.util.Debug; + public class DebugManagedDataSource extends ManagedDataSource { public static final String module = DebugManagedDataSource.class.getName(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java index f7ddc0a04f..61a7275bc3 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericPK; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java index eec4289ec1..1910e9e762 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java @@ -18,13 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.entity.finder; -import java.util.Map; import java.io.Serializable; -import org.w3c.dom.Element; +import java.util.Map; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.entity.Delegator; +import org.w3c.dom.Element; @SuppressWarnings("serial") public abstract class Finder implements Serializable { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java index be8e144591..e3289ea805 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java @@ -26,9 +26,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.entity.Delegator; @@ -37,6 +34,8 @@ import org.apache.ofbiz.entity.model.ModelViewEntity.ModelAlias; import org.apache.ofbiz.entity.model.ModelViewEntity.ModelAliasAll; import org.apache.ofbiz.entity.model.ModelViewEntity.ModelMemberEntity; import org.apache.ofbiz.entity.model.ModelViewEntity.ModelViewLink; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * This class is used for declaring Dynamic View Entities, to be used and thrown away. * A special method exists on the Delegator to accept a DynamicViewEntity instead diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java index 3a2676acf5..87f9b9410f 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.entity.model; import java.io.File; import java.util.Iterator; import java.util.List; + import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java index c0f41dc0de..ec84a08aa7 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java @@ -19,16 +19,16 @@ package org.apache.ofbiz.entity.model; import java.io.Serializable; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.Set; import org.apache.ofbiz.base.util.Debug; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java index 5fed8188ab..1f18dd0940 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.Serializable; import java.lang.ref.WeakReference; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -149,7 +150,7 @@ public class XmlSerializer { } else if (object instanceof Locale) { return makeElement("std-Locale", object, document); } else if (object instanceof BigDecimal) { - String stringValue = ((BigDecimal) object).setScale(10, BigDecimal.ROUND_HALF_UP).toString(); + String stringValue = ((BigDecimal) object).setScale(10, RoundingMode.HALF_UP).toString(); return makeElement("std-BigDecimal", stringValue, document); // - SQL Objects - } else if (object instanceof java.sql.Timestamp) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java index d9a4323baf..648fd82b01 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java @@ -20,8 +20,8 @@ package org.apache.ofbiz.entity.test; import java.util.LinkedList; import java.util.List; - import java.util.Map; + import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.GenericEntityException; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java index ed3ab215b3..4e5c2bd015 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java @@ -19,10 +19,10 @@ package org.apache.ofbiz.entity.testtools; -import junit.framework.TestCase; - import org.apache.ofbiz.entity.Delegator; +import junit.framework.TestCase; + public class EntityTestCase extends TestCase { protected Delegator delegator = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java index afcf3ea14c..d6e4c84ea0 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.entity.transaction; -import javax.transaction.xa.Xid; import javax.transaction.xa.XAException; +import javax.transaction.xa.Xid; import org.apache.ofbiz.base.util.Debug; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java index 11f8a0c164..3cf3346946 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java @@ -18,16 +18,16 @@ *******************************************************************************/ package org.apache.ofbiz.entity.transaction; -import org.apache.ofbiz.base.util.Debug; - import javax.transaction.RollbackException; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; +import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import javax.transaction.xa.XAException; + +import org.apache.ofbiz.base.util.Debug; /** * GenericXaResource - Abstract XA Resource implementation supporting a single transaction diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java index e521f7e214..f64b30641c 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java @@ -37,7 +37,9 @@ import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.JNDIContextFactory; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.config.model.*; +import org.apache.ofbiz.entity.config.model.Datasource; +import org.apache.ofbiz.entity.config.model.EntityConfig; +import org.apache.ofbiz.entity.config.model.JndiJdbc; import org.apache.ofbiz.entity.datasource.GenericHelperInfo; import org.apache.ofbiz.entity.jdbc.ConnectionFactoryLoader; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java index 2d63493471..8488a61583 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.entity.transaction; import java.sql.Connection; import java.sql.SQLException; + import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java index 816a4ecb7b..1a54b196f9 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java @@ -28,11 +28,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.commons.codec.binary.Base64; -import org.apache.shiro.crypto.AesCipherService; -import org.apache.shiro.crypto.OperationMode; -import org.apache.shiro.crypto.hash.DefaultHashService; -import org.apache.shiro.crypto.hash.HashRequest; -import org.apache.shiro.crypto.hash.HashService; import org.apache.ofbiz.base.crypto.DesCrypt; import org.apache.ofbiz.base.crypto.HashCrypt; import org.apache.ofbiz.base.util.Debug; @@ -46,6 +41,11 @@ import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.model.ModelField.EncryptMethod; import org.apache.ofbiz.entity.transaction.TransactionUtil; +import org.apache.shiro.crypto.AesCipherService; +import org.apache.shiro.crypto.OperationMode; +import org.apache.shiro.crypto.hash.DefaultHashService; +import org.apache.shiro.crypto.hash.HashRequest; +import org.apache.shiro.crypto.hash.HashService; public final class EntityCrypto { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java index e8b4f11d83..9ba97253a4 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java @@ -22,7 +22,6 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -40,7 +39,6 @@ import org.apache.ofbiz.entity.GenericPK; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.condition.EntityCondition; import org.apache.ofbiz.entity.model.DynamicViewEntity; -import org.apache.ofbiz.entity.model.ModelEntity; /** * Used to setup various options for and subsequently execute entity queries. diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java index d45db7520d..f0c3951a58 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; + import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java index 7dad72fd7d..27ebf3721f 100644 --- a/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java +++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java @@ -18,6 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.entity; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import org.apache.ofbiz.base.util.Debug; import org.junit.After; import org.junit.Before; @@ -25,8 +32,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; - public class DelegatorUnitTests { private boolean logErrorOn; diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java index cd19839cd8..5fd1d62239 100644 --- a/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java +++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java @@ -18,6 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.entity.util; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericValue; @@ -26,9 +32,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - public class EntitySaxReaderTests { private boolean logVerboseOn; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java index 2aaff7ee1c..ba2cc1f25c 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java @@ -19,13 +19,13 @@ package org.apache.ofbiz.entityext.eca; -import org.w3c.dom.Element; -import org.apache.ofbiz.base.util.UtilValidate; +import java.util.Map; + import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.entity.model.ModelUtil; - -import java.util.Map; +import org.w3c.dom.Element; /** * ServiceEcaSetField diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java index 370c896e48..dbed56c471 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.minilang; -import org.apache.ofbiz.minilang.artifact.ArtifactInfoContext; import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.minilang.artifact.ArtifactInfoContext; import org.apache.ofbiz.minilang.method.MethodContext; import org.w3c.dom.Element; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java index 7be49be0cd..e640f5f6e8 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java @@ -21,10 +21,6 @@ package org.apache.ofbiz.minilang.method.conditional; import java.util.Collections; import java.util.List; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.PatternFactory; import org.apache.ofbiz.base.util.UtilXml; @@ -38,6 +34,10 @@ import org.apache.ofbiz.minilang.SimpleMethod; import org.apache.ofbiz.minilang.artifact.ArtifactInfoContext; import org.apache.ofbiz.minilang.method.MethodContext; import org.apache.ofbiz.minilang.method.MethodOperation; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java index f4db9d2757..dc3035cc12 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java @@ -22,14 +22,14 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; import org.apache.ofbiz.base.util.PatternFactory; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java index 61a484b432..aa39a24754 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java @@ -23,15 +23,15 @@ import java.util.Map; import javax.transaction.Transaction; -import org.apache.ofbiz.service.calendar.RecurrenceRule; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.transaction.GenericTransactionException; import org.apache.ofbiz.entity.transaction.TransactionUtil; import org.apache.ofbiz.security.Security; +import org.apache.ofbiz.service.calendar.RecurrenceRule; import org.apache.ofbiz.service.jms.JmsListenerFactory; import org.apache.ofbiz.service.job.JobManager; import org.apache.ofbiz.service.job.JobManagerException; -import org.apache.ofbiz.base.util.Debug; /** * Generic Services Local Dispatcher diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java index 4a486b75b9..37e2706cd7 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.service; -import java.util.Map; import java.io.Serializable; +import java.util.Map; /** * Generic Requester Interface diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java index 677598af17..ad7d710130 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.service; -import java.util.List; import java.util.ArrayList; +import java.util.List; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java index 75d262623f..ab87cec4cd 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.calendar; import java.util.ArrayList; -import com.ibm.icu.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.Iterator; @@ -28,11 +27,12 @@ import java.util.List; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.service.calendar.TemporalExpression; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; +import com.ibm.icu.util.Calendar; + /** * Recurrence Info Object */ diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java index c900906ba3..db9bb7c088 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.calendar; import java.util.Arrays; -import com.ibm.icu.util.Calendar; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -31,6 +30,8 @@ import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; +import com.ibm.icu.util.Calendar; + /** * Recurrence Rule Object */ diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java index 62393279f1..0ae456c290 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java @@ -19,11 +19,12 @@ package org.apache.ofbiz.service.calendar; import java.io.Serializable; -import com.ibm.icu.util.Calendar; import java.util.Date; import java.util.Set; import java.util.TreeSet; +import com.ibm.icu.util.Calendar; + /** Temporal expression abstract class. */ @SuppressWarnings("serial") public abstract class TemporalExpression implements Serializable, Comparable { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java index 7133a385a3..f74f7f51f4 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.calendar; import java.io.Serializable; -import com.ibm.icu.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.Set; @@ -27,6 +26,8 @@ import java.util.TreeSet; import org.apache.ofbiz.base.util.Debug; +import com.ibm.icu.util.Calendar; + /** A collection of TemporalExpression classes. *

For the most part, these classes are immutable - with the exception * of the id field. The basic idea is to construct an expression diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java index a2bd33e009..9d30423de7 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.engine; import static org.apache.ofbiz.base.util.UtilGenerics.cast; -import groovy.lang.Script; import java.util.Collections; import java.util.HashMap; @@ -29,7 +28,6 @@ import java.util.Set; import javax.script.ScriptContext; -import org.codehaus.groovy.runtime.InvokerHelper; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.GroovyUtil; import org.apache.ofbiz.base.util.ScriptHelper; @@ -40,6 +38,9 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceDispatcher; import org.apache.ofbiz.service.ServiceUtil; +import org.codehaus.groovy.runtime.InvokerHelper; + +import groovy.lang.Script; /** * Groovy Script Service Engine diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java index 5fa653012c..a15bafd479 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java @@ -23,12 +23,12 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Map; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceDispatcher; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilGenerics; /** * Standard Java Static Method Service Engine diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java index b73a633d15..e8aa13d297 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java @@ -24,8 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.xmlrpc.XmlRpcException; -import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.start.Start; import org.apache.ofbiz.base.util.Debug; @@ -39,6 +37,8 @@ import org.apache.ofbiz.service.ServiceDispatcher; import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.service.config.ServiceConfigUtil; import org.apache.ofbiz.service.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; /** * Engine For XML RPC CLient Configuration management diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java index 1c328a01bd..31a77d580e 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java @@ -18,9 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.service.group; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilMisc; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java index afa3873c3f..02080b59c1 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java @@ -28,11 +28,11 @@ import javax.jms.Session; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.JNDIContextFactory; import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.service.GenericServiceException; /** * JmsQueueListener - Queue (P2P) Message Listener. diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java index 79f8d209f3..ebd91ab7eb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java @@ -28,11 +28,11 @@ import javax.jms.TopicSubscriber; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.JNDIContextFactory; import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.service.GenericServiceException; /** * JmsTopicListener - Topic (Pub/Sub) Message Listener. diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java index f009b4ee88..b255b8efcb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java @@ -37,8 +37,8 @@ import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.start.Start; import org.apache.ofbiz.base.util.Assert; import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.service.config.ServiceConfigUtil; import org.apache.ofbiz.service.config.ServiceConfigListener; +import org.apache.ofbiz.service.config.ServiceConfigUtil; import org.apache.ofbiz.service.config.model.ServiceConfig; import org.apache.ofbiz.service.config.model.ThreadPool; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java index 90bf843615..a93ff07fc5 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java @@ -18,9 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.service.rmi; -import java.util.Map; import java.rmi.Remote; import java.rmi.RemoteException; +import java.util.Map; import org.apache.ofbiz.service.GenericRequester; import org.apache.ofbiz.service.GenericResultWaiter; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java index c6ecb5a8b4..763c3ff2f6 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java @@ -24,11 +24,12 @@ import java.io.Serializable; import java.net.Socket; import java.rmi.server.RMIClientSocketFactory; import java.security.GeneralSecurityException; + import javax.net.ssl.SSLSocketFactory; +import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.SSLUtil; -import org.apache.ofbiz.base.config.GenericConfigException; /** * RMI SSL Client Socket Factory diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java index 7c0adbf6c9..e217253c67 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java @@ -22,10 +22,10 @@ package org.apache.ofbiz.service.test; import java.net.MalformedURLException; import java.net.URL; -import junit.framework.TestCase; - -import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.ofbiz.service.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; + +import junit.framework.TestCase; /** * AbstractXmlRpcTestCase diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java index b28d40b0ef..0b3b55dda6 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java @@ -22,7 +22,6 @@ package org.apache.ofbiz.service.test; import java.util.Locale; import java.util.Map; -import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.ofbiz.base.start.Start; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilProperties; @@ -31,6 +30,7 @@ import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.apache.xmlrpc.client.XmlRpcClient; /** * XmlRpcTests */ diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java index 3e8702ad03..d1505f5bc5 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java @@ -29,6 +29,8 @@ import java.security.KeyStore; import javax.net.ssl.HttpsURLConnection; +import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.SSLUtil; import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcRequest; import org.apache.xmlrpc.client.XmlRpcClientException; @@ -38,8 +40,6 @@ import org.apache.xmlrpc.client.XmlRpcTransport; import org.apache.xmlrpc.client.XmlRpcTransportFactoryImpl; import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig; import org.apache.xmlrpc.util.HttpUtil; -import org.apache.ofbiz.base.util.GeneralException; -import org.apache.ofbiz.base.util.SSLUtil; import org.xml.sax.SAXException; /** diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java b/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java index 8b0af13b21..f5279cd334 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java @@ -19,13 +19,13 @@ package org.apache.ofbiz.service.xmlrpc; +import java.security.KeyStore; + +import org.apache.ofbiz.base.component.ComponentConfig; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.KeyStoreUtil; import org.apache.xmlrpc.client.XmlRpcClientConfig; import org.apache.xmlrpc.client.XmlRpcTransportFactory; -import org.apache.ofbiz.base.component.ComponentConfig; -import org.apache.ofbiz.base.util.KeyStoreUtil; -import org.apache.ofbiz.base.util.Debug; - -import java.security.KeyStore; /** * XmlRpcClient diff --git a/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java b/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java index 172cd6c177..6aa01bfbdd 100644 --- a/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java +++ b/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java @@ -1,14 +1,14 @@ package org.apache.ofbiz.base.start; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; - public class OfbizStartupUnitTests { @Rule diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java index a5a838087c..aca300f0ab 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java @@ -22,9 +22,6 @@ import java.net.URL; import java.util.LinkedList; import java.util.List; -import junit.framework.AssertionFailedError; -import junit.framework.TestResult; - import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; @@ -33,6 +30,9 @@ import org.apache.ofbiz.entity.util.EntitySaxReader; import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.w3c.dom.Element; +import junit.framework.AssertionFailedError; +import junit.framework.TestResult; + public class EntityXmlAssertTest extends OFBizTestCase { public static final String module = ServiceTest.class.getName(); diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java index ff5d6e5e93..a07ce3d8a4 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java @@ -21,9 +21,6 @@ package org.apache.ofbiz.testtools; import java.util.LinkedList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.ofbiz.base.component.ComponentConfig; import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.config.ResourceHandler; @@ -31,6 +28,9 @@ import org.apache.ofbiz.base.util.Debug; import org.w3c.dom.Document; import org.w3c.dom.Element; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Use this class in a JUnit test runner to prepare the TestSuite. */ diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java index 2dd10d1808..2c52008a1e 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java @@ -23,10 +23,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.lang.RandomStringUtils; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.ObjectType; @@ -44,6 +40,10 @@ import org.apache.ofbiz.service.ServiceContainer; import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.w3c.dom.Element; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Use this class in a JUnit test runner to bootstrap the Test Suite runner. */ diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java index aa2eb1cfa2..de60ca1fcd 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java @@ -21,9 +21,6 @@ package org.apache.ofbiz.testtools; import java.util.List; import java.util.Map; -import junit.framework.AssertionFailedError; -import junit.framework.TestResult; - import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; @@ -32,6 +29,9 @@ import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.w3c.dom.Element; +import junit.framework.AssertionFailedError; +import junit.framework.TestResult; + public class ServiceTest extends OFBizTestCase { public static final String module = ServiceTest.class.getName(); diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java index 537b723d19..bbe2fe3205 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java @@ -27,6 +27,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ofbiz.base.container.Container; +import org.apache.ofbiz.base.container.ContainerException; +import org.apache.ofbiz.base.container.StartupCommandToArgsAdapter; +import org.apache.ofbiz.base.start.StartupCommand; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.entity.Delegator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest; +import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter; + import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; @@ -35,16 +45,6 @@ import junit.framework.TestListener; import junit.framework.TestResult; import junit.framework.TestSuite; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest; -import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter; -import org.apache.ofbiz.base.container.Container; -import org.apache.ofbiz.base.container.ContainerException; -import org.apache.ofbiz.base.container.StartupCommandToArgsAdapter; -import org.apache.ofbiz.base.start.StartupCommand; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.entity.Delegator; - /** * A Container implementation to run the tests configured through this testtools stuff. */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java index c9af72fc56..ebc8864c8c 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java @@ -25,10 +25,18 @@ import java.io.InputStream; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + import javax.servlet.ServletContext; import javax.servlet.ServletRequest; +import org.apache.ofbiz.base.component.ComponentConfig; +import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo; +import org.apache.ofbiz.base.util.Assert; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilXml.LocalErrorHandler; +import org.apache.ofbiz.base.util.UtilXml.LocalResolver; +import org.apache.ofbiz.base.util.cache.UtilCache; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.DelegatorFactory; import org.apache.ofbiz.security.Security; @@ -37,19 +45,11 @@ import org.apache.ofbiz.security.SecurityFactory; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceContainer; import org.apache.ofbiz.webapp.event.RequestBodyMapHandlerFactory; -import org.apache.ofbiz.base.component.ComponentConfig; -import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo; -import org.apache.ofbiz.base.util.Assert; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilXml.LocalErrorHandler; -import org.apache.ofbiz.base.util.UtilXml.LocalResolver; -import org.apache.ofbiz.base.util.cache.UtilCache; - -import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.descriptor.DigesterFactory; import org.apache.tomcat.util.descriptor.web.ServletDef; import org.apache.tomcat.util.descriptor.web.WebRuleSet; import org.apache.tomcat.util.descriptor.web.WebXml; +import org.apache.tomcat.util.digester.Digester; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java index 8eea257641..4714c10f2f 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java @@ -19,8 +19,9 @@ package org.apache.ofbiz.webapp.control; import java.io.IOException; -import java.util.Set; import java.util.HashSet; +import java.util.Set; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java index 4ce5e523b6..69a9376bdf 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java @@ -18,6 +18,14 @@ */ package org.apache.ofbiz.webapp.control; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.DelegatorFactory; @@ -25,13 +33,6 @@ import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.webapp.WebAppUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - /** * This class manages the authentication tokens that provide single sign-on authentication to the OFBiz applications. */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java index a005ff54e4..0cce2f2304 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.event; -import org.apache.commons.fileupload.ProgressListener; - import java.io.Serializable; +import org.apache.commons.fileupload.ProgressListener; + /** * FileUploadProgressListener - Commons FileUpload progress listener */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java index 3a28330099..c0981eaa82 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java @@ -18,8 +18,6 @@ */ package org.apache.ofbiz.webapp.event; -import groovy.lang.Script; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -32,7 +30,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.codehaus.groovy.runtime.InvokerHelper; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GroovyUtil; import org.apache.ofbiz.base.util.ScriptHelper; @@ -44,6 +41,9 @@ import org.apache.ofbiz.entity.transaction.GenericTransactionException; import org.apache.ofbiz.entity.transaction.TransactionUtil; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.codehaus.groovy.runtime.InvokerHelper; + +import groovy.lang.Script; public class GroovyEventHandler implements EventHandler { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java index 402ead5bcd..d52ea7fcca 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java @@ -18,13 +18,14 @@ */ package org.apache.ofbiz.webapp.event; -import org.apache.ofbiz.base.lang.JSON; -import org.apache.ofbiz.base.util.UtilGenerics; - -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.Map; +import javax.servlet.ServletRequest; + +import org.apache.ofbiz.base.lang.JSON; +import org.apache.ofbiz.base.util.UtilGenerics; + /** An implementation of RequestBodyMapHandler that can extract a Map<String, Object> from the JSON data in the request body */ public class JSONRequestBodyMapHandler implements RequestBodyMapHandler { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java index ccf0abacdc..9140f5858f 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java @@ -18,10 +18,11 @@ */ package org.apache.ofbiz.webapp.event; -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.Map; +import javax.servlet.ServletRequest; + /** An handler that can extract a Map (typically used as a service input map) from the data in the body of a ServletRequest. */ public interface RequestBodyMapHandler { /** Extracts from the data in the body of the ServletRequest an instance of Map<String, Object>. diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java index a606257287..2f82ad6073 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java @@ -18,11 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.event; -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.servlet.ServletRequest; + /** Factory class that provides the proper RequestBodyMapHandler based on the content type of the ServletRequest */ public class RequestBodyMapHandlerFactory { private final static Map requestBodyMapHandlers = new HashMap(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java index 5133ee884f..66a980288d 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java @@ -26,9 +26,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.ofbiz.webapp.control.ConfigXMLReader; -import org.apache.ofbiz.webapp.control.RequestHandler; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.apache.ofbiz.webapp.control.RequestHandler; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.io.FeedException; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java index ee62e55304..7f372f2f11 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java @@ -35,17 +35,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.xmlrpc.XmlRpcException; -import org.apache.xmlrpc.XmlRpcHandler; -import org.apache.xmlrpc.XmlRpcRequest; -import org.apache.xmlrpc.common.ServerStreamConnection; -import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig; -import org.apache.xmlrpc.common.XmlRpcHttpRequestConfigImpl; -import org.apache.xmlrpc.server.AbstractReflectiveHandlerMapping; -import org.apache.xmlrpc.server.XmlRpcHttpServer; -import org.apache.xmlrpc.server.XmlRpcHttpServerConfig; -import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; -import org.apache.xmlrpc.util.HttpUtil; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; @@ -59,6 +48,17 @@ import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.XmlRpcHandler; +import org.apache.xmlrpc.XmlRpcRequest; +import org.apache.xmlrpc.common.ServerStreamConnection; +import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig; +import org.apache.xmlrpc.common.XmlRpcHttpRequestConfigImpl; +import org.apache.xmlrpc.server.AbstractReflectiveHandlerMapping; +import org.apache.xmlrpc.server.XmlRpcHttpServer; +import org.apache.xmlrpc.server.XmlRpcHttpServerConfig; +import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; +import org.apache.xmlrpc.util.HttpUtil; /** * XmlRpcEventHandler diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java index f8bd3c877f..8b8d921c98 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java @@ -22,8 +22,13 @@ import java.io.IOException; import java.io.Writer; import java.util.Locale; import java.util.Map; + import javax.servlet.http.HttpServletRequest; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilFormatOut; +import org.apache.ofbiz.base.util.UtilHttp; + import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.NumberModel; @@ -33,10 +38,6 @@ import freemarker.template.TemplateModelException; import freemarker.template.TemplateScalarModel; import freemarker.template.TemplateTransformModel; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilFormatOut; -import org.apache.ofbiz.base.util.UtilHttp; - /** * OfbizAmountTransform - Freemarker Transform for content links */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java index 3f24596af3..a203fb7d7d 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.ftl; -import freemarker.cache.CacheStorage; - import org.apache.ofbiz.base.util.cache.UtilCache; +import freemarker.cache.CacheStorage; + /** * A custom cache wrapper for caching FreeMarker templates */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java index 6b5de082d3..841e75350b 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java @@ -23,8 +23,16 @@ import java.io.Writer; import java.math.BigDecimal; import java.util.Locale; import java.util.Map; + import javax.servlet.http.HttpServletRequest; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilFormatOut; +import org.apache.ofbiz.base.util.UtilHttp; +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.util.EntityUtilProperties; + import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.NumberModel; @@ -34,13 +42,6 @@ import freemarker.template.TemplateModelException; import freemarker.template.TemplateScalarModel; import freemarker.template.TemplateTransformModel; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilFormatOut; -import org.apache.ofbiz.base.util.UtilHttp; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.util.EntityUtilProperties; - /** * OfbizCurrencyTransform - Freemarker Transform for content links */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java index 633fecd407..f9bd39f7c8 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java @@ -18,18 +18,19 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.ftl; +import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; + import java.io.IOException; import java.io.Writer; import java.util.Map; -import freemarker.core.Environment; -import freemarker.template.TemplateTransformModel; - import org.apache.ofbiz.base.util.Debug; -import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.template.FreeMarkerWorker; +import freemarker.core.Environment; +import freemarker.template.TemplateTransformModel; + /** * RenderWrappedTextTransform - Freemarker Transform for URLs (links) */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java index aa259f71c0..48653daa87 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java @@ -18,13 +18,17 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.ftl; -import freemarker.core.Environment; -import freemarker.ext.beans.BeanModel; -import freemarker.template.*; - import java.util.List; import java.util.Map; +import freemarker.core.Environment; +import freemarker.ext.beans.BeanModel; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; +import freemarker.template.TemplateNumberModel; +import freemarker.template.TemplateScalarModel; + /** * SetRequestAttributeMethod - Freemarker Method for setting context fields */ diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java index 22b391355e..78fba48415 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java @@ -19,6 +19,7 @@ package org.apache.ofbiz.webapp.ftl; import java.util.List; + import javax.servlet.http.HttpServletRequest; import freemarker.core.Environment; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java index d7d2c944c4..2c6b2da52c 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java @@ -19,14 +19,15 @@ package org.apache.ofbiz.webapp.taglib; import java.io.IOException; + import javax.servlet.http.HttpServletRequest; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.webapp.website.WebSiteWorker; import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.webapp.website.WebSiteWorker; /** * ContentUrlTag - Creates a URL string prepending the content prefix from url.properties diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java index 762b8b7c8a..ca6a159bd2 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java @@ -19,6 +19,7 @@ package org.apache.ofbiz.webapp.view; import java.io.IOException; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java index df0e0d6ab3..adf55fee35 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java @@ -19,6 +19,7 @@ package org.apache.ofbiz.webapp.view; import java.io.IOException; + import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java index f5bde0feeb..63604f8e8d 100644 --- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java +++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java @@ -18,12 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.control; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; import javax.servlet.FilterConfig; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import org.junit.Test; public class ControlFilterTests { @Test diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java index 1a3dba0e53..116f18f607 100644 --- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java +++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java @@ -18,13 +18,17 @@ */ package org.apache.ofbiz.webapp.control; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.ofbiz.entity.GenericValue; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; public class ExternalLoginKeysManagerTests { @Test diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java index ab1ebb35e7..30a12e5353 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java @@ -23,10 +23,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.ofbiz.base.container.ContainerException; import org.apache.ofbiz.base.start.StartupCommand; import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.testtools.*; +import org.apache.ofbiz.testtools.TestRunContainer; /** * Event used to run a Junit test diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java index 0bfd61f90a..8aa3706bd5 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java @@ -18,25 +18,25 @@ *******************************************************************************/ package org.apache.ofbiz.webtools.print; -import java.util.Map; -import java.util.Locale; import java.io.IOException; -import java.io.Writer; import java.io.StringWriter; +import java.io.Writer; +import java.util.Locale; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; - -import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.DispatchContext; -import org.apache.ofbiz.base.util.UtilHttp; -import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityUtilProperties; -import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.service.DispatchContext; +import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.widget.renderer.ScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenStringRenderer; import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java index 70162b94a6..f9ba4afcd7 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java @@ -28,10 +28,6 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; @@ -50,6 +46,10 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java index a41f862d6e..4666c20bcd 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.codehaus.groovy.control.CompilationFailedException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GroovyUtil; import org.apache.ofbiz.base.util.StringUtil; @@ -52,6 +51,7 @@ import org.apache.ofbiz.service.ModelParam; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.widget.WidgetWorker; import org.apache.ofbiz.widget.renderer.FormStringRenderer; +import org.codehaus.groovy.control.CompilationFailedException; import org.w3c.dom.Element; /** diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java index d0e6b110ac..21dc7ec36e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java @@ -36,7 +36,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.TimeZone; -import org.codehaus.groovy.control.CompilationFailedException; import org.apache.ofbiz.base.conversion.ConversionException; import org.apache.ofbiz.base.conversion.DateTimeConverters; import org.apache.ofbiz.base.conversion.DateTimeConverters.StringToTimestamp; @@ -76,6 +75,7 @@ import org.apache.ofbiz.widget.renderer.FormRenderer; import org.apache.ofbiz.widget.renderer.FormStringRenderer; import org.apache.ofbiz.widget.renderer.MenuStringRenderer; import org.apache.ofbiz.widget.renderer.ScreenRenderer; +import org.codehaus.groovy.control.CompilationFailedException; import org.w3c.dom.Element; /** diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java index 741955c3e6..a184f2437e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java @@ -22,12 +22,7 @@ import java.util.Map; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; -import org.apache.ofbiz.widget.model.AbstractModelCondition; import org.apache.ofbiz.widget.model.AbstractModelCondition.DefaultConditionFactory; -import org.apache.ofbiz.widget.model.ModelCondition; -import org.apache.ofbiz.widget.model.ModelConditionFactory; -import org.apache.ofbiz.widget.model.ModelConditionVisitor; -import org.apache.ofbiz.widget.model.ModelWidget; import org.w3c.dom.Element; /** diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java index d5f7453ee4..7ba6f429c4 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java @@ -28,10 +28,6 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; @@ -50,6 +46,10 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /**