svn commit: r1848673 [1/4] - in /ofbiz: ofbiz-framework/trunk/ ofbiz-framework/trunk/applicat
Locked
svn commit: r1848673 [1/4] - in /ofbiz: ofbiz-framework/trunk/ ofbiz-framework/trunk/applicat
 
|
Author: jleroux
Date: Tue Dec 11 13:33:49 2018 New Revision: 1848673 URL: http://svn.apache.org/viewvc?rev=1848673&view=rev Log: Improved: Fix or Silence various warnings (OFBIZ-10701) In order to detect potential issues early, the linting compiler option should be used by default and disabled with {{./gradlew -PXlint:none build}}. Additionally it is important to reduce the number of warnings otherwise new warnings will remain unnoticed. The warning related to the com.googlecode.concurrentlinkedhashmap dependency should resolves itself once we handle upgrade to Caffeine like proposed in OFBIZ-6747. Thanks: Mathieu Lirzin Removed: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorkerInterface.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/WidgetPortalPageWorker.java Modified: ofbiz/ofbiz-framework/trunk/README.adoc ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.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/cms/ContentJsonEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.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/content/UploadContentAndImage.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/data/DataServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.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/webapp/ftl/CheckPermissionTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.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/OfbizContentAltUrlTransforms.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.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/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.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/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.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/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/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.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/CategoryWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogUrlTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.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/ProductConfigWorker.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/price/PriceServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/ofbiz-framework/trunk/build.gradle ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.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/string/test/FlexibleStringExpanderTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.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/period/PeriodWorker.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.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/condition/EntityCondition.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.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/TransactionUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ExecutionServiceException.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.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/RecurrenceRule.java ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.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/ftl/OfbizContentTransform.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.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/print/FoPrintServerEvents.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/ModelScreenWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.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/fo/ScreenFopViewHandler.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/container/BirtContainer.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java ofbiz/ofbiz-plugins/trunk/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/MultiSiteRequestWrapper.java ofbiz/ofbiz-plugins/trunk/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java ofbiz/ofbiz-plugins/trunk/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java ofbiz/ofbiz-plugins/trunk/example/src/main/java/org/apache/ofbiz/example/ExampleServices.java ofbiz/ofbiz-plugins/trunk/ldap/src/main/java/org/apache/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatEvents.java ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java Modified: ofbiz/ofbiz-framework/trunk/README.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/README.adoc?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/README.adoc (original) +++ ofbiz/ofbiz-framework/trunk/README.adoc Tue Dec 11 13:33:49 2018 @@ -553,12 +553,13 @@ Create an admin user with login name MyU `gradlew loadAdminUserLogin -PuserLoginId=MyUserName` -[[compile-java-using-xlint-output]] -==== Compile Java using Xlint output +[[compile-java-without-using-xlint-output]] +==== Compile Java without using Xlint output -Xlint prints output of all warnings detected by the compiler +By default Xlint prints output of all warnings detected by the compiler, if you +want to silence them -`gradlew -PXlint build` +`gradlew -PXlint:none build` [[run-owasp-tool-to-identify-dependency-vulnerabilities-cves]] ==== Run OWASP tool to identify dependency vulnerabilities (CVEs) Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java Tue Dec 11 13:33:49 2018 @@ -331,7 +331,7 @@ public final class InvoiceWorker { if (shipmentView != null) { GenericValue shipment = EntityQuery.use(delegator).from("Shipment") .where("shipmentId", shipmentView.get("shipmentId")).queryOne(); - postalAddress = shipment.getRelatedOne("DestinationPostalAddress"); + postalAddress = shipment.getRelatedOne("DestinationPostalAddress", false); } } catch (GenericEntityException e) { Debug.logError("Touble getting ContactMech entity from OISG", module); 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=1848673&r1=1848672&r2=1848673&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 Dec 11 13:33:49 2018 @@ -485,7 +485,7 @@ public class WorldPayEvents { if (ServiceUtil.isError(results)) { Debug.logError((String) results.get(ModelService.ERROR_MESSAGE), module); - request.setAttribute("_ERROR_MESSAGE_", (String) results.get(ModelService.ERROR_MESSAGE)); + request.setAttribute("_ERROR_MESSAGE_", results.get(ModelService.ERROR_MESSAGE)); return false; } return true; 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=1848673&r1=1848672&r2=1848673&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 Dec 11 13:33:49 2018 @@ -371,7 +371,7 @@ public class ContentManagementServices { if (deactivateExisting) { contentAssocExisting.put("thruDate", UtilDateTime.nowTimestamp()); } else if (UtilValidate.isNotEmpty(context.get("thruDate"))) { - contentAssocExisting.put("thruDate", (Timestamp)context.get("thruDate")); + contentAssocExisting.put("thruDate", context.get("thruDate")); } ModelService contentAssocModel = dispatcher.getDispatchContext().getModelService("updateContentAssoc"); Map<String, Object> ctx = contentAssocModel.makeValid(contentAssocExisting, ModelService.IN_PARAM); @@ -615,8 +615,8 @@ public class ContentManagementServices { uploadImage.put("dataResourceTypeId", dataResourceTypeId); uploadImage.put("rootDir", context.get("objectInfo")); uploadImage.put("uploadedFile", imageDataBytes); - uploadImage.put("_uploadedFile_fileName", (String) context.get("_imageData_fileName")); - uploadImage.put("_uploadedFile_contentType", (String) context.get("_imageData_contentType")); + uploadImage.put("_uploadedFile_fileName", context.get("_imageData_fileName")); + uploadImage.put("_uploadedFile_contentType", context.get("_imageData_contentType")); thisResult = dispatcher.runSync("attachUploadToDataResource", uploadImage); if (ServiceUtil.isError(thisResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult)); @@ -658,8 +658,8 @@ public class ContentManagementServices { uploadImage.put("dataResourceTypeId", dataResourceTypeId); uploadImage.put("rootDir", context.get("objectInfo")); uploadImage.put("uploadedFile", imageDataBytes); - uploadImage.put("_uploadedFile_fileName", (String) context.get("_imageData_fileName")); - uploadImage.put("_uploadedFile_contentType", (String) context.get("_imageData_contentType")); + uploadImage.put("_uploadedFile_fileName", context.get("_imageData_fileName")); + uploadImage.put("_uploadedFile_contentType", context.get("_imageData_contentType")); thisResult = dispatcher.runSync("attachUploadToDataResource", uploadImage); if (ServiceUtil.isError(thisResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult)); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java Tue Dec 11 13:33:49 2018 @@ -19,6 +19,7 @@ package org.apache.ofbiz.content.cms; import java.io.IOException; +import java.nio.charset.Charset; import java.sql.Timestamp; import java.util.Collections; import java.util.Comparator; @@ -86,7 +87,7 @@ public class ContentJsonEvents { } }); - IOUtils.write(JSON.from(nodes).toString(), response.getOutputStream()); + IOUtils.write(JSON.from(nodes).toString(), response.getOutputStream(), Charset.defaultCharset()); return "success"; } @@ -122,7 +123,7 @@ public class ContentJsonEvents { return newAssoc; }, String.format("move content [%s] from [%s] to [%s]", contentIdTo, contentIdFrom, contentIdFromNew), 0, true).call(); - IOUtils.write(JSON.from(getTreeNode(assoc)).toString(), response.getOutputStream()); + IOUtils.write(JSON.from(getTreeNode(assoc)).toString(), response.getOutputStream(), Charset.defaultCharset()); return "success"; } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java Tue Dec 11 13:33:49 2018 @@ -49,7 +49,6 @@ import org.apache.ofbiz.entity.util.Enti 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; /** Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java Tue Dec 11 13:33:49 2018 @@ -127,7 +127,7 @@ public class PermissionRecorder { currentContentMap = new HashMap<String, Object>(); permCheckResults.add(currentContentMap); currentContentMap.put("contentId", id); - currentContentMap.put("checkResults", new LinkedList()); + currentContentMap.put("checkResults", new LinkedList<>()); } currentContentId = id; } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java Tue Dec 11 13:33:49 2018 @@ -52,7 +52,6 @@ import org.apache.ofbiz.minilang.MiniLan import org.apache.ofbiz.minilang.SimpleMapProcessor; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceAuthException; import org.apache.ofbiz.service.ServiceUtil; @@ -215,8 +214,8 @@ public class UploadContentAndImage { sumContext.put("mapKey", "SUMMARY"); sumContext.put("dataTemplateTypeId", "NONE"); Map<String, Object> sumResults = dispatcher.runSync("persistContentAndAssoc", sumContext); - if (ServiceUtil.isError(ftlResults)) { - String errorMessage = ServiceUtil.getErrorMessage(ftlResults); + if (ServiceUtil.isError(sumResults)) { + String errorMessage = ServiceUtil.getErrorMessage(sumResults); request.setAttribute("_ERROR_MESSAGE_", errorMessage); Debug.logError(errorMessage, module); TransactionUtil.rollback(); @@ -245,8 +244,8 @@ public class UploadContentAndImage { txtContext.put("mapKey", "ARTICLE"); txtContext.put("dataTemplateTypeId", "NONE"); Map<String, Object> txtResults = dispatcher.runSync("persistContentAndAssoc", txtContext); - if (ServiceUtil.isError(ftlResults)) { - String errorMessage = ServiceUtil.getErrorMessage(ftlResults); + if (ServiceUtil.isError(txtResults)) { + String errorMessage = ServiceUtil.getErrorMessage(txtResults); request.setAttribute("_ERROR_MESSAGE_", errorMessage); Debug.logError(errorMessage, module); TransactionUtil.rollback(); @@ -278,8 +277,8 @@ public class UploadContentAndImage { imgContext.put("rootDir", "rootDir"); if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]imgContext " + imgContext, module); Map<String, Object> imgResults = dispatcher.runSync("persistContentAndAssoc", imgContext); - if (ServiceUtil.isError(ftlResults)) { - String errorMessage = ServiceUtil.getErrorMessage(ftlResults); + if (ServiceUtil.isError(imgResults)) { + String errorMessage = ServiceUtil.getErrorMessage(imgResults); request.setAttribute("_ERROR_MESSAGE_", errorMessage); Debug.logError(errorMessage, module); TransactionUtil.rollback(); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java Tue Dec 11 13:33:49 2018 @@ -987,8 +987,9 @@ public class DataResourceWorker impleme if (!file.isAbsolute()) { throw new GeneralException("File (" + objectInfo + ") is not absolute"); } - InputStreamReader in = new InputStreamReader(new FileInputStream(file), UtilIO.getUtf8()); - UtilIO.copy(in, true, out); + try (InputStreamReader in = new InputStreamReader(new FileInputStream(file), UtilIO.getUtf8())) { + UtilIO.copy(in, out); + } } else if ("OFBIZ_FILE".equals(dataResourceTypeId) && UtilValidate.isNotEmpty(objectInfo)) { String prefix = System.getProperty("ofbiz.home"); String sep = ""; @@ -996,8 +997,9 @@ public class DataResourceWorker impleme sep = "/"; } File file = FileUtil.getFile(prefix + sep + objectInfo); - InputStreamReader in = new InputStreamReader(new FileInputStream(file), UtilIO.getUtf8()); - UtilIO.copy(in, true, out); + try (InputStreamReader in = new InputStreamReader(new FileInputStream(file), UtilIO.getUtf8())) { + UtilIO.copy(in, out); + } } else if ("CONTEXT_FILE".equals(dataResourceTypeId) && UtilValidate.isNotEmpty(objectInfo)) { String prefix = rootDir; String sep = ""; @@ -1005,21 +1007,18 @@ public class DataResourceWorker impleme sep = "/"; } File file = FileUtil.getFile(prefix + sep + objectInfo); - InputStreamReader in = null; - try { - in = new InputStreamReader(new FileInputStream(file), UtilIO.getUtf8()); - String enc = in.getEncoding(); + try (InputStreamReader in = new InputStreamReader(new FileInputStream(file), UtilIO.getUtf8())) { if (Debug.infoOn()) { + String enc = in.getEncoding(); Debug.logInfo("in serveImage, encoding:" + enc, module); } - + UtilIO.copy(in, out); } catch (FileNotFoundException e) { Debug.logError(e, " in renderDataResourceAsHtml(CONTEXT_FILE), in FNFexception:", module); throw new GeneralException("Could not find context file to render", e); } catch (Exception e) { Debug.logError(" in renderDataResourceAsHtml(CONTEXT_FILE), got exception:" + e.getMessage(), module); } - UtilIO.copy(in, true, out); } } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java Tue Dec 11 13:33:49 2018 @@ -663,7 +663,6 @@ public class DataServices { if (Debug.infoOn()) { Debug.logInfo("in updateBinaryFileMethod, length:" + file.length(), module); } - out.close(); } catch (IOException e) { Debug.logWarning(e, module); throw new GenericServiceException(e.getMessage()); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java Tue Dec 11 13:33:49 2018 @@ -48,7 +48,6 @@ import org.apache.ofbiz.minilang.MiniLan import org.apache.ofbiz.minilang.SimpleMapProcessor; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; /** Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java Tue Dec 11 13:33:49 2018 @@ -20,7 +20,6 @@ package org.apache.ofbiz.content.survey; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Tue Dec 11 13:33:49 2018 @@ -84,7 +84,7 @@ public class CheckPermissionTransform im @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateCtx = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Tue Dec 11 13:33:49 2018 @@ -79,7 +79,7 @@ public class EditRenderSubContentCacheTr @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateCtx = FreeMarkerWorker.getWrappedObject("context", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java Tue Dec 11 13:33:49 2018 @@ -77,7 +77,7 @@ public class EditRenderSubContentTransfo @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); Map<String, Object> ctx = FreeMarkerWorker.getWrappedObject("context", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Tue Dec 11 13:33:49 2018 @@ -76,7 +76,7 @@ public class InjectNodeTrailCsvTransform @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateCtx = FreeMarkerWorker.getWrappedObject("context", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Tue Dec 11 13:33:49 2018 @@ -89,7 +89,7 @@ public class LimitedSubContentCacheTrans @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateRoot = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Tue Dec 11 13:33:49 2018 @@ -151,7 +151,7 @@ public class LoopSubContentTransform imp @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateCtx = FreeMarkerWorker.getWrappedObject("context", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java Tue Dec 11 13:33:49 2018 @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRes import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilCodec; +import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; @@ -48,7 +49,7 @@ public class OfbizContentAltUrlTransform public final static String module = OfbizContentAltUrlTransforms.class.getName(); private static final String defaultViewRequest = "contentViewInfo"; - public String getStringArg(Map args, String key) { + public String getStringArg(Map<String, Object> args, String key) { Object o = args.get(key); if (o instanceof SimpleScalar) { return ((SimpleScalar) o).getAsString(); @@ -63,7 +64,7 @@ public class OfbizContentAltUrlTransform } @Override - public Writer getWriter(final Writer out, final Map args) + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) throws TemplateModelException, IOException { final StringBuilder buf = new StringBuilder(); return new Writer(out) { @@ -85,8 +86,9 @@ public class OfbizContentAltUrlTransform BeanModel req = (BeanModel) env.getVariable("request"); BeanModel res = (BeanModel) env.getVariable("response"); if (req != null) { - String contentId = getStringArg(args, "contentId"); - String viewContent = getStringArg(args, "viewContent"); + Map<String, Object> arguments = UtilGenerics.cast(args); + String contentId = getStringArg(arguments, "contentId"); + String viewContent = getStringArg(arguments, "viewContent"); HttpServletRequest request = (HttpServletRequest) req.getWrappedObject(); HttpServletResponse response = null; if (res != null) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Tue Dec 11 13:33:49 2018 @@ -48,13 +48,13 @@ public class RenderContentAndSubContent @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final Environment env = Environment.getCurrentEnvironment(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); final Map<String, Object> envMap = FreeMarkerWorker.createEnvironmentMap(env); final MapStack<String> templateRoot = MapStack.create(); - ((MapStack)templateRoot).push(envMap); + templateRoot.push(envMap); if (Debug.verboseOn()) { Debug.logVerbose("in RenderContentAndSubContent, contentId(0):" + templateRoot.get("contentId"), module); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java Tue Dec 11 13:33:49 2018 @@ -57,7 +57,7 @@ public class RenderContentAsText impleme @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final Environment env = Environment.getCurrentEnvironment(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java Tue Dec 11 13:33:49 2018 @@ -53,14 +53,14 @@ public class RenderContentTransform impl @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final Environment env = Environment.getCurrentEnvironment(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env); - final Map<String, Object> templateRoot = MapStack.create(FreeMarkerWorker.createEnvironmentMap(env)); - ((MapStack)templateRoot).push(args); + final MapStack<String> templateRoot = MapStack.create(FreeMarkerWorker.createEnvironmentMap(env)); + templateRoot.push(args); final String xmlEscape = (String)templateRoot.get("xmlEscape"); final String thisContentId = (String)templateRoot.get("contentId"); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Tue Dec 11 13:33:49 2018 @@ -51,8 +51,9 @@ public class RenderSubContentAsText impl public static final String [] upSaveKeyNames = {"globalNodeTrail"}; public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "globalNodeTrail"}; + @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final Environment env = Environment.getCurrentEnvironment(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Tue Dec 11 13:33:49 2018 @@ -54,8 +54,9 @@ public class RenderSubContentCacheTransf public static final String module = RenderSubContentCacheTransform.class.getName(); static final String[] upSaveKeyNames = { "globalNodeTrail" }; + @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final Environment env = Environment.getCurrentEnvironment(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java Tue Dec 11 13:33:49 2018 @@ -71,8 +71,9 @@ public class RenderSubContentTransform i return FreeMarkerWorker.getArg(args, key, ctx); } + @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final Environment env = Environment.getCurrentEnvironment(); Map<String, Object> ctx = FreeMarkerWorker.getWrappedObject("context", env); if (ctx == null) { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Tue Dec 11 13:33:49 2018 @@ -77,8 +77,9 @@ public class TraverseSubContentCacheTran return FreeMarkerWorker.getArg(args, key, ctx); } + @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(final Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateRoot = FreeMarkerWorker.createEnvironmentMap(env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Tue Dec 11 13:33:49 2018 @@ -80,8 +80,9 @@ public class TraverseSubContentTransform return FreeMarkerWorker.getArg(args, key, ctx); } + @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(final Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); final Map<String, Object> templateCtx = FreeMarkerWorker.getWrappedObject("context", env); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Tue Dec 11 13:33:49 2018 @@ -77,8 +77,9 @@ public class WrapSubContentCacheTransfor return FreeMarkerWorker.getArg(args, key, ctx); } + @Override @SuppressWarnings("unchecked") - public Writer getWriter(final Writer out, Map args) { + public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); Map<String, Object> envContext = FreeMarkerWorker.getWrappedObject("context", env); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java Tue Dec 11 13:33:49 2018 @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilMisc; Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Tue Dec 11 13:33:49 2018 @@ -134,7 +134,7 @@ public class ProductionRun { productionRun.set("description",this.description); try { if (quantityIsUpdated) { - productionRun.set("quantityToProduce",(BigDecimal) this.quantity); + productionRun.set("quantityToProduce", this.quantity); productionRunProduct.set("estimatedQuantity",this.quantity.doubleValue()); productionRunProduct.store(); quantityIsUpdated = false; Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Tue Dec 11 13:33:49 2018 @@ -1827,12 +1827,20 @@ public class ProductionRunServices { BigDecimal totalCost = ZERO; List<GenericValue> tasks = productionRun.getProductionRunRoutingTasks(); // generic_cost - List<GenericValue> actualGenCosts = EntityQuery.use(delegator).from("CostComponent").where("workEffortId", productionRunId, "costUomId", (String) partyAccountingPreference.get("baseCurrencyUomId")).queryList(); + List<GenericValue> actualGenCosts = EntityQuery.use(delegator) + .from("CostComponent") + .where("workEffortId", productionRunId, + "costUomId", partyAccountingPreference.get("baseCurrencyUomId")) + .queryList(); for (GenericValue actualGenCost : actualGenCosts) { totalCost = totalCost.add((BigDecimal) actualGenCost.get("cost")); } for (GenericValue task : tasks) { - List<GenericValue> otherCosts = EntityQuery.use(delegator).from("CostComponent").where("workEffortId", task.get("workEffortId"), "costUomId", (String) partyAccountingPreference.get("baseCurrencyUomId")).queryList(); + List<GenericValue> otherCosts = EntityQuery.use(delegator) + .from("CostComponent") + .where("workEffortId", task.get("workEffortId"), + "costUomId", partyAccountingPreference.get("baseCurrencyUomId")) + .queryList(); for (GenericValue otherCost : otherCosts) { totalCost = totalCost.add((BigDecimal) otherCost.get("cost")); } @@ -3486,7 +3494,7 @@ public class ProductionRunServices { TreeMap<Timestamp, Object> productMap = products.get(productId); if (!productMap.containsKey(estimatedShipDate)) { productMap.put(estimatedShipDate, - UtilMisc.<String, Object>toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList())); + UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList<>())); } Map<String, Object> dateMap = UtilGenerics.checkMap(productMap.get(estimatedShipDate)); BigDecimal remainingQty = (BigDecimal)dateMap.get("remainingQty"); @@ -3528,7 +3536,8 @@ public class ProductionRunServices { } TreeMap<Timestamp, Object> productMap = products.get(productId); if (!productMap.containsKey(estimatedShipDate)) { - productMap.put(estimatedShipDate, UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList())); + productMap.put(estimatedShipDate, + UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList<>())); } Map<String, Object> dateMap = UtilGenerics.checkMap(productMap.get(estimatedShipDate)); BigDecimal remainingQty = (BigDecimal)dateMap.get("remainingQty"); Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java Tue Dec 11 13:33:49 2018 @@ -87,7 +87,6 @@ public class VCard { boolean isGroup = false; List<Map<String, String>> partiesCreated = new ArrayList<Map<String,String>>(); List<Map<String, String>> partiesExist = new ArrayList<Map<String,String>>(); - String partyName = ""; // TODO this is not used yet try (VCardReader vCardReader = new VCardReader(in)) { ezvcard.VCard vcard = null; @@ -113,7 +112,6 @@ public class VCard { if (!isGroup) { serviceCtx.put("firstName", structuredName.getGiven()); serviceCtx.put("lastName", structuredName.getFamily()); - partyName = structuredName.getGiven() + " " + structuredName.getFamily(); } // Resolve all postal Address @@ -164,9 +162,7 @@ public class VCard { } else { //TODO change uncorrect labellisation String emailFormatErrMsg = UtilProperties.getMessage(resourceError, "SfaImportVCardEmailFormatError", locale); - vCardReader.close(); return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "MarketingEmailFormatError", UtilMisc.toMap("firstName", structuredName.getGiven(), "lastName", structuredName.getFamily(), "emailFOrmatErrMsg", emailFormatErrMsg), locale)); - } } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/OrderManagerEvents.java Tue Dec 11 13:33:49 2018 @@ -47,7 +47,6 @@ import org.apache.ofbiz.entity.util.Enti import org.apache.ofbiz.order.order.OrderChangeHelper; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; /** * Order Manager Events Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java Tue Dec 11 13:33:49 2018 @@ -31,7 +31,6 @@ import org.apache.ofbiz.entity.GenericVa import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; /** Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java Tue Dec 11 13:33:49 2018 @@ -2629,7 +2629,7 @@ public class OrderReturnServices { String settingPrefix = isSalesTax ? "salestax" : "order"; String decimalsPrefix = isSalesTax ? ".calc" : ""; int decimals = UtilNumber.getBigDecimalScale(settingPrefix + decimalsPrefix + ".decimals"); - int rounding = UtilNumber.getBigDecimalRoundingMode(settingPrefix + ".rounding"); + int rounding = UtilNumber.getRoundingMode(settingPrefix + ".rounding").ordinal(); returnTotal = returnTotal.setScale(decimals, rounding); originalTotal = originalTotal.setScale(decimals, rounding); BigDecimal newAmount = null; Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Tue Dec 11 13:33:49 2018 @@ -451,7 +451,7 @@ public class OrderServices { if (ServiceUtil.isError(getNextOrderIdResult)) { String errMsg = UtilProperties.getMessage(resource_error, "OrderErrorGettingNextOrderIdWhileCreatingOrder", locale); - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(getNextOrderIdResult)); + return ServiceUtil.returnError(errMsg); } orderId = (String) getNextOrderIdResult.get("orderId"); } catch (GenericServiceException e) { @@ -3875,9 +3875,8 @@ public class OrderServices { } String[] itemInfo = key.split(":"); - int groupIdx = -1; try { - groupIdx = Integer.parseInt(itemInfo[1]); + Integer.parseInt(itemInfo[1]); } catch (NumberFormatException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); @@ -5864,7 +5863,8 @@ public class OrderServices { * @return * @throws GenericEntityException */ - public static Map addOrderItemShipGroupAssoc(DispatchContext dctx, Map<String, Object> context) throws GenericEntityException { + public static Map<String, Object> addOrderItemShipGroupAssoc(DispatchContext dctx, Map<String, Object> context) + throws GenericEntityException { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale" ); @@ -5950,7 +5950,8 @@ public class OrderServices { * @return * @throws GeneralException */ - public static Map updateOrderItemShipGroupAssoc(DispatchContext dctx, Map context) throws GeneralException{ + public static Map<String, Object> updateOrderItemShipGroupAssoc(DispatchContext dctx, Map<String, Object> context) + throws GeneralException{ Map<String, Object> result = ServiceUtil.returnSuccess(); String message = null; Delegator delegator = dctx.getDelegator(); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Tue Dec 11 13:33:49 2018 @@ -1,4 +1,4 @@ -/******************************************************************************* + /******************************************************************************* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -58,7 +58,6 @@ import org.apache.ofbiz.order.shoppingca import org.apache.ofbiz.order.shoppingcart.ShoppingCartItem; import org.apache.ofbiz.product.product.ProductContentWrapper; import org.apache.ofbiz.product.product.ProductSearch; -import org.apache.ofbiz.product.store.ProductStoreWorker; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; @@ -907,14 +906,9 @@ public final class ProductPromoWorker { String otherValue = productPromoCond.getString("otherValue"); String inputParamEnumId = productPromoCond.getString("inputParamEnumId"); String operatorEnumId = productPromoCond.getString("operatorEnumId"); - String shippingMethod = ""; - String carrierPartyId = ""; if (otherValue != null && otherValue.contains("@")) { - carrierPartyId = otherValue.substring(0, otherValue.indexOf('@')); - shippingMethod = otherValue.substring(otherValue.indexOf('@') + 1); otherValue = ""; } - String partyId = cart.getPartyId(); GenericValue userLogin = cart.getUserLogin(); if (userLogin == null) { userLogin = cart.getAutoUserLogin(); @@ -1024,59 +1018,30 @@ public final class ProductPromoWorker { BigDecimal amountOff = listPrice.subtract(basePrice); BigDecimal percentOff = amountOff.divide(listPrice, 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100L)); - Integer compareBase = null; - - if ("PPIP_LPMUP_AMT".equals(inputParamEnumId)) { - // NOTE: only check this after we know it's this type of cond, otherwise condValue may not be a number - BigDecimal condValueBigDecimal = new BigDecimal(condValue); - compareBase = amountOff.compareTo(condValueBigDecimal); - } else if ("PPIP_LPMUP_PER".equals(inputParamEnumId)) { - // NOTE: only check this after we know it's this type of cond, otherwise condValue may not be a number - BigDecimal condValueBigDecimal = new BigDecimal(condValue); - compareBase = percentOff.compareTo(condValueBigDecimal); - } else { + if (!"PPIP_LPMUP_AMT".equals(inputParamEnumId) && !"PPIP_LPMUP_PER".equals(inputParamEnumId)) { // condition doesn't apply to individual item, always passes return true; } - Debug.logInfo("Checking condition for item productId=" + cartItem.getProductId() + ", listPrice=" + listPrice + ", basePrice=" + basePrice + ", amountOff=" + amountOff + ", percentOff=" + percentOff + ", condValue=" + condValue + ", compareBase=" + compareBase + ", productPromoCond=" + productPromoCond, module); + // NOTE: only check this after we know it's this type of cond, otherwise condValue may not be a number + int compare = percentOff.compareTo(new BigDecimal(condValue)); - if (compareBase != null) { - int compare = compareBase; - if ("PPC_EQ".equals(operatorEnumId)) { - if (compare == 0) { - return true; - } - } else if ("PPC_NEQ".equals(operatorEnumId)) { - if (compare != 0) { - return true; - } - } else if ("PPC_LT".equals(operatorEnumId)) { - if (compare < 0) { - return true; - } - } else if ("PPC_LTE".equals(operatorEnumId)) { - if (compare <= 0) { - return true; - } - } else if ("PPC_GT".equals(operatorEnumId)) { - if (compare > 0) { - return true; - } - } else if ("PPC_GTE".equals(operatorEnumId)) { - if (compare >= 0) { - return true; - } - } else { - Debug.logWarning(UtilProperties.getMessage(resource_error,"OrderAnUnSupportedProductPromoCondCondition", UtilMisc.toMap("operatorEnumId",operatorEnumId) , cart.getLocale()), module); - return false; - } - // was a compareBase and nothing returned above, so condition didn't pass, return false - return false; + Debug.logInfo("Checking condition for item productId=" + cartItem.getProductId() + "," + + " listPrice=" + listPrice + ", basePrice=" + basePrice + ", amountOff=" + amountOff + "," + + " percentOff=" + percentOff + ", condValue=" + condValue + ", compareBase=" + compare + ", " + + "productPromoCond=" + productPromoCond, module); + + boolean res = ("PPC_EQ".equals(operatorEnumId) && compare == 0) + || ("PPC_NEQ".equals(operatorEnumId) && compare != 0) + || ("PPC_LT".equals(operatorEnumId) && compare < 0) + || ("PPC_LTE".equals(operatorEnumId) && compare <= 0) + || ("PPC_GT".equals(operatorEnumId) && compare > 0) + || ("PPC_GTE".equals(operatorEnumId) && compare >= 0); + if (!res) { + Debug.logWarning(UtilProperties.getMessage(resource_error,"OrderAnUnSupportedProductPromoCondCondition", + UtilMisc.toMap("operatorEnumId", operatorEnumId) , cart.getLocale()), module); } - - // no compareBase, this condition doesn't apply - return true; + return res; } public static int checkConditionPartyHierarchy(Delegator delegator, Timestamp nowTimestamp, String groupPartyId, String partyId) throws GenericEntityException{ Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java Tue Dec 11 13:33:49 2018 @@ -55,7 +55,6 @@ import org.apache.ofbiz.product.config.P import org.apache.ofbiz.product.store.ProductStoreWorker; 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.webapp.website.WebSiteWorker; Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java Tue Dec 11 13:33:49 2018 @@ -705,7 +705,7 @@ public class CommunicationEventServices communicationEventId = (String) createResult.get("communicationEventId"); //add content to newly created commEvent - Map createCommEventContentMap = new HashMap<>(); + Map<String, Object> createCommEventContentMap = new HashMap<>(); createCommEventContentMap.put("userLogin", userLogin); createCommEventContentMap.put("contentId", contentId); createCommEventContentMap.put("communicationEventId", communicationEventId); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java?rev=1848673&r1=1848672&r2=1848673&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java Tue Dec 11 13:33:49 2018 @@ -2004,7 +2004,6 @@ public class PartyServices { ByteBuffer fileBytes = (ByteBuffer) context.get("uploadedFile"); String encoding = System.getProperty("file.encoding"); String csvString = Charset.forName(encoding).decode(fileBytes).toString(); - final BufferedReader csvReader = new BufferedReader(new StringReader(csvString)); CSVFormat fmt = CSVFormat.DEFAULT.withHeader(); List<String> errMsgs = new LinkedList<>(); List<String> newErrMsgs = new LinkedList<>(); @@ -2034,7 +2033,7 @@ public class PartyServices { Boolean addParty = false; // when modify party, contact mech not added again - try { + try (BufferedReader csvReader = new BufferedReader(new StringReader(csvString))) { for (final CSVRecord rec : fmt.parse(csvReader)) { if (UtilValidate.isNotEmpty(rec.get("partyId"))) { currentPartyId = rec.get("partyId"); @@ -2343,7 +2342,7 @@ public class PartyServices { currentContactMechPurposeTypeId= "PHONE_WORK"; } Map<String, Object> resultMap = dispatcher.runSync("createPartyContactMech", UtilMisc.toMap("partyId", newPartyId, "contactMechId", newContactMechId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId, "userLogin", userLogin)); - if (ServiceUtil.isError(result)) { + if (ServiceUtil.isError(resultMap)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result)); } } @@ -2358,7 +2357,7 @@ public class PartyServices { currentContactMechPurposeTypeId = "PRIMARY_EMAIL"; } Map<String, Object> resultMap = dispatcher.runSync("createPartyContactMech", UtilMisc.toMap("partyId", newPartyId, "contactMechId", newContactMechId, "contactMechPurposeTypeId", currentContactMechPurposeTypeId, "userLogin", userLogin)); - if (ServiceUtil.isError(result)) { + if (ServiceUtil.isError(resultMap)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result)); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |