svn commit: r1837577 [1/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1837577 [1/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Author: pgil
Date: Tue Aug 7 07:30:43 2018 New Revision: 1837577 URL: http://svn.apache.org/viewvc?rev=1837577&view=rev Log: Improved : Remove all unnecessary boxing and unboxing in Java classes (OFBIZ-10504) Thanks Taher, Jacques, Mathieu and Rishi for the review Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java Tue Aug 7 07:30:43 2018 @@ -140,9 +140,9 @@ public class AgreementServices { // if days is greater than zero, then it has been set with another value, so we use the lowest term days // if days is less than zero, then it has not been set yet. if (days > 0) { - days = Math.min(days, termDays.longValue()); + days = Math.min(days, termDays); } else { - days = termDays.longValue(); + days = termDays; } } } @@ -163,7 +163,7 @@ public class AgreementServices { "currencyUomId", agreementItem.getString("currencyUomId"), "productId", productId); if (days >= 0) { - partyCommissionResult.put("days", Long.valueOf(days)); + partyCommissionResult.put("days", days); } if (!commissions.contains(partyCommissionResult)) { commissions.add(partyCommissionResult); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java Tue Aug 7 07:30:43 2018 @@ -258,7 +258,7 @@ public class FinAccountPaymentServices { if (finAccountSettings != null && finAccountSettings.getLong("authValidDays") != null) { thruDate = UtilDateTime.getDayEnd(UtilDateTime.nowTimestamp(), finAccountSettings.getLong("authValidDays")); } else { - thruDate = UtilDateTime.getDayEnd(UtilDateTime.nowTimestamp(), Long.valueOf(30)); // default 30 days for an auth + thruDate = UtilDateTime.getDayEnd(UtilDateTime.nowTimestamp(), 30L); // default 30 days for an auth } Map<String, Object> tmpResult = dispatcher.runSync("createFinAccountAuth", UtilMisc.<String, Object>toMap("finAccountId", finAccountId, Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Tue Aug 7 07:30:43 2018 @@ -1520,7 +1520,7 @@ public class InvoiceServices { // total ordered orderedQty = orderItem.getBigDecimal("quantity"); - if (dropShipmentFound && createSalesInvoicesForDropShipments.booleanValue()) { + if (dropShipmentFound && createSalesInvoicesForDropShipments) { // Override the issueQty with the quantity from the purchase order item GenericValue orderItemAssoc = EntityUtil.getFirst(EntityUtil.filterByAnd(orderItemAssocs, UtilMisc.toMap("orderId", issue.getString("orderId"), "orderItemSeqId", issue.getString("orderItemSeqId")))); @@ -1822,8 +1822,8 @@ public class InvoiceServices { } // If the authorization fails, create the invoice anyway, but make a note of it - boolean authFinished = ((Boolean) authResult.get("finished")).booleanValue(); - boolean authErrors = ((Boolean) authResult.get("errors")).booleanValue(); + boolean authFinished = (Boolean) authResult.get("finished"); + boolean authErrors = (Boolean) authResult.get("errors"); if (authErrors || ! authFinished) { String errMsg = UtilProperties.getMessage(resource, "AccountingUnableToAuthAdditionalShipCharges", UtilMisc.toMap("shipmentId", shipmentId, "paymentMethodId", paymentMethodId, "orderPaymentPreferenceId", orderPaymentPreferenceId), locale); Debug.logError(errMsg, module); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java Tue Aug 7 07:30:43 2018 @@ -138,11 +138,11 @@ public class PaymentGatewayServices { // get the process attempts so far Long procAttempt = orderPaymentPreference.getLong("processAttempt"); if (procAttempt == null) { - procAttempt = Long.valueOf(0); + procAttempt = 0L; } // update the process attempt count - orderPaymentPreference.set("processAttempt", Long.valueOf(procAttempt.longValue() + 1)); + orderPaymentPreference.set("processAttempt", procAttempt + 1); try { orderPaymentPreference.store(); orderPaymentPreference.refresh(); @@ -317,7 +317,7 @@ public class PaymentGatewayServices { Map<String, Object> result = new HashMap<>(); boolean reAuth = false; if (context.get("reAuth") != null) { - reAuth = ((Boolean)context.get("reAuth")).booleanValue(); + reAuth = (Boolean) context.get("reAuth"); } // get the order header and payment preferences GenericValue orderHeader = null; @@ -399,10 +399,10 @@ public class PaymentGatewayServices { messages.add("Could not authorize OrderPaymentPreference [" + paymentPref.getString("orderPaymentPreferenceId") + "] for order [" + orderId + "]: " + results.get(ModelService.ERROR_MESSAGE)); continue; } - if (((Boolean) results.get("finished")).booleanValue()) { + if ((Boolean) results.get("finished")) { finished += 1; } - if (((Boolean) results.get("errors")).booleanValue()) { + if ((Boolean) results.get("errors")) { hadError += 1; } if (results.get("messages") != null) { @@ -839,7 +839,7 @@ public class PaymentGatewayServices { // save the response and respective messages savePgrAndMsgs(dctx, pgCredit, messageEntities); - if (creditResponse != null && creditResponse.booleanValue()) { + if (creditResponse != null && creditResponse) { paymentPref.set("statusId", "PAYMENT_CANCELLED"); try { paymentPref.store(); @@ -1043,7 +1043,7 @@ public class PaymentGatewayServices { } } - if (releaseResponse != null && releaseResponse.booleanValue()) { + if (releaseResponse != null && releaseResponse) { paymentPref.set("statusId", "PAYMENT_CANCELLED"); try { paymentPref.store(); @@ -1874,13 +1874,13 @@ public class PaymentGatewayServices { if (authResult != null) { processAuthResult(dctx, result, userLogin, paymentPreference); - resultPassed = authResult.booleanValue(); + resultPassed = authResult; authServiceType = ("PAYMENT_NOT_AUTH".equals(initialStatus)) ? AUTH_SERVICE_TYPE : REAUTH_SERVICE_TYPE; } if (captureResult != null) { processCaptureResult(dctx, result, userLogin, paymentPreference, authServiceType, locale); if (!resultPassed) { - resultPassed = captureResult.booleanValue(); + resultPassed = captureResult; } } return resultPassed; @@ -2008,7 +2008,7 @@ public class PaymentGatewayServices { } // set the status of the OrderPaymentPreference - boolean authResultOk = authResult.booleanValue(); + boolean authResultOk = authResult; if (authResultOk) { orderPaymentPreference.set("statusId", "PAYMENT_AUTHORIZED"); @@ -2034,18 +2034,18 @@ public class PaymentGatewayServices { if (creditCard != null) { Long consecutiveFailedAuths = creditCard.getLong("consecutiveFailedAuths"); if (consecutiveFailedAuths == null) { - creditCard.set("consecutiveFailedAuths", Long.valueOf(1)); + creditCard.set("consecutiveFailedAuths", 1L); } else { - creditCard.set("consecutiveFailedAuths", Long.valueOf(consecutiveFailedAuths.longValue() + 1)); + creditCard.set("consecutiveFailedAuths", consecutiveFailedAuths + 1); } creditCard.set("lastFailedAuthDate", nowTimestamp); if (Boolean.TRUE.equals(context.get("resultNsf"))) { Long consecutiveFailedNsf = creditCard.getLong("consecutiveFailedNsf"); if (consecutiveFailedNsf == null) { - creditCard.set("consecutiveFailedNsf", Long.valueOf(1)); + creditCard.set("consecutiveFailedNsf", 1L); } else { - creditCard.set("consecutiveFailedNsf", Long.valueOf(consecutiveFailedNsf.longValue() + 1)); + creditCard.set("consecutiveFailedNsf", consecutiveFailedNsf + 1); } creditCard.set("lastFailedNsfDate", nowTimestamp); } @@ -2056,9 +2056,9 @@ public class PaymentGatewayServices { // auth was successful, to clear out any failed auth or nsf info if (authResultOk) { if ((creditCard != null) && (creditCard.get("lastFailedAuthDate") != null)) { - creditCard.set("consecutiveFailedAuths", Long.valueOf(0)); + creditCard.set("consecutiveFailedAuths", 0L); creditCard.set("lastFailedAuthDate", null); - creditCard.set("consecutiveFailedNsf", Long.valueOf(0)); + creditCard.set("consecutiveFailedNsf", 0L); creditCard.set("lastFailedNsfDate", null); creditCard.store(); } @@ -2089,7 +2089,7 @@ public class PaymentGatewayServices { "paymentMethodId", orderPaymentPreference.get("paymentMethodId"), "resultNsf", "Y") .queryCount(); - if (failedTries < autoOrderCcTryLaterMax.longValue()) { + if (failedTries < autoOrderCcTryLaterMax) { needsNsfRetry = true; } } else { @@ -2150,7 +2150,7 @@ public class PaymentGatewayServices { if (capRes != null && ServiceUtil.isError(capRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(capRes)); } - if (!captureResult.booleanValue()) { + if (!captureResult) { // capture returned false (error) try { processReAuthFromCaptureFailure(dctx, result, amount, userLogin, paymentPreference, locale); @@ -2203,7 +2203,7 @@ public class PaymentGatewayServices { if (authResp != null && Boolean.TRUE.equals(authResp)) { GenericValue authTrans = processAuthRetryResult(dctx, authPayRes, userLogin, paymentPreference); // check if auto-capture was enabled; process if so - if (capResp != null && capResp.booleanValue()) { + if (capResp != null && capResp) { processCaptureResult(dctx, result, userLogin, paymentPreference, locale); } else { // no auto-capture; do manual capture now @@ -2214,7 +2214,7 @@ public class PaymentGatewayServices { // process the capture result Boolean capPayResp = (Boolean) capPayRes.get("captureResult"); - if (capPayResp != null && capPayResp.booleanValue()) { + if (capPayResp != null && capPayResp) { // process the capture result processCaptureResult(dctx, capPayRes, userLogin, paymentPreference, locale); } else { @@ -2237,7 +2237,7 @@ public class PaymentGatewayServices { BigDecimal amount = (BigDecimal) context.get("captureAmount"); String serviceType = (String) context.get("serviceTypeEnum"); String currencyUomId = (String) context.get("currencyUomId"); - boolean captureSuccessful = ((Boolean) context.get("captureResult")).booleanValue(); + boolean captureSuccessful = (Boolean) context.get("captureResult"); String paymentMethodTypeId = paymentPreference.getString("paymentMethodTypeId"); @@ -2616,7 +2616,7 @@ public class PaymentGatewayServices { } Boolean refundResult = (Boolean) context.get("refundResult"); - if (refundResult != null && refundResult.booleanValue()) { + if (refundResult != null && refundResult) { // mark the preference as refunded paymentPref.set("statusId", "PAYMENT_REFUNDED"); @@ -2743,7 +2743,7 @@ public class PaymentGatewayServices { EntityQuery eq = EntityQuery.use(delegator) .from("OrderPaymentPreference") .where(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PAYMENT_NOT_AUTH"), - EntityCondition.makeCondition("processAttempt",EntityOperator.GREATER_THAN, Long.valueOf(0))) + EntityCondition.makeCondition("processAttempt",EntityOperator.GREATER_THAN, 0L)) .orderBy("orderId"); try (EntityListIterator eli = eq.queryIterator()) { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java Tue Aug 7 07:30:43 2018 @@ -408,17 +408,17 @@ public class TaxAuthorityServices { BigDecimal taxable = ZERO_BASE; if (product != null && (product.get("taxable") == null || (product.get("taxable") != null && product - .getBoolean("taxable").booleanValue()))) { + .getBoolean("taxable")))) { taxable = taxable.add(itemAmount); } if (shippingAmount != null && (taxAuthorityRateProduct.get("taxShipping") == null || (taxAuthorityRateProduct.get("taxShipping") != null && taxAuthorityRateProduct.getBoolean( - "taxShipping").booleanValue()))) { + "taxShipping")))) { taxable = taxable.add(shippingAmount); } if (orderPromotionsAmount != null && (taxAuthorityRateProduct.get("taxPromotions") == null || (taxAuthorityRateProduct.get("taxPromotions") != null && taxAuthorityRateProduct.getBoolean( - "taxPromotions").booleanValue()))) { + "taxPromotions")))) { taxable = taxable.add(orderPromotionsAmount); } Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Tue Aug 7 07:30:43 2018 @@ -187,7 +187,7 @@ public class AIMPaymentServices { } Map<String, Object> reply = processCard(request, props, locale); results.putAll(processRefundTransResult(request, reply)); - boolean refundResult = ((Boolean)results.get("refundResult")).booleanValue(); + boolean refundResult = (Boolean) results.get("refundResult"); String refundFlag = (String)results.get("refundFlag"); // Since the refund failed, we are going to void the previous authorization against // which ccRefunds attempted to issue the refund. This happens because Authorize.NET requires @@ -645,10 +645,10 @@ public class AIMPaymentServices { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean authResult = (Boolean) reply.get("authResult"); - results.put("authResult", new Boolean(authResult.booleanValue())); + results.put("authResult", authResult); results.put("authFlag", ar.getReasonCode()); results.put("authMessage", ar.getReasonText()); - if (authResult.booleanValue()) { //passed + if (authResult) { //passed results.put("authCode", ar.getAuthorizationCode()); results.put("authRefNum", ar.getTransactionId()); results.put("cvCode", ar.getCvResult()); @@ -676,11 +676,11 @@ public class AIMPaymentServices { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean captureResult = (Boolean) reply.get("authResult"); - results.put("captureResult", new Boolean(captureResult.booleanValue())); + results.put("captureResult", captureResult); results.put("captureFlag", ar.getReasonCode()); results.put("captureMessage", ar.getReasonText()); results.put("captureRefNum", ar.getTransactionId()); - if (captureResult.booleanValue()) { //passed + if (captureResult) { //passed results.put("captureCode", ar.getAuthorizationCode()); if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("captureAmount", getXAmount(request)); @@ -702,11 +702,11 @@ public class AIMPaymentServices { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean captureResult = (Boolean) reply.get("authResult"); - results.put("refundResult", new Boolean(captureResult.booleanValue())); + results.put("refundResult", captureResult); results.put("refundFlag", ar.getReasonCode()); results.put("refundMessage", ar.getReasonText()); results.put("refundRefNum", ar.getTransactionId()); - if (captureResult.booleanValue()) { //passed + if (captureResult) { //passed results.put("refundCode", ar.getAuthorizationCode()); if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("refundAmount", getXAmount(request)); @@ -729,11 +729,11 @@ public class AIMPaymentServices { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean captureResult = (Boolean) reply.get("authResult"); - results.put("releaseResult", new Boolean(captureResult.booleanValue())); + results.put("releaseResult", captureResult); results.put("releaseFlag", ar.getReasonCode()); results.put("releaseMessage", ar.getReasonText()); results.put("releaseRefNum", ar.getTransactionId()); - if (captureResult.booleanValue()) { //passed + if (captureResult) { //passed results.put("releaseCode", ar.getAuthorizationCode()); if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("releaseAmount", getXAmount(request)); @@ -755,14 +755,14 @@ public class AIMPaymentServices { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean authResult = (Boolean) reply.get("authResult"); - results.put("authResult", new Boolean(authResult.booleanValue())); + results.put("authResult", authResult); results.put("authFlag", ar.getReasonCode()); results.put("authMessage", ar.getReasonText()); - results.put("captureResult", new Boolean(authResult.booleanValue())); + results.put("captureResult", authResult); results.put("captureFlag", ar.getReasonCode()); results.put("captureMessage", ar.getReasonText()); results.put("captureRefNum", ar.getTransactionId()); - if (authResult.booleanValue()) { //passed + if (authResult) { //passed results.put("authCode", ar.getAuthorizationCode()); results.put("authRefNum", ar.getTransactionId()); results.put("cvCode", ar.getCvResult()); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Tue Aug 7 07:30:43 2018 @@ -507,10 +507,10 @@ public class OrbitalPaymentServices { private static void processAuthTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean authResult = (Boolean) processCardResponseContext.get("authResult"); - results.put("authResult", new Boolean(authResult.booleanValue())); + results.put("authResult", authResult); results.put("authFlag", response.getResponseCode()); results.put("authMessage", response.getMessage()); - if (authResult.booleanValue()) { //passed + if (authResult) { //passed results.put("authCode", response.getAuthCode()); results.put("authRefNum", response.getTxRefNum()); results.put("cvCode", UtilFormatOut.checkNull(response.getCVV2RespCode())); @@ -527,14 +527,14 @@ public class OrbitalPaymentServices { private static void processAuthCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean authResult = (Boolean) processCardResponseContext.get("authResult"); - results.put("authResult", new Boolean(authResult.booleanValue())); + results.put("authResult", authResult); results.put("authFlag", response.getResponseCode()); results.put("authMessage", response.getMessage()); - results.put("captureResult", new Boolean(authResult.booleanValue())); + results.put("captureResult", authResult); results.put("captureFlag", response.getResponseCode()); results.put("captureMessage", response.getMessage()); results.put("captureRefNum", response.getTxRefNum()); - if (authResult.booleanValue()) { //passed + if (authResult) { //passed results.put("authCode", response.getAuthCode()); results.put("authRefNum", response.getTxRefNum()); results.put("cvCode", UtilFormatOut.checkNull(response.getCVV2RespCode())); @@ -551,11 +551,11 @@ public class OrbitalPaymentServices { private static void processCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean captureResult = (Boolean) processCardResponseContext.get("authResult"); - results.put("captureResult", new Boolean(captureResult.booleanValue())); + results.put("captureResult", captureResult); results.put("captureFlag", response.getResponseCode()); results.put("captureMessage", response.getMessage()); results.put("captureRefNum", response.getTxRefNum()); - if (captureResult.booleanValue()) { //passed + if (captureResult) { //passed results.put("captureCode", response.getAuthCode()); results.put("captureAmount", new BigDecimal(results.get("captureAmount").toString())); } else { @@ -567,11 +567,11 @@ public class OrbitalPaymentServices { private static void processRefundTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean refundResult = (Boolean) processCardResponseContext.get("authResult"); - results.put("refundResult", new Boolean(refundResult.booleanValue())); + results.put("refundResult", refundResult); results.put("refundFlag", response.getResponseCode()); results.put("refundMessage", response.getMessage()); results.put("refundRefNum", response.getTxRefNum()); - if (refundResult.booleanValue()) { //passed + if (refundResult) { //passed results.put("refundCode", response.getAuthCode()); results.put("refundAmount", new BigDecimal(results.get("refundAmount").toString())); } else { @@ -583,11 +583,11 @@ public class OrbitalPaymentServices { private static void processReleaseTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean releaseResult = (Boolean) processCardResponseContext.get("authResult"); - results.put("releaseResult", new Boolean(releaseResult.booleanValue())); + results.put("releaseResult", releaseResult); results.put("releaseFlag", response.getResponseCode()); results.put("releaseMessage", response.getMessage()); results.put("releaseRefNum", response.getTxRefNum()); - if (releaseResult.booleanValue()) { //passed + if (releaseResult) { //passed results.put("releaseCode", response.getAuthCode()); results.put("releaseAmount", new BigDecimal(results.get("releaseAmount").toString())); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java Tue Aug 7 07:30:43 2018 @@ -113,12 +113,12 @@ public class SecurePayPaymentServices { Txn resp = payment.getTxn(0); boolean approved = resp.getApproved(); if (approved == false){ - result.put("authResult", new Boolean(false)); + result.put("authResult", Boolean.FALSE); result.put("authRefNum", "N/A"); result.put("processAmount", BigDecimal.ZERO); } else { result.put("authRefNum", resp.getTxnId()); - result.put("authResult", new Boolean(true)); + result.put("authResult", Boolean.TRUE); result.put("processAmount", processAmount); } result.put("authCode", resp.getResponseCode()); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java Tue Aug 7 07:30:43 2018 @@ -135,7 +135,7 @@ public class SecurePayServiceTest extend Debug.logInfo("[testCCAuth] responseMessage: " + responseMessage, module); TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage); - if (((Boolean) result.get("authResult")).equals(new Boolean(false))) { // returnCode ok? + if (((Boolean) result.get("authResult")).equals(Boolean.FALSE)) { // returnCode ok? Debug.logInfo("[testAuth] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module); TestCase.fail("Returned messages:" + result.get("internalRespMsgs")); } else { @@ -180,7 +180,7 @@ public class SecurePayServiceTest extend Debug.logInfo("[testdoCapture] responseMessage: " + responseMessage, module); TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage); - if (((Boolean) result.get("captureResult")).equals(new Boolean(false))) { // returnCode ok? + if (((Boolean) result.get("captureResult")).equals(Boolean.FALSE)) { // returnCode ok? Debug.logInfo("[testdoCapture] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module); TestCase.fail("Returned messages:" + result.get("internalRespMsgs")); } else { @@ -212,7 +212,7 @@ public class SecurePayServiceTest extend Debug.logInfo("[testdoRefund] responseMessage: " + responseMessage, module); TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage); - if (((Boolean) result.get("refundResult")).equals(new Boolean(false))) { // returnCode ok? + if (((Boolean) result.get("refundResult")).equals(Boolean.FALSE)) { // returnCode ok? Debug.logInfo("[testdoRefund] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module); TestCase.fail("Returned messages:" + result.get("internalRespMsgs")); } else { @@ -245,7 +245,7 @@ public class SecurePayServiceTest extend Debug.logInfo("[testdoCredit] responseMessage: " + responseMessage, module); TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage); - if (((Boolean) result.get("creditResult")).equals(new Boolean(false))) { // returnCode ok? + if (((Boolean) result.get("creditResult")).equals(Boolean.FALSE)) { // returnCode ok? Debug.logInfo("[testdoCredit] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module); TestCase.fail("Returned messages:" + result.get("internalRespMsgs")); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Tue Aug 7 07:30:43 2018 @@ -64,9 +64,9 @@ public class ValueLinkServices { Boolean kekOnly = context.get("kekOnly") != null ? (Boolean) context.get("kekOnly") : Boolean.FALSE; String kekTest = (String) context.get("kekTest"); - Debug.logInfo("KEK Only : " + kekOnly.booleanValue(), module); + Debug.logInfo("KEK Only : " + kekOnly, module); - StringBuffer buf = vl.outputKeyCreation(kekOnly.booleanValue(), kekTest); + StringBuffer buf = vl.outputKeyCreation(kekOnly, kekTest); String output = buf.toString(); Debug.logInfo(":: Key Generation Output ::\n\n" + output, module); @@ -93,7 +93,7 @@ public class ValueLinkServices { byte[] testEncryption = null; String desc = ""; - if (mode.intValue() == 1) { + if (mode == 1) { // encrypt the test bytes testEncryption = vl.encryptViaKek(testBytes); desc = "Encrypted"; @@ -154,7 +154,7 @@ public class ValueLinkServices { Map<String, Object> request = vl.getInitialRequestMap(context); request.put("Interface", "Encrypt"); request.put("EncryptKey", mwkHex); - request.put("EncryptID", Long.valueOf(vl.getWorkingKeyIndex().longValue() + 1)); + request.put("EncryptID", vl.getWorkingKeyIndex() + 1); // send the request Map<String, Object> response = null; @@ -786,7 +786,7 @@ public class ValueLinkServices { if (redeemResult != null) { Boolean processResult = (Boolean) redeemResult.get("processResult"); // confirm the amount redeemed; since VL does not error in insufficient funds - if (processResult.booleanValue()) { + if (processResult) { BigDecimal previous = (BigDecimal) redeemResult.get("previousAmount"); if (previous == null) previous = BigDecimal.ZERO; BigDecimal current = (BigDecimal) redeemResult.get("amount"); @@ -1137,7 +1137,7 @@ public class ValueLinkServices { } Boolean processResult = (Boolean) activateResult.get("processResult"); - if (activateResult.containsKey(ModelService.ERROR_MESSAGE) || !processResult.booleanValue()) { + if (activateResult.containsKey(ModelService.ERROR_MESSAGE) || !processResult) { failure = true; } @@ -1398,7 +1398,7 @@ public class ValueLinkServices { } Boolean processResult = (Boolean) reloadResult.get("processResult"); - if (reloadResult.containsKey(ModelService.ERROR_MESSAGE) || !processResult.booleanValue()) { + if (reloadResult.containsKey(ModelService.ERROR_MESSAGE) || !processResult) { Debug.logError("Reload Failed Need to Refund : " + reloadResult, module); // process the return Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Tue Aug 7 07:30:43 2018 @@ -908,8 +908,8 @@ public class PayflowPro { Integer maxLogFileSize = Integer.decode(getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "maxLogFileSize", resource, "payment.verisign.maxLogFileSize", "1000000")); boolean stackTraceOn = "Y".equalsIgnoreCase(getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "stackTraceOn", resource, "payment.verisign.stackTraceOn", "N")); - PayflowAPI pfp = new PayflowAPI(hostAddress, hostPort.intValue(), timeout.intValue(), proxyAddress, - proxyPort.intValue(), proxyLogon, proxyPassword); + PayflowAPI pfp = new PayflowAPI(hostAddress, hostPort, timeout, proxyAddress, + proxyPort, proxyLogon, proxyPassword); SDKProperties.setLogFileName(logFileName); SDKProperties.setLoggingLevel(loggingLevel); SDKProperties.setMaxLogFileSize(maxLogFileSize); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Tue Aug 7 07:30:43 2018 @@ -432,7 +432,7 @@ public class WorldPayEvents { List<GenericValue> toStore = new LinkedList<>(); java.sql.Timestamp authDate = null; try { - authDate = new java.sql.Timestamp(paymentDate.longValue()); + authDate = new java.sql.Timestamp(paymentDate); } catch (Exception e) { Debug.logError(e, "Cannot create date from long: " + paymentDate, module); authDate = UtilDateTime.nowTimestamp(); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java Tue Aug 7 07:30:43 2018 @@ -827,9 +827,9 @@ public class ContentManagementServices { String contentIdTo = (String)context.get("contentIdTo"); Integer seqInc = (Integer)context.get("seqInc"); if (seqInc == null) { - seqInc = Integer.valueOf(100); + seqInc = 100; } - int seqIncrement = seqInc.intValue(); + int seqIncrement = seqInc; List<String> typeList = UtilGenerics.checkList(context.get("typeList")); if (typeList == null) { typeList = new LinkedList<String>(); @@ -864,7 +864,7 @@ public class ContentManagementServices { try { GenericValue prevValue = listAll.get(i-1); Long prevSeqNum = (Long)prevValue.get("sequenceNum"); - prevValue.put("sequenceNum", Long.valueOf(seqNum)); + prevValue.put("sequenceNum", (long) seqNum); prevValue.store(); contentAssoc.put("sequenceNum", prevSeqNum); contentAssoc.store(); @@ -876,20 +876,20 @@ public class ContentManagementServices { if (i < listAll.size()) { // Swap with next entry GenericValue nextValue = listAll.get(i+1); - nextValue.put("sequenceNum", Long.valueOf(seqNum)); + nextValue.put("sequenceNum", (long) seqNum); nextValue.store(); seqNum += seqIncrement; - contentAssoc.put("sequenceNum", Long.valueOf(seqNum)); + contentAssoc.put("sequenceNum", (long) seqNum); contentAssoc.store(); i++; // skip next one } } } else { - contentAssoc.put("sequenceNum", Long.valueOf(seqNum)); + contentAssoc.put("sequenceNum", (long) seqNum); contentAssoc.store(); } } else { - contentAssoc.put("sequenceNum", Long.valueOf(seqNum)); + contentAssoc.put("sequenceNum", (long) seqNum); contentAssoc.store(); } seqNum += seqIncrement; @@ -938,7 +938,7 @@ public class ContentManagementServices { serviceIn.put("userLogin", userLogin); serviceIn.put("contentIdTo", contentId); serviceIn.put("contentAssocTypeId", "SUB_CONTENT"); - serviceIn.put("sequenceNum", Long.valueOf(50)); + serviceIn.put("sequenceNum", 50L); try { thisResult = dispatcher.runSync("persistContentAndAssoc", serviceIn); if (ServiceUtil.isError(thisResult)) { @@ -969,7 +969,7 @@ public class ContentManagementServices { String startContentId = (String)context.get("contentId"); try { int leafCount = ContentManagementWorker.updateStatsTopDown(delegator, startContentId, typeList); - result.put("leafCount", Integer.valueOf(leafCount)); + result.put("leafCount", leafCount); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.toString()); @@ -1210,11 +1210,11 @@ public class ContentManagementServices { } Long leafCount = (Long)content.get("childLeafCount"); if (leafCount == null) { - content.set("childLeafCount", Long.valueOf(0)); + content.set("childLeafCount", 0L); } Long branchCount = (Long)content.get("childBranchCount"); if (branchCount == null) { - content.set("childBranchCount", Long.valueOf(0)); + content.set("childBranchCount", 0L); } return result; @@ -1234,7 +1234,7 @@ public class ContentManagementServices { } Long leafCount = (Long)content.get("childLeafCount"); if (leafCount == null) { - leafCount = Long.valueOf(0); + leafCount = 0L; } int changeLeafCount = leafCount.intValue() + 1; int changeBranchCount = 1; @@ -1260,7 +1260,7 @@ public class ContentManagementServices { } Long leafCount = (Long)content.get("childLeafCount"); if (leafCount == null) { - leafCount = Long.valueOf(0); + leafCount = 0L; } int changeLeafCount = -1 * leafCount.intValue() - 1; int changeBranchCount = -1; @@ -1353,7 +1353,7 @@ public class ContentManagementServices { } else { Debug.logWarning("Don't know anything about useTimeUomId [" + useTimeUomId + "], defaulting to month", module); } - calendar.add(field, useTime.intValue()); + calendar.add(field, useTime); thruDate = new Timestamp(calendar.getTimeInMillis()); contentRole.set("thruDate", thruDate); try { @@ -1385,7 +1385,7 @@ public class ContentManagementServices { String productId = (String) context.get("productId"); Integer qty = (Integer) context.get("quantity"); if (qty == null) { - qty = Integer.valueOf(1); + qty = 1; } GenericValue productContent = null; @@ -1413,7 +1413,7 @@ public class ContentManagementServices { Long useTime = (Long) productContent.get("useTime"); Integer newUseTime = null; if (UtilValidate.isNotEmpty(useTime)) { - newUseTime = Integer.valueOf(useTime.intValue() * qty.intValue()); + newUseTime = useTime.intValue() * qty; } context.put("useTime", newUseTime); context.put("useTimeUomId", productContent.get("useTimeUomId")); @@ -1468,7 +1468,7 @@ public class ContentManagementServices { .filterByDate().queryCount(); if (productContentCount > 0) { context.put("productId", productId); - context.put("quantity", Integer.valueOf(qty.intValue())); + context.put("quantity", qty.intValue()); Map<String, Object> ctx = subscriptionModel.makeValid(context, ModelService.IN_PARAM); result = dispatcher.runSync("updateContentSubscriptionByProduct", ctx); if (ServiceUtil.isError(result)) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java Tue Aug 7 07:30:43 2018 @@ -638,8 +638,8 @@ public final class ContentManagementWork // If no children, count this as a leaf if (subLeafCount == 0) subLeafCount = 1; - thisContent.put("childBranchCount", Long.valueOf(contentAssocs.size())); - thisContent.put("childLeafCount", Long.valueOf(subLeafCount)); + thisContent.put("childBranchCount", (long) contentAssocs.size()); + thisContent.put("childLeafCount", (long) subLeafCount); thisContent.store(); return subLeafCount; @@ -662,7 +662,7 @@ public final class ContentManagementWork if (leafCount != null) { intLeafCount = leafCount.intValue(); } - contentTo.set("childLeafCount", Long.valueOf(intLeafCount + leafChangeAmount)); + contentTo.set("childLeafCount", (long) (intLeafCount + leafChangeAmount)); if (branchChangeAmount != 0) { int intBranchCount = 0; @@ -670,7 +670,7 @@ public final class ContentManagementWork if (branchCount != null) { intBranchCount = branchCount.intValue(); } - contentTo.set("childBranchCount", Long.valueOf(intBranchCount + branchChangeAmount)); + contentTo.set("childBranchCount", (long) (intBranchCount + branchChangeAmount)); } contentTo.store(); updateStatsBottomUp(delegator, contentIdTo, typeList, 0, leafChangeAmount); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java Tue Aug 7 07:30:43 2018 @@ -140,7 +140,7 @@ public class CompDocEvents { } public static String padNumberWithLeadingZeros(Long num, Integer padLen) { - String s = UtilFormatOut.formatPaddedNumber(num.longValue(), padLen.intValue()); + String s = UtilFormatOut.formatPaddedNumber(num, padLen); return s; } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java Tue Aug 7 07:30:43 2018 @@ -70,7 +70,7 @@ public class ContentKeywordIndex { List<String> strings = new LinkedList<String>(); int pidWeight = 1; - keywords.put(content.getString("contentId").toLowerCase(Locale.getDefault()), Long.valueOf(pidWeight)); + keywords.put(content.getString("contentId").toLowerCase(Locale.getDefault()), (long) pidWeight); addWeightedKeywordSourceString(content, "dataResourceId", strings); addWeightedKeywordSourceString(content, "contentName", strings); @@ -187,7 +187,7 @@ public class ContentKeywordIndex { } List<GenericValue> toBeStored = new LinkedList<GenericValue>(); - int keywordMaxLength = EntityUtilProperties.getPropertyAsInteger("contentsearch", "content.keyword.max.length", 0).intValue(); + int keywordMaxLength = EntityUtilProperties.getPropertyAsInteger("contentsearch", "content.keyword.max.length", 0); for (Map.Entry<String, Long> entry: keywords.entrySet()) { if (entry.getKey().length() <= keywordMaxLength) { GenericValue contentKeyword = delegator.makeValue("ContentKeyword", UtilMisc.toMap("contentId", content.getString("contentId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java Tue Aug 7 07:30:43 2018 @@ -104,13 +104,13 @@ public class ContentPermissionServices { GenericValue content = (GenericValue) context.get("currentContent"); Boolean bDisplayFailCond = (Boolean)context.get("displayFailCond"); boolean displayFailCond = false; - if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) { + if (bDisplayFailCond != null && bDisplayFailCond) { displayFailCond = true; } Debug.logInfo("displayFailCond(0):" + displayFailCond, ""); Boolean bDisplayPassCond = (Boolean)context.get("displayPassCond"); boolean displayPassCond = false; - if (bDisplayPassCond != null && bDisplayPassCond.booleanValue()) { + if (bDisplayPassCond != null && bDisplayPassCond) { displayPassCond = true; } Debug.logInfo("displayPassCond(0):" + displayPassCond, ""); @@ -299,7 +299,7 @@ public class ContentPermissionServices { } permissionStatus = (String)permResults.get("permissionStatus"); if (permissionStatus == null || !"granted".equals(permissionStatus)) { - if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) { + if (bDisplayFailCond != null && bDisplayFailCond) { String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE); results.put(ModelService.ERROR_MESSAGE, errMsg); } @@ -320,7 +320,7 @@ public class ContentPermissionServices { if (permissionStatus != null && "granted".equals(permissionStatus)) { results.put("permissionStatus", "granted"); } else { - if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) { + if (bDisplayFailCond != null && bDisplayFailCond) { String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE); results.put(ModelService.ERROR_MESSAGE, errMsg); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java Tue Aug 7 07:30:43 2018 @@ -179,7 +179,7 @@ public class ContentSearch { double totalSeconds = ((double)endMillis - (double)startMillis)/1000.0; // store info about results in the database, attached to the user's visitId, if specified - this.saveSearchResultInfo(Long.valueOf(contentIds.size()), Double.valueOf(totalSeconds)); + this.saveSearchResultInfo((long) contentIds.size(), totalSeconds); return contentIds; } @@ -284,7 +284,7 @@ public class ContentSearch { if (resultSortOrder != null) { resultSortOrder.setSortOrder(this); } - dynamicViewEntity.addAlias("CNT", "contentId", null, null, null, Boolean.valueOf(contentIdGroupBy), null); + dynamicViewEntity.addAlias("CNT", "contentId", null, null, null, contentIdGroupBy, null); EntityCondition whereCondition = EntityCondition.makeCondition(entityConditionList, EntityOperator.AND); EntityListIterator eli = null; @@ -305,7 +305,7 @@ public class ContentSearch { } public ArrayList<String> makeContentIdList(EntityListIterator eli) { - ArrayList<String> contentIds = new ArrayList<String>(maxResults == null ? 100 : maxResults.intValue()); + ArrayList<String> contentIds = new ArrayList<String>(maxResults == null ? 100 : maxResults); if (eli == null) { Debug.logWarning("The eli is null, returning zero results", module); return contentIds; @@ -318,9 +318,9 @@ public class ContentSearch { if (initialResult != null) { hasResults = true; } - if (resultOffset != null && resultOffset.intValue() > 1) { + if (resultOffset != null && resultOffset > 1) { if (Debug.infoOn()) Debug.logInfo("Before relative, current index=" + eli.currentIndex(), module); - hasResults = eli.relative(resultOffset.intValue() - 1); + hasResults = eli.relative(resultOffset - 1); initialResult = null; } @@ -338,9 +338,9 @@ public class ContentSearch { // nothing to get... int failTotal = 0; if (this.resultOffset != null) { - failTotal = this.resultOffset.intValue() - 1; + failTotal = this.resultOffset - 1; } - this.totalResults = Integer.valueOf(failTotal); + this.totalResults = failTotal; return contentIds; } @@ -354,7 +354,7 @@ public class ContentSearch { contentIds.add(searchResult.getString("contentId")); contentIdSet.add(searchResult.getString("contentId")); - while (((searchResult = eli.next()) != null) && (maxResults == null || numRetreived < maxResults.intValue())) { + while (((searchResult = eli.next()) != null) && (maxResults == null || numRetreived < maxResults)) { String contentId = searchResult.getString("contentId"); if (!contentIdSet.contains(contentId)) { contentIds.add(contentId); @@ -368,12 +368,12 @@ public class ContentSearch { if (searchResult != null) { this.totalResults = eli.getResultsSizeAfterPartialList(); } - if (this.totalResults == null || this.totalResults.intValue() == 0) { + if (this.totalResults == null || this.totalResults == 0) { int total = numRetreived; if (this.resultOffset != null) { - total += (this.resultOffset.intValue() - 1); + total += (this.resultOffset - 1); } - this.totalResults = Integer.valueOf(total); + this.totalResults = total; } Debug.logInfo("Got search values, numRetreived=" + numRetreived + ", totalResults=" + totalResults + ", maxResults=" + maxResults + ", resultOffset=" + resultOffset + ", duplicatesFound(in the current results)=" + duplicatesFound, module); @@ -618,7 +618,7 @@ public class ContentSearch { this.anySuffix = anySuffix; this.isAnd = isAnd; if (removeStems != null) { - this.removeStems = removeStems.booleanValue(); + this.removeStems = removeStems; } else { this.removeStems = UtilProperties.propertyValueEquals("keywordsearch", "remove.stems", "true"); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java Tue Aug 7 07:30:43 2018 @@ -52,16 +52,16 @@ public class ContentSearchEvents { ContentSearchOptions contentSearchOptions = ContentSearchSession.getContentSearchOptions(session); Integer viewIndexInteger = contentSearchOptions.getViewIndex(); - if (viewIndexInteger != null) viewIndex = viewIndexInteger.intValue(); + if (viewIndexInteger != null) viewIndex = viewIndexInteger; Integer viewSizeInteger = contentSearchOptions.getViewSize(); - if (viewSizeInteger != null) viewSize = viewSizeInteger.intValue(); + if (viewSizeInteger != null) viewSize = viewSizeInteger; lowIndex = viewIndex * viewSize; highIndex = (viewIndex + 1) * viewSize; // setup resultOffset and maxResults, noting that resultOffset is 1 based, not zero based as these numbers - Integer resultOffset = Integer.valueOf(lowIndex + 1); - Integer maxResults = Integer.valueOf(viewSize); + Integer resultOffset = lowIndex + 1; + Integer maxResults = viewSize; // ========== Do the actual search ArrayList<String> contentIds = null; @@ -85,7 +85,7 @@ public class ContentSearchEvents { Integer totalResults = contentSearchContext.getTotalResults(); if (totalResults != null) { - listSize = totalResults.intValue(); + listSize = totalResults; } } @@ -101,11 +101,11 @@ public class ContentSearchEvents { Map<String, Object> result = new HashMap<String, Object>(); result.put("contentIds", contentIds); - result.put("viewIndex", Integer.valueOf(viewIndex)); - result.put("viewSize", Integer.valueOf(viewSize)); - result.put("listSize", Integer.valueOf(listSize)); - result.put("lowIndex", Integer.valueOf(lowIndex)); - result.put("highIndex", Integer.valueOf(highIndex)); + result.put("viewIndex", viewIndex); + result.put("viewSize", viewSize); + result.put("listSize", listSize); + result.put("lowIndex", lowIndex); + result.put("highIndex", highIndex); result.put("searchConstraintStrings", searchConstraintStrings); result.put("searchSortOrderString", searchSortOrderString); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java Tue Aug 7 07:30:43 2018 @@ -243,7 +243,7 @@ public class ContentSearchSession { } catch (Exception e) { Debug.logError(e, "Error formatting VIEW_INDEX, setting to 0", module); // we could just do nothing here, but we know something was specified so we don't want to use the previous value from the session - contentSearchOptions.setViewIndex(Integer.valueOf(0)); + contentSearchOptions.setViewIndex(0); } } @@ -253,7 +253,7 @@ public class ContentSearchSession { contentSearchOptions.setViewSize(Integer.valueOf(viewSizeStr)); } catch (Exception e) { Debug.logError(e, "Error formatting VIEW_SIZE, setting to 20", module); - contentSearchOptions.setViewSize(Integer.valueOf(20)); + contentSearchOptions.setViewSize(20); } } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |