svn commit: r1857906 [1/9] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1857906 [1/9] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Author: mthl
Date: Sun Apr 21 12:49:52 2019 New Revision: 1857906 URL: http://svn.apache.org/viewvc?rev=1857906&view=rev Log: Improved: Remove redundant specification of type arguments (OFBIZ-10937) Since Java 1.7, when defining generic types it is unnecessary to redefine those types in the constructor when it is done in the declared type. 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/test/FinAccountTests.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/authorizedotnet/AIMRespPositions.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.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/util/UtilAccounting.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.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/ConvertTree.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.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/compdoc/CompDocEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.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/ContentMapFacade.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/ContentServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.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/content/UploadContentAndImage.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/layout/LayoutWorker.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/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.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/bom/BOMServices.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.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/ProductionRunEvents.java ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.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/mrp/ProposedOrder.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/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/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/quote/QuoteServices.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/shipping/ShippingEstimateWrapper.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.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/zipsales/ZipSalesServices.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.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/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/feature/ParametricSearch.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.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/store/ProductStoreWorker.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/packing/PackingSessionLine.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.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/dhl/DhlServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.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/collections/test/FlexibleMapAccessorTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.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/ObjectTypeTests.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.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/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java ofbiz/ofbiz-framework/trunk/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.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/datasource/GenericDAO.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.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/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/DynamicViewEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.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/util/Converters.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.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/EntityTypeUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.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/DelegatorEcaHandler.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/EntityEcaRule.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.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/MiniLangUtil.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.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/ServiceEcaRule.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/eca/ServiceEcaUtil.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.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/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/control/RequestHandler.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/EventFactory.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/RequestBodyMapHandlerFactory.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/event/ServiceEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.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/view/ViewFactory.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -72,7 +72,7 @@ public class AgreementServices { Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String errMsg = null; - List<Map<String, Object>> commissions = new LinkedList<Map<String,Object>>(); + List<Map<String, Object>> commissions = new LinkedList<>(); try { BigDecimal amount = ((BigDecimal)context.get("amount")); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/FinAccountTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/FinAccountTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/FinAccountTests.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/FinAccountTests.java Sun Apr 21 12:49:52 2019 @@ -39,7 +39,7 @@ public class FinAccountTests extends OFB public void testFinAccountOperations() throws Exception { GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne(); - Map<String, Object> ctx = new HashMap<String, Object>(); + Map<String, Object> ctx = new HashMap<>(); ctx.put("finAccountId", "TESTACCOUNT1"); ctx.put("finAccountName", "Test Financial Account"); ctx.put("finAccountTypeId", "BANK_ACCOUNT"); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -81,7 +81,7 @@ public class AIMPaymentServices { Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); Map<String, Object> results = ServiceUtil.returnSuccess(); - Map<String, Object> request = new HashMap<String, Object>(); + Map<String, Object> request = new HashMap<>(); Properties props = buildAIMProperties(context, delegator); buildMerchantInfo(context, props, request); buildGatewayResponeConfig(context, props, request); @@ -122,7 +122,7 @@ public class AIMPaymentServices { context.put("creditCard", creditCard); context.put("authTransaction", authTransaction); Map<String, Object> results = ServiceUtil.returnSuccess(); - Map<String, Object> request = new HashMap<String, Object>(); + Map<String, Object> request = new HashMap<>(); Properties props = buildAIMProperties(context, delegator); buildMerchantInfo(context, props, request); buildGatewayResponeConfig(context, props, request); @@ -169,7 +169,7 @@ public class AIMPaymentServices { context.put("creditCard",creditCard); context.put("authTransaction",authTransaction); Map<String, Object> results = ServiceUtil.returnSuccess(); - Map<String, Object> request = new HashMap<String, Object>(); + Map<String, Object> request = new HashMap<>(); Properties props = buildAIMProperties(context, delegator); buildMerchantInfo(context, props, request); buildGatewayResponeConfig(context, props, request); @@ -260,7 +260,7 @@ public class AIMPaymentServices { Locale locale = (Locale) context.get("locale"); context.put("authTransaction", authTransaction); Map<String, Object> results = ServiceUtil.returnSuccess(); - Map<String, Object> request = new HashMap<String, Object>(); + Map<String, Object> request = new HashMap<>(); Properties props = buildAIMProperties(context, delegator); buildMerchantInfo(context, props, request); buildGatewayResponeConfig(context, props, request); @@ -278,7 +278,7 @@ public class AIMPaymentServices { public static Map<String, Object> ccCredit(DispatchContext ctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); results.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR); results.put(ModelService.ERROR_MESSAGE, UtilProperties.getMessage(resource, "AccountingAuthorizeNetccCreditUnsupported", locale)); return results; @@ -288,7 +288,7 @@ public class AIMPaymentServices { Delegator delegator = ctx.getDelegator(); Locale locale = (Locale) context.get("locale"); Map<String, Object> results = ServiceUtil.returnSuccess(); - Map<String, Object> request = new HashMap<String, Object>(); + Map<String, Object> request = new HashMap<>(); Properties props = buildAIMProperties(context, delegator); buildMerchantInfo(context, props, request); buildGatewayResponeConfig(context, props, request); @@ -314,7 +314,7 @@ public class AIMPaymentServices { } private static Map<String, Object> processCard(Map<String, Object> request, Properties props, Locale locale) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); String url = props.getProperty("url"); if (UtilValidate.isEmpty(url)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -642,7 +642,7 @@ public class AIMPaymentServices { } private static Map<String, Object> validateRequest(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return result; } @@ -704,7 +704,7 @@ public class AIMPaymentServices { } private static Map<String, Object> processRefundTransResult(Map<String, Object> request, Map<String, Object> reply) { - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean captureResult = (Boolean) reply.get("authResult"); @@ -731,7 +731,7 @@ public class AIMPaymentServices { } private static Map<String, Object> processReleaseTransResult(Map<String, Object> request, Map<String, Object> reply) { - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); try { Boolean captureResult = (Boolean) reply.get("authResult"); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java Sun Apr 21 12:49:52 2019 @@ -25,7 +25,7 @@ import java.util.Map; public class AIMRespPositions extends AuthorizeResponse.RespPositions { // AIM v3.1 response positions - private static Map<String, Integer> positions = new LinkedHashMap<String, Integer>(); + private static Map<String, Integer> positions = new LinkedHashMap<>(); static { positions.put(AuthorizeResponse.RESPONSE_CODE, 1); positions.put(AuthorizeResponse.REASON_CODE, 3); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java Sun Apr 21 12:49:52 2019 @@ -25,7 +25,7 @@ import java.util.Map; public class CPRespPositions extends AuthorizeResponse.RespPositions { // Card-Present v1.0 response positions - private static Map<String, Integer> positions = new LinkedHashMap<String, Integer>(); + private static Map<String, Integer> positions = new LinkedHashMap<>(); static { positions.put(AuthorizeResponse.RESPONSE_CODE, 2); positions.put(AuthorizeResponse.REASON_CODE, 3); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Sun Apr 21 12:49:52 2019 @@ -51,7 +51,7 @@ public class SagePayPaymentServices { Debug.logInfo("SagePay - Entered buildCustomerBillingInfo", module); Debug.logInfo("SagePay buildCustomerBillingInfo context : " + context, module); - Map<String, String> billingInfo = new HashMap<String, String>(); + Map<String, String> billingInfo = new HashMap<>(); String orderId = null; BigDecimal processAmount = null; Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java Sun Apr 21 12:49:52 2019 @@ -49,7 +49,7 @@ public class SagePayServices private static Map<String, String> buildSagePayProperties(Map<String, Object> context, Delegator delegator) { - Map<String, String> sagePayConfig = new HashMap<String, String>(); + Map<String, String> sagePayConfig = new HashMap<>(); String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); @@ -79,7 +79,7 @@ public class SagePayServices Debug.logInfo("SagePay paymentAuthentication context : " + context, module); Delegator delegator = ctx.getDelegator(); - Map<String, Object> resultMap = new HashMap<String, Object>(); + Map<String, Object> resultMap = new HashMap<>(); Map<String, String> props = buildSagePayProperties(context, delegator); @@ -124,7 +124,7 @@ public class SagePayServices HttpHost host = SagePayUtil.getHost(props); //start - authentication parameters - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); String vpsProtocol = props.get("protocolVersion"); String vendor = props.get("vendor"); @@ -299,7 +299,7 @@ public class SagePayServices Debug.logInfo("SagePay paymentAuthorisation context : " + context, module); Delegator delegator = ctx.getDelegator(); - Map<String, Object> resultMap = new HashMap<String, Object>(); + Map<String, Object> resultMap = new HashMap<>(); Map<String, String> props = buildSagePayProperties(context, delegator); @@ -313,7 +313,7 @@ public class SagePayServices HttpHost host = SagePayUtil.getHost(props); //start - authorization parameters - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); String vpsProtocol = props.get("protocolVersion"); String vendor = props.get("vendor"); @@ -391,7 +391,7 @@ public class SagePayServices Debug.logInfo("SagePay paymentRelease context : " + context, module); Delegator delegator = ctx.getDelegator(); - Map<String, Object> resultMap = new HashMap<String, Object>(); + Map<String, Object> resultMap = new HashMap<>(); Map<String, String> props = buildSagePayProperties(context, delegator); @@ -404,7 +404,7 @@ public class SagePayServices HttpHost host = SagePayUtil.getHost(props); //start - release parameters - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); String vpsProtocol = props.get("protocolVersion"); String vendor = props.get("vendor"); @@ -480,7 +480,7 @@ public class SagePayServices Debug.logInfo("SagePay paymentVoid context : " + context, module); Delegator delegator = ctx.getDelegator(); - Map<String, Object> resultMap = new HashMap<String, Object>(); + Map<String, Object> resultMap = new HashMap<>(); Map<String, String> props = buildSagePayProperties(context, delegator); @@ -493,7 +493,7 @@ public class SagePayServices HttpHost host = SagePayUtil.getHost(props); //start - void parameters - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); String vpsProtocol = props.get("protocolVersion"); String vendor = props.get("vendor"); @@ -567,7 +567,7 @@ public class SagePayServices Debug.logInfo("SagePay paymentRefund context : " + context, module); Delegator delegator = ctx.getDelegator(); - Map<String, Object> resultMap = new HashMap<String, Object>(); + Map<String, Object> resultMap = new HashMap<>(); Map<String, String> props = buildSagePayProperties(context, delegator); @@ -585,7 +585,7 @@ public class SagePayServices HttpHost host = SagePayUtil.getHost(props); //start - refund parameters - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); String vpsProtocol = props.get("protocolVersion"); String vendor = props.get("vendor"); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java Sun Apr 21 12:49:52 2019 @@ -51,7 +51,7 @@ public final class SagePayUtil { public static Map<String, Object> buildCardAuthorisationPaymentResponse (Boolean authResult, String authCode, String authFlag, BigDecimal processAmount, String authRefNum, String authAltRefNum, String authMessage) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); if(authResult != null) { result.put("authResult", authResult); } if(authCode != null) { result.put("authCode", authCode); } if(authFlag != null) { result.put("authFlag", authFlag); } @@ -65,7 +65,7 @@ public final class SagePayUtil { public static Map<String, Object> buildCardCapturePaymentResponse (Boolean captureResult, String captureCode, String captureFlag, BigDecimal captureAmount, String captureRefNum, String captureAltRefNum, String captureMessage) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); if(captureResult != null) { result.put("captureResult", captureResult); } if(captureCode != null) { result.put("captureCode", captureCode); } if(captureFlag != null) { result.put("captureFlag", captureFlag); } @@ -79,7 +79,7 @@ public final class SagePayUtil { public static Map<String, Object> buildCardReleasePaymentResponse (Boolean releaseResult, String releaseCode, BigDecimal releaseAmount, String releaseRefNum, String releaseAltRefNum, String releaseMessage) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); if(releaseResult != null) { result.put("releaseResult", releaseResult); } if(releaseCode != null) { result.put("releaseCode", releaseCode); } if(releaseAmount != null) { result.put("releaseAmount", releaseAmount); } @@ -92,7 +92,7 @@ public final class SagePayUtil { public static Map<String, Object> buildCardVoidPaymentResponse (Boolean refundResult, BigDecimal refundAmount, String refundRefNum, String refundAltRefNum, String refundMessage) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); if(refundResult != null) { result.put("refundResult", refundResult); } if(refundAmount != null) { result.put("refundAmount", refundAmount); } if(refundRefNum != null) { result.put("refundRefNum", refundRefNum); } @@ -104,7 +104,7 @@ public final class SagePayUtil { public static Map<String, Object> buildCardRefundPaymentResponse (Boolean refundResult, String refundCode, BigDecimal refundAmount, String refundRefNum, String refundAltRefNum, String refundMessage) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); if(refundResult != null) { result.put("refundResult", refundResult); } if(refundCode != null) { result.put("refundCode", refundCode); } if(refundAmount != null) { result.put("refundAmount", refundAmount); } @@ -143,7 +143,7 @@ public final class SagePayUtil { public static Map<String, String> getResponseData(HttpResponse response) throws IOException { - Map<String, String> responseData = new HashMap<String, String>(); + Map<String, String> responseData = new HashMap<>(); HttpEntity httpEntity = response.getEntity(); if (httpEntity != null) { InputStream inputStream = httpEntity.getContent(); @@ -171,7 +171,7 @@ public final class SagePayUtil { HttpPost httpPost = new HttpPost(uri); httpPost.addHeader("User-Agent", "HTTP Client"); httpPost.addHeader("Content-type", "application/x-www-form-urlencoded"); - List<NameValuePair> postParameters = new ArrayList<NameValuePair>(); + List<NameValuePair> postParameters = new ArrayList<>(); for (Entry<String,String> entry : parameters.entrySet()) { postParameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); } 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -706,7 +706,7 @@ public class ValueLinkServices { private static void setTimeoutReversal(DispatchContext dctx, Map<String, Object> ctx, Map<String, Object> request) { String vlInterface = (String) request.get("Interface"); // clone the context - Map<String, Object> context = new HashMap<String, Object>(); + Map<String, Object> context = new HashMap<>(); context.putAll(ctx); // append the rollback interface @@ -762,7 +762,7 @@ public class ValueLinkServices { currency = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator); } - Map<String, Object> redeemCtx = new HashMap<String, Object>(); + Map<String, Object> redeemCtx = new HashMap<>(); redeemCtx.put("userLogin", userLogin); redeemCtx.put("paymentConfig", paymentConfig); redeemCtx.put("cardNumber", giftCard.get("cardNumber")); @@ -855,7 +855,7 @@ public class ValueLinkServices { currency = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator); } - Map<String, Object> redeemCtx = new HashMap<String, Object>(); + Map<String, Object> redeemCtx = new HashMap<>(); redeemCtx.put("userLogin", userLogin); redeemCtx.put("paymentConfig", paymentConfig); redeemCtx.put("cardNumber", giftCard.get("cardNumber")); @@ -920,7 +920,7 @@ public class ValueLinkServices { currency = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator); } - Map<String, Object> refundCtx = new HashMap<String, Object>(); + Map<String, Object> refundCtx = new HashMap<>(); refundCtx.put("userLogin", userLogin); refundCtx.put("paymentConfig", paymentConfig); refundCtx.put("cardNumber", giftCard.get("cardNumber")); @@ -1085,7 +1085,7 @@ public class ValueLinkServices { } // make a map of answer info - Map<String, Object> answerMap = new HashMap<String, Object>(); + Map<String, Object> answerMap = new HashMap<>(); if (responseAnswers != null) { for (GenericValue answer : responseAnswers) { GenericValue question = null; @@ -1117,7 +1117,7 @@ public class ValueLinkServices { int qtyLoop = quantity.intValue(); for (int i = 0; i < qtyLoop; i++) { // activate a gift card - Map<String, Object> activateCtx = new HashMap<String, Object>(); + Map<String, Object> activateCtx = new HashMap<>(); activateCtx.put("paymentConfig", paymentConfig); activateCtx.put("vlPromoCode", promoCode); activateCtx.put("currency", currency); @@ -1151,7 +1151,7 @@ public class ValueLinkServices { } // create the fulfillment record - Map<String, Object> vlFulFill = new HashMap<String, Object>(); + Map<String, Object> vlFulFill = new HashMap<>(); vlFulFill.put("typeEnumId", "GC_ACTIVATE"); vlFulFill.put("merchantId", EntityUtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId", delegator)); vlFulFill.put("partyId", partyId); @@ -1207,7 +1207,7 @@ public class ValueLinkServices { } } - Map<String, Object> emailCtx = new HashMap<String, Object>(); + Map<String, Object> emailCtx = new HashMap<>(); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); if (UtilValidate.isEmpty(bodyScreenLocation)) { bodyScreenLocation = ProductStoreWorker.getDefaultProductStoreEmailScreenLocation(emailType); @@ -1330,7 +1330,7 @@ public class ValueLinkServices { } // make a map of answer info - Map<String, Object> answerMap = new HashMap<String, Object>(); + Map<String, Object> answerMap = new HashMap<>(); if (responseAnswers != null) { for (GenericValue answer : responseAnswers) { GenericValue question = null; @@ -1355,7 +1355,7 @@ public class ValueLinkServices { String pinNumber = (String) answerMap.get(pinNumberKey); // reload the gift card - Map<String, Object> reloadCtx = new HashMap<String, Object>(); + Map<String, Object> reloadCtx = new HashMap<>(); reloadCtx.put("paymentConfig", paymentConfig); reloadCtx.put("currency", currency); reloadCtx.put("partyId", partyId); @@ -1375,7 +1375,7 @@ public class ValueLinkServices { } // create the fulfillment record - Map<String, Object> vlFulFill = new HashMap<String, Object>(); + Map<String, Object> vlFulFill = new HashMap<>(); vlFulFill.put("typeEnumId", "GC_RELOAD"); vlFulFill.put("merchantId", EntityUtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId", delegator)); vlFulFill.put("partyId", partyId); @@ -1442,7 +1442,7 @@ public class ValueLinkServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - Map<String, Object> emailCtx = new HashMap<String, Object>(); + Map<String, Object> emailCtx = new HashMap<>(); answerMap.put("locale", locale); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java Sun Apr 21 12:49:52 2019 @@ -98,7 +98,7 @@ public final class UtilAccounting { } public static List<String> getDescendantGlAccountClassIds(GenericValue glAccountClass) throws GenericEntityException { - List<String> glAccountClassIds = new LinkedList<String>(); + List<String> glAccountClassIds = new LinkedList<>(); getGlAccountClassChildren(glAccountClass, glAccountClassIds); return glAccountClassIds; } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java Sun Apr 21 12:49:52 2019 @@ -88,7 +88,7 @@ public class ContentManagementEvents { String pubValue = (String)map.get(pubContentId); String paramName = Integer.toString(counter) + "_" + pubContentId; String paramValue = (String)paramMap.get(paramName); - Map<String, Object> serviceIn = new HashMap<String, Object>(); + Map<String, Object> serviceIn = new HashMap<>(); serviceIn.put("userLogin", userLogin); serviceIn.put("contentIdTo", contentId); serviceIn.put("contentId", pubContentId); @@ -200,7 +200,7 @@ public class ContentManagementEvents { // make a map of the values that are passed in using the top subSite as the key. // Content can only be linked to one subsite under a top site (ends with "_MASTER") - Map<String, String> siteIdLookup = new HashMap<String, String>(); + Map<String, String> siteIdLookup = new HashMap<>(); for (Entry<String, Object> entry : paramMap.entrySet()) { String param = entry.getKey(); int pos = param.indexOf("select_"); @@ -247,7 +247,7 @@ public class ContentManagementEvents { } } // create new link - Map<String, Object> serviceIn = new HashMap<String, Object>(); + Map<String, Object> serviceIn = new HashMap<>(); serviceIn.put("userLogin", userLogin); serviceIn.put("contentId", targContentId); serviceIn.put("contentAssocTypeId", "PUBLISH_LINK"); @@ -265,7 +265,7 @@ public class ContentManagementEvents { return "error"; } - serviceIn = new HashMap<String, Object>(); + serviceIn = new HashMap<>(); serviceIn.put("userLogin", userLogin); serviceIn.put("contentId", targContentId); serviceIn.put("contentAssocTypeId", "PUBLISH_LINK"); 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=1857906&r1=1857905&r2=1857906&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 Sun Apr 21 12:49:52 2019 @@ -81,7 +81,7 @@ public class ContentManagementServices { if (UtilValidate.isNotEmpty(assocTypesString)) { List<String> lst = StringUtil.split(assocTypesString, "|"); if (assocTypes == null) { - assocTypes = new LinkedList<String>(); + assocTypes = new LinkedList<>(); } assocTypes.addAll(lst); } @@ -156,7 +156,7 @@ public class ContentManagementServices { // ContentPurposes can get passed in as a delimited string or a list. Combine. List<String> contentPurposeList = UtilGenerics.checkList(context.get("contentPurposeList")); if (contentPurposeList == null) { - contentPurposeList = new LinkedList<String>(); + contentPurposeList = new LinkedList<>(); } String contentPurposeString = (String) context.get("contentPurposeString"); if (UtilValidate.isNotEmpty(contentPurposeString)) { @@ -275,7 +275,7 @@ public class ContentManagementServices { } context.putAll(content); if (contentExists) { - Map<String, Object> contentContext = new HashMap<String, Object>(); + Map<String, Object> contentContext = new HashMap<>(); ModelService contentModel = dispatcher.getDispatchContext().getModelService("updateContent"); contentContext.putAll(contentModel.makeValid(content, ModelService.IN_PARAM)); contentContext.put("userLogin", userLogin); @@ -287,7 +287,7 @@ public class ContentManagementServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentContentUpdatingError", UtilMisc.toMap("serviceName", "persistContentAndAssoc"), locale), null, null, thisResult); } } else { - Map<String, Object> contentContext = new HashMap<String, Object>(); + Map<String, Object> contentContext = new HashMap<>(); ModelService contentModel = dispatcher.getDispatchContext().getModelService("createContent"); contentContext.putAll(contentModel.makeValid(content, ModelService.IN_PARAM)); contentContext.put("userLogin", userLogin); @@ -320,7 +320,7 @@ public class ContentManagementServices { } else if (UtilValidate.isNotEmpty(dataResourceTypeId) && UtilValidate.isNotEmpty(contentId)) { // If dataResource was not previously existing, then update the associated content with its id if (UtilValidate.isNotEmpty(dataResourceId) && !dataResourceExists) { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("userLogin", userLogin); map.put("dataResourceId", dataResourceId); map.put("contentId", contentId); @@ -344,7 +344,7 @@ public class ContentManagementServices { if (Debug.infoOn()) Debug.logInfo("contentAssoc: " + contentAssoc.toString(), module); if (UtilValidate.isNotEmpty(contentAssocTypeId) && contentAssoc.get("contentId") != null && contentAssoc.get("contentIdTo") != null) { if (Debug.infoOn()) Debug.logInfo("in persistContentAndAssoc, deactivateExisting:" + deactivateExisting, module); - Map<String, Object> contentAssocContext = new HashMap<String, Object>(); + Map<String, Object> contentAssocContext = new HashMap<>(); contentAssocContext.put("userLogin", userLogin); contentAssocContext.put("displayFailCond", bDisplayFailCond); contentAssocContext.put("skipPermissionCheck", context.get("skipPermissionCheck")); @@ -405,7 +405,7 @@ public class ContentManagementServices { LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue)context.get("userLogin"); - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); String siteContentId = (String)context.get("contentId"); String partyId = (String)context.get("partyId"); @@ -420,7 +420,7 @@ public class ContentManagementServices { } for (GenericValue roleType : siteRoles) { - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> serviceContext = new HashMap<>(); serviceContext.put("partyId", partyId); serviceContext.put("contentId", siteContentId); serviceContext.put("userLogin", userLogin); @@ -444,7 +444,7 @@ public class ContentManagementServices { // for now, will assume that any error is due to duplicates - ignore if (fromDate == null) { try { - Map<String, Object> newContext = new HashMap<String, Object>(); + Map<String, Object> newContext = new HashMap<>(); newContext.put("contentId", serviceContext.get("contentId")); newContext.put("partyId", serviceContext.get("partyId")); newContext.put("roleTypeId", serviceContext.get("roleTypeId")); @@ -472,7 +472,7 @@ public class ContentManagementServices { // for now, will assume that any error is due to non-existence - ignore try { Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, module); - Map<String, Object> newContext = new HashMap<String, Object>(); + Map<String, Object> newContext = new HashMap<>(); newContext.put("contentId", serviceContext.get("contentId")); newContext.put("partyId", serviceContext.get("partyId")); newContext.put("roleTypeId", serviceContext.get("roleTypeId")); @@ -533,8 +533,8 @@ public class ContentManagementServices { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - Map<String, Object> result = new HashMap<String, Object>(); - Map<String, Object> newDrContext = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); + Map<String, Object> newDrContext = new HashMap<>(); GenericValue dataResource = delegator.makeValue("DataResource"); dataResource.setPKFields(context); dataResource.setNonPKFields(context); @@ -593,7 +593,7 @@ public class ContentManagementServices { Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, module); } dataResource = (GenericValue)thisResult.get("dataResource"); - Map<String, Object> fileContext = new HashMap<String, Object>(); + Map<String, Object> fileContext = new HashMap<>(); fileContext.put("userLogin", userLogin); if ("IMAGE_OBJECT".equals(dataResourceTypeId)) { if (imageDataBytes != null) { @@ -607,7 +607,7 @@ public class ContentManagementServices { } else if ("SHORT_TEXT".equals(dataResourceTypeId)) { } else if ("SURVEY".startsWith(dataResourceTypeId)) { } else if ("_FILE".indexOf(dataResourceTypeId) >=0) { - Map<String, Object> uploadImage = new HashMap<String, Object>(); + Map<String, Object> uploadImage = new HashMap<>(); uploadImage.put("userLogin", userLogin); uploadImage.put("dataResourceId", dataResourceId); uploadImage.put("dataResourceTypeId", dataResourceTypeId); @@ -635,7 +635,7 @@ public class ContentManagementServices { if (ServiceUtil.isError(thisResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult)); } - Map<String, Object> fileContext = new HashMap<String, Object>(); + Map<String, Object> fileContext = new HashMap<>(); fileContext.put("userLogin", userLogin); String forceElectronicText = (String)context.get("forceElectronicText"); if ("IMAGE_OBJECT".equals(dataResourceTypeId)) { @@ -650,7 +650,7 @@ public class ContentManagementServices { } else if ("SHORT_TEXT".equals(dataResourceTypeId)) { } else if ("SURVEY".startsWith(dataResourceTypeId)) { } else if ("_FILE".indexOf(dataResourceTypeId) >=0) { - Map<String, Object> uploadImage = new HashMap<String, Object>(); + Map<String, Object> uploadImage = new HashMap<>(); uploadImage.put("userLogin", userLogin); uploadImage.put("dataResourceId", dataResourceId); uploadImage.put("dataResourceTypeId", dataResourceTypeId); @@ -695,9 +695,9 @@ public class ContentManagementServices { public static Map<String, Object> updateSiteRolesDyn(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); - Map<String, Object> results = new HashMap<String, Object>(); - Map<String, Object> thisResult = new HashMap<String, Object>(); - Map<String, Object> serviceContext = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); + Map<String, Object> thisResult = new HashMap<>(); + Map<String, Object> serviceContext = new HashMap<>(); // siteContentId will equal "ADMIN_MASTER", "AGINC_MASTER", etc. // Remember that this service is called in the "multi" mode, // with a new siteContentId each time. @@ -746,7 +746,7 @@ public class ContentManagementServices { //return ServiceUtil.returnError(e.toString()); try { Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, module); - Map<String, Object> newContext = new HashMap<String, Object>(); + Map<String, Object> newContext = new HashMap<>(); newContext.put("contentId", serviceContext.get("contentId")); newContext.put("partyId", serviceContext.get("partyId")); newContext.put("roleTypeId", serviceContext.get("roleTypeId")); @@ -766,12 +766,12 @@ public class ContentManagementServices { } public static Map<String, Object> updateOrRemove(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); Delegator delegator = dctx.getDelegator(); String entityName = (String)context.get("entityName"); String action = (String)context.get("action"); String pkFieldCount = (String)context.get("pkFieldCount"); - Map<String, String> pkFields = new HashMap<String, String>(); + Map<String, String> pkFields = new HashMap<>(); int fieldCount = Integer.parseInt(pkFieldCount); for (int i=0; i<fieldCount; i++) { String fieldName = (String)context.get("fieldName" + i); @@ -820,7 +820,7 @@ public class ContentManagementServices { } public static Map<String, Object> resequence(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); String contentIdTo = (String)context.get("contentIdTo"); Integer seqInc = (Integer)context.get("seqInc"); @@ -830,7 +830,7 @@ public class ContentManagementServices { int seqIncrement = seqInc; List<String> typeList = UtilGenerics.checkList(context.get("typeList")); if (typeList == null) { - typeList = new LinkedList<String>(); + typeList = new LinkedList<>(); } String contentAssocTypeId = (String)context.get("contentAssocTypeId"); if (UtilValidate.isNotEmpty(contentAssocTypeId)) { @@ -900,10 +900,10 @@ public class ContentManagementServices { } public static Map<String, Object> changeLeafToNode(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> thisResult = new HashMap<String, Object>(); + Map<String, Object> thisResult = new HashMap<>(); String contentId = (String)context.get("contentId"); GenericValue userLogin = (GenericValue)context.get("userLogin"); String userLoginId = userLogin.getString("userLoginId"); @@ -958,7 +958,7 @@ public class ContentManagementServices { } public static Map<String, Object> updateLeafCount(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); List<String> typeList = UtilGenerics.checkList(context.get("typeList")); if (typeList == null) { @@ -986,11 +986,11 @@ public class ContentManagementServices { public static Map<String, Object> updatePageType(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ Delegator delegator = dctx.getDelegator(); Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); Locale locale = (Locale) context.get("locale"); Set<String> visitedSet = UtilGenerics.checkSet(context.get("visitedSet")); if (visitedSet == null) { - visitedSet = new HashSet<String>(); + visitedSet = new HashSet<>(); context.put("visitedSet", visitedSet); } String pageMode = (String)context.get("pageMode"); @@ -1026,11 +1026,11 @@ public class ContentManagementServices { public static Map<String, Object> resetToOutlineMode(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ Delegator delegator = dctx.getDelegator(); Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); Locale locale = (Locale) context.get("locale"); Set<String> visitedSet = UtilGenerics.checkSet(context.get("visitedSet")); if (visitedSet == null) { - visitedSet = new HashSet<String>(); + visitedSet = new HashSet<>(); context.put("visitedSet", visitedSet); } String contentId = (String)context.get("contentId"); @@ -1069,7 +1069,7 @@ public class ContentManagementServices { } public static Map<String, Object> clearContentAssocViewCache(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); UtilCache<?, ?> utilCache = UtilCache.findCache("entitycache.entity-list.default.ContentAssocViewFrom"); if (utilCache != null) { @@ -1085,7 +1085,7 @@ public class ContentManagementServices { } public static Map<String, Object> clearContentAssocDataResourceViewCache(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); UtilCache<?, ?> utilCache = UtilCache.findCache("entitycache.entity-list.default.ContentAssocViewDataResourceFrom"); if (utilCache != null) { @@ -1104,7 +1104,7 @@ public class ContentManagementServices { String contentId = content.getString("contentId"); Set<String> visitedSet = UtilGenerics.checkSet(context.get("visitedSet")); if (visitedSet == null) { - visitedSet = new HashSet<String>(); + visitedSet = new HashSet<>(); context.put("visitedSet", visitedSet); } else { if (visitedSet.contains(contentId)) { @@ -1127,7 +1127,7 @@ public class ContentManagementServices { String contentId = content.getString("contentId"); Set<String> visitedSet = UtilGenerics.checkSet(context.get("visitedSet")); if (visitedSet == null) { - visitedSet = new HashSet<String>(); + visitedSet = new HashSet<>(); context.put("visitedSet", visitedSet); } else { if (visitedSet.contains(contentId)) { @@ -1165,7 +1165,7 @@ public class ContentManagementServices { } public static Map<String, Object> findSubNodes(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> results = new HashMap<String, Object>(); + Map<String, Object> results = new HashMap<>(); Delegator delegator = dctx.getDelegator(); String contentIdTo = (String)context.get("contentId"); try { @@ -1200,7 +1200,7 @@ public class ContentManagementServices { } public static Map<String, Object> initContentChildCounts(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Locale locale = (Locale) context.get("locale"); GenericValue content = (GenericValue)context.get("content"); if (content == null) { @@ -1219,7 +1219,7 @@ public class ContentManagementServices { } public static Map<String, Object> incrementContentChildStats(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String contentId = (String)context.get("contentId"); @@ -1245,7 +1245,7 @@ public class ContentManagementServices { } public static Map<String, Object> decrementContentChildStats(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String contentId = (String)context.get("contentId"); @@ -1271,12 +1271,12 @@ public class ContentManagementServices { } public static Map<String, Object> updateContentChildStats(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); String contentId = (String)context.get("contentId"); String contentAssocTypeId = (String)context.get("contentAssocTypeId"); - List<String> typeList = new LinkedList<String>(); + List<String> typeList = new LinkedList<>(); if (UtilValidate.isNotEmpty(contentAssocTypeId)) { typeList.add(contentAssocTypeId); } else { @@ -1292,11 +1292,11 @@ public class ContentManagementServices { } public static Map<String, Object> updateContentSubscription(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - Map<String, Object> thisResult = new HashMap<String, Object>(); + Map<String, Object> thisResult = new HashMap<>(); String partyId = (String) context.get("partyId"); String webPubPt = (String) context.get("contentId"); String roleTypeId = (String) context.get("useRoleTypeId"); @@ -1358,7 +1358,7 @@ public class ContentManagementServices { if (hasExistingContentRole) { contentRole.store(); } else { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("partyId", partyId); map.put("roleTypeId", roleTypeId); map.put("userLogin", userLogin); @@ -1428,7 +1428,7 @@ public class ContentManagementServices { public static Map<String, Object> updateContentSubscriptionByOrder(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException{ Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -1494,14 +1494,14 @@ public class ContentManagementServices { String contentId = (String)context.get("contentId"); String serviceName = (String)context.get("serviceName"); String contentAssocTypeId = (String)context.get("contentAssocTypeId"); - List<String> contentAssocTypeIdList = new LinkedList<String>(); + List<String> contentAssocTypeIdList = new LinkedList<>(); if (UtilValidate.isNotEmpty(contentAssocTypeId)) { contentAssocTypeIdList = StringUtil.split(contentAssocTypeId, "|"); } if (contentAssocTypeIdList.size() == 0) { contentAssocTypeIdList.add("SUB_CONTENT"); } - Map<String, Object> ctx = new HashMap<String, Object>(); + Map<String, Object> ctx = new HashMap<>(); ctx.put("userLogin", userLogin); ctx.put("contentAssocTypeIdList", contentAssocTypeIdList); try { @@ -1521,7 +1521,7 @@ public class ContentManagementServices { Locale locale = (Locale) context.get("locale"); Set<String> visitedSet = UtilGenerics.checkSet(context.get("visitedSet")); if (visitedSet == null) { - visitedSet = new HashSet<String>(); + visitedSet = new HashSet<>(); context.put("visitedSet", visitedSet); } else { if (visitedSet.contains(contentId)) { @@ -1576,9 +1576,9 @@ public class ContentManagementServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result)); } String contentId = (String)result.get("contentId"); - List<String> parentList = new LinkedList<String>(); + List<String> parentList = new LinkedList<>(); if (UtilValidate.isEmpty(masterRevisionContentId)) { - Map<String, Object> traversMap = new HashMap<String, Object>(); + Map<String, Object> traversMap = new HashMap<>(); traversMap.put("contentId", contentId); traversMap.put("direction", "To"); traversMap.put("contentAssocTypeId", "COMPDOC_PART"); @@ -1592,7 +1592,7 @@ public class ContentManagementServices { } // Update ContentRevision and ContentRevisonItem - Map<String, Object> contentRevisionMap = new HashMap<String, Object>(); + Map<String, Object> contentRevisionMap = new HashMap<>(); contentRevisionMap.put("itemContentId", contentId); contentRevisionMap.put("newDataResourceId", result.get("dataResourceId")); contentRevisionMap.put("oldDataResourceId", oldDataResourceId); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |